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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 29 insertions, 12 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/Manifest b/x11-misc/slim/Manifest
index aba280647c3f..44efb99a3f0a 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,6 +1,6 @@
 AUX slim-1.3.0-gcc43.patch 255 RMD160 dafb1ce951a97220916f14a418a9f4814b8c5f98 SHA1 46bcb9952bb3f9f8fefc53083cb475e073de4b46 SHA256 0cf636a722e048bcf6ca68c1419a87cacd65b87e92cda2ad88d1043b353621c4
 DIST slim-1.3.0.tar.gz 218646 RMD160 80205d8e757c76f9c0e21263ec38624f605d9586 SHA1 f27f40c73a2f757f1ae32155bf0438c97be2c019 SHA256 b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b
-EBUILD slim-1.3.0-r1.ebuild 2652 RMD160 de9a79e4c669916e524015ecefb3cb8ccac9d2f4 SHA1 2e368ddf55d3ff953c189b21c6b2b505d1f555df SHA256 b37230f19689118dd50debcdf34bc56fe393b12985fa83069909eded02949890
-EBUILD slim-1.3.0-r2.ebuild 3031 RMD160 8dc7d6e69770a1d1f78ff0df2a15615d9dbeb598 SHA1 c23a3071d989ec5773a739e7df031c2784a97f22 SHA256 18150ff6c94cb8881746eea1e3adf8393c62aae0c2812d32bb3430e294da0cf1
-MISC ChangeLog 2410 RMD160 3b11997a3e132dc80f29876132f43502c0578ceb SHA1 18064adddf90407da733966e0bd18e98652cbd74 SHA256 6cdd4aecb50dd9bacc2a8b19931591637ccf0156d21d3ab544216ba1afc2a4b7
+EBUILD slim-1.3.0-r1.ebuild 2901 RMD160 a8aa2ce96b0d4c802527c54c3d6602059a413c68 SHA1 7ac674b6fdc09d46e64c40ac52971396020a2d67 SHA256 d254f24ec386681493aba0c489bd7c880199950f4041ac2a3f00ae74c7ee37ce
+EBUILD slim-1.3.0-r2.ebuild 3277 RMD160 b6693809baa1eabcb546dd1621cfb1f20f26507b SHA1 0238c481fea7cfaa36e7c648ec4025dc66f8d0e9 SHA256 407ff0e8350d374840b7b7df90f495824341f19a366759c09d228ee33cad7c9a
+MISC ChangeLog 2614 RMD160 e97cd87df5e152f98ba96d65e2c0eac2c4648744 SHA1 e04557287d3a378f95e85094382c22b3e7c2813e SHA256 f7fee72aad1494de9916e1c600724c8cb34036eb9b90af34a71f181e8e34dbfc
 MISC metadata.xml 233 RMD160 cdc8b3d6e2c4eaff8f37088ee4e9c68c6eca7cd2 SHA1 5c3eaf0604c2e1273d7892ce1317a2525ce7d1c4 SHA256 46d923a7ef5b27ee3a8a182c96567dfe7013b0f2eb59930f332d8ade5b09f610
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
 }