Version bump.

Package-Manager: portage-2.1.2.5

4 files changed, 138 insertions, 22 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 12286e07db27..a924e5ee8616 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.90 2007/04/24 14:45:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.91 2007/05/02 05:40:16 vapier Exp $
+
+*readline-5.2_p4 (02 May 2007)
+
+  02 May 2007; Mike Frysinger <vapier@gentoo.org> +readline-5.2_p4.ebuild:
+  Version bump.
 
   24 Apr 2007; Raúl Porcel <armin76@gentoo.org> readline-5.2_p2.ebuild:
   ia64 + x86 stable
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 97c6d3db07bb..a31ee19a711b 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -73,6 +73,8 @@ DIST readline51-003 707 RMD160 73d81615e92c8f6f6a4155af571361863014c5df SHA1 fba
 DIST readline51-004 2400 RMD160 a1089571a8104ae5ba9d2c36eb600c09654a3d05 SHA1 7295f43a42d112f2de935150d7c0cb2fd3fceece SHA256 ddb050c0161c9ccdabb84c75287fc8cc76791d096ebfb3e4bdc72f531d8551d1
 DIST readline52-001 874 RMD160 0cedb82ccc4709e6b39e6cb95143131259b0e7c5 SHA1 8de77c2de3926893cbf2688912768bed48a2456b SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5
 DIST readline52-002 1433 RMD160 c9bbff4b1ba2ff77e5a43ad98a94f4753e5f0aa3 SHA1 db5baf0129357ba9397dfcd24e9f6db0abdcbc7a SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78
+DIST readline52-003 1204 RMD160 4007b1dcd19d204f6ce75fe5a60a5c780f221a12 SHA1 7a879ce1ccb10ad65c34d3eeced9f4b79ac68434 SHA256 2a55d2ecb1c9b0147aeb193a6323616ab31c1c525a83b2db3a994b15594ba934
+DIST readline52-004 2192 RMD160 7c8ef28a2d4fb6054aa84e0abfbdff0d446c0c90 SHA1 00f91e9784e2c74415bccff8cad4604424c4d470 SHA256 a03b65633781efa7c3aae5d57162985e7b7a3c10acf0f2621be610e16f27e5f2
 EBUILD readline-4.3-r5.ebuild 2407 RMD160 53b927f67615b21bd45b5e7c2d3733135e61f57c SHA1 2f4976717d0b98c1b5ccbe155fa3d73c9e906c08 SHA256 6169be62dbe8b3f6700173ed5322e7f9bb088d153dcfbd8a83e42d052512419b
 MD5 2bbd6bd627571922b0572ffa8912b6c0 readline-4.3-r5.ebuild 2407
 RMD160 53b927f67615b21bd45b5e7c2d3733135e61f57c readline-4.3-r5.ebuild 2407
@@ -85,22 +87,18 @@ EBUILD readline-5.1_p4.ebuild 2843 RMD160 73f664f17cce86600c9d6211892cad1ba986b1
 MD5 9871c88930fc2efb69ebe12eb9d4c495 readline-5.1_p4.ebuild 2843
 RMD160 73f664f17cce86600c9d6211892cad1ba986b1d1 readline-5.1_p4.ebuild 2843
 SHA256 b2931bb6faad9386ab0ac45b0936c7f327c639cbee2b9060ac3266d71f761cad readline-5.1_p4.ebuild 2843
-EBUILD readline-5.2.ebuild 2718 RMD160 e8a359a939b64d5e8c4ad621380d06c5723a0a3a SHA1 74483ca8d590a6b301547ddd5829a9e0f663013a SHA256 de62ec0e7a15cbd480127163bcd5a31e22e3706d622a06e89ec778490fcfa3a2
-MD5 a1ae584697e22593952ca193f7d52142 readline-5.2.ebuild 2718
-RMD160 e8a359a939b64d5e8c4ad621380d06c5723a0a3a readline-5.2.ebuild 2718
-SHA256 de62ec0e7a15cbd480127163bcd5a31e22e3706d622a06e89ec778490fcfa3a2 readline-5.2.ebuild 2718
-EBUILD readline-5.2_p1.ebuild 2761 RMD160 c1106068c061748d455ea1e831888fd74b99c050 SHA1 fbc45bc3393a559a5824b486695ea0dc356e26d6 SHA256 f8aa60309dad3df2ed3805cd4cd90c2d18d37763fa2ba0281c75efd3e203acdb
-MD5 75c31424e3fe4917cbfbb86fdb57a065 readline-5.2_p1.ebuild 2761
-RMD160 c1106068c061748d455ea1e831888fd74b99c050 readline-5.2_p1.ebuild 2761
-SHA256 f8aa60309dad3df2ed3805cd4cd90c2d18d37763fa2ba0281c75efd3e203acdb readline-5.2_p1.ebuild 2761
 EBUILD readline-5.2_p2.ebuild 2754 RMD160 edd0a4318dbd01c2a864935b9c4603af36027407 SHA1 532a231d91756e32d3ae42649ad8d9799598e72b SHA256 d490357d34e8965d14fcb063f8f32fdf7fd36e2f7e0472e4b1faa6a59e3dc86a
 MD5 88f8b68a80d0d602e861110ef03fb991 readline-5.2_p2.ebuild 2754
 RMD160 edd0a4318dbd01c2a864935b9c4603af36027407 readline-5.2_p2.ebuild 2754
 SHA256 d490357d34e8965d14fcb063f8f32fdf7fd36e2f7e0472e4b1faa6a59e3dc86a readline-5.2_p2.ebuild 2754
-MISC ChangeLog 11935 RMD160 fd852b46327ad1ffa471b867faa198ba0654575e SHA1 8a4387aa0e417dc68256b2401ddc50dfee10fe28 SHA256 2afa965f3f410d33084b8ca3aacc3132320db91b90b564cfa7683a80b9c603cd
-MD5 41c3851552c9b151a518930384924a4e ChangeLog 11935
-RMD160 fd852b46327ad1ffa471b867faa198ba0654575e ChangeLog 11935
-SHA256 2afa965f3f410d33084b8ca3aacc3132320db91b90b564cfa7683a80b9c603cd ChangeLog 11935
+EBUILD readline-5.2_p4.ebuild 2760 RMD160 d00a8685084059a70c1da58f85caf92372018257 SHA1 be9c8335b8050a1220f32055aad12194dae350eb SHA256 88845869477f962683e5659bdd424f6f9fbc13fae2a091288a8ddb4e0a3e3b82
+MD5 231f0e587c6e3f54e66bfed1098ba52b readline-5.2_p4.ebuild 2760
+RMD160 d00a8685084059a70c1da58f85caf92372018257 readline-5.2_p4.ebuild 2760
+SHA256 88845869477f962683e5659bdd424f6f9fbc13fae2a091288a8ddb4e0a3e3b82 readline-5.2_p4.ebuild 2760
+MISC ChangeLog 12058 RMD160 cd37e0acf6dd9abbdf72701b1ca26b58c3581b91 SHA1 42f2adc15123c178cee768bb05c80f2a3153c8c9 SHA256 6a2edd19d62aeb853d2c95f59db2113365653e6c62daa3157e3815c33f40255f
+MD5 f396bc3445752fe0d5c029d47ae1053c ChangeLog 12058
+RMD160 cd37e0acf6dd9abbdf72701b1ca26b58c3581b91 ChangeLog 12058
+SHA256 6a2edd19d62aeb853d2c95f59db2113365653e6c62daa3157e3815c33f40255f ChangeLog 12058
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -114,19 +112,16 @@ SHA256 e128619affbcad7ed89ba33873b79f9930cd14f6bf66b4574099e132a5f9f4e1 files/di
 MD5 cda18a0530ca1ea373731ab0dcb3ff26 files/digest-readline-5.1_p4 1106
 RMD160 9cec95c8cbb1b49704bde6f584f5c2a1b586d1f8 files/digest-readline-5.1_p4 1106
 SHA256 aae06807afa77c78b9d2e7e6c2de279d5d56fb2cbbce09a5694853f6078edc6c files/digest-readline-5.1_p4 1106
-MD5 ab4a328b53974164c922ecb2dd6e21db files/digest-readline-5.2 241
-RMD160 be18ee0872a60935d5d656e950fb21276ffc4042 files/digest-readline-5.2 241
-SHA256 d0a1f4592f1031c163cf2edf7a36627eae40de1971b89a9fd998f3850752d075 files/digest-readline-5.2 241
-MD5 4486107870b7834bebcb7c4dbd05d265 files/digest-readline-5.2_p1 455
-RMD160 ea5ec5ab739b6d3a4a962099b57749e57d0a2691 files/digest-readline-5.2_p1 455
-SHA256 c205562f5dbadc44dfe9349f3c796faf84fc063b10acac2be007a2d17129fd0a files/digest-readline-5.2_p1 455
 MD5 8e6bbeb2bfaad8219efcf26916179b41 files/digest-readline-5.2_p2 672
 RMD160 241a25444a19607b7ce49468da6e390b80011d6e files/digest-readline-5.2_p2 672
 SHA256 defebbf9ee76b13efab92b8ccafd517ad04dd007594594c4eefdbc1abae15e7e files/digest-readline-5.2_p2 672
+MD5 61fc2c20838b7b14af0f58bb0969491b files/digest-readline-5.2_p4 1106
+RMD160 1a578cd8b1af0a20dcc1302d4726d24b5c044fe4 files/digest-readline-5.2_p4 1106
+SHA256 bead2e4967c1694d7e11a7cf159885a75276363eb4df3ac95d6cadf05545ff3f files/digest-readline-5.2_p4 1106
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGOCMP8bi6rjpTunYRAiKPAJ0R/NwXKEHfuDuYH/emgN5O5aU44QCeOKGE
-8YoOpYu9brTnrsqf3sSURmk=
-=8ro5
+iD4DBQFGOCRN8bi6rjpTunYRAtafAJjvsKK6YV3TNaJa8uqGwiCzNFzJAJ42kTAe
+Tsr1heZYk/wv5/7T0vMNng==
+=gYT4
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/digest-readline-5.2_p4 b/sys-libs/readline/files/digest-readline-5.2_p4
new file mode 100644
index 000000000000..9ce8adc28ae9
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-5.2_p4
@@ -0,0 +1,15 @@
+MD5 e39331f32ad14009b9ff49cc10c5e751 readline-5.2.tar.gz 2037705
+RMD160 983cbb25192e0a376b80cb2428fe8ee254a041c7 readline-5.2.tar.gz 2037705
+SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 readline-5.2.tar.gz 2037705
+MD5 9d4d41622aa9b230c57f68548ce87d8f readline52-001 874
+RMD160 0cedb82ccc4709e6b39e6cb95143131259b0e7c5 readline52-001 874
+SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5 readline52-001 874
+MD5 f03e512d14206e37f7d6a748b56b9476 readline52-002 1433
+RMD160 c9bbff4b1ba2ff77e5a43ad98a94f4753e5f0aa3 readline52-002 1433
+SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78 readline52-002 1433
+MD5 252b42d8750f1a94b6bdf086612dceb2 readline52-003 1204
+RMD160 4007b1dcd19d204f6ce75fe5a60a5c780f221a12 readline52-003 1204
+SHA256 2a55d2ecb1c9b0147aeb193a6323616ab31c1c525a83b2db3a994b15594ba934 readline52-003 1204
+MD5 a32333c2e603a3ed250514e91050e552 readline52-004 2192
+RMD160 7c8ef28a2d4fb6054aa84e0abfbdff0d446c0c90 readline52-004 2192
+SHA256 a03b65633781efa7c3aae5d57162985e7b7a3c10acf0f2621be610e16f27e5f2 readline52-004 2192
diff --git a/sys-libs/readline/readline-5.2_p4.ebuild b/sys-libs/readline/readline-5.2_p4.ebuild
new file mode 100644
index 000000000000..83927e290ea7
--- /dev/null
+++ b/sys-libs/readline/readline-5.2_p4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p4.ebuild,v 1.1 2007/05/02 05:40:16 vapier Exp $
+
+inherit eutils multilib toolchain-funcs flag-o-matic
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/readline/${MY_P}.tar.gz
+	$(for ((i=1; i<=PLEVEL; i++)); do
+		printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \
+			${MY_PV} ${MY_PV/\.} ${i}
+		printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \
+			${MY_PV} ${MY_PV/\.} ${i}
+	done)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+# We must be certain that we have a bash that is linked
+# to its internal readline, else we may get problems.
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-2.05b-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	cd "${S}"
+	# Official patches
+	local i
+	for ((i=1; i<=PLEVEL; i++)); do
+		epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
+	done
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	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
+
+	ln -s ../.. examples/rlfe/readline
+
+	# force ncurses linking #71420
+	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+}
+
+src_compile() {
+	append-flags -D_GNU_SOURCE
+
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
+	emake || die
+
+	if ! tc-is-cross-compiler; then
+		cd examples/rlfe
+		econf || die
+		emake || die "make rlfe failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodir /$(get_libdir)
+
+	if ! use userland_Darwin ; then
+		mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+		chmod a+rx "${D}"/$(get_libdir)/*.so*
+
+		# Bug #4411
+		gen_usr_ldscript libreadline.so
+		gen_usr_ldscript libhistory.so
+	fi
+
+	if ! tc-is-cross-compiler; then
+		dobin examples/rlfe/rlfe || die
+	fi
+
+	dodoc CHANGELOG CHANGES README USAGE NEWS
+	docinto ps
+	dodoc doc/*.ps
+	dohtml -r doc
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4
+}