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

6 files changed, 57 insertions, 41 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 419ac1389d0f..fc34f7c1d136 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/grep
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.44 2005/03/22 08:06:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.45 2005/05/30 02:41:07 solar Exp $
+
+  29 May 2005; <solar@gentoo.org> grep-2.5.1-r6.ebuild, grep-2.5.1-r7.ebuild:
+  - update sys-apps/grep to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
 
   22 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   grep-2.5.1-r6.ebuild, grep-2.5.1-r7.ebuild:
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 1810793fecaf..f6617d6df2a8 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5c1510e20a43c023fa1329fb8ef59efc grep-2.5.1-r7.ebuild 1990
 MD5 97b1eaf5feac1593d7085913ce9b5deb grep-2.5.1-r6.ebuild 2240
 MD5 48f72d4099f9ed7d3a69a48eaf04b267 ChangeLog 7109
@@ -13,3 +16,12 @@ MD5 c723a8ca50e51326608931018be4f06b files/grep-2.5.1-restrict_arr.patch 501
 MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
 MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
 MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpp9Sp4WFLgrx1GWAQJ1+gQAj7aHh07mONg8upCiK87hcHGU4XiCyKtJ
+PXGOYVFGi+u5vix85najKp3cn9w/BrycQiWD9q5GR/qqqF1pcly0FJ6WqgSnKPeF
+8/ydHyv6CFspFpWsKer848Ftn55SxGizSTh1A9546XXlvzeEMz7ro+ej8yMaggYg
+KlllbXCGt94=
+=JE7t
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/grep-2.5.1-r6.ebuild b/sys-apps/grep/grep-2.5.1-r6.ebuild
index e4ada887a143..edd78c36024b 100644
--- a/sys-apps/grep/grep-2.5.1-r6.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r6.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/grep/grep-2.5.1-r6.ebuild,v 1.13 2005/03/22 08:06:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r6.ebuild,v 1.14 2005/05/30 02:41:07 solar Exp $
 
 inherit gnuconfig flag-o-matic eutils multilib
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
-IUSE="build nls pcre static uclibc"
+IUSE="build nls pcre static"
 
 RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
@@ -33,7 +33,7 @@ src_unpack() {
 	# 	-taviso (20 Aug 2004)
 	epatch ${FILESDIR}/${PV}-manpage-line-buffering.patch
 
-	use uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
+	use elibc_uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
 
 	epatch ${FILESDIR}/${PN}-${PV}-fgrep.patch.bz2
 	epatch ${FILESDIR}/${PN}-${PV}-i18n.patch.bz2
@@ -54,7 +54,7 @@ src_compile() {
 		append-ldflags -static
 	fi
 
-	if use uclibc ; then
+	if use elibc_uclibc ; then
 		myconf="${myconf} --without-included-regex"
 	else
 		myconf="${myconf} $(use_enable pcre perl-regexp)"
@@ -62,7 +62,7 @@ src_compile() {
 
 	econf ${myconf} || die "econf failed"
 
-	if use pcre && ! use uclibc ; then
+	if use pcre && ! use elibc_uclibc ; then
 		sed -i -e "s:-lpcre:/usr/$(get_libdir)/libpcre.a:g" {lib,src}/Makefile \
 			|| die "sed Makefile failed"
 	fi
diff --git a/sys-apps/grep/grep-2.5.1-r7.ebuild b/sys-apps/grep/grep-2.5.1-r7.ebuild
index 0de1943271c9..197f0e129174 100644
--- a/sys-apps/grep/grep-2.5.1-r7.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r7.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/grep/grep-2.5.1-r7.ebuild,v 1.7 2005/05/24 23:12:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r7.ebuild,v 1.8 2005/05/30 02:41:07 solar Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="build nls pcre static uclibc"
+IUSE="build nls pcre static"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -36,7 +36,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-utf8-case.patch
 
 	# uclibc does not suffer from this glibc bug.
-	use uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
+	use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
 }
 
 src_compile() {
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index abc9b5a634eb..b5da00888f6b 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,11 +1,11 @@
-MD5 8baa29491e8fb7e0133bd74211b4984e ChangeLog 8659
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 f2d060ba7da394a61bdd8510cd205b6b net-tools-1.60-r9.ebuild 3311
 MD5 be270bfec132b7d0bfb178d1624ca358 net-tools-1.60-r11.ebuild 2106
-MD5 34331bb3a0cf59517f6f656296d01317 net-tools-1.60-r9.ebuild 3296
+MD5 50a4c9f1b3432af1c8d9e0ac912f3300 ChangeLog 8819
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
+MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
 MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
-MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
 MD5 05ebbcad45030e806f8be710defa0aac files/digest-net-tools-1.60-r11 145
+MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
 MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
-MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
-MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 5697dd1c8b4f..b3153a961c36 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 adb53ffca50148c8d901a1a995c8d1a6 shadow-4.0.4.1-r4.ebuild 5955
 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 405bee1d6ae655f3eac18a269d0bfe3c ChangeLog 18719
+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