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.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 188 insertions, 13 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/Manifest b/gnome-base/gnome-session/Manifest
index 8f95d7691d1a..4dfb808e6318 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -13,22 +13,24 @@ AUX gnome-session-2.32.1-dialog-size2.patch 1114 SHA256 fefa53adb80c531fecc4fa4e
 AUX gnome-session-2.32.1-gnome3-conditions.patch 4552 SHA256 88482711f19399b766ed562c43511d8a6db1e1df2790945cd1819d7f616af42e SHA512 c6547805cdb8619b0cb27e8f450ca4688bbfc83925f4ad76dadacf33983293a9cea7ab3db587547de38dd4794286dc66996ee4d75aecdace3cd5dc74226ad787 WHIRLPOOL bb58874a45be0202ddfbec6d875c951a3bfde8138250667ce19b6c73e1924497e217acb8182f56c6da40b59790347b603527ee90fe4e6f63f3c851cf29a0de4b
 AUX gnome-session-2.32.1-gsettings-conditions.patch 5085 SHA256 a57d614d533a54d0d3c186d521c53caad7150d4dc19863b9171472b1a48c01b0 SHA512 289592081a1f9fb44cb0d21566cbca9e649db8588a1bf23628f1d3c01283e6d2c9bd0141ed3803399ab1f61e71c1b540145a061f25428adbd3efad1916e1ff99 WHIRLPOOL c49000b4237f7451f42463e870112939079a9fa4f80e4856be51df9b08c0f33628b004dc0c44e70066fb9d3099e7c0e7b73dc55cf54e807da84596c8b5665072
 AUX gnome-session-2.32.1-idle-transition.patch 1802 SHA256 6e80574672ff9e4b9a63796959d1e83af0f184eb4ad507bcbe6589c364b63038 SHA512 c09e0df938d46cc95f0b997142e63c109e8fd4b52dc07c36b1642f0688b3e2faf5627c88a6d0cb81b672d714354cc1f3d19c5c2d6cbcfdd889aadd638bda6958 WHIRLPOOL 1fab4d3c7b9785125d8f8540500941d1f897f8a20e16e16e113b0a9b7a28324c42e1976a49328fb8c7c6337a519fa5c917463da5ba7a360d1ae459261a61f850
+AUX gnome-session-3.6.2-upower.patch 1417 SHA256 3c978edb0349e620ddc8794c8b86c1b7bd8e1e264c9858d6dca3f67f6e9eb380 SHA512 8a79d06d40de97143ae92966ec85951a9b9b7f825be9509e62ef912759f0ab7df8035ed1a750e5182950dec098b4b2e557a1865758cd761d8e4b64f50209d531 WHIRLPOOL 8696d67d78f278336f6dac8659d3e862760855041e90191275667aa32f59404bf93f266c70fc015f577589500dbf635246241e9cb6e2806ebd0ca78aa25c2616
 DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
 DIST gnome-session-3.4.2.1.tar.xz 725144 SHA256 2fbcf10d4ad8648197fefde2052abd8bf16b827781a974f59ac118e7dd0db433 SHA512 c5f62b6017509b0a5ed95d67435a6d96614a1ec1b7ec7022ff5c4fd813988d4cda308303603a8e01a7359918274091cb127f7f25788efd89cfb4849ec3c2ff2d WHIRLPOOL 7dac382724a512b6720de32a7657516c625051b142e6f85a3eb4381b6b141e5aae63b071014d4c073505c253ab33a9957efec44053ddfd4b54c95a6ec1f52dbc
 DIST gnome-session-3.6.2.tar.xz 729676 SHA256 2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4 SHA512 3ae043a241695e26bbcfe70cb58263e74bfb62c1859d46828118740e3580df516f17c73d5a348d381ead7886333c71eb9bca2bed6e494f234b8d733a9fd37083 WHIRLPOOL 833cff921461759510fd31cb3d2bf2959d486ccd51971d401f30d85bf93878264e9ebbdba866bb9c3a05aff3a00d0f6d043958407a783dc6f7d9d5d78f62f7ac
-EBUILD gnome-session-2.32.1-r3.ebuild 2891 SHA256 1d90006d56e2e97eb74d7bdd481e8b2e68272ab8f06a9f13a4de9a1f396e065f SHA512 bec1f0a59e675fb9eb918d3ea94d7321b1be27e5c72249ab234a99320c33c26e9b91a0bb7278de0faf1e790e367b72cda64a8bb0adc524a3534358938ac5c900 WHIRLPOOL 2759ea72871942f8a3660d425f9b0cc1709306557d1362a72a45381e5cf42580f87a20aabc2bdbdd25f8e472e41e1aa0ab134144d34cd1a676f196913beb5658
+EBUILD gnome-session-2.32.1-r3.ebuild 2972 SHA256 b67ca3d7c561adccea184b8a70e047a0009ead24da57d3a9d508a43f79289674 SHA512 c1ede08752fadb66a2d95f9b01a567170e72943ad71c6bbf23f12e1b70516e0b2de10a394b7811507e84b49164f303f715059b7d8972cfc2d6e66f76826c50f6 WHIRLPOOL 37a7fb42d6d44f76f7d23f7a3158589d9381e2c830e40e593a8b51b70ef00f590a7f7dae3ae0439e80e275a43bc607f47aca31ae2d69c113e7452901021e4379
 EBUILD gnome-session-3.4.2.1.ebuild 3064 SHA256 c4abe9f9cd9505f24cae85cda70825042730b2637d8e270388b2233888ad2554 SHA512 034bd231662c88b3fc9f5fd8f2c0e56434e7e24dc5c352cd2cd3da8c53d4f707fad5a6291282c551cf1fcbf490c02215128867d121097df27b57b4ad75040f05 WHIRLPOOL 7db86cc7a003f507f1edc4c8122ce3de103c11899644f958c657e270e0137ad212244f6e07c5cbe495c118d9d2e45dc64a33d4b46e91a29fd6bf0b4c81d2bad5
+EBUILD gnome-session-3.6.2-r1.ebuild 3342 SHA256 aecfc6127a74e581c19c933d3393d756e69098029ab864cd86de00ab98bb389e SHA512 284f268d624ebbb376a7dd507e8058b267d8b9fb39500844b6740c668253b63e1941af7fa860560ad94485eccd6c3e50f34e14db4ee43ffe191940e82adc5d74 WHIRLPOOL fcf2293b18eef3214f72b015b4e7b3b2a301e717915c80295b0b6fc0b533de17d89709a568711b3a54f591d2844798719a0474e6d158d8427807ceb896724b4c
 EBUILD gnome-session-3.6.2.ebuild 3245 SHA256 4c4cbeee5ea49dca688b539387058a97ab19574fd606b35645c442e302808071 SHA512 ca5820804f0e1010dd22bf69b9160945c2e465a431ef8f216d72f66ba859f50ad758175eea48f157ec1cc02eeac0ef598b757c1d00b5c00a8d4a439b84412c78 WHIRLPOOL aa488b460da1c2289d2b81d2bd8985ce21717d1277ff836ea35319920ed9223e350c4edd9b823e33a9c9d5f9e1de4ba2ca05f0ca963a7dee6dc4c43d76421c43
-MISC ChangeLog 46450 SHA256 62ec9fcbf2c3016492c30fbfaa9ef675062660255f058cedbb256357c991a43e SHA512 cfd5ca309b3a86a42130ef00a3afade60f0c955d5dccd7a480c85a1f56304fc989d3034f0c1522eb726c7e0a8f7c696c2b49db0e31a054fbe85014939aec0f63 WHIRLPOOL 941bbfd583ee3a35beb9131e8cba051e1833facc2a62530d2f2ec1881f07d77a64602cbad4f7b0adaba3845871233e2f968c68063b9ffdac335faa2cce0ef78a
+MISC ChangeLog 46861 SHA256 ac7ab01e1ab96dc58a32bb989eeebb1899a913ba1096622a90e2ac08b80257b7 SHA512 f7bfe5f149414422e58a9f0528e4c81a309e902c196c9f098f860a2cc34671580eee7307a94175ea4d3d2e71835e59e109a0e32ed6a87b830a2eae950749374d WHIRLPOOL 7dedbe4a683063776fa49a4d963f2035734ff122d6cd5fff5aff7f0f4ea498a7bd7d78a00ee862bb03c8b8135b570f8b80a84c9c272c41cea487eebfa97e0e4e
 MISC metadata.xml 404 SHA256 7d584786789e431ffa23dd78cd547c676fb110882f60e7f3ffe579c7d2669b3a SHA512 cf707ef9e6cb0aa4122a563fbbc9690849e670d0cd4a6ebf87b40f4361f8c7ca069f2fde486b9784e9b1012790d4a41aa551b201f551963f7b473781d80b821d WHIRLPOOL 0bcb17b7140fe056c92d1c920d5e79d06aa5a628e692baa5c588c0826586d92a723ad4df5743f2996ce1de8e0fe391f88535f1349370ba6e0b668c963b498267
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3I5qAAoJEJ0WA1zPCt1h+4AH/0wGWqIZerDvoAwa748q3713
-Il3ZtYIoOELZ7fPkrv62wJJQjPdjz+UO+UJOX+G7rQgLiYwIzv1CoyGl0XvU2pHY
-WTEtOL4YDIUXywmOrA89qnu15FXtzr4gpOqMS93vydbc9mfc4ThucQQ3tptmLlul
-q1j33HJ9BGfa/0vuUmWy/m2DRmbT3NTVgGYYW1NuhOw50EIoET6W47qb40dnYX7Q
-OSQ76ESlvcL7T7z+n8yOVOjT8eurZMnyOObEqhtWBAFmVkGxOZs9YfCdZAdm1Zgw
-/lBqtAlgBJD2n5sbqYmE6kOleOZG5hDKkPm8bG/oumVoZq6UEsIRi2l4qSnXqoM=
-=T0m+
+iQEcBAEBCAAGBQJQ/iZSAAoJEJ0WA1zPCt1haNMH/jmeoFNE7VFB4HHRJFFmaBix
+6EPOy9Z9Pz+W9hkgcF/GJrwUWO0osta7Q6UV5RiY3qx/BRFvclaBhrcTyXMbV/1Z
+cZzQZCjNF4wiu7k8vzuGWKiLzQ7z647Kir7GA9e0rZeLzugAH1niZNe6pSCdxrKR
+9/FUr5LDprZ4Gm2AXTYDFvW0lBxpSONjAB6VhYacD0VO+Ofp3PKS83gZx4r4L6d1
+5S4E1jIM5/KUydWtxobR7YprhWyZ6hbLNgtyQrVJU0lKosyOb2KL4e5eq1kO9jIY
+jfsjtiWpDsBJo0QiCAZN4LDarCehIHK1XA//R9fgs9ABt7EQ6W+ywaemECswPIA=
+=IG2v
 -----END PGP SIGNATURE-----
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
+}