3 files changed, 119 insertions, 2 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 65f9e5c0ac78..660c23ccdffb 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.127 2009/02/24 08:57:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.128 2009/05/17 21:06:48 vapier Exp $
+
+*readline-6.0_p3 (17 May 2009)
+
+  17 May 2009; Mike Frysinger <vapier@gentoo.org> +readline-6.0_p3.ebuild:
+  Version bump #270170 by Lars Wendler.
 
   24 Feb 2009; Joshua Kinard <kumba@gentoo.org> readline-6.0.ebuild:
   Skip the rlfe bits if doing cross-compiling.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index ee3d14314903..c9f8a7e42b85 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
 AUX readline-5.0-darwin.patch 461 RMD160 43c4f4af91ab61d05dfb1561f3bbf68f2eb2c88a SHA1 9c971543144248c883db953c6547f520f61cfb83 SHA256 449a7cc02ca053511dff11d29481ff40e76eb9a3ac0b3f0e119fe4501d06587e
 AUX readline-5.0-del-backspace-policy.patch 1074 RMD160 785fc7768f3a017a56e9119f25fece1f58490275 SHA1 376d47bfefb1a9da8c908e2e5e07b2fa273bb142 SHA256 d607c4b902a838662df132badc7ea8a38cc041c0c9b224b34ffd28cf6a43fe7b
@@ -45,10 +48,21 @@ DIST readline52-010 1543 RMD160 545ad0c5c5d87bfd5971a4d12b47bd75ad2f195f SHA1 98
 DIST readline52-011 886 RMD160 96f9ae01b83cbca082956b0c7f88679483f32728 SHA1 d2d4cbaf85c7db1708a810fbb368e000ad81c18d SHA256 08ad3384ab0906e6fa4cc417eb8c43ff59375bcead15fd5c8e31730f0413b3d6
 DIST readline52-012 3870 RMD160 cf6ca8ced10d2e1a6cddefeb7871820f01c1f552 SHA1 3322f98db5845f40ae8e16ca1eb7e0e230bc5b8e SHA256 20f0243be2299c23213492cc2c19cfd15cc528d2b566a76a2de58306bb9e4c9e
 DIST readline52-013 5147 RMD160 a9d06dc1bef660882b5cff82728a8cd5bea47ff0 SHA1 fc4831d8f4dacd33293016fa6c5c84a13ac1c7e5 SHA256 0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060ad30ebe98144d5
+DIST readline60-001 2428 RMD160 df7512fcd5d75a0d345c6d23a12669123df5e418 SHA1 32bba5b3ecf00d461c0a365505501f76ff7a96a5 SHA256 9190e23f877e22e4ac7044772fa4b6f05e8116c3ad223a99cca85952bbb678f1
+DIST readline60-002 1369 RMD160 d1e9e7d6bdb53b11348a1502335a715733130415 SHA1 8e6f714e087ef9579814055cba2f9142b0b31b33 SHA256 749ac881832967db2458f027a6ca8586db4767e7e0d0e1fd09b86887be1c0c1c
+DIST readline60-003 1970 RMD160 9c6276146a6358d87bdf86ce0d1b9eb8e3a4a2e6 SHA1 f1ffdd3ad847272ce37de17494bca1a895ad1a02 SHA256 523c9bee365edce4ce051c33b157c7f340a695c69756eb998c0c0ae29dd29abf
 EBUILD readline-4.3_p5.ebuild 1729 RMD160 48f13ee68538f8f28e196b14dfaeba57d0c56ffe SHA1 85a93c67c7570f01ed204b9792222d70bd2d3270 SHA256 f4233d79f15277edf6321c781997d04d435d15c1a99b06d2e979d751db92dcf1
 EBUILD readline-5.0-r2.ebuild 2425 RMD160 76e46f0270a9e6f3c35365062ffd55f9ec9266ea SHA1 9b6c5bdbba268712a483f3099010ebd438ba1c56 SHA256 26f7b110e6c4cf106877f735cc10a2dca5312f95d5b7063d61e6e74dd4f0de53
 EBUILD readline-5.1_p4.ebuild 2801 RMD160 93031c30d6014333ce909240ca2acee4440f6833 SHA1 4764bb18084786f1674d85d4924f890582662722 SHA256 14b489d5603af47ba0d42a5dfdd807747ecdca198b1f53df44fd6d506e5dc851
 EBUILD readline-5.2_p13.ebuild 2730 RMD160 4b1c83ad3d87b97736f57cd6b2fe7fd556b474a6 SHA1 e47ce0cc60f83336995d305bae118fc960559cb8 SHA256 0efebbffeb7ade4fd1244a5a455a19eb51328640a90298420ec3ee85872ff5fb
 EBUILD readline-6.0.ebuild 2559 RMD160 136e085e20fe7d31e85e622f36966f7026eca181 SHA1 cadf748051225d12cec18aa7ea1aa1fb5b0e2b9f SHA256 cebdcbffb7a73c8465e958eb945b278780e23ddc5cbef3b7a02cbdb28b549a63
-MISC ChangeLog 16288 RMD160 21b1d1061647305fab09120d88e65dcb5881af2f SHA1 1303d968e398dbf3f782c439b1c5b58a7c5aafcd SHA256 9d62b1e1779ead39e83dcb5f1b6ac187f6c7edb92090c8d1f507b340a825212e
+EBUILD readline-6.0_p3.ebuild 2562 RMD160 c693533ab7ba2653e9844c6c1d319b75d269316b SHA1 f729355dec6835b6e20fee79e368c5df65a69386 SHA256 1699e201698fde7768aa53250eb726d5b02fcfd0422a06eb54c84aa632198777
+MISC ChangeLog 16437 RMD160 5bcc860c43492531cfaaefa2d95ac73c37f75588 SHA1 57915c9592a28bba9e085b059a0bf4b3eae5f260 SHA256 084af4cb414c265d9da9650b2aa317e4e6be7d4fb0f61a1bd4e40e8db36fe372
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoQfG4ACgkQn/5bYzqsSmHN2wCeJoGOXgAVzuC3hekmYOXIOCEO
+1kcAnjffNcDGzO8U6Mm0IB1H9f+nFJ3/
+=oAXS
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.0_p3.ebuild b/sys-libs/readline/readline-6.0_p3.ebuild
new file mode 100644
index 000000000000..8c866e8cafe0
--- /dev/null
+++ b/sys-libs/readline/readline-6.0_p3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p3.ebuild,v 1.1 2009/05/17 21:06:48 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_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-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}"
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.0-rlfe-build.patch #151174
+	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"
+
+	# the bundled rlfe had its configure.in updated, but no one actually
+	# ran autoconf to have the configure file updated
+	ln -s ../.. examples/rlfe/readline
+	cd examples/rlfe
+	eautoconf
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+
+	econf --with-curses || die
+	emake || die
+
+	if ! tc-is-cross-compiler ; then
+		cd examples/rlfe
+		append-ldflags -Lreadline
+		econf || die
+		emake || die "make rlfe failed"
+	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}
+}