remove dead curses sed, make sure we force bash to build against curses, and fixup static linking where appropriate

(Portage version: 2.1_pre6-r6)

6 files changed, 12 insertions, 40 deletions

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 \