Remove oggvorbis flag per bug#94254

(Portage version: 2.0.53_rc7)

5 files changed, 15 insertions, 64 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index beb60aff6f14..b1dc1520859a 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,10 @@
 # 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.95 2005/10/10 21:40:34 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.96 2005/12/01 18:27:01 dang Exp $
+
+  01 Dec 2005; <dang@gentoo.org> -gnome-media-2.10.0.ebuild,
+  gnome-media-2.10.2.ebuild:
+  Remove oggvorbis flag per bug#94254
 
   10 Oct 2005; Hardave Riar <hardave@gentoo.org> gnome-media-2.10.2.ebuild:
   Stable on mips.
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index 26e5622fa578..468fd02b2e96 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,12 +1,10 @@
 MD5 fe22939d693beca8239119f764d8409f ChangeLog 11310
-MD5 0d58bd87770b2439b49b23860007297b gnome-media-1.2.3-r2.ebuild 1130
-MD5 e2327dfb766d72526c7873286691b881 gnome-media-2.10.0.ebuild 1409
-MD5 13b75fd63cecb482608565172c02ae96 gnome-media-2.10.2.ebuild 1429
-MD5 059bd269aedb5eebb5f1550cc7a02125 gnome-media-2.8.0.ebuild 1239
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7ef0d46239b96903d63f8d9d1d50ea7a gnome-media-2.12.0.ebuild 1578
 MD5 88dec384b5105a1bffd46847025909b0 files/digest-gnome-media-1.2.3-r2 70
-MD5 8112026b401f71b5ca2633cdeda8b35d files/digest-gnome-media-2.10.0 72
 MD5 097229597447674a84ade529e1f51f9f files/digest-gnome-media-2.10.2 72
-MD5 cf54400021ff023a01bdafab7ee15c30 files/digest-gnome-media-2.8.0 71
 MD5 778a26f4fb1b4cccc326171c7b46d80f files/digest-gnome-media-2.12.0 72
+MD5 cf54400021ff023a01bdafab7ee15c30 files/digest-gnome-media-2.8.0 71
+MD5 0d58bd87770b2439b49b23860007297b gnome-media-1.2.3-r2.ebuild 1130
+MD5 e9dec470572c7d5335eed4141007f615 gnome-media-2.10.2.ebuild 1435
+MD5 7ef0d46239b96903d63f8d9d1d50ea7a gnome-media-2.12.0.ebuild 1578
+MD5 059bd269aedb5eebb5f1550cc7a02125 gnome-media-2.8.0.ebuild 1239
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.10.0 b/gnome-extra/gnome-media/files/digest-gnome-media-2.10.0
deleted file mode 100644
index d2dc58c4e154..000000000000
--- a/gnome-extra/gnome-media/files/digest-gnome-media-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3b5a422881bfcb7f4082818075e8c88 gnome-media-2.10.0.tar.bz2 3286571
diff --git a/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild
deleted file mode 100644
index 9eaaf7115093..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.10.0.ebuild
+++ /dev/null
@@ -1,50 +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.10.0.ebuild,v 1.12 2005/07/12 04:15:22 geoman Exp $
-
-inherit gnome2
-
-DESCRIPTION="Multimedia related programs for the Gnome2 desktop"
-HOMEPAGE="http://www.prettypeople.org/~iain/gnome-media/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ~ia64 mips ppc ppc64 sparc x86"
-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
-	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.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 ChangeLog NEWS README TODO"
-
-G2CONF="${G2CONF} $(use_enable ipv6) --disable-esdtest"
-
-USE_DESTDIR="1"
-
-src_install() {
-
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-
-}
diff --git a/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild b/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild
index f501085c1754..4da77c5d6fa7 100644
--- a/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.10.2.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/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild,v 1.12 2005/10/10 21:40:34 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.10.2.ebuild,v 1.13 2005/12/01 18:27:01 dang Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.prettypeople.org/~iain/gnome-media/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="oggvorbis mad ipv6"
+IUSE="ipv6 mad ogg vorbis"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2.3.1
@@ -28,8 +28,8 @@ RDEPEND=">=dev-libs/glib-2
 	>=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 )
+	ogg? ( >=media-plugins/gst-plugins-ogg-0.8.2 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2 )
 	mad? ( >=media-plugins/gst-plugins-mad-0.8.2 )"
 
 DEPEND="${RDEPEND}