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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 42 insertions, 51 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/Manifest b/media-sound/rhythmbox/Manifest
index c1cf5d35b9ba..53032f322625 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.12-python-initialization.patch 5167 RMD160 cacae6274841d595a0d55ed92c42815793081176 SHA1 0b306455b027f8f9c73e185acdbbb1d041ce882d SHA256 54f3f492d4c3204b93a1fed3886ca76aa42d36737e66c6424426fc0116b25d3e
 DIST rhythmbox-0.12.6.tar.bz2 5202025 RMD160 cf860b1a42975d4dfea09b5c265bda297d18a7b9 SHA1 f1ba375329471ec47475a4b0ce3e8bba430a537b SHA256 ddffa5b7e0e0fe81044354998fd91a58d4ff526746b17a6b638e0e8ea1ac9684
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
-EBUILD rhythmbox-0.12.6-r1.ebuild 4795 RMD160 98affad95154f09b7d0afc3dc1ee88b784392fc5 SHA1 540eb520fcfa3f57daec43ac95d3e4b857727bd4 SHA256 8e63adaecc846c2b2d52e21798ff03383c74c6a03456504ad43a025f83edd0b1
-EBUILD rhythmbox-0.12.6.ebuild 4535 RMD160 3ca2e90496ec7979cf0d578bcf1f156a40fd4261 SHA1 e7fa7615f17d426b37c4fb8f6e507cbe6208267b SHA256 6e1d2e68dbaf0991050ef9abfb24a6488e9aabe144c768fdf3e4b90f192bc259
-EBUILD rhythmbox-0.12.8-r1.ebuild 5178 RMD160 187c92ad55cb356a73ee57597907df6b77c0669d SHA1 82b758cc5e04cb7458d6ce2f53eac675def978b8 SHA256 ca6f41da83496ff198a6d51584abe61daf0add8684ead56f5b4fd9a55258b96c
-EBUILD rhythmbox-0.12.8.ebuild 5062 RMD160 cc40f44e7bed6aa9d2daffaf63dee813ab889593 SHA1 d092178b7e0365e5d65c3941d5e6702284c0334f SHA256 7b7164384ba01ee967fbbae56c4bbb81af6b5891ea6d2f9790792097230d9a0b
-MISC ChangeLog 29187 RMD160 8d748454378e2fc4cfa96ef066821832b5d31581 SHA1 81d86496e46cf1d1148432dc13b5db1460493b74 SHA256 469b4a244d405457953a5d021d89619d09be5c360650f71b5470b5c075399e46
-MISC metadata.xml 693 RMD160 1694899b1ecffa452a210fa7ee7f40d49bb1dc09 SHA1 2fecdcf02f751b816f6e853d6f7f15b7b3e6c9fe SHA256 e38fecefcfb59ecb89e3cd9c0c1c1b3af2d810de058860f41edcd9d6994788c3
+EBUILD rhythmbox-0.12.6-r1.ebuild 4603 RMD160 4eb3085ec12f936b9c8e43b103d7ba22f50c6f9d SHA1 957183f4c062605902a83e9b8e842d1c9e7c598e SHA256 5449789551fa032d8892df71bddbf5841ce0d6ca7e02e8579e1cd237a3f8fe9c
+EBUILD rhythmbox-0.12.6.ebuild 4345 RMD160 dd900b643e0a40ffa2d4d3400028f112c121db55 SHA1 04f9a63824dcb217c77f5678655d89fb855f51e4 SHA256 2cf511049ae9eb6a264d6c973b351966dcf32d74a6f739a928901972c4c10f7b
+EBUILD rhythmbox-0.12.8-r1.ebuild 4986 RMD160 cb284ce4ba481a040b32d81c9f522d88e28a71bf SHA1 e925df2c841634779b2b40771a9087340ae4ac79 SHA256 6809457a4ace70d0d69d3bcdb9c2391fe5f5cf4bad033d81895fb9307fa2b509
+EBUILD rhythmbox-0.12.8.ebuild 4870 RMD160 e9a83d0885c291da08340fa43923665de1d269c4 SHA1 ffdb19fcfa01a967f623e2ef47fbf3571482c0e3 SHA256 0e1e5cdf2a6b7a7b82c6a7f850ea706bcdd514ff1661c27674b2319f6ab7e88c
+MISC ChangeLog 29436 RMD160 ed3b4e0d38bdb6042e33d37ca0cca8944fdf996b SHA1 6644276b6c00bf517174cd1e5285c25a640f2924 SHA256 fffb190943f673c6f958e457a87ba9b3e82fa152a1f8068be507e18278009cb8
+MISC metadata.xml 560 RMD160 dae21b8f4a2b438dcdf41352bcf1aa139e817639 SHA1 276c4890cf3ff10633ea99cf4dfe15387c45f65c SHA256 0f000ca4586bf2af2d6e6cd1854d8ba67e4129d801d5a27afafaa4c25783f0f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw66vEACgkQCaWpQKGI+9TjxgCfcNaHk7ILwqMxZuFxtOTN8Zz4
+8iwAn2QU2ZiJYpqLvZplSzwW0wGPmPMR
+=bWJG
+-----END PGP SIGNATURE-----
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)