5 files changed, 59 insertions, 42 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 95c8d8ce700f..9afe8e7a9a10 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.64 2005/05/04 05:28:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.65 2005/05/30 02:32:07 solar Exp $
+
+  29 May 2005; <solar@gentoo.org> bash-2.05b-r11.ebuild, bash-3.0-r7.ebuild,
+  bash-3.0-r8.ebuild:
+  echangelog - update package to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
 
   04 May 2005; Mike Frysinger <vapier@gentoo.org>
   +files/bash-3.0-bash-logger.patch, bash-3.0-r11.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 72ffcbfd8efb..b072a0aa97ce 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,43 +1,55 @@
-MD5 3c897ed75a929b7dee7b6fbb2ff633a1 ChangeLog 13710
-MD5 2da6fba06b14770a3bb0c1641a73e6c8 bash-2.05b-r11.ebuild 3720
-MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
-MD5 7e0f2e58aed08b2c0fe09667e2a06ffe bash-3.0-r7.ebuild 4038
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 9c1b681f152c4eeba156a4881fdbfff9 bash-3.0-r8.ebuild 3931
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 761160a21f9a69be631b044d0be387e5 bash-3.0-r9.ebuild 4267
+MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
+MD5 3f49a564ce2d765e0f2c11c915df04fb bash-3.0-r8.ebuild 3929
+MD5 e3cbc054e227b1af18885d77d2f3d41a bash-2.05b-r11.ebuild 3718
 MD5 18c3f431afa54bf45d223dcdfb7e0d73 bash-3.0-r11.ebuild 5083
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
-MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
-MD5 3a15c63dcc58cecd09b00ae08524322c files/bashrc 1627
-MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
-MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
-MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
-MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
+MD5 cdbe3ae8caedac63fb9d92b39e5820ee bash-3.0-r7.ebuild 4036
+MD5 09b9bf05060af5c4ee46246023e15893 ChangeLog 13910
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
+MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
+MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
+MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
 MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
+MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
+MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
+MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
+MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
+MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
+MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
 MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
+MD5 3a15c63dcc58cecd09b00ae08524322c files/bashrc 1627
 MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
 MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
-MD5 a2845a2a194bba75c1875f4a1ad49344 files/bash30-014 698
-MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
-MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
+MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
+MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
 MD5 1fbe0324b1b5778d693d82cddcabeb9e files/digest-bash-3.0-r7 817
-MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
-MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
 MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r8 976
-MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
-MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
-MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
-MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
-MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
-MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
-MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
-MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
-MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
 MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r9 976
+MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
+MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
+MD5 a2845a2a194bba75c1875f4a1ad49344 files/bash30-014 698
+MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
+MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
+MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
 MD5 b3df3a162a43845cf9f107de9ea6ac27 files/dot-bashrc 1306
 MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
-MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
-MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
+MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpp7Np4WFLgrx1GWAQKY5gQAnktN+TIS/1MPu27wPelA6hCmC1s+SwBT
+1CMlcyc2OivBizopntJB+P90bTREXn/IuANNlybJ01Yy1eho+wRudaZqAZJOSQVf
+unsUEoTu9fry4fJ7zurfIyCpqkT6TVGNqHosBgBry46p8ahi6Rd92H/x9veraURS
+oPCUqQBfyvc=
+=L3xC
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-2.05b-r11.ebuild b/app-shells/bash/bash-2.05b-r11.ebuild
index a123c90ffdff..76822557fe27 100644
--- a/app-shells/bash/bash-2.05b-r11.ebuild
+++ b/app-shells/bash/bash-2.05b-r11.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/app-shells/bash/bash-2.05b-r11.ebuild,v 1.6 2005/05/14 18:55:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r11.ebuild,v 1.7 2005/05/30 02:32:07 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/bash/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build uclibc"
+IUSE="nls build"
 
 # we link statically with ncurses
 DEPEND=">=sys-libs/ncurses-5.2-r2"
@@ -111,7 +111,7 @@ src_install() {
 	dosym bash /bin/sh
 	dosym bash /bin/rbash
 
-	use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
+	use elibc_uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
 
 	insinto /etc/bash
 	doins ${FILESDIR}/bashrc
diff --git a/app-shells/bash/bash-3.0-r7.ebuild b/app-shells/bash/bash-3.0-r7.ebuild
index 62539a818090..8c13850ee046 100644
--- a/app-shells/bash/bash-3.0-r7.ebuild
+++ b/app-shells/bash/bash-3.0-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/app-shells/bash/bash-3.0-r7.ebuild,v 1.5 2005/05/14 18:55:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r7.ebuild,v 1.6 2005/05/30 02:32:07 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/bash/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build uclibc"
+IUSE="nls build"
 
 # we link statically with ncurses
 DEPEND=">=sys-libs/ncurses-5.2-r2"
@@ -120,7 +120,7 @@ src_install() {
 	dosym bash /bin/sh
 	dosym bash /bin/rbash
 
-	use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
+	use elibc_uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
 
 	insinto /etc/bash
 	doins ${FILESDIR}/bashrc
diff --git a/app-shells/bash/bash-3.0-r8.ebuild b/app-shells/bash/bash-3.0-r8.ebuild
index 5c5f42ec72b2..1c37019e75b5 100644
--- a/app-shells/bash/bash-3.0-r8.ebuild
+++ b/app-shells/bash/bash-3.0-r8.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/app-shells/bash/bash-3.0-r8.ebuild,v 1.2 2005/05/14 18:55:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r8.ebuild,v 1.3 2005/05/30 02:32:07 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/bash/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build uclibc"
+IUSE="nls build"
 
 # we link statically with ncurses
 DEPEND=">=sys-libs/ncurses-5.2-r2"
@@ -117,7 +117,7 @@ src_install() {
 	dosym bash /bin/sh
 	dosym bash /bin/rbash
 
-	use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
+	use elibc_uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
 
 	insinto /etc/bash
 	doins ${FILESDIR}/bashrc