Drop old.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

6 files changed, 9 insertions, 324 deletions

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
-}