For gnome-session-3.6, fix upower suspend problems (bug #450150, thanks to Tiziano Müller). For gnome-session-2.32, depend on <gconf-3.2.6, since >=gconf-3.2.6 no longer has gconf-sanity-check-2.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 177 insertions, 4 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 713427f4046f..bc4820644b45 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.314 2012/12/27 18:07:36 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.315 2013/01/22 05:40:33 tetromino Exp $
+
+*gnome-session-3.6.2-r1 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-session-2.32.1-r3.ebuild, +gnome-session-3.6.2-r1.ebuild,
+  +files/gnome-session-3.6.2-upower.patch:
+  For gnome-session-3.6, fix upower suspend problems (bug #450150, thanks to
+  Tiziano Müller). For gnome-session-2.32, depend on <gconf-3.2.6, since
+  >=gconf-3.2.6 no longer has gconf-sanity-check-2.
 
   27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-session-2.32.1-r3.ebuild:
diff --git a/gnome-base/gnome-session/files/gnome-session-3.6.2-upower.patch b/gnome-base/gnome-session/files/gnome-session-3.6.2-upower.patch
new file mode 100644
index 000000000000..db78cfbc80e0
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.6.2-upower.patch
@@ -0,0 +1,45 @@
+From b27f8c8b062e42aa89a7383fefba1833a6f63c4c Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Tue, 13 Nov 2012 11:02:35 +0100
+Subject: [PATCH] GsmConsoleKit: Properly initialize upower client
+
+Move UPower client initialization from gsm_consolekit_on_name_owner_changed()
+(which is not actually called for UPower usually) into
+gsm_consolekit_ensure_ck_connection().
+
+This makes the UPower calls actually work, otherwise they fail on trying to
+pass a NULL client.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=688229
+---
+ gnome-session/gsm-consolekit.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
+index 4c0eca5..0c58f37 100644
+--- a/gnome-session/gsm-consolekit.c
++++ b/gnome-session/gsm-consolekit.c
+@@ -182,6 +182,9 @@ gsm_consolekit_ensure_ck_connection (GsmConsolekit  *manager,
+                 }
+         }
+ 
++        g_clear_object (&manager->priv->up_client);
++        manager->priv->up_client = up_client_new ();
++
+         is_connected = TRUE;
+ 
+  out:
+@@ -219,10 +222,8 @@ gsm_consolekit_on_name_owner_changed (DBusGProxy    *bus_proxy,
+         }
+ 
+         g_clear_object (&manager->priv->ck_proxy);
+-        g_clear_object (&manager->priv->up_client);
+ 
+         gsm_consolekit_ensure_ck_connection (manager, NULL);
+-        manager->priv->up_client = up_client_new ();
+ 
+ }
+ 
+-- 
+1.8.1.1
+
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
index 2bde3335c953..05aadfbbfeff 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1-r3.ebuild,v 1.10 2012/12/27 18:07:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.11 2013/01/22 05:40:33 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -20,10 +20,12 @@ IUSE="doc ipv6 elibc_FreeBSD"
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
 # xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# >=gconf-3.2.6 no longer provides gconf-sanity-check-2
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.22.0:2
 	>=dev-libs/dbus-glib-0.76
 	>=gnome-base/gconf-2:2[gtk(+)]
+	<gnome-base/gconf-3.2.6
 	>=sys-power/upower-0.9.0
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
diff --git a/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..544e365d721c
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.6.2-r1.ebuild,v 1.1 2013/01/22 05:40:33 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND="
+	>=dev-libs/glib-2.33.4:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.7:3
+	>=dev-libs/json-glib-0.10
+	>=dev-libs/dbus-glib-0.76
+	>=sys-power/upower-0.9.0
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	x11-apps/xdpyinfo
+
+	gconf? ( >=gnome-base/gconf-2:2 )
+"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=x11-themes/gnome-themes-standard-2.91.92
+	sys-apps/dbus[X]
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/intltool-0.40.6
+	x11-libs/pango[X]
+	virtual/pkgconfig
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )
+"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+src_prepare() {
+	# upower-client problems, bug #450150; fixed in 3.6.3
+	epatch "${FILESDIR}/${P}-upower.patch"
+
+	# Silence errors due to weird checks for libX11
+	sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecation-flags \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable doc docbook-docs) \
+		$(use_enable gconf) \
+		$(use_enable ipv6) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	dodir /usr/share/gnome/applications/
+	insinto /usr/share/gnome/applications/
+	doins "${FILESDIR}/defaults.list"
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+}