Pin glib/gtk+ dependencies to slot 2. Clean up old revisions.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

9 files changed, 28 insertions, 322 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 5f296dd6209e..0ea1999b8f68 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,16 @@
 # 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.271 2010/10/17 15:18:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.272 2010/10/22 21:28:46 eva Exp $
+
+  22 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-session-2.17.90.1-gentoo-branding.patch,
+  -gnome-session-2.26.2-r1.ebuild,
+  -files/gnome-session-2.26.2-xsmp-stop-throw-error.patch,
+  -gnome-session-2.28.0.ebuild,
+  -files/gnome-session-2.28.0-do-not-keep-zombie-clients.patch,
+  -files/gnome-session-2.28.0-xsmp-stop-throw-error.patch,
+  gnome-session-2.32.0.ebuild:
+  Pin glib/gtk+ dependencies to slot 2. Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-session-2.30.2.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 647e6c94073e..ae298e7a17f9 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,21 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Gnome 2404 RMD160 48ab5c98ac1cda3593c99f6996f72a61b63b87c7 SHA1 eb7422e38600214911075bffae52fbb348a1ba44 SHA256 259c067c3293fccb587daba38fae888119250330a624687674e140e31c75d297
-AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
 AUX gnome-session-2.26.2-shutdown.patch 4512 RMD160 aa6a5fc66959e099ea7734e1f13af39890a37a9b SHA1 07461b0ed9587e0911cf57d2a8c2eaa74fde2f17 SHA256 2539c04941ac75e5003bddf4e4398ba19cbcbaae7f62277974b061737e4d8859
-AUX gnome-session-2.26.2-xsmp-stop-throw-error.patch 1056 RMD160 9b382852841e3f13a478c60d5f5b9c6b8297afd7 SHA1 8ede6d5490fa5a889d7e9d2a65095f8fade31888 SHA256 554a0fb3cc3688f938a4f570ce5a550b2ef64cba562971c958df415d89854912
 AUX gnome-session-2.27.91-gentoo-branding.patch 702 RMD160 6727c2e3dbd8fd29461e1224a160b88e027e1cfc SHA1 3223e8cdda47d006b4b7a8e8428509d7d9e417f1 SHA256 c72c26b77dbe89ca4ec6c36eece99dbf3c5cdc099d563fd8a78d68c7d2a197b4
-AUX gnome-session-2.28.0-do-not-keep-zombie-clients.patch 2360 RMD160 52401adb702ee7bb6fd0cd9c225f2a740ca36eb9 SHA1 0f5068347d71355afa4f1ce90c96817a64adba25 SHA256 4ffb255330dcd1b16c12686feb4efe22fd5f63ea85c89a1bad7b92c2c2ceace1
-AUX gnome-session-2.28.0-xsmp-stop-throw-error.patch 1159 RMD160 c0f0ea65a3a9e108479ca514099751450a95dc6d SHA1 2409efcc304b5e12258343b439808e3248233f11 SHA256 a1aed89db07542f80fc12338de6bf76199e165465973e25fe2a400a3fea5327e
 AUX gnome-session-2.32.0-session-saving-button.patch 21424 RMD160 11c4db9951859c2749473a7969693469c9d9e277 SHA1 f7c2f8d98c6deac63ca9448977bdcfa29ae80d52 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
-DIST gnome-session-2.26.2-session-saving-button.patch.bz2 4915 RMD160 dc694071d9ef5e4c494cb8ec949fe5e546e49d4d SHA1 54d4f9e64a2017486f69b3700f47461bed2ab4a5 SHA256 f0f1f6de3173f53bb565852a3bebd67d251cdfa16d9e3ef812bbeb89abc602ed
-DIST gnome-session-2.26.2.tar.bz2 804340 RMD160 ff2c75cf5b8c3405ec5d2044510cf07eedede1d1 SHA1 ba43d9c623e6e79635a09cfbd6ecfce40ccbab05 SHA256 e089c7349bb6bc73d19f65c0a4536757968b929825ec38c616c8049bfd2d6905
-DIST gnome-session-2.28.0.tar.bz2 822009 RMD160 aab868acf78d925dbb4896ecc4fb1f31e46d795f SHA1 a813c493383653e8e35b63b56b03517173f2ae8e SHA256 83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c
 DIST gnome-session-2.30.0-session-saving-button.patch 21746 RMD160 f32556cd91edd3904135e4819bfa00621a552f31 SHA1 01a9be032f5d81e7f42d399b5031e1a8b61b41e8 SHA256 e6e283721b556535eef485352c67c68962cd6464b900d601306ed3d5bc0a59ab
 DIST gnome-session-2.30.2.tar.bz2 817580 RMD160 6a269f4625af76bf6a74ad445aec9134827a726c SHA1 1333d2c1ebc4b80a00ee6a2f2d34309cfd73c5ea SHA256 ea7b5d8b254eba0f4ee5f737ed3686fca4fa734ad54a20f206534241f6aef4ec
 DIST gnome-session-2.32.0.tar.bz2 773010 RMD160 a48b5e9eea14728a292f1ff7dd31be56358579cb SHA1 518a70695a8bdc76d179ff1bc36fadf7954579f5 SHA256 4b757574303062cba560cffeca654eccd4ed0dd163efe793a4a3efb6822dea25
-EBUILD gnome-session-2.26.2-r1.ebuild 2352 RMD160 c4ad200e6ec4e5a572dacdf1703f098e03ad8da9 SHA1 ad86bb803c9d57223feacf9a0b29636aa4562d7c SHA256 2daa8d5ad978be28eb79a7cbcb37648c76a1a981e06bdad4bc4d27cd16fe9be2
-EBUILD gnome-session-2.28.0.ebuild 3043 RMD160 a267df651c2ff80fa3af05edd0ad06b60e927c02 SHA1 d3a75c3767899f679fe97fc1e4ee01ecc218da38 SHA256 77e0b52d876ebe0fc70c80550d9a35cc571f3102ce7446ad62ec192586227bfd
 EBUILD gnome-session-2.30.2.ebuild 2636 RMD160 89e116fdd3a4bc262086e07494f5d46ae205682f SHA1 9ee46815d6323f326eace01f1c4a7f4722ed6215 SHA256 c22e1d371ed485f9f75d215333a307599fc4af0e8e0dc285bba9160e92249805
-EBUILD gnome-session-2.32.0.ebuild 1740 RMD160 97ba0d3ad6dd835c1f7863433bf40de7752ce9d3 SHA1 814fb13fbde4d3ac6df0eacf6a5a7f176174cc32 SHA256 e18950bf398b568092c6208c6e9edcb2605b40fd35b570bab814970ea0fa26df
-MISC ChangeLog 38491 RMD160 1f8a9589d54afa3ea0da459df81f18a87ac4a395 SHA1 e9ae53b731a0da898bb38cb6e920f60a39851938 SHA256 54c5ac45cf5871f3c3821fda1e7c096f99605ba9eb44b919a4163d6758e69c10
+EBUILD gnome-session-2.32.0.ebuild 1755 RMD160 920f8cec7c210ef8092628932ac5fe1408431af6 SHA1 83fd9f1075e3ae728bdb93616952002a515a6216 SHA256 5d3537716e2ac94ae52cc4962ee564ef0dab030db492afa38f75102ee19ab7ef
+MISC ChangeLog 38942 RMD160 9ba34bf154dab09b8e02061de037de7b60f3d498 SHA1 7e2ae73bc7f39eadfb13b21541e29df10f14018b SHA256 75eb67a9da07b76366fa777f7279974d9478157c0b3b93d66145f5b6f8c6c2c1
 MISC metadata.xml 325 RMD160 4198957d5eb0a229eb906d1890c9de33cd76c1c7 SHA1 715be3b8b9162d4c3b0fd47b24dfb86624c0313d SHA256 25b431cfa002775be1fcb3ba978708e26aec42d182e6a0bbff125390fca07aba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzCAhsACgkQ1fmVwcYIWAYktQCeJjPSiVyzy34RPSuldYrXlcXL
+6q8AoLhhOfKYFb5lsP14AYHoO30Bx2cd
+=xPJt
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch b/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch
deleted file mode 100644
index 37c41303c427..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/gnome-session.schemas.in	2007-01-24 15:12:52.000000000 -0600
-+++ data/gnome-session.schemas.in	2007-01-24 15:13:10.000000000 -0600
-@@ -50,7 +50,7 @@
-          <applyto>/apps/gnome-session/options/splash_image</applyto>
-          <owner>gnome</owner>
-          <type>string</type>
--         <default>splash/gnome-splash.png</default>
-+         <default>splash/gentoo-splash.png</default>
-          <locale name="C">
-             <short>Preferred Image to use for login splash screen</short>
-             <long>This is a relative path value based off the $datadir/pixmaps/ directory.  Sub-directories and image names are valid values. Changing this value will effect the next session login.</long>
diff --git a/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch b/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch
deleted file mode 100644
index 165be019fc59..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Wed, 28 Oct 2009 17:20:04 +0100
-Subject: Avoid a SIGSEGV in xsmp_stop() when the SmsConn object is NULL, in this case we must throw an GError (imported from 2.28 dev cycle)
-
-When xsmp->priv->conn is NULL in xsmp_end_session() for a given GsmXsmpClient object, it implies
-that this same object in xsmp_stop() will also have a NULL SmsConn field.
-
----
- gnome-session/gsm-xsmp-client.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
---- a/gnome-session/gsm-xsmp-client.c
-+++ b/gnome-session/gsm-xsmp-client.c
-@@ -702,6 +702,13 @@ xsmp_stop (GsmClient *client,
- 
-         g_debug ("GsmXSMPClient: xsmp_stop ('%s')", xsmp->priv->description);
- 
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-         SmsDie (xsmp->priv->conn);
- 
-         return TRUE;
diff --git a/gnome-base/gnome-session/files/gnome-session-2.28.0-do-not-keep-zombie-clients.patch b/gnome-base/gnome-session/files/gnome-session-2.28.0-do-not-keep-zombie-clients.patch
deleted file mode 100644
index 56abe4292e53..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.28.0-do-not-keep-zombie-clients.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Fri, 23 Oct 2009 14:17:40 +0200
-Subject: [PATCH] Avoid to keep zombie clients in the case when a IceError is thrown between accept_ice_connection() and accept_xsmp_connection()
-
-Assuming the following behaviour:
-An "Ice packet" is caught by accept_ice_connection() and the new Ice connection is accepted, 
-then a GsmXsmpClient is instancied and stored in GsmXsmpServer's table. 
-gsm_store_add() function emits the "ADDED" signal, which calls gsm_manager.c:on_store_client_added() (connected to ADDED signal),
-this previous callback install some signals EXCEPT "disconnect" signal on this new client.
-Now before the client being registered by libSM and before accept_xsmp_connection() is invoked, an IceError is thrown.
-gsm_xsmp_client.c:client_iochannel_watch() catchs this error :
-What is the default behaviour of this function when a IceProcessMessagesIOError is detected ?
-- the status of the client is changed to GSM_CLIENT_FAILED
-- then the "disconnect" signal is emited on this object (a client)
-
-=> a problem occurs, because the "disconnect" signal is not connected yet (done by GsmManager on a registered xsmp client)
-=> so the client is able to be freed (depending on the counter reference)
-=> but the client is not removed from the GsmManager's table.
-Conclusion: the client is a "zombie".
-
-The solution is to connect the "disconnect" client in gsm_manager.c:on_store_client_added(), and in a case like that
-its works perfectly :)
-
-=> NO timeout executed on logout/reboot/shutdown ;)
-
----
- gnome-session/gsm-manager.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index ee90716..06c6a02 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -1988,9 +1988,11 @@ on_store_client_added (GsmStore   *store,
-                           "end-session-response",
-                           G_CALLBACK (on_client_end_session_response),
-                           manager);
--
-+         g_signal_connect (client,
-+                          "disconnected",
-+                          G_CALLBACK (on_client_disconnected),
-+                          manager);
-         g_signal_emit (manager, signals [CLIENT_ADDED], 0, id);
--        /* FIXME: disconnect signal handler */
- }
- 
- static void
--- 
-1.6.5.1
-
diff --git a/gnome-base/gnome-session/files/gnome-session-2.28.0-xsmp-stop-throw-error.patch b/gnome-base/gnome-session/files/gnome-session-2.28.0-xsmp-stop-throw-error.patch
deleted file mode 100644
index eacc76f73753..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.28.0-xsmp-stop-throw-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ff15cffb457715179a69cc8e05212a19ffbd4a25 Mon Sep 17 00:00:00 2001
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Wed, 14 Oct 2009 11:06:19 +0200
-Subject: [PATCH] Throw an error from xsmp_stop() when the client is not registered, it's fixes a SIGSEGV
-
----
- gnome-session/gsm-xsmp-client.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c
-index bc3f77e..7e7ad99 100644
---- a/gnome-session/gsm-xsmp-client.c
-+++ b/gnome-session/gsm-xsmp-client.c
-@@ -713,6 +713,15 @@ xsmp_stop (GsmClient *client,
- 
-         g_debug ("GsmXSMPClient: xsmp_stop ('%s')", xsmp->priv->description);
- 
-+        /*FIXME: What do we do if the client can't be stoped ?
-+         * (probably a cleaner solution exists...) */
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-         SmsDie (xsmp->priv->conn);
- 
-         return TRUE;
--- 
-1.6.5
diff --git a/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild
deleted file mode 100644
index 71616a43d3f7..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.26.2-r1.ebuild
+++ /dev/null
@@ -1,86 +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-r1.ebuild,v 1.7 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"
-
-	# Do not crash when xsmp->priv->conn is NULL for a given GsmXsmpClient,
-	# when SMS connection dies, bug #271023, import from 2.28 dev cycle.
-	epatch "${FILESDIR}/${P}-xsmp-stop-throw-error.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
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.28.0.ebuild b/gnome-base/gnome-session/gnome-session-2.28.0.ebuild
deleted file mode 100644
index faf3f9952acf..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.28.0.ebuild
+++ /dev/null
@@ -1,100 +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.28.0.ebuild,v 1.10 2010/08/29 17:27:05 armin76 Exp $
-
-EAPI="3"
-
-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 arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="branding doc ipv6 +splash elibc_FreeBSD"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.14.0
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.9
-	|| ( >=sys-apps/devicekit-power-008 sys-power/upower )
-	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=${EPREFIX}/usr/share/doc/${PF}
-		--with-default-wm=gnome-wm
-		$(use_enable splash)
-		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
-
-	if use branding && ! use splash; then
-		ewarn "You have disabled splash but enabled branding support"
-		ewarn "splash support has been auto-enabled for branding"
-		G2CONF="${G2CONF} --enable-splash"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch "${FILESDIR}/${PN}-2.27.91-gentoo-branding.patch"
-
-	# Fix shutdown/restart capability, upstream bug #549150
-	# FIXME: Needs updating for 2.27.91 (package is currently masked)
-	#epatch "${FILESDIR}/${PN}-2.26.2-shutdown.patch"
-
-	# Add "session saving" button back, upstream bug #575544
-	# FIXME: Needs updating for 2.27.91 (package is currently masked)
-	#epatch "${WORKDIR}/${PN}-2.26.2-session-saving-button.patch"
-
-	# Throw an error in xsmp_stop() when the client isn't registered,
-	# it's fixes a segfault, patch import from upstream bug #598211.
-	epatch "${FILESDIR}/${P}-xsmp-stop-throw-error.patch"
-
-	# Avoid to keep zombie clients in the case when a IceError is thrown
-	# between accept_ice_connection() and accept_xsmp_connection(),
-	# this patch should fix the timeout executed for some logout/shutdown
-	# /reboot. (patch commented out)
-	epatch "${FILESDIR}/${P}-do-not-keep-zombie-clients.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
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.32.0.ebuild b/gnome-base/gnome-session/gnome-session-2.32.0.ebuild
index ea77a902b7f8..328cda4fcfa5 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.0.ebuild
@@ -1,11 +1,11 @@
 # 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.32.0.ebuild,v 1.1 2010/10/12 19:01:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.0.ebuild,v 1.2 2010/10/22 21:28:46 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 autotools
+inherit autotools eutils gnome2
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="http://www.gnome.org/"
@@ -16,8 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
 
 IUSE="doc ipv6 elibc_FreeBSD"
 
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.14.0
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.14:2
 	>=dev-libs/dbus-glib-0.76
 	>=gnome-base/gconf-2
 	>=sys-power/upower-0.9.0
@@ -64,7 +64,7 @@ src_prepare() {
 src_install() {
 	gnome2_src_install
 
-	dodir /etc/X11/Sessions || die
+	dodir /etc/X11/Sessions || die "dodir failed"
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/Gnome" || die "doexe failed"
 }