[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-packagekit/files/, status/portage-configs/, ...

[Nirbheek Chauhan]

commit:     4af14248715a8bbcff3190b48e77aab1a5a81379
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 16:42:46 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 16:42:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4af14248

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

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

---
 .../files/gnome-packagekit-2.27.5-nls.patch        |   11 --
 .../gnome-packagekit/gnome-packagekit-3.0.3.ebuild |  104 --------------------
 media-sound/rhythmbox/metadata.xml                 |   26 +++---
 media-sound/rhythmbox/rhythmbox-9999.ebuild        |   43 +++++----
 .../files/sound-juicer-2.32.0-gtk3-api.patch       |   93 -----------------
 .../files/sound-juicer-2.32.0-gtk3-only.patch      |   71 -------------
 .../files/sound-juicer-2.32.0-new-gdk-keys.patch   |   26 -----
 .../files/sound-juicer-correct-desktop-files.patch |   13 ---
 .../sound-juicer-2.99.0_pre20110405.ebuild         |   82 ---------------
 status/portage-configs/package.keywords.gnome3     |    1 +
 status/portage-configs/package.unmask.gnome3       |    2 +
 11 files changed, 38 insertions(+), 434 deletions(-)

diff --git a/gnome-extra/gnome-packagekit/files/gnome-packagekit-2.27.5-nls.patch b/gnome-extra/gnome-packagekit/files/gnome-packagekit-2.27.5-nls.patch
deleted file mode 100644
index da1511e..0000000
--- a/gnome-extra/gnome-packagekit/files/gnome-packagekit-2.27.5-nls.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.old	2009-08-08 17:59:08.000000000 +0200
-+++ po/Makefile.in.in	2009-04-13 22:53:15.000000000 +0200
-@@ -56,7 +56,7 @@
- 
- PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
- 
--USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
- 
- USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
- 

diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
deleted file mode 100644
index 04bc3cf..0000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-
-inherit eutils gnome2 python virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="http://www.packagekit.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc nls test udev"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-2.91.0:3
-	>=x11-libs/libnotify-0.7.0
-	>=dev-libs/dbus-glib-0.73
-
-	>=app-admin/packagekit-base-0.6.5[udev]
-	>=app-admin/packagekit-gtk-0.6.5
-	>=gnome-base/gnome-menus-2.24.1
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-	>=sys-power/upower-0.9.0
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	udev? ( >=sys-fs/udev-145[extras] )"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-# Fails, recheck for next release
-# (gpk-self-test:9412): GnomePackageKit-WARNING **: Unknown error
-# FAILED [failed to get cannot-fetch-sources]
-# FAIL: gpk-self-test
-RESTRICT="test"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
-# gtk-doc is generating a useless file, don't need it
-
-# UPSTREAM:
-# misuse of CPPFLAGS/CXXFLAGS ?
-# see if tests can forget about display (use eclass for that ?)
-# intltool and gettext only with +nls
-
-pkg_setup() {
-	DOCS="AUTHORS MAINTAINERS NEWS README TODO"
-	# localstatedir: /var for upstream /var/lib for gentoo
-	# scrollkeeper and schemas-install: managed by gnome2 eclass
-	# tests: not working (need DISPLAY)
-	# gtk-doc: not needed (builded file is useless)
-#		--enable-libtool-lock
-#		--disable-dependency-tracking
-#		--enable-option-checking
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--enable-compile-warnings=yes
-		--enable-iso-c
-		--disable-scrollkeeper
-		--disable-schemas-compile
-		--disable-strict
-		$(use_enable nls)
-		$(use_enable test tests)
-		$(use_enable udev gudev)"
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# fix pyc/pyo generation
-	ln -sfn $(type -P true) py-compile
-}
-
-src_test() {
-	unset DISPLAY
-	Xemake check || die "make check failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize packagekit
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup packagekit
-}

diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index d6176a9..1721f74 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 5a90f47..b4c6b4b 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)

diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch
deleted file mode 100644
index df898eb..0000000
--- a/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From f23bb0a5aac613c385272ee448afd27ce50b9ee4 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@××××××.net>
-Date: Mon, 15 Nov 2010 17:47:54 +0000
-Subject: Update for new GTK+ 3.x and libgnome-media-profiles
-
----
-diff --git a/data/sound-juicer.ui b/data/sound-juicer.ui
-index 12de20c..50042c7 100644
---- a/data/sound-juicer.ui
-+++ b/data/sound-juicer.ui
-@@ -615,7 +615,6 @@ audio-volume-medium</property>
-     <property name="border_width">5</property>
-     <property name="title" translatable="yes">Multiple Albums Found</property>
-     <property name="type_hint">dialog</property>
--    <property name="has_separator">False</property>
-     <child internal-child="vbox">
-       <object class="GtkVBox" id="dialog-vbox2">
-         <property name="visible">True</property>
-@@ -735,7 +734,6 @@ audio-volume-medium</property>
-     <property name="title" translatable="yes">Preferences</property>
-     <property name="resizable">False</property>
-     <property name="type_hint">dialog</property>
--    <property name="has_separator">False</property>
-     <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
-     <child internal-child="vbox">
-       <object class="GtkVBox" id="dialog-vbox4">
-diff --git a/libjuicer/sj-extractor.c b/libjuicer/sj-extractor.c
-index dab6ec0..52f80d2 100644
---- a/libjuicer/sj-extractor.c
-+++ b/libjuicer/sj-extractor.c
-@@ -30,7 +30,7 @@
- #include <glib-object.h>
- #include <gst/gst.h>
- #include <gst/tag/tag.h>
--#include <profiles/gnome-media-profiles.h>
-+#include <libgnome-media-profiles/gnome-media-profiles.h>
- #include "sj-extractor.h"
- #include "sj-structures.h"
- #include "sj-error.h"
-diff --git a/libjuicer/sj-extractor.h b/libjuicer/sj-extractor.h
-index d9d8717..bbe23fc 100644
---- a/libjuicer/sj-extractor.h
-+++ b/libjuicer/sj-extractor.h
-@@ -26,7 +26,7 @@
- #include <glib.h>
- #include <glib-object.h>
- #include <gio/gio.h>
--#include <profiles/audio-profile.h>
-+#include <libgnome-media-profiles/audio-profile.h>
- #include "sj-structures.h"
- 
- G_BEGIN_DECLS
-diff --git a/src/sj-main.c b/src/sj-main.c
-index 351fb66..f9d3d71 100644
---- a/src/sj-main.c
-+++ b/src/sj-main.c
-@@ -33,7 +33,7 @@
- #include <gconf/gconf-client.h>
- #include <brasero-medium-selection.h>
- #include <brasero-volume.h>
--#include <profiles/gnome-media-profiles.h>
-+#include <libgnome-media-profiles/gnome-media-profiles.h>
- #include <gst/gst.h>
- 
- #include "bacon-message-connection.h"
-@@ -886,10 +886,10 @@ static void reread_cd (gboolean ignore_no_media)
- 
-   /* Set watch cursor */
-   if (realized) {
--    cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (window), GDK_WATCH);
-+    cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_WATCH);
-     gdk_window_set_cursor (window, cursor);
-     gdk_cursor_unref (cursor);
--    gdk_display_sync (gdk_drawable_get_display (window));
-+    gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (window)));
-   }
- 
-   /* Set statusbar message */
-diff --git a/src/sj-prefs.c b/src/sj-prefs.c
-index 698b4aa..aeb2bc5 100644
---- a/src/sj-prefs.c
-+++ b/src/sj-prefs.c
-@@ -25,7 +25,7 @@
- #include <string.h>
- #include <gtk/gtk.h>
- #include <gconf/gconf-client.h>
--#include <profiles/gnome-media-profiles.h>
-+#include <libgnome-media-profiles/gnome-media-profiles.h>
- #include <brasero-drive-selection.h>
- 
- #include "sj-util.h"
---
-cgit v0.8.3.4

diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch
deleted file mode 100644
index 2e1a83a..0000000
--- a/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 83398a1e2d1f1045353884b44c681e035b561023 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@××××××.net>
-Date: Mon, 15 Nov 2010 17:43:37 +0000
-Subject: build: Remove ability to build against GTK+ 2.x
-
----
-diff --git a/configure.in b/configure.in
-index 8727f14..9e5f0c8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -34,30 +34,7 @@ GNOME_CXX_WARNINGS
- GNOME_DEBUG_CHECK
- GNOME_MAINTAINER_MODE_DEFINES
- 
--AC_MSG_CHECKING([which gtk+ version to compile against])
--AC_ARG_WITH([gtk],
--  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
--  [case "$with_gtk" in
--     2.0|3.0) ;;
--     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
--   esac],
--  [with_gtk=2.0])
--AC_MSG_RESULT([$with_gtk])
--
--case "$with_gtk" in
--  2.0) GTK_API_VERSION=2.0
--       GTK_REQUIRED=2.20.0
--       LIBBRASERO_MEDIA_PC="libbrasero-media >= 2.26"
--       LIBCANBERRA_GTK_PC=libcanberra-gtk
--       GNOME_MEDIA_PROFILES_PC="gnome-media-profiles >= 2.11.91"
--       ;;
--  3.0) GTK_API_VERSION=3.0
--       GTK_REQUIRED=2.90.0
--       LIBBRASERO_MEDIA_PC=libbrasero-media3
--       LIBCANBERRA_GTK_PC=libcanberra-gtk3
--       GNOME_MEDIA_PROFILES_PC=gnome-media-profiles-3.0
--       ;;
--esac
-+GTK_REQUIRED=2.90.0
- 
- AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
- 
-@@ -70,7 +47,7 @@ AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
- # Find libbrasero-media
--PKG_CHECK_MODULES(BURN, $LIBBRASERO_MEDIA_PC)
-+PKG_CHECK_MODULES(BURN, libbrasero-media3)
- AC_SUBST(BURN_CFLAGS)
- AC_SUBST(BURN_LIBS)
- 
-@@ -81,7 +58,7 @@ LIBS="$LIBS $BURN_LIBS"
- # LIBS="$oldlibs"
- 
- # Find the UI libraries
--PKG_CHECK_MODULES(UI, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gconf-2.0 gio-2.0 gmodule-export-2.0 dbus-glib-1 $LIBCANBERRA_GTK_PC)
-+PKG_CHECK_MODULES(UI, gtk+-3.0 >= $GTK_REQUIRED gconf-2.0 gio-2.0 gmodule-export-2.0 dbus-glib-1 libcanberra-gtk3)
- AC_SUBST(UI_CFLAGS)
- AC_SUBST(UI_LIBS)
- 
-@@ -96,7 +73,7 @@ AM_GST_ELEMENT_CHECK(wavenc,,AC_MSG_WARN([The 'wavenc' element was not found. Th
- AM_GST_ELEMENT_CHECK(giosink,,AC_MSG_WARN([The 'giosink' element was not found. This will cause Sound Juicer to fail at runtime.]))
- 
- # Find GNOME Media Profiles
--PKG_CHECK_MODULES(MEDIA_PROFILES, $GNOME_MEDIA_PROFILES_PC)
-+PKG_CHECK_MODULES(MEDIA_PROFILES, libgnome-media-profiles-3.0)
- AC_SUBST(MEDIA_PROFILES_CFLAGS)
- AC_SUBST(MEDIA_PROFILES_LIBS)
- 
---
-cgit v0.8.3.4

diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch
deleted file mode 100644
index 205c023..0000000
--- a/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a362297f7faa7b88a3cb412ebfd3b47dd0414183 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@××××××.com>
-Date: Fri, 01 Oct 2010 15:03:30 +0000
-Subject: Use new GDK key names
-
-This fixes the build against GTK3 (and works with 2.22 as well).
-This commit does not make the chances to configure.in to actually
-build against GTK3, though.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=630868
----
-diff --git a/src/sj-main.c b/src/sj-main.c
-index 43f1a6f..351fb66 100644
---- a/src/sj-main.c
-+++ b/src/sj-main.c
-@@ -113,7 +113,7 @@ sj_stock_init (void)
- 
-   static const GtkStockItem sj_stock_items[] =
-   {
--    { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_Return, NULL }
-+    { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_KEY_Return, NULL }
-   };
- 
-   if (initialized)
---
-cgit v0.8.3.4

diff --git a/media-sound/sound-juicer/files/sound-juicer-correct-desktop-files.patch b/media-sound/sound-juicer/files/sound-juicer-correct-desktop-files.patch
deleted file mode 100644
index 5d7546b..0000000
--- a/media-sound/sound-juicer/files/sound-juicer-correct-desktop-files.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/data/sound-juicer.desktop.in.in b/data/sound-juicer.desktop.in.in
-index ecd42e0..3a7dc28 100644
---- a/data/sound-juicer.desktop.in.in
-+++ b/data/sound-juicer.desktop.in.in
-@@ -1,5 +1,7 @@
- [Desktop Entry]
--_Name=Audio CD Extractor
-+_Name=Sound Juicer
-+_GenericName=Audio CD Extractor
-+_X-GNOME-FullName=Sound Juicer Audio CD Extractor
- _Comment=Copy music from your CDs
- Exec=sound-juicer %u
- Icon=sound-juicer

diff --git a/media-sound/sound-juicer/sound-juicer-2.99.0_pre20110405.ebuild b/media-sound/sound-juicer/sound-juicer-2.99.0_pre20110405.ebuild
deleted file mode 100644
index 8fd3b5c..0000000
--- a/media-sound/sound-juicer/sound-juicer-2.99.0_pre20110405.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.32.0.ebuild,v 1.2 2010/12/08 17:01:34 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="CD ripper for GNOME"
-HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.90:3
-	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	>=gnome-base/gconf-2:2
-	sys-apps/dbus
-	dev-libs/dbus-glib
-
-	>=media-libs/musicbrainz-3.0.2:3
-	media-libs/libgnome-media-profiles:3
-
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[cdda,udev]
-	>=media-plugins/gst-plugins-gconf-0.10:0.10
-	>=media-plugins/gst-plugins-gio-0.10:0.10
-	|| (
-		>=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"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/scrollkeeper-0.3.5
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-pkg_setup() {
-	# GST_INSPECT needed to get around some sandboxing checks
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		GST_INSPECT=$(type -p true)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Use non-generic application name. See bug #377855, upstream bug 616860,
-	# and https://live.gnome.org/GnomeGoals/CorrectDesktopFiles
-	epatch "${FILESDIR}/${PN}-correct-desktop-files.patch"
-
-	gnome-doc-common
-	gnome-doc-prepare --automake
-	intltoolize --force
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn "If ${PN} does not rip to some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-}

diff --git a/status/portage-configs/package.keywords.gnome3 b/status/portage-configs/package.keywords.gnome3
index 1130584..7089c43 100644
--- a/status/portage-configs/package.keywords.gnome3
+++ b/status/portage-configs/package.keywords.gnome3
@@ -216,6 +216,7 @@ dev-libs/gmime:2.6
 dev-libs/totem-pl-parser
 media-libs/libgnome-media-profiles:3
 media-libs/libdmapsharing:3.0
+net-misc/npapi-sdk
 media-sound/rhythmbox
 >=media-sound/sound-juicer-2.99
 >=media-video/totem-3.0

diff --git a/status/portage-configs/package.unmask.gnome3 b/status/portage-configs/package.unmask.gnome3
index dfdac22..8b25702 100644
--- a/status/portage-configs/package.unmask.gnome3
+++ b/status/portage-configs/package.unmask.gnome3
@@ -57,6 +57,7 @@
 >=gnome-extra/gnome-games-3.0
 >=gnome-extra/gnome-games-extra-data-3.0
 >=gnome-extra/gnome-media-2.32.0-r300
+>=gnome-extra/gnome-packagekit-3.0
 >=gnome-extra/gnome-power-manager-3.0
 >=gnome-extra/gnome-screensaver-3.0
 >=gnome-extra/gnome-system-monitor-3.0
@@ -69,6 +70,7 @@
 >=gnome-extra/zenity-3.0
 >=mail-client/evolution-3.0
 >=media-gfx/eog-3.0
+>=media-sound/rhythmbox-2.90
 >=media-sound/sound-juicer-2.99
 >=media-video/cheese-3.0
 >=media-video/totem-3.0