Version bump.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 142 insertions, 7 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 4a04ac13ffbf..ff1569d7071c 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # 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.70 2006/03/17 23:16:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.71 2006/03/21 00:57:34 vapier Exp $
+
+*readline-5.1_p4 (21 Mar 2006)
+
+  21 Mar 2006; Mike Frysinger <vapier@gentoo.org> +readline-5.1_p4.ebuild:
+  Version bump.
 
 *readline-5.1_p2 (17 Mar 2006)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index c344a6481a77..4304829c6d69 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ed13175abbb108240bc518d953cc8053 ChangeLog 9405
-RMD160 19d9fce9b1ae1f41eda4f45c9005e088059f0fb6 ChangeLog 9405
-SHA256 108897efe2c180554d96af7b21770288a4f9f324a44403e674c1175a8b0fab86 ChangeLog 9405
+MD5 074274e80cfbe56d38d72d9395e51920 ChangeLog 9529
+RMD160 ff6bdbb5c1f7caa77576f51dea42a5d337d2f9a1 ChangeLog 9529
+SHA256 0b907543735f84510a2def241e033c3ed2402b1e9b80b8ab03503791f615785a ChangeLog 9529
 MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 files/bash-3.0-etc-inputrc.patch 1443
 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025 files/bash-3.0-etc-inputrc.patch 1443
@@ -22,6 +22,9 @@ SHA256 edb7229211246792f9c599f577dccd1f420f8e856079cf0bda010a35ba5d79ed files/di
 MD5 a46bee7317d675994b1b0f0b123cd494 files/digest-readline-5.1_p3 889
 RMD160 c8281d76792c651cd4dd0bf72169a18ff72b4d09 files/digest-readline-5.1_p3 889
 SHA256 eb1dcab7d8727d4fe93b8cc17552f77f62927ece921bdf42e6cff4810f89e8c2 files/digest-readline-5.1_p3 889
+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 9905e333ead392447a670e0f2374651a files/macos.patch 504
 RMD160 f1d8af91c277b9bf3b3402cde93af34a015f461d files/macos.patch 504
 SHA256 d745da0aa5338e799f1fb84593395364b9966d0053db3d1a952e0367f6a61877 files/macos.patch 504
@@ -73,10 +76,13 @@ SHA256 0143009dc5aaf35562acdc380d5272005cd00dfaf280c3ac9ee88d7519052f50 readline
 MD5 ab9141593685f9aba7b825972647c47c readline-5.1_p3.ebuild 3161
 RMD160 daed35024c0a4de52173ffa39413ef91d60a46da readline-5.1_p3.ebuild 3161
 SHA256 576aed837441bf697b2db27dfa3963ce583ec1f0506409e325cee2e50163839f readline-5.1_p3.ebuild 3161
+MD5 c4bc4f044084d25b4d8b6667f67bcb36 readline-5.1_p4.ebuild 3161
+RMD160 0eac57e750ffc452d45ab5e686872a787d77d148 readline-5.1_p4.ebuild 3161
+SHA256 2355d457d84e059587337712e8e0283ccd81827897e4db38f80d07b7e571089e readline-5.1_p4.ebuild 3161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEG0PI2+ySkm8kpY0RAlrfAKC+U3xfpAnOAJVbbYd9r/RI2yS7uwCgiwz1
-NOm6tXiMGZDlyngiRUVc4Tk=
-=02BL
+iD8DBQFEH0+r2+ySkm8kpY0RAlA3AJ9W96RFx5Sja65c6ZHPh0Pf9rxjkACfWBxa
+OXjM4jkyqaArTsuAH+8Js6Q=
+=aNNy
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/digest-readline-5.1_p4 b/sys-libs/readline/files/digest-readline-5.1_p4
new file mode 100644
index 000000000000..08bde1dd87be
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-5.1_p4
@@ -0,0 +1,15 @@
+MD5 7ee5a692db88b30ca48927a13fd60e46 readline-5.1.tar.gz 2030276
+RMD160 e7e755bcde7a38740dd0ef6fc10d66614b74ea21 readline-5.1.tar.gz 2030276
+SHA256 163ec6407ec75a709c9077657b1fca9314cc74999d57d1c35ab185702bb067c6 readline-5.1.tar.gz 2030276
+MD5 63faf622820ca0828131c8b5aeac1e6a readline51-001 2042
+RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 readline51-001 2042
+SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 readline51-001 2042
+MD5 e60f96f9277f42aa2e66020b2f30e55f readline51-002 1149
+RMD160 3eb4a80089d23f05d76f702952f0dbb7ef3ba24d readline51-002 1149
+SHA256 61b560d4a8e5e3b99a2911a46c0d4c4916f5d0ff61723b21c64cc7c0d59dfd35 readline51-002 1149
+MD5 c9c488f203dbfa1a7da843a07c6c2a25 readline51-003 707
+RMD160 73d81615e92c8f6f6a4155af571361863014c5df readline51-003 707
+SHA256 939ea5fb84ff519ae50b9c2749f441a59af9f97ed0bf8fc0981af612ea720160 readline51-003 707
+MD5 1b5e14a35a781dfce8ae23389cff30c0 readline51-004 2400
+RMD160 a1089571a8104ae5ba9d2c36eb600c09654a3d05 readline51-004 2400
+SHA256 ddb050c0161c9ccdabb84c75287fc8cc76791d096ebfb3e4bdc72f531d8551d1 readline51-004 2400
diff --git a/sys-libs/readline/readline-5.1_p4.ebuild b/sys-libs/readline/readline-5.1_p4.ebuild
new file mode 100644
index 000000000000..610ac0d7bf25
--- /dev/null
+++ b/sys-libs/readline/readline-5.1_p4.ebuild
@@ -0,0 +1,109 @@
+# 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.1_p4.ebuild,v 1.1 2006/03/21 00:57:34 vapier Exp $
+
+inherit eutils multilib toolchain-funcs
+
+# 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 ~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"
+
+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}"/bash-3.0-etc-inputrc.patch
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${MY_P}-cleanups.patch
+	epatch "${FILESDIR}"/${MY_P}-rlfe-build.patch #116483
+	epatch "${FILESDIR}"/${MY_P}-rlfe-uclibc.patch
+	epatch "${FILESDIR}"/${MY_P}-rlfe-libutil.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() {
+	# 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() {
+	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
+
+	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() {
+	# 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 --library libreadline.so.4' asap."
+		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
+	fi
+}