Make sure we statically link with ncurses #51901 and turn on emake since it seems to work fine for me.

4 files changed, 18 insertions, 10 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 2fc1448df87a..fe35255159f5 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.49 2004/08/18 16:39:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.50 2004/09/08 14:54:50 vapier Exp $
+
+  08 Sep 2004; Mike Frysinger <vapier@gentoo.org> bash-2.05b-r10.ebuild,
+  bash-2.05b-r9.ebuild, bash-3.0-r5.ebuild:
+  Make sure we statically link with ncurses #51901 and turn on emake since it
+  seems to work fine for me.
 
 *bash-3.0-r5 (18 Aug 2004)
 
diff --git a/app-shells/bash/bash-2.05b-r10.ebuild b/app-shells/bash/bash-2.05b-r10.ebuild
index c0617e08a9dc..f12744f53707 100644
--- a/app-shells/bash/bash-2.05b-r10.ebuild
+++ b/app-shells/bash/bash-2.05b-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r10.ebuild,v 1.3 2004/08/19 22:08:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r10.ebuild,v 1.4 2004/09/08 14:54:50 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -87,8 +87,9 @@ src_compile() {
 		--with-curses \
 		--without-gnu-malloc \
 		${myconf} || die
-
-	make || die
+	# Make sure we always link statically with ncurses
+	sed -i "/^TERMCAP_LIB/s:-lcurses:${ROOT}/usr/lib/libcurses.a:" Makefile || die "sed failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-2.05b-r9.ebuild b/app-shells/bash/bash-2.05b-r9.ebuild
index a55e159715b0..2949f11de237 100644
--- a/app-shells/bash/bash-2.05b-r9.ebuild
+++ b/app-shells/bash/bash-2.05b-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r9.ebuild,v 1.18 2004/08/19 22:08:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r9.ebuild,v 1.19 2004/09/08 14:54:50 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -85,8 +85,9 @@ src_compile() {
 		--with-curses \
 		--without-gnu-malloc \
 		${myconf} || die
-
-	make || die
+	# Make sure we always link statically with ncurses
+	sed -i "/^TERMCAP_LIB/s:-lcurses:${ROOT}/usr/lib/libcurses.a:" Makefile || die "sed failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.0-r5.ebuild b/app-shells/bash/bash-3.0-r5.ebuild
index e64dd1ff1562..929ab1eef9bc 100644
--- a/app-shells/bash/bash-3.0-r5.ebuild
+++ b/app-shells/bash/bash-3.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r5.ebuild,v 1.2 2004/08/19 22:08:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r5.ebuild,v 1.3 2004/09/08 14:54:50 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -117,8 +117,9 @@ src_compile() {
 		--with-curses \
 		--without-gnu-malloc \
 		${myconf} || die
-
-	make || die
+	# Make sure we always link statically with ncurses
+	sed -i "/^TERMCAP_LIB/s:-lcurses:${ROOT}/usr/lib/libcurses.a:" Makefile || die "sed failed"
+	emake || die "make failed"
 }
 
 src_install() {