Clean up old revisions.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

8 files changed, 10 insertions, 638 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 649a434a0e10..2cb83b68c4c6 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.264 2010/08/18 21:47:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.265 2010/08/22 15:51:07 eva Exp $
+
+  22 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-session-2.19.2-no-asserts.patch,
+  -gnome-session-2.22.3-r1.ebuild,
+  -files/gnome-session-2.22.3-gsd-spawn.patch,
+  -files/gnome-session-2.23.5-polkit-automagic.patch,
+  -files/gnome-session-2.24.2-shutdown.patch,
+  -files/gnome-session-2.26.1-execinfo.patch, -gnome-session-2.26.2.ebuild:
+  Clean up old revisions.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gnome-session-2.30.2.ebuild:
   add ~arm
diff --git a/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch b/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch
deleted file mode 100644
index eb61c89f2ab6..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- gnome-session/main.c	2007-01-22 20:15:57.000000000 -0600
-+++ gnome-session/main.c	2007-01-22 20:17:57.000000000 -0600
-@@ -572,7 +572,6 @@
-   GError *err;
-   int status;
-   char *display_str;
--  char **versions;
-   GConfClient *gconf_client;
-   GOptionContext *goption_context;
-   gboolean dbus_daemon_owner;
-@@ -580,20 +579,6 @@
-   if (getenv ("GSM_VERBOSE_DEBUG"))
-     gsm_set_verbose (TRUE);
- 
--  /* Help eradicate the critical warnings in unstable releases of GNOME */
--  versions = g_strsplit (VERSION, ".", 3);
--  if (versions && versions [0] && versions [1])
--    {
--      int major;
--      major = atoi (versions [1]);
--      if ((major % 2) != 0)
--	{
--          g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
--	  g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
--	}
--    }
--  g_strfreev (versions);
--      
-   set_lang();
-   set_gtk1_theme_rcfile ();
- 
diff --git a/gnome-base/gnome-session/files/gnome-session-2.22.3-gsd-spawn.patch b/gnome-base/gnome-session/files/gnome-session-2.22.3-gsd-spawn.patch
deleted file mode 100644
index 20b5ec00a512..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.22.3-gsd-spawn.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-
-Debian #339785
-GNOME #500216
-Spawn gnome-settings-daemon with g_spawn instead of DBus.
-
-The underlying problem fixed by this change is that gnome-settings-daemon
-handles the configured multimedia keys shortcuts which can launch any app;
-these apps will inherit gnome-settings-daemon's env, which might miss things
-such as GnuPG or SSH agent information.  Spawning instead of using dbus
-activation gnome-settings-daemon makes it possible to inherit the env vars.
-The better long term solution might be in the gnome-session dbus rewrite, which
-might mean apps are started by gnome-session, but this hasn't been confirmed.
-
-Index: gnome-session-2.22.1/configure.in
-===================================================================
---- gnome-session-2.22.1.orig/configure.in	2008-04-07 23:45:59.000000000 +0100
-+++ gnome-session-2.22.1/configure.in	2008-05-07 00:29:18.000000000 +0100
-@@ -393,6 +393,20 @@
- ])
- AC_SUBST(RSH_COMMAND)
- 
-+AC_MSG_CHECKING([for gnome-settings-daemon])
-+AC_ARG_WITH(settings-daemon,
-+    AC_HELP_STRING([--with-settings-daemon=PATH],
-+                   [Specify the path to gnome-settings-daemon]),
-+    [SETTINGS_DAEMON_PATH="$with_settings_daemon"],
-+    [SETTINGS_DAEMON_PATH=`pkg-config --variable=binary gnome-settings-daemon`
-+     if test x$SETTINGS_DAEMON_PATH = x ; then
-+         AC_MSG_ERROR([No path found to gnome-settings-daemon.])
-+     fi
-+])
-+AC_MSG_RESULT($SETTINGS_DAEMON_PATH)
-+AC_DEFINE_UNQUOTED(SETTINGS_DAEMON_PATH, "$SETTINGS_DAEMON_PATH",
-+                  [Defines the path to the gnome-settings-daemon binary])
-+
- 
- GNOME_SESSION_TARBALL=`date +%e`
- AC_DEFINE_UNQUOTED(GNOME_SESSION_TARBALL_DAY, $GNOME_SESSION_TARBALL,
-Index: gnome-session-2.22.1/gnome-session/gsm-gsd.c
-===================================================================
---- gnome-session-2.22.1.orig/gnome-session/gsm-gsd.c	2008-04-07 23:45:55.000000000 +0100
-+++ gnome-session-2.22.1/gnome-session/gsm-gsd.c	2008-05-07 00:29:18.000000000 +0100
-@@ -11,11 +11,13 @@
- #include <dbus/dbus-glib-lowlevel.h>
- 
- #include <gtk/gtkmessagedialog.h>
-+#include <gtk/gtkmain.h>
- 
- #include <gnome-settings-daemon/gnome-settings-client.h>
- 
- typedef struct {
--  DBusGProxy       *dbus_proxy;
-+  DBusGProxy  *dbus_proxy;
-+  GPid         pid;
-   gboolean     activating;
-   time_t       start_time;
-   guint        attempts;
-@@ -80,6 +82,8 @@
-   gtk_widget_show (dialog);
- }
- 
-+static void gsd_spawn (gboolean wait_activated);
-+
- static void
- name_owner_changed (DBusGProxy *proxy,
-                     const char *name,
-@@ -102,7 +106,7 @@
- 
-               gsd->dbus_proxy = NULL;
- 
--              gsm_gsd_start ();
-+              gsd_spawn (FALSE);
-             }
- 	}
-       else
-@@ -128,15 +132,29 @@
- 				 G_CALLBACK(plugin_activated), gsd);
- }
- 
--void
--gsm_gsd_start (void)
-+static void
-+gsd_died_cb (GPid pid, gint status, GnomeSettingsData *gsd)
-+{
-+  gsd->pid = 0;
-+  /* gsd terminated before registering to dbus */
-+  if (gsd->activating)
-+    {
-+      gsd->activating = FALSE;
-+      gsd_spawn (FALSE);
-+    }
-+}
-+
-+static void
-+gsd_spawn (gboolean wait_activated)
- {
-   static GnomeSettingsData gsd = { NULL };
-   time_t now;
-   DBusGConnection *connection;
-+  DBusGProxy *dbus_service;
-   GError *error = NULL;
-+  const gchar *const argv[] = { SETTINGS_DAEMON_PATH, "gnome-settings-daemon", NULL };
- 
--  gsm_verbose ("gsm_gsd_start(): starting\n");
-+  gsm_verbose ("gsd_spawn(): starting\n");
- 
-   if (gsd.activating)
-     return;
-@@ -171,67 +189,89 @@
-       gsd_set_error (&gsd, error->message);
-       gsd_error_dialog (&gsd, NULL);
-       g_error_free (error);
-+      return;
-+    }
-+
-+  dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection),
-+                                          FALSE);
-+
-+  gsd.dbus_proxy = dbus_g_proxy_new_for_name (connection,
-+                                              "org.gnome.SettingsDaemon",
-+                                              "/org/gnome/SettingsDaemon",
-+                                              "org.gnome.SettingsDaemon");
-+
-+  if (gsd.dbus_proxy == NULL)
-+    {
-+      gsd_set_error (&gsd, "Could not obtain DBUS proxy");
-+      gsd_error_dialog (&gsd, NULL);
-+      return;
-+    }
-+
-+  if (g_spawn_async (NULL, (gchar **) argv, NULL,
-+                     G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_FILE_AND_ARGV_ZERO,
-+                     NULL, NULL, &gsd.pid, &error))
-+    {
-+      g_child_watch_add (gsd.pid, (GChildWatchFunc) gsd_died_cb, &gsd);
-     }
-   else
-     {
--      dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection),
--                                              FALSE);
-+      gsd_set_error (&gsd, error->message);
-+      gsd_error_dialog (&gsd, NULL);
-+      g_error_free (error);
-+      return;
-+    }
- 
--      gsd.dbus_proxy = dbus_g_proxy_new_for_name (connection,
--                                                  "org.gnome.SettingsDaemon",
--                                                  "/org/gnome/SettingsDaemon",
--                                                  "org.gnome.SettingsDaemon");
-+  dbus_service = dbus_g_proxy_new_for_name (connection,
-+                                           DBUS_SERVICE_DBUS,
-+                                           DBUS_PATH_DBUS,
-+                                           DBUS_INTERFACE_DBUS);
-+  dbus_g_proxy_add_signal (dbus_service,
-+                           "NameOwnerChanged",
-+                           G_TYPE_STRING,
-+                           G_TYPE_STRING,
-+                           G_TYPE_STRING,
-+                           G_TYPE_INVALID);
-+  dbus_g_proxy_connect_signal (dbus_service,
-+                               "NameOwnerChanged",
-+                               G_CALLBACK (name_owner_changed),
-+                               &gsd,
-+                               NULL);
- 
--      if (gsd.dbus_proxy == NULL)
--        {
--          gsd_set_error (&gsd, "Could not obtain DBUS proxy");
--          gsd_error_dialog (&gsd, NULL);
--        } 
--      else
-+  if (wait_activated)
-+    {
-+      while (gsd.activating)
-         {
--          /* Connect to the signal before we wake the settings daemon
--           * up, otherwise, it might have the sound system ready before
--           * we're actually listening */
--	  dbus_g_proxy_add_signal (gsd.dbus_proxy,
--				   "PluginActivated",
--				   G_TYPE_STRING,
--				   G_TYPE_INVALID);
--
--	  dbus_g_proxy_connect_signal (gsd.dbus_proxy,
--				       "PluginActivated",
--				       G_CALLBACK (plugin_activated),
--				       &gsd,
--				       NULL);
-+          gtk_main_iteration ();
-+        }
- 
--          if (!org_gnome_SettingsDaemon_awake(gsd.dbus_proxy, &error))
--            {
--              /* Method failed, the GError is set, let's warn everyone */
--              gsd_set_error (&gsd, error->message);
--              gsd_error_dialog (&gsd, NULL);
--              g_error_free (error);
--            }
--          else
--            {
--              DBusGProxy *dbusService;
--              dbusService = dbus_g_proxy_new_for_name (connection,
--                                                       DBUS_SERVICE_DBUS,
--                                                       DBUS_PATH_DBUS,
--                                                       DBUS_INTERFACE_DBUS);
--
--              dbus_g_proxy_add_signal (dbusService,
--                                       "NameOwnerChanged",
--                                       G_TYPE_STRING,
--                                       G_TYPE_STRING,
--                                       G_TYPE_STRING,
--                                       G_TYPE_INVALID);
--
--              dbus_g_proxy_connect_signal (dbusService,
--                                           "NameOwnerChanged",
--                                           G_CALLBACK (name_owner_changed),
--                                           &gsd,
--                                           NULL);
-+      /* Connect to the signal before we wake the settings daemon
-+       * up, otherwise, it might have the sound system ready before
-+       * we're actually listening */
-+      dbus_g_proxy_add_signal (gsd.dbus_proxy,
-+                               "PluginActivated",
-+                               G_TYPE_STRING,
-+                               G_TYPE_INVALID);
-+
-+      dbus_g_proxy_connect_signal (gsd.dbus_proxy,
-+                                   "PluginActivated",
-+                                   G_CALLBACK (plugin_activated),
-+                                   &gsd,
-+                                   NULL);
- 
--            }
-+      /* if gsd.pid is 0, something broke havoc and the user has already been warned */
-+      if (gsd.pid && !org_gnome_SettingsDaemon_awake(gsd.dbus_proxy, &error))
-+        {
-+          /* Method failed, the GError is set, let's warn everyone */
-+          gsd_set_error (&gsd, error->message);
-+          gsd_error_dialog (&gsd, NULL);
-+          g_error_free (error);
-         }
-     }
- }
-+
-+void
-+gsm_gsd_start (void)
-+{
-+  gsd_spawn (TRUE);
-+}
-+
-
diff --git a/gnome-base/gnome-session/files/gnome-session-2.23.5-polkit-automagic.patch b/gnome-base/gnome-session/files/gnome-session-2.23.5-polkit-automagic.patch
deleted file mode 100644
index c92e47491b3a..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.23.5-polkit-automagic.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
- From bheelinkg, fix automagic dependency on policykit
-
- configure.in |   13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff -Naur gnome-session-2.23.5/configure.in gnome-session-2.23.5.new/configure.in
---- gnome-session-2.23.5/configure.in	2008-07-23 03:08:03.000000000 +0530
-+++ gnome-session-2.23.5.new/configure.in	2008-08-09 11:34:35.000000000 +0530
-@@ -77,9 +77,18 @@
- PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0)
- PKG_CHECK_MODULES(EGG_LIBGNOMEUI, libgnomeui-2.0)
- 
--PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED, have_polkit=yes, have_polkit=no)
-+AC_ARG_ENABLE([polkit],
-+  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
-+  enable_polkit=$enableval,
-+  enable_polkit=auto)
-+if test "x$enable_polkit" != "xno"; then
-+  PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED, have_polkit=yes, have_polkit=no)
-+  if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then
-+    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
-+  fi
-+fi
- 
--if test "$have_polkit" = "yes"; then
-+if test "x$have_polkit" = "xyes"; then
-   AC_DEFINE(HAVE_POLKIT_GNOME, [1], [whether PolKit GNOME was found])
- fi
- 
diff --git a/gnome-base/gnome-session/files/gnome-session-2.24.2-shutdown.patch b/gnome-base/gnome-session/files/gnome-session-2.24.2-shutdown.patch
deleted file mode 100644
index cdea74fb3947..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.24.2-shutdown.patch
+++ /dev/null
@@ -1,88 +0,0 @@
----
- Straight forward fix to allow shutdown on systems not using policykit.
-
- If the system really don't have policykit, it will make things work
- as in 2.22.
- 
- If pk is in gsm but not in ck, it'll still work as in 2.22.
-
- If pk is present in both, you just have to fix the logic to make
- gsm ask pk if the user has the permission to shutdown _before_ showing
- buttons and in case this is not possible, just damn fix pk.
-
- reported as http://bugzilla.gnome.org/show_bug.cgi?id=549150
-
- gnome-session/gsm-consolekit.c |   22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-Index: b/gnome-session/gsm-consolekit.c
-===================================================================
---- a/gnome-session/gsm-consolekit.c
-+++ b/gnome-session/gsm-consolekit.c
-@@ -528,7 +528,7 @@ request_restart_priv (GsmConsolekit *man
-                 g_free (error_message);
-         }
- #else
--        g_assert_not_reached ();
-+        g_warning ("Failed to restart and Policykit support not enabled");
- #endif /* HAVE POLKIT */
- }
- 
-@@ -568,7 +568,7 @@ request_stop_priv (GsmConsolekit *manage
-                 }
-         }
- #else
--        g_assert_not_reached ();
-+        g_warning ("Failed to shutdown and Policykit support not enabled");
- #endif /* HAVE POLKIT */
- }
- 
-@@ -877,12 +877,19 @@ gsm_consolekit_can_do_action (GsmConsole
- 
-         return result != POLKIT_RESULT_NO && result != POLKIT_RESULT_UNKNOWN;
- }
-+#else
-+static gboolean
-+gsm_consolekit_can_do_action (GsmConsolekit *manager,
-+                              const char    *action_id)
-+{
-+        /* if we got here, res was true */
-+        return TRUE;
-+}
- #endif
- 
- gboolean
- gsm_consolekit_can_restart (GsmConsolekit *manager)
- {
--#ifdef HAVE_POLKIT_GNOME
-         gboolean res;
-         GError  *error;
- 
-@@ -897,16 +904,11 @@ gsm_consolekit_can_restart (GsmConsoleki
- 
-         return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart") ||
-                gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart-multiple-users");
--#else
--        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot restart system");
--        return FALSE;
--#endif
- }
- 
- gboolean
- gsm_consolekit_can_stop (GsmConsolekit *manager)
- {
--#ifdef HAVE_POLKIT_GNOME
-         gboolean res;
-         GError  *error;
-         error = NULL;
-@@ -920,10 +922,6 @@ gsm_consolekit_can_stop (GsmConsolekit *
- 
-         return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop") ||
-                gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop-multiple-users");
--#else
--        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot stop system");
--        return FALSE;
--#endif
- }
- 
- GsmConsolekit *
diff --git a/gnome-base/gnome-session/files/gnome-session-2.26.1-execinfo.patch b/gnome-base/gnome-session/files/gnome-session-2.26.1-execinfo.patch
deleted file mode 100644
index a4903e2cf037..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.26.1-execinfo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 6b551c1c6061fe6431ff265f7acc7ff227236b7d Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Fri, 26 Jun 2009 21:42:41 +0200
-Subject: [PATCH] Fix build on systems without execinfo in the libc.
-
-Try to see if we have execinfo.h, and if we need to link to an extra library for using it. For instance FreeBSD does not have execinfo.h but a port has been made and we can use libexecinfo.
----
- configure.in                       |    9 +++++++++
- gnome-session/Makefile.am          |    1 +
- gnome-session/gdm-signal-handler.c |    6 ++++++
- 3 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 1b8067c..55a566c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -253,6 +253,15 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS(syslog.h tcpd.h sys/param.h)
- 
- dnl ====================================================================
-+dnl check for backtrace support
-+dnl ====================================================================
-+
-+AC_CHECK_HEADERS(execinfo.h)
-+LIBEXECINFO=""
-+AC_CHECK_LIB(execinfo, backtrace, [LIBEXECINFO="-lexecinfo"],[])
-+AC_SUBST(LIBEXECINFO)
-+
-+dnl ====================================================================
- dnl Check for newish X interface
- dnl ====================================================================
- oCFLAGS="$CFLAGS"
-diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
-index d5cb98c..fb81bb8 100644
---- a/gnome-session/Makefile.am
-+++ b/gnome-session/Makefile.am
-@@ -53,6 +53,7 @@ gnome_session_LDADD =				\
- 	$(POLKIT_GNOME_LIBS)			\
- 	$(XRENDER_LIBS)				\
- 	$(XTEST_LIBS)				\
-+	$(LIBEXECINFO)				\
- 	$(NULL)
- 
- gnome_session_SOURCES =				\
-diff --git a/gnome-session/gdm-signal-handler.c b/gnome-session/gdm-signal-handler.c
-index 58dca7d..353f79f 100644
---- a/gnome-session/gdm-signal-handler.c
-+++ b/gnome-session/gdm-signal-handler.c
-@@ -27,7 +27,9 @@
- #include <unistd.h>
- #include <string.h>
- #include <signal.h>
-+#if HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- #include <syslog.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-@@ -160,6 +162,7 @@ signal_io_watch (GIOChannel       *ioc,
- static void
- fallback_get_backtrace (void)
- {
-+#if HAVE_EXECINFO_H
-         void *  frames[64];
-         size_t  size;
-         char ** strings;
-@@ -174,8 +177,11 @@ fallback_get_backtrace (void)
-                 free (strings);
-                 syslog (LOG_CRIT, "******************* END **********************************");
-         } else {
-+#endif
-                 g_warning ("GDM crashed, but symbols couldn't be retrieved.");
-+#if HAVE_EXECINFO_H
-         }
-+#endif
- }
- 
- 
--- 
-1.6.3.3
-
diff --git a/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild
deleted file mode 100644
index 8f0e877c51e0..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild,v 1.11 2010/07/20 15:34:26 jer Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-		 branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding ipv6 tcpd"
-
-RDEPEND=">=dev-libs/glib-2.13
-		 >=gnome-base/libgnomeui-2.2
-		 >=x11-libs/gtk+-2.11.1
-		 >=dev-libs/dbus-glib-0.71
-		 >=gnome-base/gnome-keyring-2.21.92
-		 gnome-base/gnome-settings-daemon
-		 >=x11-libs/libnotify-0.2.1
-		 x11-libs/libXau
-		 x11-apps/xdpyinfo
-		 >=gnome-base/gconf-2
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-		  x11-apps/xrdb
-		>=sys-devel/gettext-0.10.40
-		>=dev-util/pkgconfig-0.17
-		>=dev-util/intltool-0.35
-		!gnome-base/gnome-core
-		!<gnome-base/gdm-2.20.4"
-
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable tcpd tcp-wrappers) --with-settings-daemon=/usr/libexec/gnome-settings-daemon"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
-
-	# Get rid of random asserts in tons of programs due to development versions
-	epatch "${FILESDIR}/${PN}-2.19.2-no-asserts.patch"
-
-	# Spawn GSD instead of relying on D-Bus, as this falls down quite
-	# spectacularly on SMP systems (bug #239293)
-	epatch "${FILESDIR}/${P}-gsd-spawn.patch"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	# Our own splash for world domination
-	if use branding ; then
-		insinto /usr/share/pixmaps/splash/
-		doins "${DISTDIR}/gentoo-splash.png"
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.26.2.ebuild b/gnome-base/gnome-session/gnome-session-2.26.2.ebuild
deleted file mode 100644
index 90c96334a679..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.26.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.2.ebuild,v 1.8 2010/07/20 15:34:26 jer Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.26.2-session-saving-button.patch.bz2
-	branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="branding doc ipv6 policykit elibc_FreeBSD"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.11.1
-	>=gnome-base/libglade-2.3.6
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.9
-	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-apps/xdpyinfo"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.17
-	>=dev-util/intltool-0.40
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )"
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF}
-		--docdir=/usr/share/doc/${PF}
-		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)
-		$(use_enable policykit polkit)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
-
-	# Fix shutdown/restart capability, upstream bug #549150
-	epatch "${FILESDIR}/${PN}-2.26.2-shutdown.patch"
-
-	# Add "session saving" button back, upstream bug #575544
-	epatch "${WORKDIR}/${PN}-2.26.2-session-saving-button.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome" || die "doexe failed"
-
-	# Our own splash for world domination
-	if use branding ; then
-		insinto /usr/share/pixmaps/splash/
-		doins "${DISTDIR}/gentoo-splash.png" || die "doins failed"
-	fi
-}