- update sys-apps/shadow to use libc expanded variable elibc_uclibc vs uclibc so USE=-* works

3 files changed, 34 insertions, 30 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 381b56fae99c..154bd79d4f74 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.100 2005/03/23 15:25:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.101 2005/05/30 02:43:14 solar Exp $
+
+  29 May 2005; <solar@gentoo.org> shadow-4.0.4.1-r4.ebuild:
+  - update sys-apps/shadow to use libc expanded variable elibc_uclibc vs uclibc
+  so USE=-* works
 
   23 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/securetty:
   Added hvc0 to securetty for ppc64 serial console.
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 5697dd1c8b4f..32515d9f0281 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,44 +1,44 @@
-MD5 c25320cf5c27d6f2ace576fd6888a849 ChangeLog 18563
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 9e30ca37850982773b2ce9e296d5b2c6 shadow-4.0.4.1-r4.ebuild 5957
-MD5 dc81ff1d34e63f13ad0fcf44c642ffce shadow-4.0.7.ebuild 5596
 MD5 1406e810bd64ab17f882f8d8f194a863 shadow-4.0.6-r1.ebuild 5635
-MD5 0ff6c0eabc050c3f8c8385c34ab19dd8 shadow-4.0.5-r2.ebuild 5435
+MD5 c5db1966bb09c55e07df052e1f67accc shadow-4.0.4.1-r4.ebuild 5956
 MD5 8524e4f28fd78ee92c165a3e41fe210a shadow-4.0.5-r3.ebuild 5509
+MD5 dc81ff1d34e63f13ad0fcf44c642ffce shadow-4.0.7.ebuild 5596
 MD5 022f36ddd345601f10ed3ac2da635139 shadow-4.0.7-r1.ebuild 6596
-MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
-MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
-MD5 47fdb47d3025548f36d37a93c13aef4f files/securetty 248
+MD5 6a6ff714a37ac217f22fabcdfe5dbf64 ChangeLog 18722
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0ff6c0eabc050c3f8c8385c34ab19dd8 shadow-4.0.5-r2.ebuild 5435
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
-MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 47fdb47d3025548f36d37a93c13aef4f files/securetty 248
 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
 MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
 MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
+MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
+MD5 8bf11ce0e8ee683fe290462473871dab files/shadow-4.0.6-long-groupnames.patch 1625
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
+MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
+MD5 a63ee37286c486567191c7c6b24432e2 files/shadow-4.0.7-lastlog.patch 455
 MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
-MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
+MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
+MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
 MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
-MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
-MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
-MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
-MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
-MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
-MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
+MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
 MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
-MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
-MD5 8bf11ce0e8ee683fe290462473871dab files/shadow-4.0.6-long-groupnames.patch 1625
-MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
 MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
-MD5 a63ee37286c486567191c7c6b24432e2 files/shadow-4.0.7-lastlog.patch 455
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
+MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
 MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
+MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
 MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
 MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
-MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
-MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
+MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
diff --git a/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild b/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
index afbd8658edcf..2c01c21bdc84 100644
--- a/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild,v 1.14 2005/01/16 12:34:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild,v 1.15 2005/05/30 02:43:14 solar Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="pam selinux nls uclibc"
+IUSE="pam selinux nls"
 
 DEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 )
@@ -36,7 +36,7 @@ src_unpack() {
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 
 	# uclibc support, corrects NIS usage
-	use uclibc && epatch ${FILESDIR}/shadow-4.0.4.1-nonis.patch
+	use elibc_uclibc && epatch ${FILESDIR}/shadow-4.0.4.1-nonis.patch
 
 	# Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY,
 	# else the session entries in /etc/pam.d/su never get executed, and