Link against the local readline #151174 by Javier Armendariz.

Package-Manager: portage-2.1.2_pre2-r5

4 files changed, 43 insertions, 11 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 673b9824bb85..f6a45e8ed9bb 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.83 2006/10/13 10:59:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.84 2006/10/13 20:55:17 vapier Exp $
+
+  13 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-5.2-rlfe-build.patch, readline-5.2.ebuild:
+  Link against the local readline #151174 by Javier Armendariz.
 
   13 Oct 2006; Roy Marples <uberlord@gentoo.org>
   +files/readline-5.1-fbsd-pic.patch, readline-5.1_p4.ebuild,
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 0f09b1e78eba..5b1bc61ae091 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
 MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 files/bash-3.0-etc-inputrc.patch 1443
@@ -46,6 +49,10 @@ AUX readline-5.1-rlfe-uclibc.patch 1694 RMD160 715127465c03df7329f23b1a12aece800
 MD5 ae8aaec6f366e3f675d626b157c8cffd files/readline-5.1-rlfe-uclibc.patch 1694
 RMD160 715127465c03df7329f23b1a12aece8001aca96c files/readline-5.1-rlfe-uclibc.patch 1694
 SHA256 8045b4a37c1a3b19171fe4192161af46188223bdd61ab5e32561593f9c89270e files/readline-5.1-rlfe-uclibc.patch 1694
+AUX readline-5.2-rlfe-build.patch 350 RMD160 b6563fbd50795759543f3294c1bf93a9e485cf7b SHA1 de2c1a03e054bdc94c641ff943d2677fb0542d58 SHA256 2a6e8890363b367e4df890c4d4c1afa30437712fbdae98d8f04b7baed3b4c58c
+MD5 9cefb7a0d9c781706561dc4c359d6885 files/readline-5.2-rlfe-build.patch 350
+RMD160 b6563fbd50795759543f3294c1bf93a9e485cf7b files/readline-5.2-rlfe-build.patch 350
+SHA256 2a6e8890363b367e4df890c4d4c1afa30437712fbdae98d8f04b7baed3b4c58c files/readline-5.2-rlfe-build.patch 350
 DIST readline-4.3.tar.gz 961662 RMD160 07aebeb250284d0ef68acf44d1c1ff8578e2ae2f SHA1 4e226fd5f6f919707f11b9e28d47b5487448895d SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.0.tar.gz 1808946 RMD160 17b38d5cafab6dbc663aba4fbba5a2e282bb4876 SHA1 9b9959c3f62e3e82d3edd604c0bf6124d5256c9e SHA256 d19e4f820da653b94262b0e5cdeda45f474c2d7b378a85a4b9aeaae76269a611
 DIST readline-5.1.tar.gz 2030276 RMD160 e7e755bcde7a38740dd0ef6fc10d66614b74ea21 SHA1 4b2ee2bc9c6dd1d238c84a58f7e6db173600b850 SHA256 163ec6407ec75a709c9077657b1fca9314cc74999d57d1c35ab185702bb067c6
@@ -76,14 +83,14 @@ EBUILD readline-5.1_p4.ebuild 3205 RMD160 d2ccaf733b7556f393b193ad3ab771c0ea9824
 MD5 c05c4cb568f4e8ff616c9a5eb21bc4b0 readline-5.1_p4.ebuild 3205
 RMD160 d2ccaf733b7556f393b193ad3ab771c0ea982443 readline-5.1_p4.ebuild 3205
 SHA256 e36995d22ee0b5f5f5fa5c9dc1b0bc4b4506b34ce64c154690cf2899977723a1 readline-5.1_p4.ebuild 3205
-EBUILD readline-5.2.ebuild 3082 RMD160 78dea4e9b4f1e0d94a16062eebd27e408be4f9a4 SHA1 7a8da4715f8db6834fc693a07b3a1ae97a0a8766 SHA256 e7fabeca7b58d2919f63b8b9600ad3d7781096141923260e7e814adffe4e6166
-MD5 f76e4fccc78435aa84af4c7cc669c918 readline-5.2.ebuild 3082
-RMD160 78dea4e9b4f1e0d94a16062eebd27e408be4f9a4 readline-5.2.ebuild 3082
-SHA256 e7fabeca7b58d2919f63b8b9600ad3d7781096141923260e7e814adffe4e6166 readline-5.2.ebuild 3082
-MISC ChangeLog 10978 RMD160 8135eb07a8f7fbe7e2d47f457923f08649093196 SHA1 f4aba9a662389e59df28203b99f9d647cded3537 SHA256 a4f5db2b72e00304e505ed4c3eafe6be464fda396761a0b5578d5e838cd11ad3
-MD5 b5914c5c31bbb1a77a87f6ce00819498 ChangeLog 10978
-RMD160 8135eb07a8f7fbe7e2d47f457923f08649093196 ChangeLog 10978
-SHA256 a4f5db2b72e00304e505ed4c3eafe6be464fda396761a0b5578d5e838cd11ad3 ChangeLog 10978
+EBUILD readline-5.2.ebuild 3079 RMD160 3996da55080811ef8b97e88f6b2264b1ac46db03 SHA1 038ab8cec8474eb4d56d75981ac5416e8a8c3a14 SHA256 238d3ccb166824066fb84acd9f5549d1a80459c8125a20eab866327f0eea6ba8
+MD5 91b88f54e6d5166a5490c0288177058d readline-5.2.ebuild 3079
+RMD160 3996da55080811ef8b97e88f6b2264b1ac46db03 readline-5.2.ebuild 3079
+SHA256 238d3ccb166824066fb84acd9f5549d1a80459c8125a20eab866327f0eea6ba8 readline-5.2.ebuild 3079
+MISC ChangeLog 11152 RMD160 a2cf1562774267830fe8a0f9165bf75ad415cd11 SHA1 b97fe8e709fc7f06c0fadf488cab758147c8a8a4 SHA256 123e05f62d165d7467fdf63201f889275abdeb3eb034a21ca53a8e0b3e7ae395
+MD5 603de3adf27772c54aa6a512d0e40852 ChangeLog 11152
+RMD160 a2cf1562774267830fe8a0f9165bf75ad415cd11 ChangeLog 11152
+SHA256 123e05f62d165d7467fdf63201f889275abdeb3eb034a21ca53a8e0b3e7ae395 ChangeLog 11152
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -100,3 +107,10 @@ SHA256 aae06807afa77c78b9d2e7e6c2de279d5d56fb2cbbce09a5694853f6078edc6c files/di
 MD5 ab4a328b53974164c922ecb2dd6e21db files/digest-readline-5.2 241
 RMD160 be18ee0872a60935d5d656e950fb21276ffc4042 files/digest-readline-5.2 241
 SHA256 d0a1f4592f1031c163cf2edf7a36627eae40de1971b89a9fd998f3850752d075 files/digest-readline-5.2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFL/1QamhnQswr0vIRAi7zAKClYRTIhXkpa/zWZanWH+lJ2xVAIACgite9
+ja4/qyEyK2LSApO94dnguRQ=
+=QZBo
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-5.2-rlfe-build.patch b/sys-libs/readline/files/readline-5.2-rlfe-build.patch
new file mode 100644
index 000000000000..9ad0b2d53f5c
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.2-rlfe-build.patch
@@ -0,0 +1,14 @@
+make sure we link with the current build readline rather than
+the system installed one
+
+--- examples/rlfe/Makefile.in
++++ examples/rlfe/Makefile.in
+@@ -22,7 +22,7 @@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ #LDFLAGS = -L$(READLINE_DIR)
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -Lreadline
+ LIBS = -lreadline -lhistory -lncurses @LIBS@
+ 
+ CPP=@CPP@
diff --git a/sys-libs/readline/readline-5.2.ebuild b/sys-libs/readline/readline-5.2.ebuild
index ac7deb3c9fc0..d9a4b67416b5 100644
--- a/sys-libs/readline/readline-5.2.ebuild
+++ b/sys-libs/readline/readline-5.2.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/sys-libs/readline/readline-5.2.ebuild,v 1.2 2006/10/13 10:59:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2.ebuild,v 1.3 2006/10/13 20:55:17 vapier Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -43,7 +43,7 @@ src_unpack() {
 		epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
 	done
 	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	#epatch "${FILESDIR}"/${PN}-5.1-rlfe-build.patch #116483
+	epatch "${FILESDIR}"/${PN}-5.2-rlfe-build.patch #151174
 	epatch "${FILESDIR}"/${PN}-5.1-rlfe-uclibc.patch
 	epatch "${FILESDIR}"/${PN}-5.1-fbsd-pic.patch