gnome-packagekikt, sound-juicer, rhythmbox: moved to the tree

* rhythmbox live deps were updated, metadata.xml edited
* portage-configs was updated

3 files changed, 37 insertions, 36 deletions

diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 77e84b58..d680435d 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,2 +1,2 @@
-EBUILD rhythmbox-9999.ebuild 5558 RMD160 478f24128106d72c0661520b39a57c30ffac2564 SHA1 1ee8310115e3cac0cccca29f9f59d1e5d18d519a SHA256 162571127f62ace0a70e38eaafd15442b0954efc048f6f4231435a785fd02ce8
-MISC metadata.xml 1297 RMD160 54d2978626746b960c9c92ba3557e3b04a201b24 SHA1 f9f4a477eb20d414c1b76cb02d0745b9a78bc858 SHA256 25a638fc97e8e66b92281901e89adc751947db6ee05594f86d835317dd7d631f
+EBUILD rhythmbox-9999.ebuild 5715 RMD160 5c936474165fb9b7f923979b43478b5c8d5955c1 SHA1 72d504bfb8ac413eeb7a5837b35df265e2d7a2b5 SHA256 24ed9838c3d3acbb98c325e0d89b7efbbabdd1b3f2cac462361de702446a4b3d
+MISC metadata.xml 1223 RMD160 f0e09761fed896f0fcd8d8fc1aea9301e223e3f6 SHA1 616307df851f306c7bcf25dd4c27447715d67a91 SHA256 1619b8bc7ab2a9473b2b27ce7317137325dbfac8dd7322517084b9e038988e53
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index d6176a99..1721f74a 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!-- vim: set sts=2 sw=2 et : -->
 <pkgmetadata>
   <herd>gnome</herd>
   <herd>gstreamer</herd>
   <use>
-	<flag name="brasero">Enable CD burning via <pkg>app-cdr/brasero</pkg> rather
-      than <pkg>gnome-extra/nautilus-cd-burner</pkg></flag>
+	<flag name="clutter">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>
-    <flag name="daap">Enable support for local network music sharing via the
-      DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
+    	clients using <pkg>dev-python/dbus-python</pkg></flag>
+    <flag name="daap">Build the local network music sharing plugin which uses
+		the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
+  	<flag name="lastfm">Build a plugin for Last.fm and Librefm scrobbling</flag>
     <flag name="html">Use <pkg>net-libs/webkit-gtk</pkg> for detecting and
-      displaying HTML podcast episode descriptions.</flag>
+		displaying HTML podcast episode descriptions.</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 the
-      UPnP protocols using <pkg>media-video/coherence</pkg>,
-      <pkg>dev-python/louie</pkg>, and <pkg>dev-python/twisted</pkg></flag>
-	<flag name="vala">Enable support for plugins written using
-		<pkg>dev-lang/vala</pkg></flag>
-	<flag name="webkit">Enable context panel plugin.</flag>
+		replacing the deprecated <pkg>sys-apps/hal</pkg> code</flag>
+    <flag name="upnp">Build a plugin for local network music sharing which uses
+		UPnP protocols using <pkg>media-video/coherence</pkg>,
+		<pkg>dev-python/louie</pkg>, and <pkg>dev-python/twisted</pkg></flag>
+	<flag name="webkit">Enable context panel plugin</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index 5a90f475..b4c6b4bf 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -18,7 +18,9 @@ HOMEPAGE="http://www.rhythmbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp vala webkit"
+IUSE="cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
+musicbrainz mtp nsplugin python test udev upnp webkit"
+# vala
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -27,25 +29,25 @@ fi
 
 # FIXME: double check what to do with fm-radio plugin
 # FIXME: Zeitgeist python plugin
-# NOTE:: Rhythmbox Uses dbus-glib, gdbus, and dbus-python right now
+# NOTE: Rhythmbox uses both gdbus and dbus-python right now
+# NOTE: gst-python is still needed because gstreamer introspection is incomplete
 COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	dev-libs/libxml2:2
 	>=x11-libs/gtk+-2.91.4:3[introspection]
-	>=x11-libs/gdk-pixbuf-2.18.0
-	>=dev-libs/dbus-glib-0.71
+	>=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/totem-pl-parser-2.32.1
-	>=media-libs/libgnome-media-profiles-2.91.0:3
 	>=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
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
 
 	clutter? (
-		media-libs/clutter
-		media-libs/clutter-gst
-		media-libs/clutter-gtk )
+		>=media-libs/clutter-1.2:1.0
+		>=media-libs/clutter-gst-1.0:1.0
+		>=media-libs/clutter-gtk-1.0:1.0
+		>=x11-libs/mx-1.0.1:1.0 )
 	cdr? ( >=app-cdr/brasero-2.91.90 )
 	daap? (
 		>=net-libs/libdmapsharing-2.9.11:3.0
@@ -55,8 +57,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	lastfm? ( dev-libs/json-glib )
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 	lirc? ( app-misc/lirc )
-	musicbrainz? ( media-libs/musicbrainz:3 )
-	python? ( >=dev-python/pygobject-2.28:2[introspection] )
+	musicbrainz? (
+		media-libs/musicbrainz:3
+		gnome-base/gconf:2 )
+	python? ( >=dev-python/pygobject-2.90.2:3[introspection] )
 	udev? (
 		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
 		mtp? ( >=media-libs/libmtp-0.3 )
@@ -84,10 +88,8 @@ RDEPEND="${COMMON_DEPEND}
 		gnome-keyring? ( dev-python/gnome-keyring-python )
 		webkit? (
 			dev-python/mako
-			>=net-libs/webkit-gtk-1.3.9:3[introspection] )
-	)
-
-	nsplugin? ( net-libs/xulrunner )"
+			>=net-libs/webkit-gtk-1.3.9:3[introspection] ) )
+"
 # gtk-doc-am needed for eautoreconf
 #	dev-util/gtk-doc-am
 DEPEND="${COMMON_DEPEND}
@@ -96,9 +98,8 @@ DEPEND="${COMMON_DEPEND}
 	app-text/scrollkeeper
 	>=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.10 )
-"
+	test? ( dev-libs/check )"
+#	vala? ( >=dev-lang/vala-0.9.4:0.12 )
 DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
 	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
 
@@ -145,14 +146,17 @@ pkg_setup() {
 		ewarn "The magnatune plugin requires USE='python gnome-keyring'"
 	fi
 
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
 	G2CONF="${G2CONF}
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		VALAC=$(type -P valac-0.10)
+		VALAC=$(type -P valac-0.12)
 		--enable-mmkeys
-		--disable-maintainer-mode
+		--disable-more-warnings
 		--disable-scrollkeeper
 		--disable-schemas-compile
 		--disable-static
+		--disable-vala
 		--without-hal
 		$(use_enable clutter visualizer)
 		$(use_enable daap)
@@ -163,7 +167,6 @@ pkg_setup() {
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable python)
 		$(use_enable upnp grilo)
-		$(use_enable vala)
 		$(use_with cdr brasero)
 		$(use_with daap mdns avahi)
 		$(use_with gnome-keyring)