revbump for consolekit fixes by Ian Stakenvicius

(Portage version: 2.1.10.3/cvs/Linux i686)

3 files changed, 25 insertions, 2 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index db5cdc2871c6..9f642b917ff7 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.68 2011/08/16 02:18:37 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.69 2011/08/19 19:55:10 darkside Exp $
+
+*slim-1.3.2-r5 (19 Aug 2011)
+
+  19 Aug 2011; Jeremy Olexa <darkside@gentoo.org> -slim-1.3.2-r4.ebuild,
+  +slim-1.3.2-r5.ebuild, files/Xsession-r2:
+  revbump for consolekit fixes by Ian Stakenvicius
 
 *slim-1.3.2-r4 (16 Aug 2011)
 
diff --git a/x11-misc/slim/files/Xsession-r2 b/x11-misc/slim/files/Xsession-r2
index 237fb3630661..2712610f5b11 100644
--- a/x11-misc/slim/files/Xsession-r2
+++ b/x11-misc/slim/files/Xsession-r2
@@ -142,6 +142,9 @@ if [ -z "${command}" ]; then
   exec xterm -geometry 80x24+0+0
 fi
 
+# temporarily unset XDG_SESSION_COOKIE so consolekit launches a new session
+realxdgcookie="$XDG_SESSION_COOKIE"
+XDG_SESSION_COOKIE=
 # run all system xinitrc shell scripts which will update command
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
   for i in /etc/X11/xinit/xinitrc.d/* ; do
@@ -151,6 +154,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   done
   unset i
 fi
+# restore XDG_SESSION_COOKIE
+XDG_SESSION_COOKIE="$realxdgcookie"
+unset realxdgcookie
 
 echo "$0: Setup done, will execute: $command"
 exec $command
diff --git a/x11-misc/slim/slim-1.3.2-r4.ebuild b/x11-misc/slim/slim-1.3.2-r5.ebuild
index 296efc9a9368..6b54291f1ca7 100644
--- a/x11-misc/slim/slim-1.3.2-r4.ebuild
+++ b/x11-misc/slim/slim-1.3.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r4.ebuild,v 1.1 2011/08/16 02:18:37 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r5.ebuild,v 1.1 2011/08/19 19:55:10 darkside Exp $
 
 EAPI=2
 
@@ -110,9 +110,20 @@ pkg_postinst() {
 	elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
 	elog "accordingly."
 	elog
+	ewarn "Please note that the slim session start script now supports consolekit"
+	ewarn "directly, via xinitrc.d scripts.  Please remove any existing work-arounds to"
+	ewarn "avoid multiple calls to ck-launch-session."
+	if has_version "<=sys-auth/pambase-20101024[consolekit]" ; then
+		ewarn
+		ewarn "You should also remove the 'nox11' flag from the pam_ck_connector.so module "
+		ewarn "in /etc/pam.d/system-login if you have not already done so."
+		ewarn "(this is safe, it will be default in the next version of pambase)"
+	fi
+	elog
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to"
 		elog "the console when restarting your window manager. If this is not"
 		elog "desired, then please remerge ${PN} with USE=pam"
+		elog
 	fi
 }