3 files changed, 124 insertions, 2 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index a6dbd4729ecc..1e3f3d6214be 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.150 2010/03/12 18:14:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.151 2010/03/23 02:23:01 vapier Exp $
+
+*readline-6.1_p2 (23 Mar 2010)
+
+  23 Mar 2010; Mike Frysinger <vapier@gentoo.org> +readline-6.1_p2.ebuild:
+  Version bump.
 
   12 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   readline-6.0_p4.ebuild, readline-6.1.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 53a235d3285b..23fc40f22bbd 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX readline-5.0-no_rpath.patch 363 RMD160 6a4ea25da4f683a77892a24f904de873579270fd SHA1 6e5e24e7965cd71abc8b09897de74b766a85461e SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
 AUX readline-6.0-rlfe-build.patch 743 RMD160 49ddd8e98588ea3efbd2c8fd613e27fa52d70b95 SHA1 29e6ca942db168919973d79a0f11e0c9b88268ac SHA256 3a084fe0c976355031b2b7a467b60489e4d26d5d4c443b69f102e55fa8ca4f2b
@@ -28,9 +31,19 @@ DIST readline60-001 2428 RMD160 df7512fcd5d75a0d345c6d23a12669123df5e418 SHA1 32
 DIST readline60-002 1369 RMD160 d1e9e7d6bdb53b11348a1502335a715733130415 SHA1 8e6f714e087ef9579814055cba2f9142b0b31b33 SHA256 749ac881832967db2458f027a6ca8586db4767e7e0d0e1fd09b86887be1c0c1c
 DIST readline60-003 1970 RMD160 9c6276146a6358d87bdf86ce0d1b9eb8e3a4a2e6 SHA1 f1ffdd3ad847272ce37de17494bca1a895ad1a02 SHA256 523c9bee365edce4ce051c33b157c7f340a695c69756eb998c0c0ae29dd29abf
 DIST readline60-004 1840 RMD160 b03c01243ea3653cd5b7307c2546aae110603b60 SHA1 4fb45252521e063776bef3aecd874a524fc9c4f8 SHA256 f5cbb02ad37e682f0876d454a07bc2b4ad433a4b0f9f096893454bec1af3eafb
+DIST readline61-001 1631 RMD160 b3c9c350089e2fc19c217b14e6058004fda7c5cb SHA1 b0bfd7a6693674b915995e6dd513bfdceed98946 SHA256 9adbc791c0b76d4f161623ad9e4a5938d763bf4067d59d180312d620d7c94dde
+DIST readline61-002 1177 RMD160 2a049b121df86c3a5234b5ca4953cf17b65c4ab3 SHA1 5af24e7f33d80b4a588f77153ef7df8d9c043380 SHA256 a19519cd56bf3c55d2ce226b70bae1a962ff0f40e2478d090dd12b6624c23d62
 EBUILD readline-4.3_p5.ebuild 1591 RMD160 d689f7d568d7e3b1115fbf89daf7c8840d801fa1 SHA1 6277a967c3304b2bbc54d2dac5b98d03cb539a68 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a
 EBUILD readline-5.2_p14.ebuild 1905 RMD160 292c4388861f43c7cbbb7f5eda9bb3afc5ef90e1 SHA1 c5ceb9f28c7f9a480881275919200671d4233ab5 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259
 EBUILD readline-6.0_p4.ebuild 2931 RMD160 c893cb5a03b9073002868967a3e4a8884f2f0865 SHA1 3e9b72d63131c8faec2c360b4408cc13692d4b08 SHA256 76f31753e9c5dc2892600982a98dd2757a9aae725cf306d926051a7f68d096e9
 EBUILD readline-6.1.ebuild 2766 RMD160 c1c2658faed9795d3273ef9f129b30453a537e21 SHA1 aa458bb786517eae4f011585ba5ecee4fda56c77 SHA256 da324ab29d702db0314262be2daf20e40017904a2f3d08ff9786097e1cceda29
-MISC ChangeLog 19137 RMD160 c80d9722b19b3991221afc5ec2f9590734fa6d2e SHA1 f53083adf4468eae931a1d3c6e183433383173a7 SHA256 ac4432d4e2d94431b86481c9fbd89a5ca4f56a8ae2c65bb86ef392ba91befb53
+EBUILD readline-6.1_p2.ebuild 2766 RMD160 2384abecc0019378a19b98abfa85f6c875118e8c SHA1 445e5f545ce8ad70cfd608caeb8c68ad05239b31 SHA256 10a1ecdf589f3d7dad2c2657df035cb1728e429eecf86cd538ea460ea515d1a3
+MISC ChangeLog 19258 RMD160 bb882b534311cbd81d9dcf807f041908b3b21445 SHA1 70fd30a6258853d48971a6ed41181dd474a3c60c SHA256 6a590ddc5952ec36df38c24400dcc66fa3c1689089c73fb3b3f751f0d07f7e1b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkuoJgcACgkQTwhj9JtAlp5TiwD/RskM/0r4Rele4yNimdl+KjiZ
+fp3jt+c9IHcMjM7kEAAA/1/BZBHH3yV32PLepm6T2Me2LaPdL9t8ATxqLV//aaVq
+=1J7x
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.1_p2.ebuild b/sys-libs/readline/readline-6.1_p2.ebuild
new file mode 100644
index 000000000000..6a6c14de19b3
--- /dev/null
+++ b/sys-libs/readline/readline-6.1_p2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1_p2.ebuild,v 1.1 2010/03/23 02:23:01 vapier Exp $
+
+inherit autotools eutils multilib toolchain-funcs flag-o-matic
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~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}"
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
+
+	# force ncurses linking #71420
+	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline # for local readline headers
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+
+	econf --with-curses || die
+	emake || die
+
+	if ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe
+		append-ldflags -L.
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+			ln -sf ../../lib${l}.a lib${l}.a
+		done
+		econf || die
+		emake || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	gen_usr_ldscript -a readline history #4411
+
+	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,5} #29865
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
+}