Remove seamonkey support, by Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>, bug #300456; also update -9999 patchset to match recent file moves.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 26 insertions, 41 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index ad64c5fd9844..1568cba0af9e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.545 2010/01/09 15:35:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.546 2010/01/10 17:04:46 aballier Exp $
+
+  10 Jan 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.4.ebuild,
+  vlc-1.0.9999.ebuild, vlc-9999.ebuild:
+  Remove seamonkey support, by Lars Wendler (Polynomial-C)
+  <polynomial-c@gentoo.org>, bug #300456; also update -9999 patchset to
+  match recent file moves.
 
   09 Jan 2010; Christian Faulhammer <fauli@gentoo.org> vlc-1.0.4.ebuild:
   stable x86, bug 297849
diff --git a/media-video/vlc/vlc-1.0.4.ebuild b/media-video/vlc/vlc-1.0.4.ebuild
index 460e146bc190..dfb2f6d87cd2 100644
--- a/media-video/vlc/vlc-1.0.4.ebuild
+++ b/media-video/vlc/vlc-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.4.ebuild,v 1.5 2010/01/09 15:35:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.4.ebuild,v 1.6 2010/01/10 17:04:46 aballier Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc139
 	libnotify libproxy libsysfs libtiger libv4l2 lirc live lua matroska mmx
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	pda png pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba schroedinger
-	sdl sdl-image seamonkey shine shout skins speex sse stream svg svga taglib
+	sdl sdl-image shine shout skins speex sse stream svg svga taglib
 	theora truetype twolame udev upnp v4l v4l2 vcdinfo vcdx vlm vorbis win32codecs
 	wma-fixed X x264 xcb xinerama xml xosd xv zvbi"
 
@@ -112,10 +112,7 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-0.3.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? (
-			seamonkey?  ( =www-client/seamonkey-1* )
-			!seamonkey? ( >=net-libs/xulrunner-1.8 )
-		)
+		nsplugin? ( >=net-libs/xulrunner-1.8 )
 		ogg? ( media-libs/libogg )
 		pda? ( x11-libs/gtk+:2 )
 		png? ( media-libs/libpng )
@@ -244,14 +241,10 @@ src_configure() {
 	local MOZILLA_PC
 
 	if use nsplugin; then
-		if use seamonkey; then
-			MOZILLA_PC=seamonkey-plugin
+		if has_version 'net-libs/xulrunner:1.9' ; then
+			MOZILLA_PC=libxul
 		else
-			if has_version 'net-libs/xulrunner:1.9' ; then
-				MOZILLA_PC=libxul
-			else
-				MOZILLA_PC=xulrunner-plugin
-			fi
+			MOZILLA_PC=xulrunner-plugin
 		fi
 	fi
 
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index 3cd125a9da27..e6299bab9164 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.33 2010/01/03 19:42:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.34 2010/01/10 17:04:46 aballier Exp $
 
 EAPI="2"
 
@@ -53,7 +53,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc139
 	libnotify libproxy libsysfs libtiger libv4l2 lirc live lua matroska mmx
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	pda png pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba schroedinger
-	sdl sdl-image seamonkey shine shout skins speex sse stream svg svga taglib
+	sdl sdl-image shine shout skins speex sse stream svg svga taglib
 	theora truetype twolame udev upnp v4l v4l2 vcdinfo vcdx vlm vorbis win32codecs
 	wma-fixed X x264 xcb xinerama xml xosd xv zvbi"
 
@@ -113,10 +113,7 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-0.3.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? (
-			seamonkey?  ( =www-client/seamonkey-1* )
-			!seamonkey? ( >=net-libs/xulrunner-1.8 )
-		)
+		nsplugin? ( >=net-libs/xulrunner-1.8 )
 		ogg? ( media-libs/libogg )
 		pda? ( x11-libs/gtk+:2 )
 		png? ( media-libs/libpng )
@@ -245,14 +242,10 @@ src_configure() {
 	local MOZILLA_PC
 
 	if use nsplugin; then
-		if use seamonkey; then
-			MOZILLA_PC=seamonkey-plugin
+		if has_version 'net-libs/xulrunner:1.9' ; then
+			MOZILLA_PC=libxul
 		else
-			if has_version 'net-libs/xulrunner:1.9' ; then
-				MOZILLA_PC=libxul
-			else
-				MOZILLA_PC=xulrunner-plugin
-			fi
+			MOZILLA_PC=xulrunner-plugin
 		fi
 	fi
 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a1d754cbc73b..f2f34798dc11 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.54 2010/01/09 11:55:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.55 2010/01/10 17:04:46 aballier Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="72"
+PATCHLEVEL="80"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
@@ -51,7 +51,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb cdio dbus dc1394
 	libnotify libproxy libsysfs libtiger libv4l libv4l2 lirc live lua matroska mmx
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
-	schroedinger sdl sdl-image seamonkey shine shout skins speex sqlite sse stream
+	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
 	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vcdinfo vcdx vlm
 	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
 
@@ -108,10 +108,7 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-0.3.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? (
-			seamonkey?  ( =www-client/seamonkey-1* )
-			!seamonkey? ( >=net-libs/xulrunner-1.8 )
-		)
+		nsplugin? ( >=net-libs/xulrunner-1.8 )
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl )
 		png? ( media-libs/libpng sys-libs/zlib )
@@ -232,14 +229,10 @@ src_configure() {
 	local MOZILLA_PC
 
 	if use nsplugin; then
-		if use seamonkey; then
-			MOZILLA_PC=seamonkey-plugin
+		if has_version 'net-libs/xulrunner:1.9' ; then
+			MOZILLA_PC=libxul
 		else
-			if has_version 'net-libs/xulrunner:1.9' ; then
-				MOZILLA_PC=libxul
-			else
-				MOZILLA_PC=xulrunner-plugin
-			fi
+			MOZILLA_PC=xulrunner-plugin
 		fi
 	fi