Don't enable shadow when pam is disabled on anything but glibc, as that is a GNU extension. Thanks to Timothy Redaelli for reporting.

Package-Manager: portage-2.1.1_pre2-r8

3 files changed, 21 insertions, 19 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 5d12e6137b33..667e8c93dc3b 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.64 2006/07/09 06:07:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.65 2006/07/14 19:59:35 flameeyes Exp $
+
+  14 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kdm-3.5.2-r1.ebuild:
+  Don't enable shadow when pam is disabled on anything but glibc, as that is a
+  GNU extension. Thanks to Timothy Redaelli for reporting.
 
   09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kdm-3.5.2-r1.ebuild,
   kdm-3.5.3-r2.ebuild:
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index d8cbc3e13231..a5afdc96245a 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -30,18 +30,18 @@ EBUILD kdm-3.4.3-r2.ebuild 2798 RMD160 47db56da14c1294ec15ee1215b278913773ec870
 MD5 f387e2c861df90e2a458e55b86b20d3c kdm-3.4.3-r2.ebuild 2798
 RMD160 47db56da14c1294ec15ee1215b278913773ec870 kdm-3.4.3-r2.ebuild 2798
 SHA256 c41a979f3e8feab9983053e367463b35c29c5b2879c1aaea478a319835242bc5 kdm-3.4.3-r2.ebuild 2798
-EBUILD kdm-3.5.2-r1.ebuild 2515 RMD160 f639b496d7b35c37b0c3a1a2355ce89960acb070 SHA1 38c7997f0ec7a0a65cdbb6b6d2d9e90ede294a83 SHA256 63ccc075cc343b214d6b89c864b51798e5ee5b24d294e46331d4420bdbe685c2
-MD5 c305b4446a70eafafd77807d8ecec396 kdm-3.5.2-r1.ebuild 2515
-RMD160 f639b496d7b35c37b0c3a1a2355ce89960acb070 kdm-3.5.2-r1.ebuild 2515
-SHA256 63ccc075cc343b214d6b89c864b51798e5ee5b24d294e46331d4420bdbe685c2 kdm-3.5.2-r1.ebuild 2515
+EBUILD kdm-3.5.2-r1.ebuild 2508 RMD160 6ccd00b438807fd9915f4f78a2eb0602aa8c6dd7 SHA1 ebad4b67fe36aeea4536db9f2129d6061f8907b7 SHA256 8642b48516a7f67982f29a17ee080faff24fedfe8a3d4c5347c46067a2de54d6
+MD5 aa20323f99ec92fa553922c3e26659ed kdm-3.5.2-r1.ebuild 2508
+RMD160 6ccd00b438807fd9915f4f78a2eb0602aa8c6dd7 kdm-3.5.2-r1.ebuild 2508
+SHA256 8642b48516a7f67982f29a17ee080faff24fedfe8a3d4c5347c46067a2de54d6 kdm-3.5.2-r1.ebuild 2508
 EBUILD kdm-3.5.3-r2.ebuild 2570 RMD160 12a1548881f9c5fb71eb2cc86b4c6f306ce56941 SHA1 33475cc3f6cb5f56022e9f11381a9609929c5ed4 SHA256 1a45da2c3b26e9f89f738e07e01c405ca2841b7477b087f8567ac5375bb10105
 MD5 273edf2a0bc7391bd5e9dd6f2f74a4ea kdm-3.5.3-r2.ebuild 2570
 RMD160 12a1548881f9c5fb71eb2cc86b4c6f306ce56941 kdm-3.5.3-r2.ebuild 2570
 SHA256 1a45da2c3b26e9f89f738e07e01c405ca2841b7477b087f8567ac5375bb10105 kdm-3.5.3-r2.ebuild 2570
-MISC ChangeLog 8504 RMD160 218297a686e427b475b85a4bb0296fbe6dbcf39a SHA1 4a74d6a42e61966cb35ae9157f59f931443f17a2 SHA256 8cebdb6e51cccd4fc15db50c9daa98bec10351bf1ccf530ee79cd0e925df9276
-MD5 5885b8a7d1179c4631cd922d2867d172 ChangeLog 8504
-RMD160 218297a686e427b475b85a4bb0296fbe6dbcf39a ChangeLog 8504
-SHA256 8cebdb6e51cccd4fc15db50c9daa98bec10351bf1ccf530ee79cd0e925df9276 ChangeLog 8504
+MISC ChangeLog 8717 RMD160 dfb49f916e5e068c49d1a667918e8bcc05ac8542 SHA1 589aab0f6821e26fb5c875299d116868893e6767 SHA256 f421a259d403c34d5d060a581e2a3f538b3e5c62443c63aecdc5be4e0bde6543
+MD5 0d252690dcdac46c0f71b85862a26dcd ChangeLog 8717
+RMD160 dfb49f916e5e068c49d1a667918e8bcc05ac8542 ChangeLog 8717
+SHA256 f421a259d403c34d5d060a581e2a3f538b3e5c62443c63aecdc5be4e0bde6543 ChangeLog 8717
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -61,7 +61,7 @@ SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsJ1FAiZjviIA2XgRAl1rAKCt1MAhDse0djZaigQbQujmnCk6oQCg6ly5
-0cek3YbsTCRFogbz9P1V1xU=
-=ZGzR
+iD8DBQFEt/e6AiZjviIA2XgRAiXUAKCiMK+r8wZjuNcBTKaxdKf5ZB7w4ACfRe8j
+T3KE0kFTgf5b/Y0G7O47zng=
+=CQUE
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-3.5.2-r1.ebuild b/kde-base/kdm/kdm-3.5.2-r1.ebuild
index f483adb6542a..c02b2748625b 100644
--- a/kde-base/kdm/kdm-3.5.2-r1.ebuild
+++ b/kde-base/kdm/kdm-3.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.2-r1.ebuild,v 1.6 2006/07/09 06:07:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.2-r1.ebuild,v 1.7 2006/07/14 19:59:35 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI}
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
 KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam"
+IUSE="pam elibc_glibc"
 
 KMEXTRA="kdmlib/"
 # kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
@@ -39,12 +39,10 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin"
+	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
 
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
+	if ! use pam && use elibc_glibc; then
+		myconf="${myconf} --with-shadow"
 	fi
 
 	export USER_LDFLAGS="${LDFLAGS}"