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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     778aecc85a7210e4606040449b9ec0dd93d574bf
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 21:38:00 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 05:59:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=778aecc8

media-sound/rhythmbox: 0.13.3 was moved to gx86

Punt rb 0.13.3 and stale patches (in gx86 since March). Update the live
ebuild with changes from the in-gx86 ebuild (new udev flags, pkg_setup
changes) and otherwise update dependencies (runtime and build-time deps
on pygobject and libpeas; the coherence plugin imports gconf and pygtk
for some strange reason) to reflect the current state of the tree.

Other than the vala plugin (which does not build at the moment), the
live ebuild appears to compile and work.

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 .../files/libdmapsharing-0.3-support.patch         |  235 --------------------
 .../files/rhythmbox-daap-media-enum.patch          |   41 ----
 .../rhythmbox/files/rhythmbox-daap-password.patch  |   86 -------
 media-sound/rhythmbox/rhythmbox-0.13.3.ebuild      |  204 -----------------
 media-sound/rhythmbox/rhythmbox-9999.ebuild        |   37 ++-
 5 files changed, 25 insertions(+), 578 deletions(-)

diff --git a/media-sound/rhythmbox/files/libdmapsharing-0.3-support.patch b/media-sound/rhythmbox/files/libdmapsharing-0.3-support.patch
deleted file mode 100644
index 8798b28..0000000
--- a/media-sound/rhythmbox/files/libdmapsharing-0.3-support.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-commit 0d3b198d1bdb3b15eaca1f1105a5940d45fd79b4
-Author: W. Michael Petullo <mike@flyn.org>
-Date:   Tue Jan 18 19:56:24 2011 -0600
-
-    Update to use libdmapsharing 3.0 API
-    
-    Signed-off-by: W. Michael Petullo <mike@flyn.org>
-
-diff --git a/configure.ac b/configure.ac
-index a69febe..8383e47 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -785,7 +785,7 @@ AC_ARG_ENABLE(daap,
-                              [Disable DAAP support]),,
-               enable_daap=auto)
- if test "x$enable_daap" != "xno"; then
--	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-2.2 >= 2.1.6,
-+	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-3.0,
- 			  have_libdmapsharing=yes,
- 			  have_libdmapsharing=no)
- 	if test "x$have_libdmapsharing" = "xno" -a "x$enable_daap" = "xyes"; then
-diff --git a/plugins/daap/rb-daap-container-record.c b/plugins/daap/rb-daap-container-record.c
-index 5957452..621b038 100644
---- a/plugins/daap/rb-daap-container-record.c
-+++ b/plugins/daap/rb-daap-container-record.c
-@@ -147,9 +147,9 @@ rb_daap_container_record_class_init (RBDAAPContainerRecordClass *klass)
- static void
- rb_daap_container_record_daap_iface_init (gpointer iface, gpointer data)
- {
--	DMAPContainerRecordInterface *dmap_container_record = iface;
-+	DMAPContainerRecordIface *dmap_container_record = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (dmap_container_record) == TYPE_DMAP_CONTAINER_RECORD);
-+	g_assert (G_TYPE_FROM_INTERFACE (dmap_container_record) == DMAP_TYPE_CONTAINER_RECORD);
- 
- 	dmap_container_record->get_id = rb_daap_container_record_get_id;
- 	dmap_container_record->add_entry = rb_daap_container_record_add_entry;
-@@ -158,7 +158,7 @@ rb_daap_container_record_daap_iface_init (gpointer iface, gpointer data)
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBDAAPContainerRecord, rb_daap_container_record, G_TYPE_OBJECT, 
--			 G_IMPLEMENT_INTERFACE (TYPE_DMAP_CONTAINER_RECORD, rb_daap_container_record_daap_iface_init))
-+			 G_IMPLEMENT_INTERFACE (DMAP_TYPE_CONTAINER_RECORD, rb_daap_container_record_daap_iface_init))
- 
- static void rb_daap_container_record_finalize (GObject *object)
- {
-diff --git a/plugins/daap/rb-daap-record-factory.c b/plugins/daap/rb-daap-record-factory.c
-index be750e4..393cf31 100644
---- a/plugins/daap/rb-daap-record-factory.c
-+++ b/plugins/daap/rb-daap-record-factory.c
-@@ -55,15 +55,15 @@ rb_daap_record_factory_class_init (RBDAAPRecordFactoryClass *klass)
- static void
- rb_daap_record_factory_interface_init (gpointer iface, gpointer data)
- {
--	DMAPRecordFactoryInterface *factory = iface;
-+	DMAPRecordFactoryIface *factory = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (factory) == TYPE_DMAP_RECORD_FACTORY);
-+	g_assert (G_TYPE_FROM_INTERFACE (factory) == DMAP_TYPE_RECORD_FACTORY);
- 
- 	factory->create = rb_daap_record_factory_create;
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBDAAPRecordFactory, rb_daap_record_factory, G_TYPE_OBJECT, 
--			 G_IMPLEMENT_INTERFACE (TYPE_DMAP_RECORD_FACTORY,
-+			 G_IMPLEMENT_INTERFACE (DMAP_TYPE_RECORD_FACTORY,
- 					        rb_daap_record_factory_interface_init))
- 
- RBDAAPRecordFactory *
-diff --git a/plugins/daap/rb-daap-record.c b/plugins/daap/rb-daap-record.c
-index 91cca4b..ff5c127 100644
---- a/plugins/daap/rb-daap-record.c
-+++ b/plugins/daap/rb-daap-record.c
-@@ -346,9 +346,9 @@ rb_daap_record_class_init (RBDAAPRecordClass *klass)
- static void
- rb_daap_record_daap_iface_init (gpointer iface, gpointer data)
- {
--	DAAPRecordInterface *daap_record = iface;
-+	DAAPRecordIface *daap_record = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (daap_record) == TYPE_DAAP_RECORD);
-+	g_assert (G_TYPE_FROM_INTERFACE (daap_record) == DAAP_TYPE_RECORD);
- 
- 	daap_record->itunes_compat = rb_daap_record_itunes_compat;
- 	daap_record->read = rb_daap_record_read;
-@@ -357,14 +357,14 @@ rb_daap_record_daap_iface_init (gpointer iface, gpointer data)
- static void
- rb_daap_record_dmap_iface_init (gpointer iface, gpointer data)
- {
--	DMAPRecordInterface *dmap_record = iface;
-+	DMAPRecordIface *dmap_record = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (dmap_record) == TYPE_DMAP_RECORD);
-+	g_assert (G_TYPE_FROM_INTERFACE (dmap_record) == DMAP_TYPE_RECORD);
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBDAAPRecord, rb_daap_record, G_TYPE_OBJECT,
--			 G_IMPLEMENT_INTERFACE (TYPE_DAAP_RECORD, rb_daap_record_daap_iface_init)
--			 G_IMPLEMENT_INTERFACE (TYPE_DMAP_RECORD, rb_daap_record_dmap_iface_init))
-+			 G_IMPLEMENT_INTERFACE (DAAP_TYPE_RECORD, rb_daap_record_daap_iface_init)
-+			 G_IMPLEMENT_INTERFACE (DMAP_TYPE_RECORD, rb_daap_record_dmap_iface_init))
- 
- static void rb_daap_record_finalize (GObject *object)
- {
-diff --git a/plugins/daap/rb-daap-source.c b/plugins/daap/rb-daap-source.c
-index c531428..ceec711 100644
---- a/plugins/daap/rb-daap-source.c
-+++ b/plugins/daap/rb-daap-source.c
-@@ -649,7 +649,7 @@ rb_daap_source_selected (RBDisplayPage *page)
- 
- 	factory = DMAP_RECORD_FACTORY (rb_daap_record_factory_new ());
- 
--	daap_source->priv->connection = dmap_connection_new (name,
-+	daap_source->priv->connection = daap_connection_new (name,
- 							     daap_source->priv->host,
- 							     daap_source->priv->port,
- 							     daap_source->priv->password_protected,
-diff --git a/plugins/daap/rb-dacp-player.c b/plugins/daap/rb-dacp-player.c
-index 0a49f1d..a8227b5 100644
---- a/plugins/daap/rb-dacp-player.c
-+++ b/plugins/daap/rb-dacp-player.c
-@@ -58,7 +58,7 @@ static void playing_song_changed (RBShellPlayer *shell_player, RhythmDBEntry *en
- static void elapsed_changed (RBShellPlayer *shell_player, guint elapsed, RBDACPPlayer *player);
- 
- static DAAPRecord *rb_dacp_player_now_playing_record  (DACPPlayer *player);
--static gchar *rb_dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint height);
-+static const guchar *rb_dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint height);
- static void rb_dacp_player_play_pause          (DACPPlayer *player);
- static void rb_dacp_player_pause               (DACPPlayer *player);
- static void rb_dacp_player_next_item           (DACPPlayer *player);
-@@ -86,9 +86,9 @@ static guint signals[LAST_SIGNAL] = { 0 };
- static void
- rb_dacp_player_iface_init (gpointer iface, gpointer data)
- {
--	DACPPlayerInterface *dacp_player = iface;
-+	DACPPlayerIface *dacp_player = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (dacp_player) == TYPE_DACP_PLAYER);
-+	g_assert (G_TYPE_FROM_INTERFACE (dacp_player) == DACP_TYPE_PLAYER);
- 
- 	dacp_player->now_playing_record  = rb_dacp_player_now_playing_record;
- 	dacp_player->now_playing_artwork = rb_dacp_player_now_playing_artwork;
-@@ -102,7 +102,7 @@ rb_dacp_player_iface_init (gpointer iface, gpointer data)
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBDACPPlayer, rb_dacp_player, G_TYPE_OBJECT,
--                         G_IMPLEMENT_INTERFACE (TYPE_DACP_PLAYER, rb_dacp_player_iface_init))
-+                         G_IMPLEMENT_INTERFACE (DACP_TYPE_PLAYER, rb_dacp_player_iface_init))
- 
- static void
- rb_dacp_player_init (RBDACPPlayer *object)
-@@ -291,7 +291,7 @@ rb_dacp_player_now_playing_record (DACPPlayer *player)
- 	}
- }
- 
--static gchar *
-+static const guchar *
- rb_dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint height)
- {
- 	return NULL;
-diff --git a/plugins/daap/rb-dmap-container-db-adapter.c b/plugins/daap/rb-dmap-container-db-adapter.c
-index 0f3e640..e7a4b1a 100644
---- a/plugins/daap/rb-dmap-container-db-adapter.c
-+++ b/plugins/daap/rb-dmap-container-db-adapter.c
-@@ -139,9 +139,9 @@ rb_dmap_container_db_adapter_class_init (RBDMAPContainerDbAdapterClass *klass)
- static void
- rb_dmap_container_db_adapter_interface_init (gpointer iface, gpointer data)
- {
--	DMAPContainerDbInterface *dmap_db = iface;
-+	DMAPContainerDbIface *dmap_db = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (dmap_db) == TYPE_DMAP_CONTAINER_DB);
-+	g_assert (G_TYPE_FROM_INTERFACE (dmap_db) == DMAP_TYPE_CONTAINER_DB);
- 
- 	dmap_db->lookup_by_id = rb_dmap_container_db_adapter_lookup_by_id;
- 	dmap_db->foreach = rb_dmap_container_db_adapter_foreach;
-@@ -149,7 +149,7 @@ rb_dmap_container_db_adapter_interface_init (gpointer iface, gpointer data)
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBDMAPContainerDbAdapter, rb_dmap_container_db_adapter, G_TYPE_OBJECT, 
--			 G_IMPLEMENT_INTERFACE (TYPE_DMAP_CONTAINER_DB, rb_dmap_container_db_adapter_interface_init))
-+			 G_IMPLEMENT_INTERFACE (DMAP_TYPE_CONTAINER_DB, rb_dmap_container_db_adapter_interface_init))
- 
- static void
- assign_id (RBPlaylistManager *mgr,
-diff --git a/plugins/daap/rb-rhythmdb-dmap-db-adapter.c b/plugins/daap/rb-rhythmdb-dmap-db-adapter.c
-index e6b6891..2d7eb48 100644
---- a/plugins/daap/rb-rhythmdb-dmap-db-adapter.c
-+++ b/plugins/daap/rb-rhythmdb-dmap-db-adapter.c
-@@ -247,9 +247,9 @@ rb_rhythmdb_dmap_db_adapter_class_init (RBRhythmDBDMAPDbAdapterClass *klass)
- static void
- rb_rhythmdb_dmap_db_adapter_interface_init (gpointer iface, gpointer data)
- {
--	DMAPDbInterface *dmap_db = iface;
-+	DMAPDbIface *dmap_db = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (dmap_db) == TYPE_DMAP_DB);
-+	g_assert (G_TYPE_FROM_INTERFACE (dmap_db) == DMAP_TYPE_DB);
- 
- 	dmap_db->add = rb_rhythmdb_dmap_db_adapter_add;
- 	dmap_db->lookup_by_id = rb_rhythmdb_dmap_db_adapter_lookup_by_id;
-@@ -258,7 +258,7 @@ rb_rhythmdb_dmap_db_adapter_interface_init (gpointer iface, gpointer data)
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBRhythmDBDMAPDbAdapter, rb_rhythmdb_dmap_db_adapter, G_TYPE_OBJECT, 
--			 G_IMPLEMENT_INTERFACE (TYPE_DMAP_DB, rb_rhythmdb_dmap_db_adapter_interface_init))
-+			 G_IMPLEMENT_INTERFACE (DMAP_TYPE_DB, rb_rhythmdb_dmap_db_adapter_interface_init))
- 
- RBRhythmDBDMAPDbAdapter *
- rb_rhythmdb_dmap_db_adapter_new (RhythmDB *rdb, RhythmDBEntryType *entry_type)
-diff --git a/plugins/daap/rb-rhythmdb-query-model-dmap-db-adapter.c b/plugins/daap/rb-rhythmdb-query-model-dmap-db-adapter.c
-index 58abe5e..0a341e1 100644
---- a/plugins/daap/rb-rhythmdb-query-model-dmap-db-adapter.c
-+++ b/plugins/daap/rb-rhythmdb-query-model-dmap-db-adapter.c
-@@ -129,9 +129,9 @@ rb_rhythmdb_query_model_dmap_db_adapter_class_init (RBRhythmDBQueryModelDMAPDbAd
- static void
- rb_rhythmdb_query_model_dmap_db_adapter_interface_init (gpointer iface, gpointer data)
- {
--	DMAPDbInterface *dmap_db = iface;
-+	DMAPDbIface *dmap_db = iface;
- 
--	g_assert (G_TYPE_FROM_INTERFACE (dmap_db) == TYPE_DMAP_DB);
-+	g_assert (G_TYPE_FROM_INTERFACE (dmap_db) == DMAP_TYPE_DB);
- 
- 	dmap_db->add = rb_rhythmdb_query_model_dmap_db_adapter_add;
- 	dmap_db->lookup_by_id = rb_rhythmdb_query_model_dmap_db_adapter_lookup_by_id;
-@@ -140,7 +140,7 @@ rb_rhythmdb_query_model_dmap_db_adapter_interface_init (gpointer iface, gpointer
- }
- 
- G_DEFINE_TYPE_WITH_CODE (RBRhythmDBQueryModelDMAPDbAdapter, rb_rhythmdb_query_model_dmap_db_adapter, G_TYPE_OBJECT, 
--			 G_IMPLEMENT_INTERFACE (TYPE_DMAP_DB, rb_rhythmdb_query_model_dmap_db_adapter_interface_init))
-+			 G_IMPLEMENT_INTERFACE (DMAP_TYPE_DB, rb_rhythmdb_query_model_dmap_db_adapter_interface_init))
- 
- RBRhythmDBQueryModelDMAPDbAdapter *
- rb_rhythmdb_query_model_dmap_db_adapter_new (RhythmDBQueryModel *model)

diff --git a/media-sound/rhythmbox/files/rhythmbox-daap-media-enum.patch b/media-sound/rhythmbox/files/rhythmbox-daap-media-enum.patch
deleted file mode 100644
index 9e15fb7..0000000
--- a/media-sound/rhythmbox/files/rhythmbox-daap-media-enum.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d7230bc94184e341d477722e3844006ef9d4ed87 Mon Sep 17 00:00:00 2001
-From: W. Michael Petullo <mike@flyn.org>
-Date: Thu, 19 May 2011 03:05:06 +0000
-Subject: daap: treat DAAP record's mediakind property as en enum, not int
-
-Signed-off-by: W. Michael Petullo <mike@flyn.org>
----
-diff --git a/plugins/daap/rb-daap-record.c b/plugins/daap/rb-daap-record.c
-index 08e28b5..50027c5 100644
---- a/plugins/daap/rb-daap-record.c
-+++ b/plugins/daap/rb-daap-record.c
-@@ -119,7 +119,7 @@ rb_daap_record_set_property (GObject *object,
- 			record->priv->genre = g_value_dup_string (value);
- 			break;
- 		case PROP_MEDIAKIND:
--			record->priv->mediakind = g_value_get_int (value);
-+			record->priv->mediakind = g_value_get_enum (value);
- 			break;
- 		case PROP_FORMAT:
- 			g_free (record->priv->format);
-@@ -201,7 +201,7 @@ rb_daap_record_get_property (GObject *object,
- 			g_value_set_string (value, record->priv->genre);
- 			break;
- 		case PROP_MEDIAKIND:
--			g_value_set_int (value, record->priv->mediakind);
-+			g_value_set_enum (value, record->priv->mediakind);
- 			break;
- 		case PROP_FORMAT:
- 			g_value_set_string (value, record->priv->format);
-@@ -437,9 +437,6 @@ rb_daap_record_new (RhythmDBEntry *entry)
- 		record->priv->real_format = g_strdup (ext);
- 		record->priv->format = g_strdup (record->priv->real_format);
- 
--		/* Only support songs */
--		record->priv->mediakind = 1;
--
- 		record->priv->track    = rhythmdb_entry_get_ulong
- 						(entry, RHYTHMDB_PROP_TRACK_NUMBER);
- 
---
-cgit v0.9

diff --git a/media-sound/rhythmbox/files/rhythmbox-daap-password.patch b/media-sound/rhythmbox/files/rhythmbox-daap-password.patch
deleted file mode 100644
index b54e1ea..0000000
--- a/media-sound/rhythmbox/files/rhythmbox-daap-password.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 2305ce47ad13c00979109192dbd34780b5bd944e Mon Sep 17 00:00:00 2001
-From: W. Michael Petullo <mike@flyn.org>
-Date: Tue, 17 May 2011 14:40:28 +0000
-Subject: daap: properly handle password-protected shares; req. libdmapsharing 2.9.9+ (bug #501389)
-
-Signed-off-by: W. Michael Petullo <mike@flyn.org>
----
-diff --git a/configure.ac b/configure.ac
-index 124b1a2..5a82ab4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -728,7 +728,7 @@ AC_ARG_ENABLE(daap,
-                              [Disable DAAP support]),,
-               enable_daap=auto)
- if test "x$enable_daap" != "xno"; then
--	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-3.0,
-+	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-3.0 >= 2.9.9,
- 			  have_libdmapsharing=yes,
- 			  have_libdmapsharing=no)
- 	if test "x$have_libdmapsharing" = "xno" -a "x$enable_daap" = "xyes"; then
-diff --git a/plugins/daap/rb-daap-source.c b/plugins/daap/rb-daap-source.c
-index 4e12aee..82d6b2f 100644
---- a/plugins/daap/rb-daap-source.c
-+++ b/plugins/daap/rb-daap-source.c
-@@ -429,16 +429,24 @@ ask_password (RBDAAPSource *source, const char *name, const char *keyring)
- #endif
- 	}
- 
-+	if (! password) {
-+		rb_daap_source_disconnect (source);
-+	}
-+
- 	return password;
- }
- 
--static char *
--connection_auth_cb (DMAPConnection   *connection,
--		    const char       *name,
--		    RBDAAPSource     *source)
-+static void
-+connection_auth_cb (DMAPConnection *connection,
-+                    const char     *name,
-+                    SoupSession    *session,
-+                    SoupMessage    *msg,
-+                    SoupAuth       *auth,
-+                    gboolean        retrying,
-+		    RBDAAPSource   *source)
- {
--#ifdef WITH_GNOME_KEYRING
- 	gchar *password = NULL;
-+#ifdef WITH_GNOME_KEYRING
- 	GnomeKeyringResult keyringret;
- 	gchar *keyring;
- 	GList *list;
-@@ -473,11 +481,10 @@ connection_auth_cb (DMAPConnection   *connection,
- 	if (list)
- 		gnome_keyring_network_password_list_free (list); */
- 	g_free (keyring);
--	return password;
- #else
--	return ask_password (source, name, NULL);
-+	password = ask_password (source, name, NULL);
- #endif
--
-+	dmap_connection_authenticate_message (connection, session, msg, auth, password);
- }
- 
- static void
-@@ -494,7 +501,6 @@ connection_connecting_cb (DMAPConnection       *connection,
- 
- 	switch (state) {
- 	case DMAP_GET_INFO:
--	case DMAP_GET_PASSWORD:
- 	case DMAP_LOGIN:
- 		source->priv->connection_status = _("Connecting to music share");
- 		break;
-@@ -656,7 +662,6 @@ rb_daap_source_selected (RBDisplayPage *page)
- 	daap_source->priv->connection = daap_connection_new (name,
- 							     daap_source->priv->host,
- 							     daap_source->priv->port,
--							     daap_source->priv->password_protected,
- 							     db,
- 							     factory);
- 	g_object_unref (entry_type);
---
-cgit v0.9

diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
deleted file mode 100644
index 39a9f5d..0000000
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ /dev/null
@@ -1,204 +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/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.2 2010/07/06 15:46:43 ssuominen Exp $
-
-EAPI="2"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils gnome2 python multilib virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+brasero cdr daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
-musicbrainz mtp nsplugin python test udev upnp vala webkit"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-# FIXME: double check what to do with fm-radio plugin
-# TODO: watchout for udev use flag changes
-COMMON_DEPEND=">=dev-libs/glib-2.25.12
-	dev-libs/libxml2
-	>=x11-libs/gtk+-2.20:2
-	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/totem-pl-parser-2.32.1
-	>=gnome-base/gconf-2
-	>=gnome-extra/gnome-media-2.14
-	<gnome-extra/gnome-media-2.90
-	>=net-libs/libsoup-2.26:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
-	>=media-libs/gst-plugins-base-0.10.24
-
-	cdr? (
-		brasero? ( >=app-cdr/brasero-0.9.1 )
-		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.9:3.0
-		>=net-dns/avahi-0.6 )
-	html? ( >=net-libs/webkit-gtk-1.1.17 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	lastfm? ( dev-libs/json-glib )
-	libnotify? ( >=x11-libs/libnotify-0.4.1 )
-	lirc? ( app-misc/lirc )
-	musicbrainz? ( media-libs/musicbrainz:3 )
-	udev? (
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 )
-		>=sys-fs/udev-145[extras] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-soup-0.10
-	>=media-plugins/gst-plugins-libmms-0.10
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10
-		>=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
-
-	nsplugin? ( net-libs/xulrunner )
-	python? (
-		>=dev-python/pygtk-2.8
-		>=dev-python/pygobject-2.15.4
-		>=dev-python/gconf-python-2.22
-		>=dev-python/libgnome-python-2.22
-		>=dev-python/gnome-keyring-python-2.22
-		>=dev-python/gst-python-0.10.8
-		dbus? ( dev-python/dbus-python )
-		webkit? (
-			dev-python/mako
-			dev-python/pywebkitgtk )
-		upnp? (
-			dev-python/louie
-			media-video/coherence
-			dev-python/twisted[gtk] ) )
-"
-# gtk-doc-am needed for eautoreconf
-#	dev-util/gtk-doc-am
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35
-	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.1.0:0.12 )
-"
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-pkg_setup() {
-	if ! use udev; then
-		if use ipod; then
-			ewarn "ipod support requires udev support.  Please"
-			ewarn "re-emerge with USE=udev to enable ipod support"
-		fi
-
-		if use mtp; then
-			ewarn "MTP support requires udev support.  Please"
-			ewarn "re-emerge with USE=udev to enable MTP support"
-		fi
-	fi
-
-	if ! use cdr ; then
-		ewarn "You have cdr USE flag disabled."
-		ewarn "You will not be able to burn CDs."
-	fi
-
-	if ! use python; then
-		if use dbus; then
-			ewarn "You need python support to use the im-status plugin"
-		fi
-
-		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
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
-	else
-		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
-	fi
-
-	G2CONF="${G2CONF}
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		VALAC=$(type -P valac-0.12)
-		--enable-mmkeys
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-static
-		$(use_enable daap)
-		$(use_enable lastfm)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable musicbrainz)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable vala)
-		$(use_with daap mdns avahi)
-		$(use_with gnome-keyring)
-		$(use_with html webkit)
-		$(use_with ipod)
-		$(use_with mtp)
-		$(use_with udev gudev)"
-
-	export GST_INSPECT=/bin/true
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/libdmapsharing-0.3-support.patch"
-	epatch "${FILESDIR}/rhythmbox-daap-media-enum.patch"
-	epatch "${FILESDIR}/rhythmbox-daap-password.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "test failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
-	fi
-
-	ewarn
-	ewarn "If ${PN} doesn't play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
-}

diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index 9d81969..670f9d2 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.2 2010/07/06 15:46:43 ssuominen Exp $
 
-EAPI="2"
+EAPI="3"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
+PYTHON_USE_WITH="xml"
+PYTHON_USE_WITH_OPT="python"
 
 inherit eutils gnome2 python multilib virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -16,8 +18,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cdr daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
-musicbrainz mtp nsplugin python test udev upnp vala webkit"
+IUSE="cdr daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp vala webkit"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -25,7 +26,6 @@ else
 fi
 
 # FIXME: double check what to do with fm-radio plugin
-# TODO: watchout for udev use flag changes
 # FIXME: Zeitgesti python plugin
 # NOTE:: Rhythmbox Uses dbus-glib, gdbus, and dbus-python right now
 COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
@@ -34,6 +34,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/gdk-pixbuf-2.18.0
 	>=dev-libs/dbus-glib-0.71
 	>=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
@@ -51,10 +52,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 	lirc? ( app-misc/lirc )
 	musicbrainz? ( media-libs/musicbrainz:3 )
+	python? ( >=dev-python/pygobject-2.28:2[introspection] )
 	udev? (
 		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
 		mtp? ( >=media-libs/libmtp-0.3 )
-		>=sys-fs/udev-145[extras] )
+		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=media-plugins/gst-plugins-soup-0.10
@@ -64,10 +66,7 @@ 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
-
-	nsplugin? ( net-libs/xulrunner )
 	python? (
-		>=dev-python/pygobject-2.15.4:2[introspection]
 		>=dev-python/gst-python-0.10.8
 
 		x11-libs/gdk-pixbuf:2[introspection]
@@ -78,12 +77,15 @@ RDEPEND="${COMMON_DEPEND}
 		gnome-keyring? ( dev-python/gnome-keyring-python )
 		webkit? (
 			dev-python/mako
-			net-libs/webkit-gtk:3[introspection] )
+			>=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
 #	dev-util/gtk-doc-am
 DEPEND="${COMMON_DEPEND}
@@ -99,16 +101,26 @@ DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
 	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
 
 pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+		G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
+	fi
+
 	if ! use udev; then
 		if use ipod; then
 			ewarn "ipod support requires udev support.  Please"
 			ewarn "re-emerge with USE=udev to enable ipod support"
+			G2CONF="${G2CONF} --without-ipod"
 		fi
 
 		if use mtp; then
 			ewarn "MTP support requires udev support.  Please"
 			ewarn "re-emerge with USE=udev to enable MTP support"
+			G2CONF="${G2CONF} --without-mtp"
 		fi
+	else
+		G2CONF="${G2CONF} $(use_with ipod) $(use_with mtp)"
 	fi
 
 	if ! use cdr ; then
@@ -140,8 +152,9 @@ pkg_setup() {
 		VALAC=$(type -P valac-0.10)
 		--enable-mmkeys
 		--disable-scrollkeeper
-		--disable-schemas-commpile
+		--disable-schemas-compile
 		--disable-static
+		--without-hal
 		$(use_enable daap)
 		$(use_enable lastfm)
 		$(use_enable libnotify)