Fix GStreamer dependencies

Package-Manager: portage-2.0.51.22-r3

5 files changed, 80 insertions, 73 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/Manifest b/media-video/totem/Manifest
index 4342cf06a540..48b1686ed00b 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,12 +1,12 @@
-MD5 7d03d95c20e30a7d7dbcee436b31f5b5 ChangeLog 12291
+MD5 351fc5938d60ab088379fd80c779c1c6 totem-1.2.0-r2.ebuild 3076
+MD5 576377003e0d8cbbf36c9194914a1099 totem-1.2.0-r1.ebuild 3175
+MD5 5336725da254f097a11aa7ad78986038 ChangeLog 12445
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
-MD5 06d52fc007ef24fa66f1a352be6f3ee3 totem-1.0.4.ebuild 2682
-MD5 802b6db9953bcd0bb94621f6c04e66c4 totem-1.2.0-r1.ebuild 3145
-MD5 22536dfd0fe8633747fb98339f70a031 totem-1.2.0-r2.ebuild 3046
-MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
-MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190
+MD5 6645b9eed7d922972cb815cadddf7d89 totem-1.0.4.ebuild 2709
 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r1 65
-MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178
 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r2 65
+MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178
+MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
+MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190
 MD5 d64b50de60d0223b68b67b7788086b5b files/totem-1.2.0-lang_it_fix.patch 834
 MD5 faed9bfdf2ea1835a17c9e56e7738ac1 files/totem-1.2.0-gmoduledep.patch 1535
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 )"