Drop old.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

10 files changed, 16 insertions, 597 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 96f59eb27119..644a13881d1c 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.165 2011/10/30 16:21:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.166 2011/11/25 06:58:03 tetromino Exp $
+
+  25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-power-manager-3.0.2-r1.ebuild,
+  -files/gnome-power-manager-3.0.2-idle-status.patch,
+  -files/gnome-power-manager-3.0.2-screensaver.patch:
+  Drop old.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-power-manager-2.32.0-r2.ebuild:
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
deleted file mode 100644
index acd9093cd949..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 02 May 2011 23:18:58 +0000
-Subject: gpm-idle: manually update the status property
-
-gnome-session doesn't emit PropertyChanged since it uses dbus-glib,
-therefore we need to manually update the cached property when
-receiving a SessionChanged signal.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=679083
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/gpm-idle.c b/src/gpm-idle.c
-index 04225fc..0f2f1ee 100644
---- a/src/gpm-idle.c
-+++ b/src/gpm-idle.c
-@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha
- 		return;
- 	}
- 	if (g_strcmp0 (signal_name, "StatusChanged") == 0) {
-+                guint status;
-+
-+                g_variant_get (parameters, "(u)", &status);
-+                g_dbus_proxy_set_cached_property (proxy, "status",
-+                                                  g_variant_new ("u", status));
- 		g_debug ("Received gnome session status change");
- 		gpm_idle_evaluate (idle);
- 		return;
---
-cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
deleted file mode 100644
index 1ff7cc6d785b..000000000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From c36c35b2ecd818e54de975fe81885eca05a1be98 Mon Sep 17 00:00:00 2001
-From: Gary Ching-Pang Lin <chingpang@gmail.com>
-Date: Wed, 08 Jun 2011 16:01:33 +0000
-Subject: Query gnome-screensaver settings with GSettings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650464
----
-diff --git a/configure.ac b/configure.ac
-index 90bbe5f..3134ae4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
- 
- PKG_CHECK_MODULES(GNOME, [
-  gtk+-3.0 >= 2.91.0
-- gconf-2.0 >= 2.31.1
-  gnome-keyring-1 >= 0.6.0
-  cairo >= 1.0.0])
- 
-diff --git a/src/gpm-common.h b/src/gpm-common.h
-index b540c05..dabda1a 100644
---- a/src/gpm-common.h
-+++ b/src/gpm-common.h
-@@ -129,8 +129,8 @@ G_BEGIN_DECLS
- #define GPM_SETTINGS_INFO_LAST_DEVICE			"info-last-device"
- 
- /* gnome-screensaver */
--#define GS_CONF_DIR					"/apps/gnome-screensaver"
--#define GS_CONF_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
-+#define GS_SETTINGS_SCHEMA				"org.gnome.desktop.screensaver"
-+#define GS_SETTINGS_PREF_LOCK_ENABLED			"lock-enabled"
- 
- typedef enum {
- 	GPM_ICON_POLICY_PRESENT,
-diff --git a/src/gpm-control.c b/src/gpm-control.c
-index 0fc864d..902db44 100644
---- a/src/gpm-control.c
-+++ b/src/gpm-control.c
-@@ -38,7 +38,6 @@
- 
- #include <glib/gi18n.h>
- #include <gnome-keyring.h>
--#include <gconf/gconf-client.h>
- #include <libupower-glib/upower.h>
- 
- #include "egg-console-kit.h"
-@@ -51,8 +50,8 @@
- 
- struct GpmControlPrivate
- {
--	GConfClient		*conf;
- 	GSettings		*settings;
-+	GSettings		*settings_ss;
- 	UpClient		*client;
- };
- 
-@@ -118,7 +117,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
- 	   See bug #331164 for all the juicy details. :-) */
- 	use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
- 	if (use_ss_setting) {
--		do_lock = gconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
-+		do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
- 		g_debug ("Using ScreenSaver settings (%i)", do_lock);
- 	} else {
- 		do_lock = g_settings_get_boolean (control->priv->settings, policy);
-@@ -256,8 +255,8 @@ gpm_control_finalize (GObject *object)
- 	g_return_if_fail (GPM_IS_CONTROL (object));
- 	control = GPM_CONTROL (object);
- 
--	g_object_unref (control->priv->conf);
- 	g_object_unref (control->priv->settings);
-+	g_object_unref (control->priv->settings_ss);
- 	g_object_unref (control->priv->client);
- 
- 	g_return_if_fail (control->priv != NULL);
-@@ -306,7 +305,7 @@ gpm_control_init (GpmControl *control)
- 
- 	control->priv->client = up_client_new ();
- 	control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
--	control->priv->conf = gconf_client_get_default ();
-+	control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
- }
- 
- /**
-diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
-index 842ea7c..f41baed 100644
---- a/src/gpm-screensaver.c
-+++ b/src/gpm-screensaver.c
-@@ -25,7 +25,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gio/gio.h>
--#include <gconf/gconf-client.h>
- 
- #include "gpm-screensaver.h"
- #include "gpm-common.h"
-@@ -41,7 +40,7 @@ static void     gpm_screensaver_finalize   (GObject		*object);
- struct GpmScreensaverPrivate
- {
- 	GDBusProxy		*proxy;
--	GConfClient		*conf;
-+	GSettings		*settings;
- };
- 
- enum {
-@@ -63,7 +62,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver)
- {
- 	gboolean enabled;
- 	g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
--	enabled = gconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
-+	enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED);
- 	return enabled;
- }
- 
-@@ -296,7 +295,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
- 		g_warning ("failed to setup screensaver proxy: %s", error->message);
- 		g_error_free (error);
- 	}
--	screensaver->priv->conf = gconf_client_get_default ();
-+	screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA) ;
- }
- 
- /**
-@@ -313,7 +312,7 @@ gpm_screensaver_finalize (GObject *object)
- 	screensaver = GPM_SCREENSAVER (object);
- 	screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
- 
--	g_object_unref (screensaver->priv->conf);
-+	g_object_unref (screensaver->priv->settings);
- 	g_object_unref (screensaver->priv->proxy);
- 
- 	G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object);
-diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
-index e7eb21b..a444c2e 100644
---- a/src/gpm-statistics.c
-+++ b/src/gpm-statistics.c
-@@ -27,7 +27,6 @@
- #include <glib/gi18n.h>
- 
- #include <gtk/gtk.h>
--#include <gconf/gconf-client.h>
- #include <libupower-glib/upower.h>
- 
- #include "gpm-array-float.h"
---
-cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
deleted file mode 100644
index 589305543942..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild,v 1.1 2011/08/19 10:49:13 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc test"
-
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-# Latest libcanberra is needed due to gtk+:3 API changes
-COMMON_DEPEND=">=dev-libs/glib-2.25.9
-	>=x11-libs/gtk+-2.91.7:3
-	>=gnome-base/gnome-keyring-0.6.0
-	>=x11-libs/libnotify-0.7.0
-	>=x11-libs/cairo-1.0.0
-	>=gnome-base/gconf-2.31.1:2
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	>=sys-power/upower-0.9.1
-	>=x11-apps/xrandr-1.3
-	>=x11-proto/xproto-7.0.15
-	x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/consolekit-0.4[policykit]
-	sys-auth/polkit
-	gnome-extra/polkit-gnome"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/randrproto
-
-	sys-devel/gettext
-	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.3
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? (
-		app-text/xmlto
-		app-text/docbook-sgml-utils
-		app-text/docbook-xml-dtd:4.4
-		app-text/docbook-sgml-dtd:4.1
-		app-text/docbook-xml-dtd:4.1.2 )
-	test? ( sys-apps/dbus )"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
-		--disable-strict
-		--enable-compile-warnings=minimum
-		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	if ! use doc; then
-		G2CONF="${G2CONF} DOCBOOK2MAN=$(type -p false)"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=679083
-	# will be in next release
-	epatch "${FILESDIR}/${P}-idle-status.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=650464
-	# will be in next release
-	epatch "${FILESDIR}/${P}-screensaver.patch"
-
-	# Drop debugger CFLAGS from configure
-	# XXX: touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 12640d915ce5..a682ffc80bc0 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.146 2011/10/30 07:55:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.147 2011/11/25 07:01:04 tetromino Exp $
+
+  25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-screensaver-3.0.0-r1.ebuild,
+  -files/gnome-screensaver-3.0.0-clock-skew.patch,
+  -files/gnome-screensaver-3.0.0-user-switcher-crash.patch,
+  -files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch,
+  -gnome-screensaver-3.0.1.ebuild:
+  Drop old.
 
 *gnome-screensaver-3.2.0 (30 Oct 2011)
 
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
deleted file mode 100644
index 8a453efa79c1..000000000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 9f98f3a20b5eec6a1fa13e5a4972eadc2d728acf Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 20 Jul 2011 18:00:43 +0000
-Subject: gs-window-x11: shorten clock timeout to detect skew
-
-The timer for the panel clock currently wakes up once a minute in
-the default case.  This means, if the clock changes while the
-screen is locked (say from a resume following suspend, or from
-ntp) then it becomes out of date for up to a minute.
-
-There's no good way right now to detect when clock skew happens,
-so this commit changes the timeout to expire every couple of
-seconds instead of once a minute.
-
-Minor-Updates-By: Ray Strode <rstrode@redhat.com>
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index e7a475e..a723c4d 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -101,6 +102,8 @@ struct GSWindowPrivate
-         guint      info_bar_timer_id;
-         guint      clock_update_id;
- 
-+        gint64     clock_update_time;
-+
-         gint       lock_pid;
-         gint       lock_watch_id;
-         gint       dialog_response;
-@@ -2201,7 +2204,8 @@ update_clock (GSWindow *window)
-                 /* Translators, this is the 12h date format used in the panel clock */
-                 clock_format = _("%a %l:%M %p");
- 
--        dt = g_date_time_new_now_local ();
-+        window->priv->clock_update_time = g_get_real_time ();
-+        dt = g_date_time_new_from_unix_local (window->priv->clock_update_time / G_USEC_PER_SEC);
-         text = g_date_time_format (dt, clock_format);
-         markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
-         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-@@ -2219,6 +2223,28 @@ update_clock_timer (GSWindow *window)
-         return FALSE;
- }
- 
-+static gboolean
-+check_clock_timer (GSWindow *window)
-+{
-+        /* Update the panel clock when necessary.
-+           This happens:
-+
-+           - Once a minute in the normal case
-+           - When the machine resumes from suspend
-+           - When the system time is adjusted
-+
-+           Right now this function is called much more frequently than any of the
-+           above 3 events happen (see queue_clock_update ()).
-+
-+           We can wake up less often if bug 655129 gets fixed.  */
-+        if (ABS (g_get_real_time () - window->priv->clock_update_time) > 60 * G_USEC_PER_SEC) {
-+                update_clock (window);
-+        }
-+
-+        queue_clock_update (window);
-+        return FALSE;
-+}
-+
- static void
- queue_clock_update (GSWindow *window)
- {
-@@ -2228,10 +2254,17 @@ queue_clock_update (GSWindow *window)
-         gettimeofday (&tv, NULL);
-         timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
- 
--        /* timeout of one minute if we don't care about the seconds */
-+        /* time until next minute */
-         timeouttime += 1000 * (59 - tv.tv_sec % 60);
- 
--        window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+        /* If we are more than 2.5 seconds from the start of the next minute,
-+           schedule less precise but more power friendly 2 second add_seconds
-+           timeout to check if the system realtime clock has changed under us. */
-+        if (timeouttime > 2500) {
-+                window->priv->clock_update_id = g_timeout_add_seconds (2, (GSourceFunc)check_clock_timer, window);
-+        } else {
-+                window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+        }
- }
- 
- static char *
---
-cgit v0.9
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
deleted file mode 100644
index bfdea6e92447..000000000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 338b86c4f0c2cdc4241dbf5cda913f0184afc105 Mon Sep 17 00:00:00 2001
-From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
-Date: Tue, 26 Apr 2011 17:15:56 +0000
-Subject: dialog: Fix crash in user switcher code
-
-The user switch button currently causes the lock dialog to crash
-because of an inverted conditional in the error checking code.
-
-This commit addresses the crash by performing the proper check
-in the conditional.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=648234
----
-diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
-index 67ab36a..6706fde 100644
---- a/src/gs-lock-plug.c
-+++ b/src/gs-lock-plug.c
-@@ -167,7 +167,7 @@ do_user_switch (GSLockPlug *plug)
-         g_object_unref (context);
-         g_object_unref (app);
- 
--        if (!error) {
-+        if (error != NULL) {
-                 gs_debug ("Unable to start GDM greeter: %s", error->message);
-                 g_error_free (error);
-         }
---
-cgit v0.9
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
deleted file mode 100644
index 4dddf1563732..000000000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 742b77d217dced55b8b07616bf6a70ec167ffc01 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 25 Jul 2011 15:03:00 +0000
-Subject: gs-window-x11: use g_timeout_add_seconds for watch dog
-
-The watch dog timer runs sort of arbitrarily every 30 seconds.
-We don't need much precision on when it runs, it just needs to
-run once in a while.
-
-This commit changes the timer setup call from g_timeout_add
-to g_timeout_add_seconds so the watch dog will wake up with
-any other pending timeouts that happen to expire around the same
-time, saving a little power.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 5120476..e7a475e 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -481,9 +481,9 @@ static void
- add_watchdog_timer (GSWindow *window,
-                     glong     timeout)
- {
--        window->priv->watchdog_timer_id = g_timeout_add (timeout,
--                                                         (GSourceFunc)watchdog_timer,
--                                                         window);
-+        window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
-+                                                                 (GSourceFunc)watchdog_timer,
-+                                                                 window);
- }
- 
- static void
-@@ -671,7 +671,7 @@ gs_window_real_show (GtkWidget *widget)
-         window->priv->timer = g_timer_new ();
- 
-         remove_watchdog_timer (window);
--        add_watchdog_timer (window, 30000);
-+        add_watchdog_timer (window, 30);
- 
-         select_popup_events ();
-         window_select_shape_events (window);
---
-cgit v0.9
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
deleted file mode 100644
index ce9d9be7f22d..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild,v 1.1 2011/08/19 11:43:42 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc pam"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.6:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable pam locking)
-		--with-mit-ext
-		--with-pam-prefix=/etc
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--disable-schemas-compile"
-	# xscreensaver and custom screensaver capability removed
-	# poke and inhibit commands were also removed, bug 579430
-}
-
-src_prepare() {
-	# Upstream patch to fix crash in user switcher; will be in next release
-	epatch "${FILESDIR}/${P}-user-switcher-crash.patch"
-
-	# Upstream patches to fix timers and update the clock properly; will be
-	# in next release
-	epatch "${FILESDIR}/${P}-watchdog-add_seconds.patch"
-	epatch "${FILESDIR}/${P}-clock-skew.patch"
-
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild
deleted file mode 100644
index fb622cd4ea3b..000000000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.1.ebuild,v 1.1 2011/09/15 21:03:31 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc pam"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.6:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-menus-2.12
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
-	>=dev-libs/dbus-glib-0.71
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	doc? (
-		app-text/xmlto
-		~app-text/docbook-xml-dtd-4.1.2
-		~app-text/docbook-xml-dtd-4.4 )
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable doc docbook-docs)
-		$(use_enable pam locking)
-		--with-mit-ext
-		--with-pam-prefix=/etc
-		--with-xf86gamma-ext
-		--with-kbd-layout-indicator
-		--disable-schemas-compile"
-	# xscreensaver and custom screensaver capability removed
-	# poke and inhibit commands were also removed, bug 579430
-}
-
-src_prepare() {
-	# Upstream patches to fix timers and update the clock properly; will be
-	# in next release
-	epatch "${FILESDIR}/${PN}-3.0.0-watchdog-add_seconds.patch"
-	epatch "${FILESDIR}/${PN}-3.0.0-clock-skew.patch"
-
-	gnome2_src_prepare
-}