[patch] remove nsplugins eclass use as it is no longer needed

vlc-nsplugin-fixup-1.diff (text/plain), 1.27 KB, created by Jory A. Pratt on 2010-07-31 22:39:04 UTC

Index: vlc-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.1.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 vlc-1.1.1.ebuild
--- vlc-1.1.1.ebuild	22 Jul 2010 06:39:54 -0000	1.2
+++ vlc-1.1.1.ebuild	31 Jul 2010 22:38:19 -0000
@@ -17,7 +17,7 @@
 	fi
 fi
 
-inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
+inherit eutils multilib autotools toolchain-funcs gnome2 qt4 flag-o-matic ${SCM}
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -212,6 +212,11 @@
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	eautoreconf
+
+	# Fix plugin install dir
+	einfo "Fixing installation location for libvlcplugin"
+	 sed -i -e 's:\$(libdir)\/mozilla\/plugins:\$(libdir)\/nsbrowser\/plugins:g' \
+		${S}/projects/mozilla/Makefile.am || die "failed to fix libvlcplugin installation dir"
 }
 
 src_configure() {
@@ -343,12 +348,6 @@
 	rm -rf "${D}/usr/share/doc/vlc" \
 		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
 
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
 	use skins || rm -rf "${D}/usr/share/vlc/skins2"
 }