7 files changed, 33 insertions, 61 deletions
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 81cc66e9bde3..62e693f4be30 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -4,24 +4,24 @@ Hash: SHA1
 MD5 384e607b4aa95075829ab0ff6105fdfd ChangeLog 18088
 RMD160 3571016cc85de2a94224b0e032e77263f0239d43 ChangeLog 18088
 SHA256 6987a1f38e0d61488e51f1667e433e0c28b415f4e78d163dbc0b1c466ebf68c7 ChangeLog 18088
-MD5 c603fe9ef8881f067c762b9a9e82c1d0 bash-2.05b-r11.ebuild 3512
-RMD160 2b8cd1d36c4108fbe0dc2e74f5d65f0992a0ec8d bash-2.05b-r11.ebuild 3512
-SHA256 ab4086a4a8930c48d72415071c4632b3fbe15722372b3089a09ee73cca4d3e11 bash-2.05b-r11.ebuild 3512
-MD5 2b263efe797fa87a7b590450f8b493cc bash-3.0-r12.ebuild 5404
-RMD160 ecf7be72900b5e9297e88405542433b85d7f59db bash-3.0-r12.ebuild 5404
-SHA256 b7fc88ba43e903d4516502b43782bb628433ac95993e5f4d1b648237cae04f67 bash-3.0-r12.ebuild 5404
-MD5 849dd23191a1dcb973f877b78606776d bash-3.0-r13.ebuild 4953
-RMD160 436a804fce8344c424ebbd601a7b4a051c0ea9ad bash-3.0-r13.ebuild 4953
-SHA256 0fc9a6412228f7bb0e8cf30f3f9991cdcd980b998de45336607e366800a81079 bash-3.0-r13.ebuild 4953
-MD5 03d8b9cfbce98de82d0b8879409b747b bash-3.0-r14.ebuild 4837
-RMD160 bfe4df76783354525948a3269e3cf0911f37fe8b bash-3.0-r14.ebuild 4837
-SHA256 308ac39dfee3b6401633067d0a0550d8b5881e93af2be98dcadb0b3184e92cb6 bash-3.0-r14.ebuild 4837
-MD5 eb20d214de0aebadcd2a174f827eb947 bash-3.1_p11.ebuild 4564
-RMD160 f4447a783599610c4bfa83c63765f0eb91ec6e21 bash-3.1_p11.ebuild 4564
-SHA256 a45a930b1dbc323e238b7ed6dade187af4117854bff6b4995f37bef43295f2c1 bash-3.1_p11.ebuild 4564
-MD5 74407c1f64be2da95f1ddaf3ce2b6ffc bash-3.1_p14.ebuild 4564
-RMD160 04f2fa8cc0bd108ab59b61af7014f16e232343ae bash-3.1_p14.ebuild 4564
-SHA256 3b1fc00d28dac37b60756c5cd1f4b2d630600fc720ca1a252d7fee5b0587ec11 bash-3.1_p14.ebuild 4564
+MD5 1b20b4f87ce25d15dad8e6333d4fd716 bash-2.05b-r11.ebuild 3408
+RMD160 67bd104beb601e5cbf46d13bcd61e0b28c7590dc bash-2.05b-r11.ebuild 3408
+SHA256 672433e5a5364a9ea5dd226936e95af752a972be152a885b7141757ed1cdf8a6 bash-2.05b-r11.ebuild 3408
+MD5 16754b03572d3f626d6afa2e1103e619 bash-3.0-r12.ebuild 5073
+RMD160 e825d8fae56773f0d6e8c3b53607e81a0ffbe843 bash-3.0-r12.ebuild 5073
+SHA256 4a64aa8607399de48692f502d392955582c4846351b7142c005be6849d8d0437 bash-3.0-r12.ebuild 5073
+MD5 2410e998db269d50d993310e079fc641 bash-3.0-r13.ebuild 4622
+RMD160 036795930fd08edc08c62557859f75c55307292c bash-3.0-r13.ebuild 4622
+SHA256 88e087af5739bc84e112ec079d1fa0b70c3c0b7951c2a34499d2d1c393da695d bash-3.0-r13.ebuild 4622
+MD5 b9e9d65af4b321ef366f64f47bc5a37d bash-3.0-r14.ebuild 4733
+RMD160 05cb9f38faa1c321dcf03f52f959e459a69265f6 bash-3.0-r14.ebuild 4733
+SHA256 158a757431cdd4fdc8fc265aeea0e594f1a10c47b65d5f6a4634a8394b60a4df bash-3.0-r14.ebuild 4733
+MD5 17cbe15d4bbd4904f332e4cacfe516be bash-3.1_p11.ebuild 4460
+RMD160 e0ac6af0dc30e30b64b2881bbc794cb4790865fe bash-3.1_p11.ebuild 4460
+SHA256 f09944bb0b0068d6ea6d72e6d45dcf32561c61579ef84097bf131715293f7482 bash-3.1_p11.ebuild 4460
+MD5 f16df21165ce2f77b80481ddc762c92b bash-3.1_p14.ebuild 4460
+RMD160 3595e8bdc4ce899eb342946f512a8498f8f7ccc7 bash-3.1_p14.ebuild 4460
+SHA256 fccdce9f378da4a29810feccbbf5c0f116702f6d2034b5ef9085fdf1bb2c5fe9 bash-3.1_p14.ebuild 4460
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 files/bash-2.05b-empty-herestring.patch 836
 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae files/bash-2.05b-empty-herestring.patch 836
@@ -190,7 +190,7 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEIi5D2+ySkm8kpY0RAt/BAKCgieB7ZaOWW0QTX0194Uq2Ey8R/gCfQNY4
-uzR7xBve+iO0BBiKgMisC24=
-=epya
+iD8DBQFEIypq2+ySkm8kpY0RAte2AKDDEDgo2RJNCwCAaXkBACJBVBAptQCgg0Ya
+y9kD6QRJ1W9UfYF9R19bEjc=
+=lYLl
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-2.05b-r11.ebuild b/app-shells/bash/bash-2.05b-r11.ebuild
index ad010961e84c..17a37c3b8f78 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-2006 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.10 2006/03/23 05:11:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r11.ebuild,v 1.11 2006/03/23 23:07:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -64,8 +64,6 @@ src_unpack() {
 	# side - although reproduceble with later 2.4 kernels, it is
 	# especially easy with 2.6 kernels.
 	echo '#define PGRP_PIPE 1' >> config-bot.h
-
-	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
 }
 
 src_compile() {
@@ -88,7 +86,6 @@ src_compile() {
 
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses
-	export bash_cv_termcap_lib=libcurses
 	myconf="${myconf} --with-curses"
 
 	econf \
diff --git a/app-shells/bash/bash-3.0-r12.ebuild b/app-shells/bash/bash-3.0-r12.ebuild
index e94f236b5fe1..761c75d90ac9 100644
--- a/app-shells/bash/bash-3.0-r12.ebuild
+++ b/app-shells/bash/bash-3.0-r12.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/app-shells/bash/bash-3.0-r12.ebuild,v 1.7 2006/03/08 01:21:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r12.ebuild,v 1.8 2006/03/23 23:07:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -91,8 +91,6 @@ src_unpack() {
 	# side - although reproduceble with later 2.4 kernels, it is
 	# especially easy with 2.6 kernels.
 	echo '#define PGRP_PIPE 1' >> config-bot.h
-
-	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
 }
 
 src_compile() {
@@ -113,20 +111,14 @@ src_compile() {
 	#use static && export LDFLAGS="${LDFLAGS} -static"
 	use nls || myconf="${myconf} --disable-nls"
 
-	echo 'int main(){}' > "${T}"/term-test.c
-	if ! $(tc-getCC) -static -lncurses "${T}"/term-test.c 2> /dev/null ; then
-		export bash_cv_termcap_lib=gnutermcap
-	else
-		export bash_cv_termcap_lib=libcurses
-		myconf="${myconf} --with-curses"
-	fi
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses
+	myconf="${myconf} --with-curses"
 
 	econf \
 		--disable-profiling \
 		--without-gnu-malloc \
 		${myconf} || die
-	# Make sure we always link statically with ncurses
-	sed -i "/^TERMCAP_LIB/s:-lncurses:-Wl,-Bstatic -lncurses -Wl,-Bdynamic:" Makefile || die "sed failed"
 	emake -j1 || die "make failed"  # see bug 102426
 }
 
diff --git a/app-shells/bash/bash-3.0-r13.ebuild b/app-shells/bash/bash-3.0-r13.ebuild
index d3136dcc13c6..a00517904f53 100644
--- a/app-shells/bash/bash-3.0-r13.ebuild
+++ b/app-shells/bash/bash-3.0-r13.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/app-shells/bash/bash-3.0-r13.ebuild,v 1.3 2006/03/08 01:21:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r13.ebuild,v 1.4 2006/03/23 23:07:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -83,8 +83,6 @@ src_unpack() {
 	# Add strnlen function for non-glibc systems, as one of Fedora's patches
 	# requires it.
 	epatch "${FILESDIR}"/${P}-strnlen.patch
-
-	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
 }
 
 src_compile() {
@@ -105,21 +103,15 @@ src_compile() {
 	#use static && export LDFLAGS="${LDFLAGS} -static"
 	use nls || myconf="${myconf} --disable-nls"
 
-	echo 'int main(){}' > "${T}"/term-test.c
-	if ! $(tc-getCC) -static -lncurses "${T}"/term-test.c 2> /dev/null ; then
-		export bash_cv_termcap_lib=gnutermcap
-	else
-		export bash_cv_termcap_lib=libcurses
-		myconf="${myconf} --with-curses"
-	fi
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses
+	myconf="${myconf} --with-curses"
 
 	econf \
 		$(use_with afs) \
 		--disable-profiling \
 		--without-gnu-malloc \
 		${myconf} || die
-	# Make sure we always link statically with ncurses
-	sed -i "/^TERMCAP_LIB/s:-lncurses:-Wl,-Bstatic -lncurses -Wl,-Bdynamic:" Makefile || die "sed failed"
 	emake -j1 || die "make failed"  # see bug 102426
 }
 
diff --git a/app-shells/bash/bash-3.0-r14.ebuild b/app-shells/bash/bash-3.0-r14.ebuild
index 10242c4e9777..0576d9beae3c 100644
--- a/app-shells/bash/bash-3.0-r14.ebuild
+++ b/app-shells/bash/bash-3.0-r14.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/app-shells/bash/bash-3.0-r14.ebuild,v 1.3 2006/03/08 01:21:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r14.ebuild,v 1.4 2006/03/23 23:07:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -84,8 +84,6 @@ src_unpack() {
 	# Add strnlen function for non-glibc systems, as one of Fedora's patches
 	# requires it.
 	epatch "${FILESDIR}"/${P}-strnlen.patch
-
-	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
 }
 
 src_compile() {
@@ -107,7 +105,6 @@ src_compile() {
 
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses
-	export bash_cv_termcap_lib=libcurses
 	myconf="${myconf} --with-curses"
 
 	econf \
diff --git a/app-shells/bash/bash-3.1_p11.ebuild b/app-shells/bash/bash-3.1_p11.ebuild
index 7336aa745bf6..d8a0801b103f 100644
--- a/app-shells/bash/bash-3.1_p11.ebuild
+++ b/app-shells/bash/bash-3.1_p11.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/app-shells/bash/bash-3.1_p11.ebuild,v 1.4 2006/03/14 02:27:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p11.ebuild,v 1.5 2006/03/23 23:07:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -78,8 +78,6 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
-
-	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
 }
 
 src_compile() {
@@ -101,7 +99,6 @@ src_compile() {
 
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses
-	export bash_cv_termcap_lib=libcurses
 	myconf="${myconf} --with-curses"
 
 	econf \
diff --git a/app-shells/bash/bash-3.1_p14.ebuild b/app-shells/bash/bash-3.1_p14.ebuild
index d256bf02d6fb..fdb3cde688a9 100644
--- a/app-shells/bash/bash-3.1_p14.ebuild
+++ b/app-shells/bash/bash-3.1_p14.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/app-shells/bash/bash-3.1_p14.ebuild,v 1.1 2006/03/21 00:57:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p14.ebuild,v 1.2 2006/03/23 23:07:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -78,8 +78,6 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
-
-	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
 }
 
 src_compile() {
@@ -101,7 +99,6 @@ src_compile() {
 
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses
-	export bash_cv_termcap_lib=libcurses
 	myconf="${myconf} --with-curses"
 
 	econf \