Add coherence support, bug #293051.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 32 insertions, 10 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index b774210edc28..cbc0353f0c26 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.173 2010/03/03 16:15:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.174 2010/03/04 00:01:57 eva Exp $
+
+  03 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  rhythmbox-0.12.7.ebuild, metadata.xml:
+  Add coherence support, bug #293051.
 
   03 Mar 2010; Daniel Gryniewicz <dang@gentoo.org> rhythmbox-0.12.7.ebuild,
   +files/rhythmbox-0.12.7-audiocd.patch:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index f5f444a84ce0..82957be61b3a 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.12.5-fix-daap-plugin-linking.patch 714 RMD160 f41f995764b8ac60172b8e8e6c1a9face9d3e408 SHA1 2ebd320ef650c9fe6dd06531afc697399a071ed6 SHA256 4617073fc7e275680b8ad3334009dbcf707725294f499df4912be83c6abbb2cd
 AUX rhythmbox-0.12.7-audiocd.patch 767 RMD160 2b15fc65627e28f34614f5beb5ecc1aa9aeda482 SHA1 57e79b0893e0dbfa6d5ba780a8c4e1c15792bad9 SHA256 a1d8454d9b029c4e53989035c85e6d3f2f2b8337e131dff048dcdb9976e0b578
 DIST rhythmbox-0.12.5.tar.bz2 5123204 RMD160 5286cda2e457d21627a8fe2392c85504bcd254b7 SHA1 b41bbb4e7e8f2dc64122ff6a0b334478a0cef42b SHA256 b26c45a715502d3b4d47bf532078bdf3dbed68c1cb68c61d8995a349dd488cd1
@@ -5,6 +8,13 @@ DIST rhythmbox-0.12.6.tar.bz2 5202025 RMD160 cf860b1a42975d4dfea09b5c265bda297d1
 DIST rhythmbox-0.12.7.tar.bz2 5224160 RMD160 02815a3503c195fa00f65c03e56e0d686a25e118 SHA1 a793132c49f9a24053fb9d05514b380c4dd62f7c SHA256 4ab28b93b2e9d7bc9338194ba6e01549362fdd5b0cf2806da091fbfb2c2a8362
 EBUILD rhythmbox-0.12.5-r2.ebuild 4811 RMD160 552c4c989441bbb0b91bbe90ceb070d4309a226f SHA1 9e53e7bf34459b064bc8a3e06ca221445262f086 SHA256 7fb752710dd1adb756800c7147f637761a00ad9949e7e92fb13847c484a76cf4
 EBUILD rhythmbox-0.12.6.ebuild 4536 RMD160 5d9e62a20c280698d2e005b07165486309b57cef SHA1 496a67461548572885cea231b617936a08f2bbb6 SHA256 4e3defda21fbc969c494ef19157fae23683daaa7647d553488959cf07e5815a4
-EBUILD rhythmbox-0.12.7.ebuild 5029 RMD160 18d5c03fc1d8911493dd4d66e4f66d9fc2cd194b SHA1 30522860c00b354938b92b32760087284ddc56e2 SHA256 6199bc0ffe83092e2d952dbd1ca7478547a1a9d61aab88de426ddb93170d2208
-MISC ChangeLog 26780 RMD160 37b6e9c9dc34b6092677d26a4fa26adc51b92153 SHA1 e137b8ae5bb7f126a4b3fc10a625d5e274fdd609 SHA256 f4dcc9cd38cfea0ec08aa0a9f40a754e7531addd56f7e93ddeb7dec80359f7eb
-MISC metadata.xml 611 RMD160 a537fe9b35e6e61fed13baf0d308d7cfd89c7d12 SHA1 4a124b2e09a3787b5c0e8c23ca03c52e1499505f SHA256 d4aeb1c1d55bef78b74c25fdb1b5afae23af8627213bed498df78a54a07eb721
+EBUILD rhythmbox-0.12.7.ebuild 5139 RMD160 070ef671ddc9ffeb130535200651c6054e35e5bf SHA1 49d01c64b863b21558adf791f80d17700d8c0d23 SHA256 cfcd49c6ab7e46cf9c66125c4e3044a6ff063f7d4a9c59fdc771eb647a27508a
+MISC ChangeLog 26913 RMD160 2eef9cb18d3021cb2a18f10a8c08322654684ded SHA1 e2c9a88b3495a831cdd7c3f4a5e67ecdf3e060f4 SHA256 788d7328fdf8e93e5fa3a6600b0d8496e43c59d94d9a27d4da79138233c42769
+MISC metadata.xml 693 RMD160 1694899b1ecffa452a210fa7ee7f40d49bb1dc09 SHA1 2fecdcf02f751b816f6e853d6f7f15b7b3e6c9fe SHA256 e38fecefcfb59ecb89e3cd9c0c1c1b3af2d810de058860f41edcd9d6994788c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuO+IEACgkQ1fmVwcYIWAa8UQCdGxm64AONee+N2FKQxJiZEFF3
+1PEAnjkYM4rvUlfu5WapPUMebD2eqW3q
+=QiHx
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 882eabd2c803..071b1e588cb8 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -8,6 +8,7 @@
 	<flag name="brasero">Enable CD burning via <pkg>app-cdr/brasero</pkg> rather than <pkg>gnome-extra/nautilus-cd-burner</pkg></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>
 	<flag name="webkit">Enable context panel plugin.</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild
index 815dd429f88b..c902ab7542a6 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.7.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.7.ebuild,v 1.2 2010/03/03 16:15:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild,v 1.3 2010/03/04 00:01:57 eva Exp $
 
 EAPI="2"
 
@@ -9,8 +9,8 @@ inherit gnome2 python multilib virtualx eutils
 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 webkit"
+KEYWORDS="~amd64"
+IUSE="+brasero 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
@@ -62,6 +62,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18
 		webkit? (
 			dev-python/mako
 			dev-python/pywebkitgtk )
+		upnp? ( media-video/coherence )
 	)"
 
 RDEPEND="${COMMON_DEPEND}
@@ -110,9 +111,15 @@ pkg_setup() {
 		ewarn "You will not be able to burn CDs."
 	fi
 
-	if use webkit && ! use python; then
-		ewarn "You need python support in addition to webkit to be able to use"
-		ewarn "the context panel plugin."
+	if ! use python; then
+		if use webkit; then
+			ewarn "You need python support in addition to webkit to be able to use"
+			ewarn "the context panel plugin."
+		fi
+
+		if use upnp; then
+			ewarn "You need python support in addition to upnp"
+		fi
 	fi
 
 	if use brasero; then