Version bump.

Package-Manager: portage-2.1.2_rc3

4 files changed, 131 insertions, 5 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 84d733a20529..cb9bb726c850 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.85 2006/10/17 06:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.86 2006/12/16 03:07:46 vapier Exp $
+
+*readline-5.2_p1 (16 Dec 2006)
+
+  16 Dec 2006; Mike Frysinger <vapier@gentoo.org> +readline-5.2_p1.ebuild:
+  Version bump.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> readline-5.1_p4.ebuild,
   readline-5.2.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 339d75e0784b..7bdc67275bb4 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -68,6 +68,7 @@ DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d
 DIST readline51-002 1149 RMD160 3eb4a80089d23f05d76f702952f0dbb7ef3ba24d SHA1 fbaf6fcd10cdf1282b0a0401225ed8056d09a960 SHA256 61b560d4a8e5e3b99a2911a46c0d4c4916f5d0ff61723b21c64cc7c0d59dfd35
 DIST readline51-003 707 RMD160 73d81615e92c8f6f6a4155af571361863014c5df SHA1 fba03ba37b6d9bbc6a612ec602ab1ff6d3038fc2 SHA256 939ea5fb84ff519ae50b9c2749f441a59af9f97ed0bf8fc0981af612ea720160
 DIST readline51-004 2400 RMD160 a1089571a8104ae5ba9d2c36eb600c09654a3d05 SHA1 7295f43a42d112f2de935150d7c0cb2fd3fceece SHA256 ddb050c0161c9ccdabb84c75287fc8cc76791d096ebfb3e4bdc72f531d8551d1
+DIST readline52-001 874 RMD160 0cedb82ccc4709e6b39e6cb95143131259b0e7c5 SHA1 8de77c2de3926893cbf2688912768bed48a2456b SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5
 EBUILD readline-4.3-r5.ebuild 2765 RMD160 86b1d664f52ea5861923e7d72cbee59f5c119c48 SHA1 456f10b7b93f1735f5d9b324e99b97cac3ac2866 SHA256 802200062c819b1dd93e9c33141157b4ca7207ef7dfa997c6b7696a70d93f511
 MD5 f57994b50a6ef31969945eef6dfa6a80 readline-4.3-r5.ebuild 2765
 RMD160 86b1d664f52ea5861923e7d72cbee59f5c119c48 readline-4.3-r5.ebuild 2765
@@ -84,10 +85,14 @@ EBUILD readline-5.2.ebuild 3093 RMD160 c90913a469769fbb4abc21588bba5ca354129804
 MD5 1e0990dbfb38ffe6bea1ef6558788b28 readline-5.2.ebuild 3093
 RMD160 c90913a469769fbb4abc21588bba5ca354129804 readline-5.2.ebuild 3093
 SHA256 cc67cfff6cefc658393eb145fc51398ec08ac7700de2b9cd4255f86baae51987 readline-5.2.ebuild 3093
-MISC ChangeLog 11280 RMD160 0af05dee1c7be6e594523e23f23d86bbc85bca48 SHA1 8f4ab465480b32200c4e2b29f8853920a98d477f SHA256 8ecec2cfb1c2ddc480d910e17583415864d252429896b7a5126aaca63454cd5a
-MD5 411bfab34297bca1c70e1ab1bb1cd37b ChangeLog 11280
-RMD160 0af05dee1c7be6e594523e23f23d86bbc85bca48 ChangeLog 11280
-SHA256 8ecec2cfb1c2ddc480d910e17583415864d252429896b7a5126aaca63454cd5a ChangeLog 11280
+EBUILD readline-5.2_p1.ebuild 3091 RMD160 de690f3880f5cc3678373371ab8a7d3a83f8e08c SHA1 e5afe490d9a6205097f225c161ad5bf3d7430ff8 SHA256 cf45da01401ad642d035153d34ef2c1654c5d7465a581f1a26575147c83e0c03
+MD5 3bfdc2c82959f0143ffc0efd04a15bd5 readline-5.2_p1.ebuild 3091
+RMD160 de690f3880f5cc3678373371ab8a7d3a83f8e08c readline-5.2_p1.ebuild 3091
+SHA256 cf45da01401ad642d035153d34ef2c1654c5d7465a581f1a26575147c83e0c03 readline-5.2_p1.ebuild 3091
+MISC ChangeLog 11402 RMD160 6d94bc87636a58d19ef45c850bdb66fc179c99e6 SHA1 e85e59c2bdf23d20df724b78fe3f1125fb55dcd8 SHA256 9e5e4e050520f2af01cbbf9e36ca86f8f45c1eefb1c11562f4ce60fc718e0bbe
+MD5 ff0f4b6de7239274e411ec3c66c75736 ChangeLog 11402
+RMD160 6d94bc87636a58d19ef45c850bdb66fc179c99e6 ChangeLog 11402
+SHA256 9e5e4e050520f2af01cbbf9e36ca86f8f45c1eefb1c11562f4ce60fc718e0bbe ChangeLog 11402
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -104,3 +109,6 @@ SHA256 aae06807afa77c78b9d2e7e6c2de279d5d56fb2cbbce09a5694853f6078edc6c files/di
 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
diff --git a/sys-libs/readline/files/digest-readline-5.2_p1 b/sys-libs/readline/files/digest-readline-5.2_p1
new file mode 100644
index 000000000000..ab0f584a83ca
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-5.2_p1
@@ -0,0 +1,6 @@
+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
diff --git a/sys-libs/readline/readline-5.2_p1.ebuild b/sys-libs/readline/readline-5.2_p1.ebuild
new file mode 100644
index 000000000000..5da52f163e5c
--- /dev/null
+++ b/sys-libs/readline/readline-5.2_p1.ebuild
@@ -0,0 +1,107 @@
+# 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.2_p1.ebuild,v 1.1 2006/12/16 03:07:46 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 ~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() {
+	# 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
+}