Force ncurses linking #71420.

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index f77b559bf849216203f87ee33fef9c97bd927343..1be656f96caa71b6a22befcb1c2caf9e931c1e02 100644 (file)
--- 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/Manifest b/sys-libs/readline/Manifest
index 6e8bb5b93f0f922b64a6350358c5fba6ed6c7083..db29550428f5266fe03de8ce7e85ccd5cda321bc 100644 (file)
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1f8cdb8cd648a420456a67b62b64cc14 ChangeLog 6058
+MD5 8fcec7bb18f5ade784804f499392aaa9 ChangeLog 6163
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 9035c99b0bc9d15f2d17273f3041c645 readline-4.3-r5.ebuild 2642
 MD5 0bc2f5a9e2a444057779d18e8034e25b readline-4.3-r6.ebuild 3176
-MD5 a18156032a69aa4be85b8682fd867ded readline-5.0-r1.ebuild 2273
+MD5 bb1cede45efdbca8c1b14d6c21d15009 readline-5.0-r1.ebuild 2391
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
@@ -14,7 +14,7 @@ MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r1 350
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBm3BWHTu7gpaalycRAuK5AJ9gb/guz0fCvgA8Ss4CYVHPDKkfAwCcCrOq
-bNYekyxW08OOnhQLLAx9sbo=
-=F5+8
+iD8DBQFBpKf0HTu7gpaalycRAuilAKCjFZRRKg1xYILKlrg+jawwyJD7LwCg7J6T
+kWc+Y9ZE2tPSqr5fRgJ+1SU=
+=VAGy
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/readline/readline-5.0-r1.ebuild b/sys-libs/readline/readline-5.0-r1.ebuild
index 75d3ffc5a88568c38ea48c71578af651e42ecec8..91e5a3fcf336bc15702003b8364e1e0bc7f82a11 100644 (file)
--- 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() {