bugfix release, remove old ebuilds

(Portage version: 2.0.51.19)

7 files changed, 23 insertions, 60 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index c71894411aaf..2e1885e249eb 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.73 2005/04/02 10:02:52 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.74 2005/04/12 16:37:40 joem Exp $
+
+*gnome-media-2.10.1 (12 Apr 2005)
+
+  12 Apr 2005; Joe McCann <joem@gentoo.org> +gnome-media-2.10.1.ebuild,
+  -gnome-media-2.6.0.ebuild, -gnome-media-2.6.1.ebuild:
+  bugfix release, remove old ebuilds
 
   02 Apr 2005; Joe McCann <joem@gentoo.org> -gnome-media-2.4.1.1.ebuild:
   Remove old version that contains the last of the gstreamer-0.6 deps
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index 427f7351031f..4bbeb763751a 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0c44bdfd804084755908119b7afd33a9 ChangeLog 8783
 MD5 0d58bd87770b2439b49b23860007297b gnome-media-1.2.3-r2.ebuild 1130
 MD5 4f6dae636e070dc55cc2d6a3c5198b3a gnome-media-2.6.0.ebuild 1147
@@ -9,16 +6,11 @@ MD5 12e4ca27d0da26baad7a1bedf9fd3b21 gnome-media-2.6.2.ebuild 1146
 MD5 a392243c82ea2994bd68329d0baac012 gnome-media-2.8.0.ebuild 1144
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 18f63700eb68df435b4730dc32b0363d gnome-media-2.10.0.ebuild 1312
+MD5 18f63700eb68df435b4730dc32b0363d gnome-media-2.10.1.ebuild 1312
 MD5 88dec384b5105a1bffd46847025909b0 files/digest-gnome-media-1.2.3-r2 70
 MD5 0912d3fd68c54ed40913e5bdbae64299 files/digest-gnome-media-2.6.0 71
 MD5 9e40ac8b88c1b01b89c70fb048496ec7 files/digest-gnome-media-2.6.1 71
 MD5 28d862b5dbc7c8b0dc52ccfa0a89171b files/digest-gnome-media-2.6.2 71
 MD5 cf54400021ff023a01bdafab7ee15c30 files/digest-gnome-media-2.8.0 71
 MD5 8112026b401f71b5ca2633cdeda8b35d files/digest-gnome-media-2.10.0 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCTm25XjcVihsel0ERAh+jAJ9fR6i12HycQSvp9dvspFuHYjnMXQCgjOMU
-1vuWMWlrPR3SbC2bDJyO2fY=
-=lvjq
------END PGP SIGNATURE-----
+MD5 9f242860addefe16e501ccbe95c861c3 files/digest-gnome-media-2.10.1 72
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.10.1 b/gnome-extra/gnome-media/files/digest-gnome-media-2.10.1
new file mode 100644
index 000000000000..3c7a2b130d7d
--- /dev/null
+++ b/gnome-extra/gnome-media/files/digest-gnome-media-2.10.1
@@ -0,0 +1 @@
+MD5 3b8fc25c0f391ac869759c8f1ec01316 gnome-media-2.10.1.tar.bz2 3328501
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
deleted file mode 100644
index f9528c12e042..000000000000
--- a/gnome-extra/gnome-media/files/digest-gnome-media-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51dd73a96cbdb8049fa9e7d2aa0af9b5 gnome-media-2.6.0.tar.bz2 2943852
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.6.1 b/gnome-extra/gnome-media/files/digest-gnome-media-2.6.1
deleted file mode 100644
index 09ad890c2773..000000000000
--- a/gnome-extra/gnome-media/files/digest-gnome-media-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2003e36259c057236afb60dd1293377f gnome-media-2.6.1.tar.bz2 2966568
diff --git a/gnome-extra/gnome-media/gnome-media-2.6.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.10.1.ebuild
index 452bf041d6a8..13fe66056274 100644
--- a/gnome-extra/gnome-media/gnome-media-2.6.0.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.10.1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.6.0.ebuild,v 1.10 2005/01/08 23:29:03 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.10.1.ebuild,v 1.1 2005/04/12 16:37:40 joem Exp $
 
 inherit gnome2
 
 DESCRIPTION="Multimedia related programs for the Gnome2 desktop"
 HOMEPAGE="http://www.prettypeople.org/~iain/gnome-media/"
 
-IUSE="oggvorbis mad"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2"
-KEYWORDS="x86 ppc ~sparc amd64 alpha hppa ~ia64 mips"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips"
+IUSE="oggvorbis mad ipv6"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2.3.1
 	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
 	>=gnome-base/gconf-1.2.1
 	>=gnome-base/gnome-desktop-2
 	>=gnome-base/gnome-vfs-2
@@ -24,16 +25,20 @@ RDEPEND=">=dev-libs/glib-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.2
+	>=gnome-extra/nautilus-cd-burner-2.9
+	>=media-plugins/gst-plugins-cdparanoia-0.8
+	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
+		>=media-plugins/gst-plugins-ogg-0.8.2 )
+	mad? ( >=media-plugins/gst-plugins-mad-0.8.2 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/intltool-0.29"
 
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+G2CONF="${G2CONF} $(use_enable ipv6) --disable-esdtest"
 
 USE_DESTDIR="1"
diff --git a/gnome-extra/gnome-media/gnome-media-2.6.1.ebuild b/gnome-extra/gnome-media/gnome-media-2.6.1.ebuild
deleted file mode 100644
index 83838855ba86..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.6.1.ebuild,v 1.5 2005/01/08 23:29:03 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Multimedia related programs for the Gnome2 desktop"
-HOMEPAGE="http://www.prettypeople.org/~iain/gnome-media/"
-
-IUSE="oggvorbis mad"
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc amd64 ~alpha ~hppa ~ia64 ~mips"
-
-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
-	>=gnome-base/gnome-vfs-2
-	dev-libs/libxml2
-	>=gnome-base/orbit-2.4.1
-	>=gnome-base/libbonobo-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 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-USE_DESTDIR="1"