media-sound/rhythmbox: Update deps, and fix USE-flags

2 files changed, 23 insertions, 25 deletions

diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 1721f74a..dea4b57b 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -4,7 +4,7 @@
   <herd>gnome</herd>
   <herd>gstreamer</herd>
   <use>
-	<flag name="clutter">Build the visualizer plugin which uses
+	<flag name="visualizer">Build the visualizer plugin which uses
 		<pkg>media-libs/clutter</pkg> and <pkg>x11-libs/mx</pkg></flag>
     <flag name="dbus">Allow the im-status plugin to set the status of your IM
     	clients using <pkg>dev-python/dbus-python</pkg></flag>
diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index 7706adeb..ff1107f7 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -18,8 +18,8 @@ HOMEPAGE="http://www.rhythmbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cdr clutter daap dbus doc gnome-keyring html ipod libnotify lirc mtp nsplugin +python test +udev upnp-av webkit zeitgeist"
-# vala
+IUSE="cdr daap dbus doc gnome-keyring html ipod libnotify lirc mtp nsplugin
++python test +udev upnp-av visualizer webkit zeitgeist"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -30,7 +30,6 @@ REQUIRED_USE="
 	ipod? ( udev )
 	mtp? ( udev )
 	dbus? ( python )
-	gnome-keyring? ( python )
 	webkit? ( python )"
 
 # FIXME: double check what to do with fm-radio plugin
@@ -41,23 +40,25 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.0:2
 	>=x11-libs/gtk+-3.4:3[introspection]
 	>=x11-libs/gdk-pixbuf-2.18.0:2
 	>=dev-libs/gobject-introspection-0.10.0
-	>=dev-libs/libpeas-0.7.3[gtk,python?]
+	>=dev-libs/libpeas-0.7.3[gtk]
 	>=dev-libs/totem-pl-parser-3.2.0
 	>=net-libs/libsoup-2.26:2.4
 	>=net-libs/libsoup-gnome-2.26:2.4
-	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
-	>=media-libs/gstreamer-0.10.32:0.10[introspection]
+	>=media-libs/gst-plugins-base-0.11.92:1.0[introspection]
+	>=media-libs/gstreamer-0.11.92:1.0[introspection]
 	>=sys-libs/tdb-1.2.6
 
-	clutter? (
+	visualizer? (
 		>=media-libs/clutter-1.8:1.0
-		>=media-libs/clutter-gst-1.4:1.0
+		>=media-libs/clutter-gst-1.9.92:2.0
 		>=media-libs/clutter-gtk-1.0:1.0
-		>=x11-libs/mx-1.0.1:1.0 )
+		>=x11-libs/mx-1.0.1:1.0
+		media-plugins/gst-plugins-libvisual:1.0 )
 	cdr? ( >=app-cdr/brasero-2.91.90 )
 	daap? (
-		>=net-libs/libdmapsharing-2.9.11:3.0
-		>=net-dns/avahi-0.6 )
+		>=net-libs/libdmapsharing-2.9.16:3.0
+		>=net-dns/avahi-0.6
+		media-plugins/gst-plugins-soup:1.0 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	html? ( >=net-libs/webkit-gtk-1.3.9:3 )
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
@@ -70,26 +71,25 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.0:2
 	zeitgeist? ( gnome-extra/zeitgeist )
 "
 RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-soup-0.10:0.10
-	>=media-plugins/gst-plugins-libmms-0.10:0.10
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
 	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10:0.10
-		>=media-plugins/gst-plugins-cdio-0.10:0.10 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-taglib-0.10.6:0.10
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
 	x11-themes/gnome-icon-theme-symbolic
 	upnp-av? (
 		>=media-libs/grilo-0.2:0.2
 		>=media-plugins/grilo-plugins-0.2:0.2[upnp-av] )
 	python? (
-		>=dev-python/gst-python-0.10.8:0.10
-
 		x11-libs/gdk-pixbuf:2[introspection]
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection]
+		dev-libs/libpeas[introspection]
 
 		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( dev-python/gnome-keyring-python )
+		gnome-keyring? ( gnome-base/gnome-keyring[introspection] )
 		webkit? (
 			dev-python/mako
 			>=net-libs/webkit-gtk-1.3.9:3[introspection] ) )
@@ -103,7 +103,6 @@ DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.9.1
 	doc? ( >=dev-util/gtk-doc-1.4 )
 	test? ( dev-libs/check )"
-#	vala? ( >=dev-lang/vala-0.9.4:0.12 )
 DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
 	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
 
@@ -118,14 +117,13 @@ pkg_setup() {
 	# checks are broken, so don't enable it
 	G2CONF="${G2CONF}
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		VALAC=$(type -P valac-0.14)
 		--enable-mmkeys
 		--disable-more-warnings
 		--disable-schemas-compile
 		--disable-static
 		--disable-vala
 		--without-hal
-		$(use_enable clutter visualizer)
+		$(use_enable visualizer)
 		$(use_enable daap)
 		$(use_enable libnotify)
 		$(use_enable lirc)
@@ -163,7 +161,7 @@ pkg_postinst() {
 
 	ewarn
 	ewarn "If ${PN} doesn't play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta:0.10"
+	ewarn "USE flags on media-plugins/gst-plugins-meta:1.0"
 	ewarn
 }