drop old

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

8 files changed, 9 insertions, 877 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index c9a388eba565..7f9c986ddb99 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.241 2013/04/22 19:01:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.242 2013/07/21 07:50:24 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/rhythmbox-2.95-fix-db-dbus-interface.patch,
+  -files/rhythmbox-2.95-port-im-status-plugin.patch,
+  -files/rhythmbox-2.95-port-rb-set-rating-py-example.patch,
+  -rhythmbox-0.13.3.ebuild, -rhythmbox-2.97.ebuild, -rhythmbox-2.98.ebuild,
+  metadata.xml:
+  drop old
 
 *rhythmbox-2.99.1 (22 Apr 2013)
 
diff --git a/media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch b/media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch
deleted file mode 100644
index fc73aba43757..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-2.95-fix-db-dbus-interface.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Patch by moch, will enter upstream trunk soon
-
-diff --git a/rhythmdb/rhythmdb-dbus.c b/rhythmdb/rhythmdb-dbus.c
-index bf982ce..d31486e 100644
---- a/rhythmdb/rhythmdb-dbus.c
-+++ b/rhythmdb/rhythmdb-dbus.c
-@@ -111,19 +111,28 @@ rhythmdb_method_call (GDBusConnection *connection,
- 			GVariant *v;
- 
- 			value = value_ptr;
-+			v = NULL;
- 			if (G_VALUE_HOLDS_STRING (value)) {
--				v = g_variant_new_string (g_value_get_string (value));
-+				if (g_value_get_string (value) != NULL) {
-+					v = g_variant_new_string (g_value_get_string (value));
-+				}
- 			} else if (G_VALUE_HOLDS_ULONG (value)) {
- 				v = g_variant_new_uint32 (g_value_get_ulong (value));
- 			} else if (G_VALUE_HOLDS_DOUBLE (value)) {
- 				v = g_variant_new_double (g_value_get_double (value));
-+			} else if (G_VALUE_HOLDS_BOOLEAN (value)) {
-+				v = g_variant_new_boolean (g_value_get_boolean (value));
-+			} else if (G_VALUE_HOLDS_UINT64 (value)) {
-+				v = g_variant_new_uint64 (g_value_get_uint64 (value));
- 			} else {
- 				g_assert_not_reached ();
- 			}
--			g_variant_builder_add (builder,
--					       "{sv}",
--					       (const char *)name_ptr,
--					       v);
-+			if (v != NULL) {
-+				g_variant_builder_add (builder,
-+						       "{sv}",
-+						       (const char *)name_ptr,
-+						       v);
-+			}
- 			count++;
- 		}
- 		g_hash_table_destroy (prop_hash);
-@@ -133,7 +142,8 @@ rhythmdb_method_call (GDBusConnection *connection,
- 			g_variant_builder_add (builder, "{sv}", "", g_variant_new_string (""));
- 		}
- 
--		g_dbus_method_invocation_return_value (invocation, g_variant_builder_end (builder));
-+		g_dbus_method_invocation_return_value (invocation,
-+						       g_variant_new ("(a{sv})", builder));
- 		g_variant_builder_unref (builder);
- 
- 	} else if (g_strcmp0 (method_name, "SetEntryProperties") == 0) {
-@@ -183,6 +193,7 @@ rhythmdb_method_call (GDBusConnection *connection,
- 			g_value_unset (&v);
- 		}
- 
-+		g_dbus_method_invocation_return_value (invocation, NULL);
- 	} else {
- 		g_dbus_method_invocation_return_error (invocation,
- 						       G_DBUS_ERROR,
diff --git a/media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch b/media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch
deleted file mode 100644
index f8453c084083..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-2.95-port-im-status-plugin.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From ed98714cb111d2befbeebbfceeeb60fcf8dcdc1d Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Sun, 15 Jan 2012 16:13:38 +0530
-Subject: [PATCH 1/2] Port im-status python plugin to Gio/GDBus
-
-Also drop Gossip support since it's a dead project with no way to test for it.
----
- plugins/im-status/im-status.py |  157 ++++++++++++++--------------------------
- 1 files changed, 53 insertions(+), 104 deletions(-)
-
-diff --git a/plugins/im-status/im-status.py b/plugins/im-status/im-status.py
-index 17bcb2d..6bb5b89 100644
---- a/plugins/im-status/im-status.py
-+++ b/plugins/im-status/im-status.py
-@@ -2,6 +2,7 @@
- # vim: set et sw=2:
- # 
- # Copyright (C) 2007-2008 - Vincent Untz
-+# Copyright (C) 2012 - Nirbheek Chauhan <nirbheek@gentoo.org>
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -26,19 +27,10 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
- 
- import rb
--from gi.repository import GObject, Peas
-+import gi
-+from gi.repository import Gio, GLib, GObject, Peas
- from gi.repository import RB
- 
--try:
--  import dbus
--  use_gossip = True
--  use_mc5 = True
--  use_purple = True
--except ImportError:
--  use_gossip = False
--  use_mc5 = False
--  use_purple = False
--
- import gettext
- gettext.install('rhythmbox', RB.locale_dir(), unicode=True)
- 
-@@ -49,10 +41,6 @@ STREAM_SONG_ARTIST = 'rb:stream-song-artist'
- STREAM_SONG_TITLE  = 'rb:stream-song-title'
- STREAM_SONG_ALBUM  = 'rb:stream-song-album'
- 
--GOSSIP_BUS_NAME = 'org.gnome.Gossip'
--GOSSIP_OBJ_PATH = '/org/gnome/Gossip'
--GOSSIP_IFACE_NAME = 'org.gnome.Gossip'
--
- PROPERTIES_IFACE_NAME = 'org.freedesktop.DBus.Properties'
- MC5_BUS_NAME = 'org.freedesktop.Telepathy.MissionControl5'
- MC5_AM_OBJ_PATH = '/org/freedesktop/Telepathy/AccountManager'
-@@ -70,6 +58,17 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
-   def __init__ (self):
-     GObject.Object.__init__ (self)
- 
-+  def _init_dbus_proxies(self):
-+    self.proxies = {}
-+    bus_type = Gio.BusType.SESSION
-+    flags = 0
-+    iface_info = None
-+    # Creating proxies doesn't do any blocking I/O, and never fails
-+    self.proxies["purple"] = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
-+                               PURPLE_BUS_NAME, PURPLE_OBJ_PATH, PURPLE_IFACE_NAME, None)
-+    self.proxies["mc5_props"] = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
-+                               MC5_BUS_NAME, MC5_AM_OBJ_PATH, PROPERTIES_IFACE_NAME, None)
-+
-   def do_activate (self):
-     shell = self.object
-     sp = shell.props.shell_player
-@@ -85,6 +84,7 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
-     self.current_title = None
-     self.current_album = None
- 
-+    self._init_dbus_proxies ()
-     self.save_status ()
- 
-     if sp.get_playing ():
-@@ -185,124 +185,73 @@ class IMStatusPlugin (GObject.Object, Peas.Activatable):
-     else:
-       new_status = _(u"♫ Listening to music... ♫")
- 
--    self.set_gossip_status (new_status)
-     self.set_mc5_status (new_status)
-     self.set_purple_status (new_status)
- 
-   def save_status (self):
--    self.saved_gossip = self.get_gossip_status ()
-     self.saved_mc5 = self.get_mc5_status ()
-     self.saved_purple = self.get_purple_status ()
- 
-   def restore_status (self):
--    if self.saved_gossip != None:
--      self.set_gossip_status (self.saved_gossip)
-     if self.saved_mc5 != None:
-       self.set_mc5_status (self.saved_mc5)
-     if self.saved_purple != None:
-       self.set_purple_status (self.saved_purple)
- 
--  def set_gossip_status (self, new_status):
--    if not use_gossip:
--      return
--
--    try:
--      bus = dbus.SessionBus ()
--      gossip_obj = bus.get_object (GOSSIP_BUS_NAME, GOSSIP_OBJ_PATH)
--      gossip = dbus.Interface (gossip_obj, GOSSIP_IFACE_NAME)
--
--      state, status = gossip.GetPresence ("")
--      gossip.SetPresence (state, new_status)
--    except dbus.DBusException:
--      pass
--
--  def get_gossip_status (self):
--    if not use_gossip:
--      return
--
--    try:
--      bus = dbus.SessionBus ()
--      gossip_obj = bus.get_object (GOSSIP_BUS_NAME, GOSSIP_OBJ_PATH)
--      gossip = dbus.Interface (gossip_obj, GOSSIP_IFACE_NAME)
--
--      state, status = gossip.GetPresence ("")
--      return status
--    except dbus.DBusException:
--      return None
--
-   def set_mc5_status (self, new_status):
--    if not use_mc5:
--      return
--
-     try:
--      bus = dbus.SessionBus ()
--      am_obj = bus.get_object (MC5_BUS_NAME, MC5_AM_OBJ_PATH)
--      am = dbus.Interface (am_obj, PROPERTIES_IFACE_NAME)
--
--      for acct in am.Get (MC5_AM_IFACE_NAME, "ValidAccounts"):
--        acct_obj = bus.get_object (MC5_BUS_NAME, acct)
--        acct_iface = dbus.Interface (acct_obj, PROPERTIES_IFACE_NAME)
--        status = acct_iface.Get (MC5_ACCT_IFACE_NAME, "RequestedPresence")
--        acct_iface.Set (MC5_ACCT_IFACE_NAME, "RequestedPresence", (status[0], status[1], new_status))
--
--    except dbus.DBusException, e:
--      print "dbus exception while setting status: " + str(e)
--
-+      proxy = self.proxies["mc5_props"]
-+      for acct_obj_path in proxy.Get("(ss)", MC5_AM_IFACE_NAME, "ValidAccounts"):
-+        # Create a new proxy connected to acct_obj_path
-+        acct_proxy = Gio.DBusProxy.new_for_bus_sync(Gio.BusType.SESSION, 0, None,
-+                                                    MC5_BUS_NAME, acct_obj_path,
-+                                                    PROPERTIES_IFACE_NAME, None)
-+        # status = (state, status, status_message)
-+        status = acct_proxy.Get("(ss)", MC5_ACCT_IFACE_NAME, "RequestedPresence")
-+        # Create the (uss) GVariant to set the new status message
-+        vstatus = GLib.Variant("(uss)", (status[0], status[1], new_status))
-+        # Set the status!
-+        acct_proxy.Set("(ssv)", MC5_ACCT_IFACE_NAME, "RequestedPresence", vstatus)
-+    except gi._glib.GError as e:
-+      print ("GError while setting status: " + str(e))
- 
-   def get_mc5_status (self):
--    if not use_mc5:
--      return
--
-     try:
--      bus = dbus.SessionBus ()
--      am_obj = bus.get_object (MC5_BUS_NAME, MC5_AM_OBJ_PATH)
--      am = dbus.Interface (am_obj, PROPERTIES_IFACE_NAME)
-+      proxy = self.proxies["mc5_props"]
-       got_status = False
--
-       # a bit awful: this just returns the status text from the first account
-       # that has one.
--      for acct in am.Get (MC5_AM_IFACE_NAME, "ValidAccounts"):
--        acct_obj = bus.get_object (MC5_BUS_NAME, acct)
--        acct_iface = dbus.Interface (acct_obj, PROPERTIES_IFACE_NAME)
--        status = acct_iface.Get (MC5_ACCT_IFACE_NAME, "RequestedPresence")
-+      for acct_obj_path in proxy.Get("(ss)", MC5_AM_IFACE_NAME, "ValidAccounts"):
-+        # Create a new proxy connected to acct_obj_path
-+        acct_proxy = Gio.DBusProxy.new_for_bus_sync (Gio.BusType.SESSION, 0, None,
-+                                                     MC5_BUS_NAME, acct_obj_path,
-+                                                     PROPERTIES_IFACE_NAME, None)
-+        # Get (state, status, status_message)
-+        ret = acct_proxy.Get("(ss)", MC5_ACCT_IFACE_NAME, "RequestedPresence")
-         got_status = True
--        if status[2] != "":
--          return status[2]
--
-+        if ret[2] != "":
-+          return ret[2]
-       # if all accounts have empty status, return that
-       if got_status:
-         return ""
--    except dbus.DBusException, e:
--      print "dbus exception while getting status: " + str(e)
--
-+    except gi._glib.GError as e:
-+      print ("GError while setting status: " + str(e))
-     return None
- 
-   def set_purple_status (self, new_status):
--    if not use_purple:
--      return
--
-     try:
--      bus = dbus.SessionBus ()
--      purple_obj = bus.get_object (PURPLE_BUS_NAME, PURPLE_OBJ_PATH)
--      purple = dbus.Interface (purple_obj, PURPLE_IFACE_NAME)
--
--      status = purple.PurpleSavedstatusGetCurrent ()
--      purple.PurpleSavedstatusSetMessage (status, new_status)
--      purple.PurpleSavedstatusActivate (status)
--    except dbus.DBusException:
--      pass
-+      proxy = self.proxies["purple"]
-+      status = proxy.PurpleSavedstatusGetCurrent()
-+      proxy.PurpleSavedstatusSetMessage("(is)", status, new_status)
-+      proxy.PurpleSavedstatusActivate("(i)", status)
-+    except gi._glib.GError as e:
-+      print ("GError while setting status: " + str(e))
- 
-   def get_purple_status (self):
--    if not use_purple:
--      return
--
-     try:
--      bus = dbus.SessionBus ()
--      purple_obj = bus.get_object (PURPLE_BUS_NAME, PURPLE_OBJ_PATH)
--      purple = dbus.Interface (purple_obj, PURPLE_IFACE_NAME)
--
--      current = purple.PurpleSavedstatusGetCurrent ()
--      status = purple.PurpleSavedstatusGetMessage (current)
--      return status
--    except dbus.DBusException:
--      return None
-+      proxy = self.proxies["purple"]
-+      status = proxy.PurpleSavedstatusGetCurrent()
-+      return proxy.PurpleSavedstatusGetMessage("(i)", status)
-+    except gi._glib.GError as e:
-+      print ("GError while setting status: " + str(e))
-+    return None
--- 
-1.7.3.4
-
diff --git a/media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch b/media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch
deleted file mode 100644
index 2a34868ab4ba..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-2.95-port-rb-set-rating-py-example.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a9e3286eec99cdd9d229aa0d9bcab925cc381889 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Mon, 16 Jan 2012 06:56:21 +0530
-Subject: [PATCH 2/2] Port the rb-set-rating.py example script to PyGI/GDBus
-
----
- remote/dbus/rb-set-rating.py |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/remote/dbus/rb-set-rating.py b/remote/dbus/rb-set-rating.py
-index 82264d5..9fdd0d5 100755
---- a/remote/dbus/rb-set-rating.py
-+++ b/remote/dbus/rb-set-rating.py
-@@ -1,11 +1,20 @@
- #!/usr/bin/python
-+# vim: set sts=2 sw=2 et :
- # Set the rating for a URI
- 
--import dbus, sys
-+import sys
- 
--bus = dbus.SessionBus()
--rbshellobj = bus.get_object('org.gnome.Rhythmbox', '/org/gnome/Rhythmbox/Shell')
--rbshell = dbus.Interface(rbshellobj, 'org.gnome.Rhythmbox.Shell')
-+from gi.repository import GLib, Gio
- 
--rbshell.setSongProperty(sys.argv[1], "rating", dbus.Double(float(sys.argv[2])))
-+bus_type = Gio.BusType.SESSION
-+flags = 0
-+iface_info = None
-+proxy = Gio.DBusProxy.new_for_bus_sync(bus_type, flags, iface_info,
-+                                       "org.gnome.Rhythmbox3",
-+                                       "/org/gnome/Rhythmbox3/RhythmDB",
-+                                       "org.gnome.Rhythmbox3.RhythmDB", None)
- 
-+entry_uri = sys.argv[1]
-+rating = float(sys.argv[2])
-+vrating = GLib.Variant("u", rating)
-+proxy.SetEntryProperties("(sa{sv})", entry_uri, {"rating": vrating})
--- 
-1.7.3.4
-
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 02c395cc1cae..8b6b048d4bf9 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -7,7 +7,6 @@
 	<flag name="clutter">Build the visualizer plugin which uses <pkg>media-libs/clutter</pkg> and <pkg>x11-libs/mx</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="html">Use <pkg>net-libs/webkit-gtk</pkg> for detecting and displaying HTML podcast episode descriptions.</flag>
-	<flag name="lastfm">Build a plugin for Last.fm and Librefm scrobbling</flag>
 	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
   </use>
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 4585186f64a8..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.15 2013/03/31 19:02:20 pacho Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 python multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdr daap gnome-keyring ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp-av webkit"
-
-# FIXME: double check what to do with fm-radio plugin
-# TODO: watchout for udev use flag changes
-COMMON_DEPEND=">=dev-libs/glib-2.26:2
-	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.91
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
-
-	>=media-libs/gst-plugins-base-0.10.20:0.10
-	|| (
-		>=media-libs/gst-plugins-base-0.10.24:0.10
-		>=media-libs/gst-plugins-bad-0.10.6:0.10 )
-
-	app-misc/media-player-info
-
-	cdr? ( >=app-cdr/brasero-0.9.1 )
-	daap? (
-		>=net-libs/libdmapsharing-2.1.6:2.2
-		>=net-dns/avahi-0.6 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	udev? (
-		virtual/udev[gudev]
-		ipod? ( >=media-libs/libgpod-0.7.92 )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-	lastfm? ( dev-libs/json-glib )
-	libnotify? ( >=x11-libs/libnotify-0.4.1 )
-	lirc? ( app-misc/lirc )
-	musicbrainz? ( media-libs/musicbrainz:3 )
-	python? (
-		|| (
-			dev-lang/python:2.7
-			dev-lang/python:2.6
-			dev-lang/python:2.5
-			dev-python/celementtree )
-		>=dev-python/pygtk-2.8:2
-		>=dev-python/pygobject-2.15.4:2
-		>=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:0.10
-		webkit? (
-			dev-python/mako
-			dev-python/pywebkitgtk )
-		upnp-av? ( media-video/coherence )
-	)
-	webkit? ( >=net-libs/webkit-gtk-1.1.7:2 )
-"
-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-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
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	test? ( dev-libs/check )"
-
-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
-		ewarn "You have cdr USE flag disabled."
-		ewarn "You will not be able to burn CDs."
-	else
-		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
-	fi
-
-	if ! use python; then
-		if use upnp-av; then
-			ewarn "You need python support in addition to upnp-av"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		GST_INSPECT=$(type -P true)
-		$(use_with gnome-keyring)
-		$(use_with udev gudev)
-		--without-hal
-		$(use_enable lastfm)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable musicbrainz)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable daap)
-		$(use_with daap mdns avahi)
-		$(use_with webkit)
-		--enable-mmkeys
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-static
-		--disable-vala
-		--disable-more-warnings"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	use python && python_clean_py-compile_files
-}
-
-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"
-}
-
-src_install() {
-	gnome2_src_install
-
-	find "${ED}/usr/$(get_libdir)/rhythmbox/plugins" -name "*.la" -delete \
-		|| die "failed to remove *.la files"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
-
-	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
-	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
-}
diff --git a/media-sound/rhythmbox/rhythmbox-2.97.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
deleted file mode 100644
index 8acfe2f75fa9..000000000000
--- a/media-sound/rhythmbox/rhythmbox-2.97.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.17 2013/03/31 19:02:20 pacho Exp $
-
-EAPI="4"
-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
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cdr clutter daap dbus gnome-keyring html ipod libnotify lirc musicbrainz mtp nsplugin +python test +udev upnp-av webkit zeitgeist"
-# vala
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	gnome-keyring? ( python )
-	webkit? ( python )"
-
-# FIXME: double check what to do with fm-radio plugin
-# NOTE: gst-python is still needed because gstreamer introspection is incomplete
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=dev-libs/libxml2-2.7.8:2
-	>=x11-libs/gtk+-3.2: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/totem-pl-parser-2.32.1
-	|| ( >=net-libs/libsoup-2.42: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]
-	>=sys-libs/tdb-1.2.6
-	dev-libs/json-glib
-
-	clutter? (
-		>=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-3.4* )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.11:3.0
-		>=net-dns/avahi-0.6 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	html? ( <net-libs/webkit-gtk-1.10:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-	lirc? ( app-misc/lirc )
-	musicbrainz? (
-		media-libs/libdiscid
-		|| ( >=media-libs/musicbrainz-4.0.0:4
-		     >=media-libs/musicbrainz-3.0.2:3 )
-		gnome-base/gconf:2 )
-	python? ( dev-python/pygobject:3 )
-	udev? (
-		virtual/udev[gudev]
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-	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-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
-	x11-themes/gnome-icon-theme-symbolic
-	upnp-av? (
-		>=media-libs/grilo-0.1.17:0.1
-		>=media-plugins/grilo-plugins-0.1.17:0.1[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]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( dev-python/gnome-keyring-python )
-		webkit? (
-			dev-python/mako
-			<net-libs/webkit-gtk-1.10:3[introspection] ) )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	test? ( dev-libs/check )"
-#	vala? ( >=dev-lang/vala-0.9.4:0.12 )
-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
-
-	# --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.14)
-		--enable-mmkeys
-		--disable-more-warnings
-		--disable-scrollkeeper
-		--disable-schemas-compile
-		--disable-static
-		--disable-vala
-		--without-hal
-		$(use_enable clutter visualizer)
-		$(use_enable daap)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable musicbrainz)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable upnp-av grilo)
-		$(use_with cdr brasero)
-		$(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() {
-	gnome2_src_prepare
-	use python && python_clean_py-compile_files
-}
-
-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
-	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
-}
diff --git a/media-sound/rhythmbox/rhythmbox-2.98.ebuild b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
deleted file mode 100644
index a95a0f932852..000000000000
--- a/media-sound/rhythmbox/rhythmbox-2.98.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.11 2013/03/31 19:02:20 pacho Exp $
-
-EAPI="4"
-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
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cdr clutter daap dbus gnome-keyring html ipod libnotify lirc mtp nsplugin +python test +udev upnp-av webkit zeitgeist"
-# vala
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	gnome-keyring? ( python )
-	webkit? ( python )"
-
-# FIXME: double check what to do with fm-radio plugin
-# NOTE: gst-python is still needed because gstreamer introspection is incomplete
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.7.8: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/totem-pl-parser-3.2
-	|| ( >=net-libs/libsoup-2.42: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]
-	>=sys-libs/tdb-1.2.6
-	dev-libs/json-glib
-
-	clutter? (
-		>=media-libs/clutter-1.8:1.0
-		>=media-libs/clutter-gst-1.4: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
-		>=net-dns/avahi-0.6 )
-	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 )
-	lirc? ( app-misc/lirc )
-	python? ( >=dev-python/pygobject-3:3 )
-	udev? (
-		virtual/udev[gudev]
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-	zeitgeist? ( gnome-extra/zeitgeist )
-"
-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:0.10
-	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]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( dev-python/gnome-keyring-python )
-		webkit? (
-			dev-python/mako
-			>=net-libs/webkit-gtk-1.3.9:3[introspection] ) )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-#	vala? ( >=dev-lang/vala-0.9.4:0.12 )
-
-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
-}
-
-src_prepare() {
-	rm -v lib/rb-marshal.{c,h} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --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.14)
-		--enable-mmkeys
-		--disable-more-warnings
-		--disable-schemas-compile
-		--disable-static
-		--disable-vala
-		--without-hal
-		$(use_enable clutter visualizer)
-		$(use_enable daap)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable upnp-av grilo)
-		$(use_with cdr brasero)
-		$(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
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	use python && python_clean_py-compile_files
-}
-
-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
-	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
-}