Fix GStreamer dependencies

(Portage version: 2.0.51.22-r3)

4 files changed, 73 insertions, 66 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index ac3e2bb54a58..7c548c680ee9 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.87 2005/11/24 06:59:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.88 2005/12/06 07:38:51 zaheerm Exp $
+
+  06 Dec 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> totem-1.0.4.ebuild,
+  totem-1.2.0-r1.ebuild, totem-1.2.0-r2.ebuild:
+  Fix GStreamer dependencies
 
   24 Nov 2005; Markus Rothe <corsair@gentoo.org> totem-1.2.0-r1.ebuild,
   totem-1.2.0-r2.ebuild:
diff --git a/media-video/totem/totem-1.0.4.ebuild b/media-video/totem/totem-1.0.4.ebuild
index 054a62ef8969..458f16278e38 100644
--- a/media-video/totem/totem-1.0.4.ebuild
+++ b/media-video/totem/totem-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.0.4.ebuild,v 1.11 2005/10/02 15:00:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.0.4.ebuild,v 1.12 2005/12/06 07:38:51 zaheerm Exp $
 
 inherit gnome2 eutils
 
@@ -23,26 +23,27 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	lirc? ( app-misc/lirc )
 	xine? ( >=media-libs/xine-lib-1
 		>=gnome-base/gconf-2 )
-	!xine? ( >=media-libs/gstreamer-0.8.9-r3
-		>=media-libs/gst-plugins-0.8.8
-		>=media-plugins/gst-plugins-gnomevfs-0.8.8
-		xv? ( >=media-plugins/gst-plugins-xvideo-0.8.8 )
-		>=media-plugins/gst-plugins-pango-0.8.8
-		>=media-plugins/gst-plugins-ffmpeg-0.8.3
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.8 )
-		mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.8.8 )
-		ogg? ( >=media-plugins/gst-plugins-ogg-0.8.8 )
-		vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.8
-			>=media-plugins/gst-plugins-vorbis-0.8.8 )
-		a52? ( >=media-plugins/gst-plugins-a52dec-0.8.8 )
-		flac? ( >=media-plugins/gst-plugins-flac-0.8.8 )
-		theora? ( >=media-plugins/gst-plugins-ogg-0.8.8
-		        >=media-plugins/gst-plugins-theora-0.8.8 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.8 )
-		dvd? ( >=media-plugins/gst-plugins-a52dec-0.8.8
-			>=media-plugins/gst-plugins-dvdread-0.8.8
-			>=media-plugins/gst-plugins-mpeg2dec-0.8.8 )
-		win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 )
+	!xine? ( || ( =media-libs/gstreamer-0.8.9-r3 =media-libs/gstreamer-0.8.10
+		=media-libs/gstreamer-0.8.11 )
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-gnomevfs-0.8*
+		xv? ( =media-plugins/gst-plugins-xvideo-0.8* )
+		=media-plugins/gst-plugins-pango-0.8*
+		=media-plugins/gst-plugins-ffmpeg-0.8*
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		mpeg? ( =media-plugins/gst-plugins-mpeg2dec-0.8* )
+		ogg? ( =media-plugins/gst-plugins-ogg-0.8* )
+		vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-vorbis-0.8* )
+		a52? ( =media-plugins/gst-plugins-a52dec-0.8* )
+		flac? ( =media-plugins/gst-plugins-flac-0.8* )
+		theora? ( =media-plugins/gst-plugins-ogg-0.8*
+		        =media-plugins/gst-plugins-theora-0.8* )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		dvd? ( =media-plugins/gst-plugins-a52dec-0.8*
+			=media-plugins/gst-plugins-dvdread-0.8*
+			=media-plugins/gst-plugins-mpeg2dec-0.8* )
+		win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* )
 		)
 	!gnome-extra/nautilus-media"
 
diff --git a/media-video/totem/totem-1.2.0-r1.ebuild b/media-video/totem/totem-1.2.0-r1.ebuild
index 792b50036a3c..b40ee705b97d 100644
--- a/media-video/totem/totem-1.2.0-r1.ebuild
+++ b/media-video/totem/totem-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r1.ebuild,v 1.5 2005/11/24 06:59:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r1.ebuild,v 1.6 2005/12/06 07:38:51 zaheerm Exp $
 
 inherit eutils multilib gnome2
 
@@ -27,30 +27,31 @@ RDEPEND=">=dev-libs/glib-2.6.3
 		>=media-libs/xine-lib-1.0.1
 		>=gnome-base/gconf-2 )
 	!xine? (
-		>=media-libs/gstreamer-0.8.10
-		>=media-libs/gst-plugins-0.8.10
-		>=media-plugins/gst-plugins-gnomevfs-0.8.10
-		>=media-plugins/gst-plugins-pango-0.8.10
-		>=media-plugins/gst-plugins-ffmpeg-0.8.6
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.10 )
-		mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.8.10 )
-		ogg? ( >=media-plugins/gst-plugins-ogg-0.8.10 )
-		xv? ( >=media-plugins/gst-plugins-xvideo-0.8.10 )
+		|| ( =media-libs/gstreamer-0.8.10 =media-libs/gstreamer-0.8.11 )
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-gnomevfs-0.8*
+		=media-plugins/gst-plugins-pango-0.8*
+		|| ( =media-plugins/gst-plugins-ffmpeg-0.8.6
+			=media-plugins/gst-plugins-ffmpeg-0.8.7 )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		mpeg? ( =media-plugins/gst-plugins-mpeg2dec-0.8* )
+		ogg? ( =media-plugins/gst-plugins-ogg-0.8* )
+		xv? ( =media-plugins/gst-plugins-xvideo-0.8* )
 		vorbis? (
-			>=media-plugins/gst-plugins-ogg-0.8.10
-			>=media-plugins/gst-plugins-vorbis-0.8.10 )
-		a52? ( >=media-plugins/gst-plugins-a52dec-0.8.10 )
-		flac? ( >=media-plugins/gst-plugins-flac-0.8.10 )
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-vorbis-0.8* )
+		a52? ( =media-plugins/gst-plugins-a52dec-0.8* )
+		flac? ( =media-plugins/gst-plugins-flac-0.8* )
 		theora? (
-			>=media-plugins/gst-plugins-ogg-0.8.10
-			>=media-plugins/gst-plugins-theora-0.8.10 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.10 )
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-theora-0.8* )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
 		!sparc? ( dvd? (
-			>=media-plugins/gst-plugins-a52dec-0.8.10
-			>=media-plugins/gst-plugins-dvdread-0.8.10
-			>=media-plugins/gst-plugins-mpeg2dec-0.8.10
-			>=media-plugins/gst-plugins-dvdnav-0.8.11 ) )
-		win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 ) )
+			=media-plugins/gst-plugins-a52dec-0.8*
+			=media-plugins/gst-plugins-dvdread-0.8*
+			=media-plugins/gst-plugins-mpeg2dec-0.8*
+			=media-plugins/gst-plugins-dvdnav-0.8.11 ) )
+		win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* ) )
 	nsplugin? (
 		>=net-libs/gecko-sdk-1.7
 		>=sys-apps/dbus-0.35 )"
diff --git a/media-video/totem/totem-1.2.0-r2.ebuild b/media-video/totem/totem-1.2.0-r2.ebuild
index bf11ab0f4ba9..880db85c02bc 100644
--- a/media-video/totem/totem-1.2.0-r2.ebuild
+++ b/media-video/totem/totem-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.2 2005/11/24 06:59:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.3 2005/12/06 07:38:51 zaheerm Exp $
 
 inherit autotools eutils multilib gnome2
 
@@ -27,30 +27,31 @@ RDEPEND=">=dev-libs/glib-2.6.3
 		>=media-libs/xine-lib-1.0.1
 		>=gnome-base/gconf-2 )
 	!xine? (
-		>=media-libs/gstreamer-0.8.10
-		>=media-libs/gst-plugins-0.8.10
-		>=media-plugins/gst-plugins-gnomevfs-0.8.10
-		>=media-plugins/gst-plugins-pango-0.8.10
-		>=media-plugins/gst-plugins-ffmpeg-0.8.6
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.10 )
-		mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.8.10 )
-		ogg? ( >=media-plugins/gst-plugins-ogg-0.8.10 )
-		xv? ( >=media-plugins/gst-plugins-xvideo-0.8.10 )
+		|| ( =media-libs/gstreamer-0.8.10 =media-libs/gstreamer-0.8.11 )
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-gnomevfs-0.8*
+		=media-plugins/gst-plugins-pango-0.8*
+		|| ( =media-plugins/gst-plugins-ffmpeg-0.8.6
+			=media-plugins/gst-plugins-ffmpeg-0.8.7 )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		mpeg? ( =media-plugins/gst-plugins-mpeg2dec-0.8* )
+		ogg? ( =media-plugins/gst-plugins-ogg-0.8* )
+		xv? ( =media-plugins/gst-plugins-xvideo-0.8* )
 		vorbis? (
-			>=media-plugins/gst-plugins-ogg-0.8.10
-			>=media-plugins/gst-plugins-vorbis-0.8.10 )
-		a52? ( >=media-plugins/gst-plugins-a52dec-0.8.10 )
-		flac? ( >=media-plugins/gst-plugins-flac-0.8.10 )
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-vorbis-0.8* )
+		a52? ( =media-plugins/gst-plugins-a52dec-0.8* )
+		flac? ( =media-plugins/gst-plugins-flac-0.8* )
 		theora? (
-			>=media-plugins/gst-plugins-ogg-0.8.10
-			>=media-plugins/gst-plugins-theora-0.8.10 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.8.10 )
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-theora-0.8* )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
 		!sparc? ( dvd? (
-			>=media-plugins/gst-plugins-a52dec-0.8.10
-			>=media-plugins/gst-plugins-dvdread-0.8.10
-			>=media-plugins/gst-plugins-mpeg2dec-0.8.10
-			>=media-plugins/gst-plugins-dvdnav-0.8.11 ) )
-		win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 ) )
+			=media-plugins/gst-plugins-a52dec-0.8*
+			=media-plugins/gst-plugins-dvdread-0.8*
+			=media-plugins/gst-plugins-mpeg2dec-0.8*
+			=media-plugins/gst-plugins-dvdnav-0.8.11 ) )
+		win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* ) )
 	nsplugin? (
 		>=net-libs/gecko-sdk-1.7
 		>=sys-apps/dbus-0.35 )"