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

(Portage version: 2.2_rc25/cvs/Linux i686)

5 files changed, 202 insertions, 2 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/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>