Install a default pam.d file and honor XSESSION

Package-Manager: portage-2.1.4_rc14

3 files changed, 28 insertions, 26 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 24bd4095fdec..43298d7adb23 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/slim
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.9 2007/10/27 18:02:37 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.10 2008/01/01 18:06:15 angelos Exp $
+
+  01 Jan 2008; Christoph Mende <angelos@gentoo.org> slim-1.3.0-r1.ebuild:
+  Install a default pam.d file and honor XSESSION
 
 *slim-1.3.0-r1 (27 Oct 2007)
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index aaa89f18c770..288a30165f88 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -7,18 +7,18 @@ EBUILD slim-1.2.6.ebuild 1975 RMD160 baf743d341ba0ff57a641eb2e8086636fd7d3f4d SH
 MD5 4276855805f35eaf21031d473e3e6a73 slim-1.2.6.ebuild 1975
 RMD160 baf743d341ba0ff57a641eb2e8086636fd7d3f4d slim-1.2.6.ebuild 1975
 SHA256 6c93fd72c5b272a3ee419e03ba31fbf1f0876cdc6257a1f1856e659807277b9d slim-1.2.6.ebuild 1975
-EBUILD slim-1.3.0-r1.ebuild 2449 RMD160 fa46e3e2f865b3143de899ebb1b1986ef447beff SHA1 7bef8b09afd4fe06abd0e7e60fcfb1c03d68bc5b SHA256 5ea086bb13eba6ea8cb508617ebb326e2d6cf4c2f229d54844d287d34a11546a
-MD5 2732467910f1406ba5ea0adcbccade91 slim-1.3.0-r1.ebuild 2449
-RMD160 fa46e3e2f865b3143de899ebb1b1986ef447beff slim-1.3.0-r1.ebuild 2449
-SHA256 5ea086bb13eba6ea8cb508617ebb326e2d6cf4c2f229d54844d287d34a11546a slim-1.3.0-r1.ebuild 2449
+EBUILD slim-1.3.0-r1.ebuild 2560 RMD160 bf0cc1a54396fa884a8732bfc5607c7595d5da09 SHA1 da50771ecd312fae55de2b9d7a72d53047bc5088 SHA256 cbc1f35009c2464c3fb420d63ad8d03484583020b0b938ea0628b1f32a6361f7
+MD5 d9fd776396e31e36745fb6369ffb6404 slim-1.3.0-r1.ebuild 2560
+RMD160 bf0cc1a54396fa884a8732bfc5607c7595d5da09 slim-1.3.0-r1.ebuild 2560
+SHA256 cbc1f35009c2464c3fb420d63ad8d03484583020b0b938ea0628b1f32a6361f7 slim-1.3.0-r1.ebuild 2560
 EBUILD slim-1.3.0.ebuild 2118 RMD160 0ee6af66a5cb802eb16f67b45ed3d2d180bb0037 SHA1 0fcac3981a0ea7530efd26674e17ec7367d7041a SHA256 1fb31f7320567a1f503ad97ead4e27af7e7982c7eb7f501f2d9788f895754530
 MD5 130ec13bf6ba3988180a4e721a23d2ff slim-1.3.0.ebuild 2118
 RMD160 0ee6af66a5cb802eb16f67b45ed3d2d180bb0037 slim-1.3.0.ebuild 2118
 SHA256 1fb31f7320567a1f503ad97ead4e27af7e7982c7eb7f501f2d9788f895754530 slim-1.3.0.ebuild 2118
-MISC ChangeLog 1274 RMD160 1d5d64df2566326f00daad6bc44cecf80dc1f11f SHA1 94544ed88e94eb979e5774d649b29d3e5f1e8dfd SHA256 7d96013aa4b6a803976a65085b787bc6064745fdba2ca28b9ab75b6ce5a3e4fe
-MD5 13b51031a121413b601ce546903816be ChangeLog 1274
-RMD160 1d5d64df2566326f00daad6bc44cecf80dc1f11f ChangeLog 1274
-SHA256 7d96013aa4b6a803976a65085b787bc6064745fdba2ca28b9ab75b6ce5a3e4fe ChangeLog 1274
+MISC ChangeLog 1400 RMD160 54a325276faa9017f03217bd4b22c59c4d16eb49 SHA1 ae74a64c94b7f6f00e91508d4ee54f6919d1150e SHA256 36d66914a3cc88f2324996032cdd04cceafcaa585b8627224e0c39d0dbdd0e21
+MD5 b20e341bf5dc7329186c8ca5de409218 ChangeLog 1400
+RMD160 54a325276faa9017f03217bd4b22c59c4d16eb49 ChangeLog 1400
+SHA256 36d66914a3cc88f2324996032cdd04cceafcaa585b8627224e0c39d0dbdd0e21 ChangeLog 1400
 MISC metadata.xml 263 RMD160 1d58ccbb4af4fda82e05f8b91f6e2a48f3577278 SHA1 38a9916d3fc3090dd815a4fdf1d3b6846ba34de0 SHA256 4bb7d8dfbb8db552b58ebef18cfb44bc7167d2d871773f193b424dcfc43017c2
 MD5 84fc834691e8edacaaed363418de1234 metadata.xml 263
 RMD160 1d58ccbb4af4fda82e05f8b91f6e2a48f3577278 metadata.xml 263
@@ -33,9 +33,9 @@ MD5 4c548f9eeb2fe3fdf095124b88458a96 files/digest-slim-1.3.0-r1 232
 RMD160 5cf13fdbfe330e8dfa1cd9692f082cda64f2afcc files/digest-slim-1.3.0-r1 232
 SHA256 d3b8bd736b6add0b7faaaab2f5cb97f7c8b9522e1fe1c0aa6f5839ea3d8e8851 files/digest-slim-1.3.0-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHI31DKhnDs22gwa8RAiMuAJoD8cMIXhB/a9JDpu+cbgcL5xL6MACglm7E
-iBrxyJyEmbDwDc3erD8ILHk=
-=TOa+
+iEYEARECAAYFAkd6gRwACgkQKhnDs22gwa/PCgCg+QvN8ahtdjTVaBLT1q7UL8oa
+GG8AoKBRXN3vpE2026GhBXJPyaQLIQEl
+=IR3Z
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/slim-1.3.0-r1.ebuild b/x11-misc/slim/slim-1.3.0-r1.ebuild
index 25ccec727014..61e0f26dea97 100644
--- a/x11-misc/slim/slim-1.3.0-r1.ebuild
+++ b/x11-misc/slim/slim-1.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v 1.1 2007/10/27 18:02:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v 1.2 2008/01/01 18:06:15 angelos Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs pam
 
 DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
@@ -41,9 +41,11 @@ src_unpack() {
 	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
 	# Set the default logfile to /dev/null to avoid cluttering up the harddisk
 	# as slim puts a lot of garbage in its logfile
+	# Make slim honor XSESSION in /etc/rc.conf by default.
 	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
 		-e 's/# daemon/daemon/' \
 		-e 's#/var/log/slim.log#/dev/null#g' \
+		-e '/^login_cmd.*/s#exec /bin/bash.*#exec /bin/bash -login /etc/X11/xinit/xinitrc#' \
 		slim.conf || die "sed failed in slim.conf"
 }
 
@@ -58,6 +60,7 @@ src_compile() {
 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
@@ -68,17 +71,13 @@ src_install() {
 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 "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf"
-	elog "for session management. For further information, see README and"
-	elog "xinitrc.sample in /usr/share/doc/${PF}."
+	elog "If you want to use .xinitrc in the user's home directory for session management"
+	elog "instead, see README and xinitrc.sample in /usr/share/doc/${PF}."
+	elog "and change your login_cmd in /etc/slim.conf accordingly."
 	elog
-	if use pam ; then
-		elog "You need to create /etc/pam.d/slim for SLiM to work."
-		elog "A simple symlink to /etc/pam.d/system-auth is enough,"
-		elog "if you don't need any extra configuration"
-		elog
-	fi
 }