Revbump to vastly improve the session handling. Work done by Ian Stakenvicius in bug 334111. Also remove old and cleanup.

Package-Manager: portage-2.1.9.4/cvs/Linux x86_64

8 files changed, 210 insertions, 176 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index c84a04312e3b..3f72c7ba66d2 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.57 2010/09/12 15:29:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.58 2010/09/20 15:22:38 darkside Exp $
+
+*slim-1.3.2-r2 (20 Sep 2010)
+
+  20 Sep 2010; Jeremy Olexa <darkside@gentoo.org>
+  -slim-1.3.1_p20091114.ebuild, -files/slim-1.3.1-config.diff,
+  -files/slim-1.3.1-gcc4.4.patch, -slim-1.3.2.ebuild, +slim-1.3.2-r2.ebuild,
+  -files/slim-1.3.2-config.diff, +files/slim-1.3.2-r2-config.diff,
+  +files/Xsession:
+  Revbump to vastly improve the session handling. Work done by Ian
+  Stakenvicius in bug 334111. Also remove old and cleanup.
 
   12 Sep 2010; Raúl Porcel <armin76@gentoo.org> slim-1.3.2-r1.ebuild:
   sparc stable wrt #333661
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index dde3eb802a6f..987174e6279f 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -2,15 +2,12 @@ AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984
 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
 AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e290f4d93 SHA1 dd8b782438bbdb86c44a4e1cb64bd8c3e3afefe6 SHA256 bd3221c9b94cc64ba6f4d786ec57a5d085f247b283cd64117034be15fedc5201
 AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
-AUX slim-1.3.1-config.diff 1589 RMD160 dd92d5bc0ecc507309d7d36631cde9310002dd3c SHA1 8e84e9c99fc3fbb2f0893578cebf4a76cb7a0263 SHA256 cda9414dd9586f22b6996815e368078688488a234d672ecc9f647012ae8d3889
-AUX slim-1.3.1-gcc4.4.patch 380 RMD160 e2b1f057d32857239591474b5562b717a8ddab2c SHA1 60749d3357630cf54dadbc68f37d2e7831710f8f SHA256 52f6941889687a87f343f25b6aa590f0db08542bc2de65554f6e076d2033f7b1
-AUX slim-1.3.2-config.diff 2102 RMD160 f55b6a0d9acace01c0950ffa55b0d0ea5ca2e54b SHA1 693937055fea62aa3ad037da351e9a2e8636c6ea SHA256 dea2cb302bd8dcc4318c9b1c0296d14db10c5d9f9247d48134ec1b35a9db0943
+AUX Xsession 4215 RMD160 86ab057ea3f78a9604811a1bff7e5aad88c2f717 SHA1 46dc684b873b190b74df199eae39b38e0f5ffccc SHA256 55671397563aa32d89e66658e6594f17d4ddcddd1ad6aa2d7582ba56ceec7628
 AUX slim-1.3.2-r1-config.diff 2367 RMD160 ac53bf33f1e369a2e545e38b6029b8daaf5aba15 SHA1 f3731b6f4dcd9bf125b3f76057901eca1cc8c0e8 SHA256 e5bd697a68c08b70e02c2bc8fd3be85828a7a3f1019dfcb4f4609ed60039d53c
+AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d
 AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
-DIST slim-1.3.1_p20091114.tar.bz2 216441 RMD160 61ede89624ed6983c08d05512c9f6458cff6425e SHA1 127aa0eb599c5bcbd87ce1ee040f8bb59bd63491 SHA256 ba68da747db4ef87329064fd3990f0402ad840ad723b03cea5e7c6c15a2c1a7b
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
-EBUILD slim-1.3.1_p20091114.ebuild 3036 RMD160 b38e64c7ebf148737d8e67620498ef3d208786dd SHA1 2814b884d4da90a807bac643b515594ac366f756 SHA256 5d747c2261517538bced10a3672b2c840387b818b41d199ddf46106e17e0e9f5
 EBUILD slim-1.3.2-r1.ebuild 3126 RMD160 298f24a06f93bca134db41a63e95df6b38471832 SHA1 ac001b1872649c9f07ea45bab7518a1acff9111f SHA256 3644eb27b29fefe5e92c852c14f0c2606a48a3264d19079078d5cc16edc4f701
-EBUILD slim-1.3.2.ebuild 2997 RMD160 2bbecf513d6817cba8aa02fa7435efbe3e6fcc36 SHA1 c8afedbecf8742b8f62578a714bceb93e99d6960 SHA256 c89642d19c1f3c51d472ff8828aa06a0b60a502e61a7f5a060450a808cb81fbb
-MISC ChangeLog 8889 RMD160 58cee502674f1ad02579ca7e3595cf44b36e514d SHA1 0db3d45757f0210a201eafe42a2c7ee685800244 SHA256 b6c39e2a5f3f0d62897671fcc79caa27bacfd1af7bf905811b2ad111f626d5ba
+EBUILD slim-1.3.2-r2.ebuild 3489 RMD160 2587998be5bc7b6b17abcd6b280e55fe77f769ed SHA1 7d8f7a34fe7502ef90b1cd2b80ce295f6bd53d9c SHA256 d51bf9ec44751fdcdb13ce46abe29a71f84cc2a40978288fe82676ae9912a1e9
+MISC ChangeLog 9323 RMD160 d6a075329e2000101516c1da5b66e59427a51f83 SHA1 8b18e4e8d29e2d2e08d66ac54b9c236e42e00126 SHA256 68f6e6cb95f79ed688ddb1e67b52d1b4de4870cb7d7f2fb4d59198c88886b837
 MISC metadata.xml 348 RMD160 22b309bfa0ee5378b0476cc4c7fe8ea3eabe8fbc SHA1 4f8c2e941ce68487614dfab204737ff51f9f8531 SHA256 821a30989eb2cad5bd636c79abffbdb600b31d67cd1b6fb219204d8aedd987bb
diff --git a/x11-misc/slim/files/Xsession b/x11-misc/slim/files/Xsession
new file mode 100644
index 000000000000..d24ee1c03011
--- /dev/null
+++ b/x11-misc/slim/files/Xsession
@@ -0,0 +1,160 @@
+#!/bin/sh
+#
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/files/Xsession,v 1.1 2010/09/20 15:22:38 darkside Exp $
+#
+# SLiM Xsession script
+#
+# This script is a wrapper that handles selection of a session from
+# /etc/X11/Sessions/ as necessary.  It doesn't handle actual session setup.
+#
+# The script takes a session name as the first argument. If no argument is
+# given, or if the argument does not match an available session script:
+#  - Run ~/.xsession and if that's not available,
+#  - Run the appropriate Xclients startup (see the code below)
+#
+# (Note that other arguments could also follow, but only the command one is
+# right now relevant and supported)
+#
+# The output is redirected to /var/log/slim.log.
+#
+# By default this is run in a login shell, see /etc/slim.conf for details.
+
+command="$@"
+
+# this will go into the slim.log along with all other echo's
+# good for debugging where things went wrong
+echo "$0: Beginning session setup..."
+
+# Read /etc/xprofile and .xprofile for X specific setup
+test -f /etc/xprofile && . /etc/xprofile
+test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
+
+# userresources and sysresources and all these other vars are
+# unneeded here as by default the session script we're handing
+# off to will take care of it.
+
+# wrap possible arguments to determine whether to treat special or not
+if [ "x$command" = "xcustom" ] || [ "x$command" = "xCustom" ] || \
+  [ "x$command" = "xdefault" ] || [ "x$command" = "xDefault" ]; then
+    command="Xsession"
+fi
+if [ "x$command" = "x" ]; then
+    # no default specified, check if Xsession will complete
+    # and if not then assign XSESSION to command
+    if [ -x "$HOME/.xsession" ] || [ -x "$HOME/.Xclients" ] || \
+      [ -x /etc/X11/xinit/Xclients ] || [ -x /etc/X11/Xclients ]; then
+        command="Xsession"
+    else
+        command=$XSESSION
+    fi
+fi
+
+# ripped directly from /etc/X11/chooser.sh
+
+sessionscript=""
+for x in /etc/X11/Sessions/* ; do
+    if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
+      = "`echo ${command} | awk '{ print toupper($1) }'`" ]; then
+        # Found the matching session
+	sessionscript="${x}"
+        break
+    fi
+done
+
+if [ -n "$sessionscript" ]; then
+
+    if [ -f ${sessionscript} ]; then
+        if [ -x ${sessionscript} ]; then
+            exec "${sessionscript}"
+        else
+            exec /bin/sh "${sessionscript}"
+        fi
+    fi
+
+    echo "Unable to execute session script ${sessionscript}"
+    exit 1
+
+fi
+
+# Launch a default session
+# This was mostly ripped from GDM's Xsession script
+
+
+echo "Could not find appropriate session script, exec'ing xterm"
+
+userresources="$HOME/.Xresources"
+usermodmap="$HOME/.Xmodmap"
+userxkbmap="$HOME/.Xkbmap"
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec xterm -geometry 80x24+0+0
+
diff --git a/x11-misc/slim/files/slim-1.3.1-config.diff b/x11-misc/slim/files/slim-1.3.1-config.diff
deleted file mode 100644
index bb9a98bab379..000000000000
--- a/x11-misc/slim/files/slim-1.3.1-config.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- slim.conf.orig	2008-12-26 11:45:17.308256705 -0600
-+++ slim.conf	2008-12-26 11:46:55.314256630 -0600
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path        ./:/bin:/usr/bin:/usr/local/bin
- default_xserver     /usr/bin/X
--#xserver_arguments   -dpi 75
-+xserver_arguments   -nolisten tcp -br -deferglyphs 16
- 
- # Commands for halt, login, etc.
- halt_cmd            /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
- 
- 
- # Activate numlock when slim starts. Valid values: on|off
--# numlock             on
-+numlock             on
- 
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd           exec /bin/sh - ~/.xinitrc %session
--login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /etc/X11/xinit/xinitrc
- 
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,11 +42,13 @@
- #
- # sessionstart_cmd	some command
- # sessionstop_cmd	some command
-+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
- 
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon	yes
-+daemon	yes
- 
- # Available sessions (first one is the default).
- # The current chosen session name is replaced in the login_cmd
diff --git a/x11-misc/slim/files/slim-1.3.1-gcc4.4.patch b/x11-misc/slim/files/slim-1.3.1-gcc4.4.patch
deleted file mode 100644
index 5c51d1f79662..000000000000
--- a/x11-misc/slim/files/slim-1.3.1-gcc4.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch to allow compilation with gcc-4.4
-
-Notified by Daniel J. - from Debian bug tracker
-
-http://bugs.gentoo.org/252745
-
---- switchuser.h	2008-11-11 19:40:18.000000000 +0000
-+++ switchuser.h	2008-11-11 19:40:28.000000000 +0000
-@@ -18,6 +18,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <paths.h>
-+#include <cstdio>
- #include <iostream>
- #include "const.h"
- #include "cfg.h"
-
diff --git a/x11-misc/slim/files/slim-1.3.2-config.diff b/x11-misc/slim/files/slim-1.3.2-r2-config.diff
index e05711b41c14..a8ae185a845e 100644
--- a/x11-misc/slim/files/slim-1.3.2-config.diff
+++ b/x11-misc/slim/files/slim-1.3.2-r2-config.diff
@@ -1,5 +1,5 @@
---- slim.conf.orig	2010-07-08 00:04:10.000000000 -0500
-+++ slim.conf	2010-07-30 21:46:14.713367279 -0500
+--- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
++++ slim.conf	2010-08-25 11:58:58.000000000 -0400
 @@ -2,7 +2,7 @@
  # Note: -xauth $authfile is automatically appended
  default_path        /bin:/usr/bin:/usr/local/bin
@@ -24,11 +24,11 @@
  # login_cmd           exec /bin/sh - ~/.xinitrc %session
 -login_cmd           exec /bin/bash -login ~/.xinitrc %session
 +# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /etc/X11/xinit/xinitrc
++login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
  
  # Commands executed when starting and exiting a session.
  # They can be used for registering a X11 session with
-@@ -41,11 +42,13 @@
+@@ -41,20 +42,26 @@
  #
  # sessionstart_cmd	some command
  # sessionstop_cmd	some command
@@ -43,9 +43,12 @@
  
  # Available sessions (first one is the default).
  # The current chosen session name is replaced in the login_cmd
-@@ -53,8 +56,10 @@
+ # above, so your login command can handle different sessions.
  # see the xinitrc.sample file shipped with slim sources
- sessions            xfce4,icewm,wmaker,blackbox
+-sessions            xfce4,icewm,wmaker,blackbox
++#sessions            xfce4,icewm,wmaker,blackbox
++# Alternatively, read available sessions from a directory:
++sessiondir           /etc/X11/Sessions
  
 -# Executed when pressing F11 (requires imagemagick)
 +# Executed when pressing F11 (requires media-gfx/imagemagick for import)
@@ -55,3 +58,14 @@
  
  # welcome message. Available variables: %host, %domain
  welcome_msg         Welcome to %host
+@@ -83,8 +88,8 @@
+ # randomly choose from
+ current_theme       default
+ 
+-# Lock file
+-lockfile            /var/run/slim.lock
++# Lock file, /etc/init.d/xdm expects slim.pid
++lockfile            /var/run/slim.pid
+ 
+ # Log file
+ logfile             /var/log/slim.log
diff --git a/x11-misc/slim/slim-1.3.1_p20091114.ebuild b/x11-misc/slim/slim-1.3.1_p20091114.ebuild
deleted file mode 100644
index 39306feb69a2..000000000000
--- a/x11-misc/slim/slim-1.3.1_p20091114.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.11 2010/05/21 22:24:38 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs pam eutils
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="http://slim.berlios.de"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="branding screenshot pam"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/libpng
-	media-libs/jpeg
-	x11-apps/sessreg
-	pam? ( virtual/pam )
-	screenshot? ( media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-src_prepare() {
-	# respect C[XX]FLAGS, fix crosscompile,
-	# fix linking order for --as-needed"
-	sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
-		-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
-		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
-		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-		-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
-		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
-		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-		Makefile || die "sed failed in Makefile"
-	epatch "${FILESDIR}/${PN}-1.3.1-config.diff"
-
-	if use branding; then
-		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
-	fi
-
-	# Gentoo bug 297655
-	epatch "${FILESDIR}/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch"
-	# Upstream bug #15287
-	epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
-	# Gentoo Bug 261713
-	epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
-}
-
-src_compile() {
-	if use pam ; then
-		emake USE_PAM=1 || die "emake failed."
-	else
-		emake || die "emake failed."
-	fi
-}
-
-src_install() {
-	if use pam ; then
-		emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
-		pamd_mimic_system slim auth account password session
-	else
-		emake DESTDIR="${D}" install || die "emake install failed."
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
-
-	dodoc xinitrc.sample ChangeLog README TODO THEMES
-}
-
-pkg_postinst() {
-	elog
-	elog "The configuration file is located at /etc/slim.conf."
-	elog
-	elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
-	elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
-	elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf."
-	elog
-	elog "If you want to use .xinitrc in the user's home directory for session"
-	elog "management instead, see README and xinitrc.sample in"
-	elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
-	elog "accordingly."
-	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"
-	fi
-}
diff --git a/x11-misc/slim/slim-1.3.2.ebuild b/x11-misc/slim/slim-1.3.2-r2.ebuild
index 6f3196666045..bf22b7e8e6d5 100644
--- a/x11-misc/slim/slim-1.3.2.ebuild
+++ b/x11-misc/slim/slim-1.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.1 2010/07/31 02:58:39 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r2.ebuild,v 1.1 2010/09/20 15:22:38 darkside Exp $
 
 EAPI=2
 
@@ -39,7 +39,8 @@ src_prepare() {
 		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
 		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
 		Makefile || die "sed failed in Makefile"
-	epatch "${FILESDIR}/${PN}-1.3.2-config.diff"
+	# Our Gentoo-specific config changes
+	epatch "${FILESDIR}/${PN}-1.3.2-r2-config.diff"
 
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
@@ -51,6 +52,8 @@ src_prepare() {
 	epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
 	# Gentoo Bug 261713
 	epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
+	# Gentoo bug 261359, upstream 15326
+	epatch "${FILESDIR}/261359-fix-SIGTERM-freeze.patch"
 }
 
 src_compile() {
@@ -69,6 +72,9 @@ src_install() {
 		emake DESTDIR="${D}" install || die "emake install failed."
 	fi
 
+	insinto /usr/share/slim
+	newins "${FILESDIR}/Xsession" Xsession || die "newins failed"
+
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
 
@@ -81,7 +87,13 @@ pkg_postinst() {
 	elog
 	elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
 	elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
-	elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf."
+	elog
+	elog "By default, ${PN} now does proper X session selection, including ~/.xsession"
+	elog "support, as well as selection between sessions available in"
+	elog "/etc/X11/Sessions/ at login by pressing [F1]."
+	elog
+	elog "The XSESSION environment variable is still supported as a default"
+	elog "if no session has been specified by the user."
 	elog
 	elog "If you want to use .xinitrc in the user's home directory for session"
 	elog "management instead, see README and xinitrc.sample in"