gnome 2.6 release & fixes for the old ebuilds

7 files changed, 28 insertions, 20 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index d9cd1b492e40..5e440a36abd0 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.44 2004/03/22 01:00:08 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.45 2004/03/28 22:43:06 foser Exp $
+
+*gnome-media-2.6.0 (28 Mar 2004)
+
+  28 Mar 2004; foser <foser@gentoo.org> gnome-media-2.6.0.ebuild :
+  2.6 : Gnome 2.6 final, reenable mp3 & oggvorbis USE flags
+  2.4 : fix gst deps to be 0.6 only (ranged deps are a fata morgona)
 
 *gnome-media-2.5.5 (21 Mar 2004)
 
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index b51b63af3f0e..9679ae3afbca 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,4 +1,5 @@
 MD5 2b38c56965de76be90754c2f3b6f0f58 gnome-media-2.4.1.1.ebuild 1151
+MD5 8aa58e9654ee38ba6a6d8aa7003027d3 gnome-media-2.6.0.ebuild 1161
 MD5 4f2d9a22b6f79630275a505b25ea8ffa gnome-media-1.2.3-r2.ebuild 1177
 MD5 127ae3f32ce66fe03fd5d2f22ec46d43 gnome-media-2.4.0.ebuild 1139
 MD5 be1ffb71ddf6fd846caf44a7c86163f7 ChangeLog 5744
@@ -8,3 +9,4 @@ MD5 23d5ca8e56cf9339c159aae0a0b31c9d files/digest-gnome-media-2.4.1.1 73
 MD5 88dec384b5105a1bffd46847025909b0 files/digest-gnome-media-1.2.3-r2 70
 MD5 045d3d76a52fb6dad2961ce45ddac7a6 files/digest-gnome-media-2.4.0 71
 MD5 7c69aab64c8cc959020686995541fe6d files/digest-gnome-media-2.5.5 71
+MD5 0912d3fd68c54ed40913e5bdbae64299 files/digest-gnome-media-2.6.0 71
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.5.5 b/gnome-extra/gnome-media/files/digest-gnome-media-2.5.5
deleted file mode 100644
index e78c820a3460..000000000000
--- a/gnome-extra/gnome-media/files/digest-gnome-media-2.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2932569a45bc6746ec9b17cac27dc25c gnome-media-2.5.5.tar.bz2 2931924
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.6.0 b/gnome-extra/gnome-media/files/digest-gnome-media-2.6.0
new file mode 100644
index 000000000000..f9528c12e042
--- /dev/null
+++ b/gnome-extra/gnome-media/files/digest-gnome-media-2.6.0
@@ -0,0 +1 @@
+MD5 51dd73a96cbdb8049fa9e7d2aa0af9b5 gnome-media-2.6.0.tar.bz2 2943852
diff --git a/gnome-extra/gnome-media/gnome-media-2.4.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.4.0.ebuild
index 2b0e7cdcbb96..52b5fe56d20b 100644
--- a/gnome-extra/gnome-media/gnome-media-2.4.0.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.4.0.ebuild,v 1.10 2003/12/06 18:00:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.4.0.ebuild,v 1.11 2004/03/28 22:43:06 foser Exp $
 
 inherit gnome2
 
@@ -23,10 +23,10 @@ RDEPEND=">=media-sound/esound-0.2.23
 	>=gnome-base/ORBit2-2.4.1
 	>=gnome-base/libbonobo-2
 	>=gnome-base/gail-0.0.3
-	>=media-libs/gstreamer-0.6.3
-	>=media-libs/gst-plugins-0.6.3
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.6.3 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )"
+	=media-libs/gstreamer-0.6*
+	=media-libs/gst-plugins-0.6*
+	oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.6* )
+	mad? ( =media-plugins/gst-plugins-mad-0.6* )"
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11
diff --git a/gnome-extra/gnome-media/gnome-media-2.4.1.1.ebuild b/gnome-extra/gnome-media/gnome-media-2.4.1.1.ebuild
index 17d0f2d3902d..e2d6bb0e71ed 100644
--- a/gnome-extra/gnome-media/gnome-media-2.4.1.1.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.4.1.1.ebuild,v 1.8 2004/03/17 00:29:57 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.4.1.1.ebuild,v 1.9 2004/03/28 22:43:06 foser Exp $
 
 inherit gnome2
 
@@ -23,10 +23,10 @@ RDEPEND=">=media-sound/esound-0.2.23
 	>=gnome-base/ORBit2-2.4.1
 	>=gnome-base/libbonobo-2
 	>=gnome-base/gail-0.0.3
-	>=media-libs/gstreamer-0.6.3
-	>=media-libs/gst-plugins-0.6.3
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.6.3 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )"
+	=media-libs/gstreamer-0.6*
+	=media-libs/gst-plugins-0.6*
+	oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.6* )
+	mad? ( =media-plugins/gst-plugins-mad-0.6* )"
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11
diff --git a/gnome-extra/gnome-media/gnome-media-2.5.5.ebuild b/gnome-extra/gnome-media/gnome-media-2.6.0.ebuild
index f78a31a21f31..11cbb302624e 100644
--- a/gnome-extra/gnome-media/gnome-media-2.5.5.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.5.5.ebuild,v 1.1 2004/03/22 01:00:08 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.6.0.ebuild,v 1.1 2004/03/28 22:43:06 foser Exp $
 
 inherit gnome2
 
@@ -12,8 +12,8 @@ LICENSE="GPL-2 FDL-1.1"
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips"
 
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.3.1
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/gconf-1.2.1
 	>=gnome-base/gnome-desktop-2
@@ -24,10 +24,10 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/gail-0.0.3
 	>=media-sound/esound-0.2.23
 	>=media-libs/gstreamer-0.8
-	>=media-libs/gst-plugins-0.8"
-#	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8
-#		>=media-plugins/gst-plugins-ogg-0.8 )
-#	mad? ( >=media-plugins/gst-plugins-mad-0.8 )"
+	>=media-libs/gst-plugins-0.8
+	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8
+		>=media-plugins/gst-plugins-ogg-0.8 )
+	mad? ( >=media-plugins/gst-plugins-mad-0.8 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0