Drop gnome-extra/nautilus-cd-burner references since it will be dropped soon.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 15 insertions, 21 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index f7708c4fb63d..359966e467bf 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.216 2010/06/13 19:14:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.217 2010/07/12 09:58:48 pacho Exp $
+
+  12 Jul 2010; Pacho Ramos <pacho@gentoo.org>
+  gnome-media-2.24.0.1-r1.ebuild, gnome-media-2.26.0-r1.ebuild,
+  metadata.xml:
+  Drop gnome-extra/nautilus-cd-burner references since it will be dropped
+  soon.
 
 *gnome-media-2.30.0-r1 (13 Jun 2010)
 
diff --git a/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild
index 49c9dafea368..eca72bcd5bcb 100644
--- a/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.24.0.1-r1.ebuild,v 1.14 2010/05/03 22:16:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild,v 1.15 2010/07/12 09:58:48 pacho Exp $
 
 EAPI="1"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
 LICENSE="LGPL-2 GPL-2 FDL-1.1"
 SLOT="2"
 KEYWORDS="arm sh"
-IUSE="esd gnomecd ipv6"
+IUSE="esd ipv6"
 
 RDEPEND=">=dev-libs/glib-2.16.0:2
 	>=gnome-base/libgnome-2.13.7
@@ -24,11 +24,6 @@ RDEPEND=">=dev-libs/glib-2.16.0:2
 	>=media-libs/gst-plugins-base-0.10.3
 	>=media-libs/gst-plugins-good-0.10
 	>=gnome-base/orbit-2
-	gnomecd? (
-		>=gnome-extra/nautilus-cd-burner-2.12
-		|| (
-			>=media-plugins/gst-plugins-cdio-0.10
-			>=media-plugins/gst-plugins-cdparanoia-0.10 ) )
 	>=gnome-base/libglade-2
 	dev-libs/libxml2
 	>=gnome-base/gconf-2
@@ -46,11 +41,11 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable esd esound)
 		$(use_enable esd vumeter)
-		$(use_enable gnomecd cddbslave)
-		$(use_enable gnomecd)
 		$(use_enable ipv6)
 		--enable-gstmix
 		--enable-gstprops
+		--disable-cddbslave
+		--disable-gnomecd
 		--disable-esdtest
 		--disable-scrollkeeper
 		--disable-schemas-install"
diff --git a/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild
index 939f3688d3c7..358f32b6f8b0 100644
--- a/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.26.0-r1.ebuild,v 1.9 2010/05/03 22:16:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild,v 1.10 2010/07/12 09:58:48 pacho Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
 LICENSE="LGPL-2 GPL-2 FDL-1.1"
 SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+sound esd gnomecd ipv6 pulseaudio"
+IUSE="+sound esd ipv6 pulseaudio"
 
 RDEPEND=">=dev-libs/glib-2.18.2:2
 	>=x11-libs/gtk+-2.15.1:2
@@ -25,12 +25,6 @@ RDEPEND=">=dev-libs/glib-2.18.2:2
 	>=media-libs/gst-plugins-good-0.10
 	>=gnome-base/orbit-2
 	>=dev-libs/libunique-1
-	gnomecd? (
-		>=gnome-extra/nautilus-cd-burner-2.12
-		>=gnome-base/libbonobo-2
-		|| (
-			>=media-plugins/gst-plugins-cdio-0.10
-			>=media-plugins/gst-plugins-cdparanoia-0.10 ) )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15[glib] )
 	sound? (
 		>=media-libs/libcanberra-0.4[gtk]
@@ -49,14 +43,14 @@ DOCS="AUTHORS ChangeLog NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-gstprops
+		--disable-cddbslave
+		--disable-gnomecd
 		--disable-esdtest
 		--disable-static
 		--disable-scrollkeeper
 		--disable-schemas-install
 		$(use_enable esd esound)
 		$(use_enable esd vumeter)
-		$(use_enable gnomecd cddbslave)
-		$(use_enable gnomecd)
 		$(use_enable ipv6)
 		$(use_enable pulseaudio)
 		$(use_enable !pulseaudio gstmix)
diff --git a/gnome-extra/gnome-media/metadata.xml b/gnome-extra/gnome-media/metadata.xml
index 911b83df24a3..53450b7df667 100644
--- a/gnome-extra/gnome-media/metadata.xml
+++ b/gnome-extra/gnome-media/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="gnomecd">Builds the GNOME CD Player</flag>
 	<flag name="sound">Adds support for sound notification themes using
 		<pkg>media-libs/libcanberra</pkg></flag>
 </use>