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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 26 insertions, 45 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index becc73f1a250..44f8f8cc2577 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.189 2010/07/09 15:20:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.190 2010/07/12 10:14:02 pacho Exp $
+
+  12 Jul 2010; Pacho Ramos <pacho@gentoo.org> rhythmbox-0.12.6.ebuild,
+  rhythmbox-0.12.6-r1.ebuild, rhythmbox-0.12.8.ebuild,
+  rhythmbox-0.12.8-r1.ebuild, metadata.xml:
+  Drop gnome-extra/nautilus-cd-burner references since it will be dropped
+  soon.
 
   09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   rhythmbox-0.12.6-r1.ebuild:
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 071b1e588cb8..ecc3855696ed 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -4,8 +4,7 @@
   <herd>gnome</herd>
   <herd>gstreamer</herd>
   <use>
-    <flag name="daap">Enable support for local network music sharing via daap</flag>
-	<flag name="brasero">Enable CD burning via <pkg>app-cdr/brasero</pkg> rather than <pkg>gnome-extra/nautilus-cd-burner</pkg></flag>
+  	<flag name="daap">Enable support for local network music sharing via daap</flag>
 	<flag name="udev">Enable hardware detection via <pkg>sys-fs/udev</pkg>
 	replacing the deprecated <pkg>sys-apps/hal</pkg> code.</flag>
 	<flag name="upnp">Enable support for local network music sharing via upnp</flag>
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.6-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.6-r1.ebuild
index ad402cddcd4f..b018eda72649 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.6-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.6-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/media-sound/rhythmbox/rhythmbox-0.12.6-r1.ebuild,v 1.6 2010/07/09 15:20:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.6-r1.ebuild,v 1.7 2010/07/12 10:14:02 pacho Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="+brasero cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev"
+IUSE="cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -32,9 +32,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16
 		>=media-libs/gst-plugins-base-0.10.24
 		>=media-libs/gst-plugins-bad-0.10.6 )
 
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
+	cdr? ( >=app-cdr/brasero-0.9.1 )
 	daap? ( >=net-dns/avahi-0.6 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	udev? (
@@ -103,12 +101,8 @@ pkg_setup() {
 	if ! use cdr ; then
 		ewarn "You have cdr USE flag disabled."
 		ewarn "You will not be able to burn CDs."
-	fi
-
-	if use brasero; then
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
 	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
 	fi
 
 	G2CONF="${G2CONF}
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.6.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.6.ebuild
index 931066b8d042..7a12556454c2 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.6.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.6.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/media-sound/rhythmbox/rhythmbox-0.12.6.ebuild,v 1.8 2010/04/05 15:06:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.6.ebuild,v 1.9 2010/07/12 10:14:02 pacho Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="+brasero cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev"
+IUSE="cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -32,9 +32,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16.0
 		>=media-libs/gst-plugins-base-0.10.24
 		>=media-libs/gst-plugins-bad-0.10.6 )
 
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
+	cdr? ( >=app-cdr/brasero-0.9.1 )
 	daap? ( >=net-dns/avahi-0.6 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	udev? (
@@ -103,12 +101,8 @@ pkg_setup() {
 	if ! use cdr ; then
 		ewarn "You have cdr USE flag disabled."
 		ewarn "You will not be able to burn CDs."
-	fi
-
-	if use brasero; then
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
 	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
 	fi
 
 	G2CONF="${G2CONF}
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
index 12c3d1c12615..ba5763d62e83 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-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/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.2 2010/07/06 15:46:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.3 2010/07/12 10:14:02 pacho Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+brasero cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
+IUSE="cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -32,9 +32,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18
 		>=media-libs/gst-plugins-base-0.10.24
 		>=media-libs/gst-plugins-bad-0.10.6 )
 
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
+	cdr? ( >=app-cdr/brasero-0.9.1 )
 	daap? ( >=net-dns/avahi-0.6 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	udev? (
@@ -109,6 +107,8 @@ pkg_setup() {
 	if ! use cdr ; then
 		ewarn "You have cdr USE flag disabled."
 		ewarn "You will not be able to burn CDs."
+	else
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
 	fi
 
 	if ! use python; then
@@ -122,12 +122,6 @@ pkg_setup() {
 		fi
 	fi
 
-	if use brasero; then
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
-	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
-	fi
-
 	G2CONF="${G2CONF}
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
 		$(use_with gnome-keyring)
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8.ebuild
index e973b3597ca1..88abebb3f5e6 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8.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/media-sound/rhythmbox/rhythmbox-0.12.8.ebuild,v 1.4 2010/07/06 15:46:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8.ebuild,v 1.5 2010/07/12 10:14:02 pacho Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+brasero cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
+IUSE="cdr daap doc gnome-keyring hal ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -32,9 +32,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18
 		>=media-libs/gst-plugins-base-0.10.24
 		>=media-libs/gst-plugins-bad-0.10.6 )
 
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
+	cdr? ( >=app-cdr/brasero-0.9.1 )
 	daap? ( >=net-dns/avahi-0.6 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	udev? (
@@ -109,6 +107,8 @@ pkg_setup() {
 	if ! use cdr ; then
 		ewarn "You have cdr USE flag disabled."
 		ewarn "You will not be able to burn CDs."
+	else
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
 	fi
 
 	if ! use python; then
@@ -122,12 +122,6 @@ pkg_setup() {
 		fi
 	fi
 
-	if use brasero; then
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
-	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
-	fi
-
 	G2CONF="${G2CONF}
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
 		$(use_with gnome-keyring)