Remove USE="nsplugin" in favour of media-plugins/npapi-vlc (and because net-libs/xulrunner is vulnerable) wrt #407567 and #415479.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 25 insertions, 16 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b606229a1d0e..238a265b0f90 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.798 2012/05/18 02:22:49 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.799 2012/05/21 05:21:20 ssuominen Exp $
+
+  21 May 2012; Samuli Suominen <ssuominen@gentoo.org> vlc-1.1.13.ebuild:
+  Remove USE="nsplugin" in favour of media-plugins/npapi-vlc (and because
+  net-libs/xulrunner is vulnerable) wrt #407567 and #415479.
 
   18 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   vlc-2.0.1.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 06a24b32d7fe..59254bdadf5e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
 DIST vlc-2.0.1.tar.xz 17210552 RMD160 9d932e1be72b65cf47057191d9e84deeedea282c SHA1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
 DIST vlc-patches-107.tar.bz2 4694 RMD160 341138714b59572bb4aaa7af96cfbebcfdd76d28 SHA1 60217caa88a35487a28eaab4f95e2dc6bae6ec98 SHA256 b371af609bd3d8ed11769b72b9bdb82bc231a8e2058c8965567ab4fa9363b4ca
-EBUILD vlc-1.1.13.ebuild 12191 RMD160 7b43ec8e6f9a15feca5539302bba2b03c759ea92 SHA1 f7783f88a746d7ab87c83345598259c3edf5116e SHA256 5bace9c8b7fbfc18f9668ccafa85aa5282cedbf7fb284571e0182fd6fe7ed80b
+EBUILD vlc-1.1.13.ebuild 11793 RMD160 c302441e84e179a53c2042bc7b30450aa64ec4d0 SHA1 5e9d4256a8b48648d2234a22666bbad28b941a49 SHA256 a5f2ac401c0c7061a56f6335c0ca52b29737b9edd0aa8d67c5899974b335bc5d
 EBUILD vlc-2.0.1.ebuild 11034 RMD160 ab1b907752e76d86f38b274ac7ae514ceb0db176 SHA1 91f3158531aee42f76003c89523c15bcc01c3c8d SHA256 9c8b034c4a3eca65d13d71678fd2d73f2a838604726e61333713e874e0c104c6
 EBUILD vlc-2.0.9999.ebuild 10996 RMD160 57103310c069a6f186f65b462f932b3fc1372370 SHA1 02557d1fefe02b6130b2266985547343206df932 SHA256 c210e5cbea683471e562249435ce0b9dd0d7fa9ca4fcb1c8889cd7dda1f61d73
 EBUILD vlc-9999.ebuild 10811 RMD160 67937219249f843d179fb10197b8f9d02188fe32 SHA1 288ec30997c29f2c2d82433ba9b8adf18fdf8944 SHA256 560562f8c0b5fc042c53ec1fedac0ef46a9c425f8139f45f79c57eff8439095c
-MISC ChangeLog 4535 RMD160 a2c16ef4191e72e86d04d72f0e1c4e86811886fd SHA1 0851b99324e2a35c64a6d5e5f4a7c33c8dcfe045 SHA256 20e7951051f5391f6bed09213778960a42e28764868a653a6e85e406415d7335
+MISC ChangeLog 4745 RMD160 5142948161460094caedb61c9082ac742203613e SHA1 34f584c1f492e619051bed9a538c0cbd5f84e6e4 SHA256 79659f26c39e7a36e4a605ba26a2844004d3fef6398f9d931ed734170fab57b7
 MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2
 MISC metadata.xml 6552 RMD160 488f3c652c7618d7b380e00e4653f7dbb8a9889f SHA1 e4b180f82122f69d3e975b0f2957c4c414d9cc6d SHA256 fa3578af6d2d660fe8ffecf5fbc1601379d10f78ee3a2c0dc0632f4d424b9d3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPudAeAAoJEEdUh39IaPFNxOwIAKKjShhJhOIJxgVl3ljdgEcH
+BAo8H3xoUfIthiDR7w0L84DHYeiTWzCXv8YxpOZFiFnaA6vFh4Wjn24C+lSmBHcr
+bBsneyjV/f3xFWr+z20CUbBMoJbCaOG0I71fxHqETuv42oKQfvhYDz6pijrDGsMW
+xP8uatH7azaAIAPOxuFghdnevSDlqAIk4PT201kPJDpZa4xfGozW6btPe45m99dH
+HhNJAPbf5i3CDDw1Q1IshFahxJ86KtY3SQV+8t13O/mdF+dc+UMrcAGmNkK2ik0L
+22QRGZnvuYDJW34OBIIvCZXmCZilZ6Bg/P8idTNZMLN8CU/9A9Kl12ZDZrEtztE=
+=1p5O
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.13.ebuild b/media-video/vlc/vlc-1.1.13.ebuild
index e7c514bf7406..14ca5380081c 100644
--- a/media-video/vlc/vlc-1.1.13.ebuild
+++ b/media-video/vlc/vlc-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.7 2012/05/05 08:58:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.8 2012/05/21 05:21:20 ssuominen Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
 	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}"
@@ -51,7 +51,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
 	+gcrypt ggi gme gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
 	libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
-	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
+	modplug mp3 mpeg mtp musepack ncurses ogg opengl optimisememory oss
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
 	svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
@@ -102,7 +102,6 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-1.0.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
 		png? ( media-libs/libpng sys-libs/zlib )
@@ -182,7 +181,6 @@ pkg_setup() {
 	vlc_use_force skins qt4
 	vlc_use_force vlm stream
 	vlc_use_force vaapi ffmpeg
-	vlc_use_force nsplugin xcb
 	vlc_use_force xosd X
 	vlc_use_force sdl X
 	vlc_use_force aalib X
@@ -279,7 +277,7 @@ src_configure() {
 		$(use_enable mtp) \
 		$(use_enable musepack mpc) \
 		$(use_enable ncurses) \
-		$(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
+		--disable-mozilla \
 		$(use_enable ogg) \
 		$(use_enable opengl glx) $(use_enable opengl) \
 		$(use_enable optimisememory optimize-memory) \
@@ -337,7 +335,6 @@ src_configure() {
 		$(vlc_use_enable_force remoteosd libgcrypt) \
 		$(vlc_use_enable_force gnutls libgcrypt) \
 		$(vlc_use_enable_force vaapi avcodec) \
-		$(vlc_use_enable_force nsplugin xcb) \
 		$(use sdl && echo '--with-x') \
 		$(use xosd && echo '--with-x') \
 		$(use aalib && echo '--with-x')
@@ -352,12 +349,6 @@ src_install() {
 	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"
 }