[gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/

["Priit Laes" <plaes@plaes.org>]

commit:     02f61bc5529634154f9d5fd3374a7e95862210dd
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Sep 13 10:36:29 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Sep 13 10:36:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=02f61bc5

media-sound/rhythmbox: Keep in sync with upstream

---
 media-sound/rhythmbox/rhythmbox-9999.ebuild |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index f324181..5a90f47 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -70,6 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 		>=media-plugins/gst-plugins-cdio-0.10 )
 	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
 	>=media-plugins/gst-plugins-taglib-0.10.6
+	upnp? (
+		>=media-libs/grilo-0.1.17
+		>=media-plugins/grilo-plugins-0.1.17[upnp] )
 	python? (
 		>=dev-python/gst-python-0.10.8
 
@@ -82,12 +85,7 @@ RDEPEND="${COMMON_DEPEND}
 		webkit? (
 			dev-python/mako
 			>=net-libs/webkit-gtk-1.3.9:3[introspection] )
-		upnp? (
-			>=dev-python/gconf-python-2.22
-			>=dev-python/pygtk-2.8:2
-			dev-python/louie
-			media-video/coherence
-			dev-python/twisted[gtk] ) )
+	)
 
 	nsplugin? ( net-libs/xulrunner )"
 # gtk-doc-am needed for eautoreconf
@@ -141,10 +139,6 @@ pkg_setup() {
 			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 gnome-keyring && ! use python; then
@@ -155,6 +149,7 @@ pkg_setup() {
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
 		VALAC=$(type -P valac-0.10)
 		--enable-mmkeys
+		--disable-maintainer-mode
 		--disable-scrollkeeper
 		--disable-schemas-compile
 		--disable-static
@@ -167,6 +162,7 @@ pkg_setup() {
 		$(use_enable musicbrainz)
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable python)
+		$(use_enable upnp grilo)
 		$(use_enable vala)
 		$(use_with cdr brasero)
 		$(use_with daap mdns avahi)