Add =gnome-session-2.24.3 from overlay (p.masked)

Package-Manager: portage-2.2_rc25/cvs/Linux i686

6 files changed, 208 insertions, 14 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index ff3ba22b4692..8ea67fb4161d 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.229 2009/03/15 21:50:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.230 2009/03/17 08:32:33 nirbheek Exp $
+
+*gnome-session-2.24.3 (17 Mar 2009)
+
+  17 Mar 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-session-2.23.5-polkit-automagic.patch,
+  +files/gnome-session-2.24.2-shutdown.patch, +gnome-session-2.24.3.ebuild:
+  Add gnome-session-2.24.3 from overlay (p.masked)
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org>
   gnome-session-2.22.3-r1.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 2274fdda6f2f..8e40c34db277 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Gnome 2464 RMD160 07fe125890d825fdf95fe532aeec07c2718cf64e SHA1 9d64837491953dd8c38142e50e0cd36d015db583 SHA256 a1214ba383eb6dbd32b34eb89c7e00df08f9284b7a2b8a82f291cb29e865ba02
 AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
 AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb SHA1 b3aa320808ac63eef91e5dcac17c3ebe94a0f684 SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122
 AUX gnome-session-2.22.3-gsd-spawn.patch 9005 RMD160 a5ef84a8701f43d91e61edf6c46264de3057f581 SHA1 3f923280228aafc242d49a6ff45f6ca9e42b9e90 SHA256 27f5a81eb52fcbb57189d4385d1e154af9dc6d1401445247cdcca18dc986dbeb
+AUX gnome-session-2.23.5-polkit-automagic.patch 1235 RMD160 2b5fee32765d8745fea0d27b1e834592cdc0b316 SHA1 942a4a41abc28596f8baac7ff41c03a677ac64db SHA256 cb2daab00d2ae8c143cc7577e512092dada71a97a05ff7ea085dfa53bcf9b61a
+AUX gnome-session-2.24.2-shutdown.patch 2809 RMD160 a26a418511dc5ff7a56252ea005a8f24190e0743 SHA1 4162514ba914bb7753dbceadfd654201c940c2a8 SHA256 50e71a8dd347d43b19cae80a50169365ac923a62d30c8e4c52f1223c2f008ed5
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.22.3.tar.bz2 773853 RMD160 a35065aa665ada5081f3fe19abc70950f8588e34 SHA1 817e007009e6e43cd2f1980e6d90546e7117cc9d SHA256 07ec872ae8213c4e92072ff74451caa2b6afb747fd0b07d2cea40cfcd32b7176
+DIST gnome-session-2.24.3.tar.bz2 792300 RMD160 2cd9fb8435f452873ca8bd34fd51276d24282a48 SHA1 a48bcf47b879db439cec193e4191909409e7efcb SHA256 2d59d979467459261cc741c64ce2ba6aaccd7a31cccb5b13b2ea46858e1bc636
 EBUILD gnome-session-2.22.3-r1.ebuild 2121 RMD160 5e253b7fd3ebefab3d22c3264a24f36e683a93c8 SHA1 66a677a2f60a78fd797d1e4258f76254d8f54846 SHA256 03f2e52fec9055550117628192e933a24096c73cabc28a98eae795de896de4a6
 EBUILD gnome-session-2.22.3.ebuild 1873 RMD160 1ddd0c4904bc3e298eb10928e938b13559289ed1 SHA1 2996093608be172e0eacbeeb6a6a649d3bd6e460 SHA256 ab49e8b6ecc73a4186d1ced5ef9b0689feb9ad0a0194990da738b5eedd08ff2d
-MISC ChangeLog 31317 RMD160 c97c917cdb524c4c4ac1363a38ec8a7a3f1c55d0 SHA1 a2ee388206911044ebeebbc800394380c20842d6 SHA256 caa4f2304f51fc560d4fe6cd38d29e6edd657ee8a0b96ddcef435f9f80f51510
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkm9eBkACgkQkKaRLQcq0GLYuQCgiLQD6IDIH2uNWuyUPRdGPsGP
-gdsAn01d3t1UuhtXKyooeSJjID56Y5r1
-=qhzT
------END PGP SIGNATURE-----
+EBUILD gnome-session-2.24.3.ebuild 1948 RMD160 5897beb4dae8fc6f363fdf1c87c0b12b75b6634e SHA1 63c1d8ab8e21d94b465ada3c5db54225aac66f31 SHA256 51bb5a07493cff28b99a0affd796d53ea3561ea697b456b213ca935e9eea7c41
+MISC ChangeLog 31592 RMD160 ecfb56478929ccd58efac168845a7bf34b69924a SHA1 5588faa774f2edc5a3f808f9b60488011ba68273 SHA256 ef07a0e6df45d78ae5e281b083c7cdb735ab209c348b81dbc9d31f4deb1ec354
+MISC metadata.xml 269 RMD160 6bbdafdb02cf28eb4f772d7e330519eb07ab4dcb SHA1 18a2628db0509bf3ccd54f626f3bdd4b7c3a7a43 SHA256 a735ba6a51fe0c18552eda7327e431b231fd7b590a82ba9f1cc32b0c1a38e50e
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
new file mode 100644
index 000000000000..c92e47491b3a
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.23.5-polkit-automagic.patch
@@ -0,0 +1,30 @@
+---
+ 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
new file mode 100644
index 000000000000..cdea74fb3947
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.24.2-shutdown.patch
@@ -0,0 +1,88 @@
+---
+ 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/gnome-session-2.24.3.ebuild b/gnome-base/gnome-session/gnome-session-2.24.3.ebuild
new file mode 100644
index 000000000000..1dedecfcef1c
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.24.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 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.24.3.ebuild,v 1.1 2009/03/17 08:32:33 nirbheek Exp $
+
+inherit autotools eutils gnome2
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="branding ipv6 policykit"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=gnome-base/libgnomeui-2.2
+	>=x11-libs/gtk+-2.11.1
+	>=gnome-base/libglade-2.3.6
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gnome-keyring-2.21.92
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.9
+	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
+
+	x11-apps/xdpyinfo"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	!<gnome-base/gdm-2.20.4"
+# 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} $(use_enable ipv6) $(use_enable policykit polkit)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Fix automagic dependency on policykit, upstream bug #551766
+	epatch "${FILESDIR}/${PN}-2.23.5-polkit-automagic.patch"
+
+	# Fix shutdown/restart capability, upstream bug #549150
+	epatch "${FILESDIR}/${PN}-2.24.2-shutdown.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	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/metadata.xml b/gnome-base/gnome-session/metadata.xml
index da6fd63d0085..fa475007ee22 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="policykit">Enable <pkg>sys-auth/policykit</pkg>
+			authentication support</flag>
+	</use>
 </pkgmetadata>