4 files changed, 102 insertions, 5 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index f9abece6ca6d..c36d3f8dc901 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.52 2005/12/20 01:26:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.53 2005/12/21 11:21:55 agriffis Exp $
+
+*readline-5.1-r2 (21 Dec 2005)
+
+  21 Dec 2005; Aron Griffis <agriffis@gentoo.org> +readline-5.1-r2.ebuild:
+  Install rlfe from the examples directory
 
 *readline-5.1-r1 (20 Dec 2005)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 1a472e4cffa1..c3b781c7fac2 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,12 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e52d66e186ada1dd34efb410f7456d47 ChangeLog 7808
+MD5 397e61fa71b5cd362c40e73bd5e9fcba ChangeLog 7961
 MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
 MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
 MD5 a0e38a462831e1a0e4e8871bc0c25fea files/digest-readline-5.1-r1 65
+MD5 a0e38a462831e1a0e4e8871bc0c25fea files/digest-readline-5.1-r2 65
 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
 MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461
 MD5 6fea6318a26be7b6186ba83c42fb0d75 files/readline-5.0-del-backspace-policy.patch 1074
@@ -21,10 +22,11 @@ MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764
 MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
 MD5 d33ebebef248a79c288c6b1dce06b0ee readline-5.0-r2.ebuild 2778
 MD5 dc0b48946bb4117622f73bb9a1bb3000 readline-5.1-r1.ebuild 2467
+MD5 e871b866cee3e3f49291cf4ad3d8ee04 readline-5.1-r2.ebuild 2543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDp13t2+ySkm8kpY0RAu4wAJ9Xdu/g6nhbOqLpTI8/zLNL67kbOACeJloC
-y4J7B7Km0EmU0r8nPO8NvI0=
-=/M6I
+iD8DBQFDqTroJrHF4yAQTrARAioBAJ4j5vUA/p7ILeKuLHHiL7sj6YmO2QCfVYIO
+wrmtt7eEsQ3Uq8KYHeexjRM=
+=7rIu
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/digest-readline-5.1-r2 b/sys-libs/readline/files/digest-readline-5.1-r2
new file mode 100644
index 000000000000..69fda4e3389b
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-5.1-r2
@@ -0,0 +1 @@
+MD5 7ee5a692db88b30ca48927a13fd60e46 readline-5.1.tar.gz 2030276
diff --git a/sys-libs/readline/readline-5.1-r2.ebuild b/sys-libs/readline/readline-5.1-r2.ebuild
new file mode 100644
index 000000000000..69c6703dd2a8
--- /dev/null
+++ b/sys-libs/readline/readline-5.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.1 2005/12/21 11:21:55 agriffis Exp $
+
+inherit eutils multilib
+
+# Official patches
+PLEVEL=""
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/readline/${P}.tar.gz
+	${PLEVEL//x/mirror://gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+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"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}"
+	for x in ${PLEVEL//x} ; do
+		epatch "${DISTDIR}"/${PN}${PV/\.}-${x}
+	done
+	epatch "${FILESDIR}"/bash-3.0-etc-inputrc.patch
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${P}-cleanups.patch
+	epatch "${FILESDIR}"/${P}-callback-segv.patch #115326
+
+	# force ncurses linking #71420
+	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+}
+
+src_compile() {
+	# 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
+
+	cd examples/rlfe
+	econf
+	emake || die
+}
+
+src_install() {
+	make 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
+
+	dobin examples/rlfe/rlfe || die
+
+	dodoc CHANGELOG CHANGES README USAGE NEWS
+	docinto ps
+	dodoc doc/*.ps
+	dohtml -r doc
+}
+
+pkg_preinst() {
+	# Backwards compatibility #29865
+	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
+		cp -pPR "${ROOT}"/$(get_libdir)/libreadline.so.4* "${D}"/$(get_libdir)/
+		touch "${D}"/$(get_libdir)/libreadline.so.4*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ]] ; then
+		ewarn "Your old readline libraries have been copied over."
+		ewarn "You should run 'revdep-rebuild --soname libreadline.so.4' asap."
+		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
+	fi
+}