summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-11-24 15:25:27 +0000
committerMike Frysinger <vapier@gentoo.org>2004-11-24 15:25:27 +0000
commit9fe882e7bbca02394118417c01e186ff4d7cf8a9 (patch)
tree4c8deb8219d3954167dd53222370cee224b002e8 /sys-libs
parentReally add the fix in 0.91-r1 :) Thanks to Enrique D. Bosch <presidev@presi.... (diff)
downloadgentoo-2-9fe882e7bbca02394118417c01e186ff4d7cf8a9.tar.gz
gentoo-2-9fe882e7bbca02394118417c01e186ff4d7cf8a9.tar.bz2
gentoo-2-9fe882e7bbca02394118417c01e186ff4d7cf8a9.zip
Force ncurses linking #71420.
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog5
-rw-r--r--sys-libs/readline/readline-5.0-r1.ebuild15
2 files changed, 12 insertions, 8 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index f77b559bf849..1be656f96caa 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/readline
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.39 2004/09/30 19:38:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.40 2004/11/24 15:25:27 vapier Exp $
+
+ 24 Nov 2004; Mike Frysinger <vapier@gentoo.org> readline-5.0-r1.ebuild:
+ Force ncurses linking #71420.
30 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> readline-4.3-r5.ebuild:
Stable on sparc
diff --git a/sys-libs/readline/readline-5.0-r1.ebuild b/sys-libs/readline/readline-5.0-r1.ebuild
index 75d3ffc5a885..91e5a3fcf336 100644
--- a/sys-libs/readline/readline-5.0-r1.ebuild
+++ b/sys-libs/readline/readline-5.0-r1.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/sys-libs/readline/readline-5.0-r1.ebuild,v 1.3 2004/11/12 14:51:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r1.ebuild,v 1.4 2004/11/24 15:25:27 vapier Exp $
inherit eutils gnuconfig
@@ -19,20 +19,21 @@ IUSE=""
# We must be certain that we have a bash that is linked
# to its internal readline, else we may get problems.
-DEPEND=">=app-shells/bash-2.05b-r2
- >=sys-libs/ncurses-5.2-r2"
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+ >=app-shells/bash-2.05b-r2"
src_unpack() {
unpack ${P}.tar.gz
cd ${S}
- for x in ${PLEVEL//x}
- do
+ for x in ${PLEVEL//x} ; do
epatch ${DISTDIR}/${PN}${PV/\.}-${x}
done
-
epatch ${FILESDIR}/bash-3.0-etc-inputrc.patch
- gnuconfig_update
+
+ # force ncurses linking #71420
+ sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
}
src_compile() {