clean up postinst and add words about USE=pam for bug #238328. Thanks to nightmorph for investigating

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 26 insertions, 9 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 665e8d9bffe4..17f112793da4 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.17 2008/09/20 10:07:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.18 2008/09/22 15:45:49 darkside Exp $
+
+  22 Sep 2008; Jeremy Olexa <darkside@gentoo.org> slim-1.3.0-r1.ebuild,
+  slim-1.3.0-r2.ebuild:
+  clean up postinst and add words about USE=pam for bug #238328. Thanks to
+  nightmorph for investigating
 
   20 Sep 2008; Raúl Porcel <armin76@gentoo.org> slim-1.3.0-r2.ebuild:
   Re-add ~sparc/~x86 wrt #238159
diff --git a/x11-misc/slim/slim-1.3.0-r1.ebuild b/x11-misc/slim/slim-1.3.0-r1.ebuild
index 16f42c02d07f..e629faddf41c 100644
--- a/x11-misc/slim/slim-1.3.0-r1.ebuild
+++ b/x11-misc/slim/slim-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2008/08/27 17:00:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v 1.8 2008/09/22 15:45:49 darkside Exp $
 
 inherit eutils toolchain-funcs pam
 
@@ -78,8 +78,14 @@ pkg_postinst() {
 	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 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 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.0-r2.ebuild b/x11-misc/slim/slim-1.3.0-r2.ebuild
index 999ba6a0d0d0..00b4d509bdc5 100644
--- a/x11-misc/slim/slim-1.3.0-r2.ebuild
+++ b/x11-misc/slim/slim-1.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.3 2008/09/20 15:38:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r2.ebuild,v 1.4 2008/09/22 15:45:49 darkside Exp $
 
 inherit eutils toolchain-funcs pam
 
@@ -85,8 +85,14 @@ pkg_postinst() {
 	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 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 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
 }