Version bump.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 178 insertions, 5 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index a09b540c346c..fd8d1789e386 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.59 2006/01/05 11:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.60 2006/02/04 20:06:39 vapier Exp $
+
+*readline-5.1_p2 (04 Feb 2006)
+
+  04 Feb 2006; Mike Frysinger <vapier@gentoo.org> +readline-5.1_p2.ebuild:
+  Version bump.
 
   05 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/readline-5.1-rlfe-libutil.patch, readline-5.1-r2.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 1be58318b41a..6bd0b966f013 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,32 +1,82 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 339cd3c0304426278f5d21a10d0ca619 ChangeLog 8938
+MD5 d22a2229d94398cf4b084cdb4fcb543f ChangeLog 9059
+RMD160 d11cd3472dc65473b38c6bb58d81587b73169d5e ChangeLog 9059
+SHA256 5c45e45e19133cd7f4f3a5a177fc351ebc70c03689b6151e254f0f876b83dd98 ChangeLog 9059
 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
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
+RMD160 7445d3607ee8083b1e756a1fc884fb725e5df56c files/digest-readline-4.3-r5 348
+SHA256 30b69b17f7a6770c2c8d8d85f5f843a15d14c0d149c8c40f0a1ab4b3ba2432a8 files/digest-readline-4.3-r5 348
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
+RMD160 7445d3607ee8083b1e756a1fc884fb725e5df56c files/digest-readline-4.3-r6 348
+SHA256 30b69b17f7a6770c2c8d8d85f5f843a15d14c0d149c8c40f0a1ab4b3ba2432a8 files/digest-readline-4.3-r6 348
 MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
+RMD160 7983bb7f748cacf163122698f2e8c1b8a5d1d305 files/digest-readline-5.0-r2 350
+SHA256 8516d7f6f2a1143760cd7a73831978d2b13f9878069e0a2701b9779c597a2652 files/digest-readline-5.0-r2 350
 MD5 1d930552cdea6057066fcf79714f9253 files/digest-readline-5.1-r2 122
+RMD160 cf5d1366c455a15b3b74901a07a84c52b9add941 files/digest-readline-5.1-r2 122
+SHA256 34d5d18a0cf994a82c02acdebb5af3cc55cacdb7da87819d5289fbdfeaca5b70 files/digest-readline-5.1-r2 122
+MD5 899ae79419e83907ddf440269d4612c7 files/digest-readline-5.1_p2 675
+RMD160 79d095a461349da10278ec9218bceeeebef7b095 files/digest-readline-5.1_p2 675
+SHA256 edb7229211246792f9c599f577dccd1f420f8e856079cf0bda010a35ba5d79ed files/digest-readline-5.1_p2 675
 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+RMD160 f1d8af91c277b9bf3b3402cde93af34a015f461d files/macos.patch 504
+SHA256 d745da0aa5338e799f1fb84593395364b9966d0053db3d1a952e0367f6a61877 files/macos.patch 504
 MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461
+RMD160 43c4f4af91ab61d05dfb1561f3bbf68f2eb2c88a files/readline-5.0-darwin.patch 461
+SHA256 449a7cc02ca053511dff11d29481ff40e76eb9a3ac0b3f0e119fe4501d06587e files/readline-5.0-darwin.patch 461
 MD5 6fea6318a26be7b6186ba83c42fb0d75 files/readline-5.0-del-backspace-policy.patch 1074
+RMD160 785fc7768f3a017a56e9119f25fece1f58490275 files/readline-5.0-del-backspace-policy.patch 1074
+SHA256 d607c4b902a838662df132badc7ea8a38cc041c0c9b224b34ffd28cf6a43fe7b files/readline-5.0-del-backspace-policy.patch 1074
 MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
+RMD160 6a4ea25da4f683a77892a24f904de873579270fd files/readline-5.0-no_rpath.patch 363
+SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b files/readline-5.0-no_rpath.patch 363
 MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
+RMD160 7cf35cf5796d681a324573c0662f5e832c976279 files/readline-5.0-parallel.patch 849
+SHA256 38b03d28d11c5443e01b00de83cf2c789bd9b1380883bb61f59606eaa8834162 files/readline-5.0-parallel.patch 849
 MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
+RMD160 e74e661a75538b8d94156372862ba8ee240cdda7 files/readline-5.0-self-insert.patch 2463
+SHA256 fd41e508c1c08401a7e57265c0d518bbb878098916ee8a94e22c642ba84e8950 files/readline-5.0-self-insert.patch 2463
 MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
+RMD160 d737e6b923f95f3e192ffa80a146b4d29dc00436 files/readline-5.0-solaris.patch 756
+SHA256 3919ebedeabcc2d4816c1ad3eabdcad5cae02eb17780b4ffb3b2b0f8c4731f44 files/readline-5.0-solaris.patch 756
 MD5 e4ac33c0a2293b72378e00e8729c71af files/readline-5.1-cleanups.patch 3817
+RMD160 ee6773b08e8dcc7f9f03239a52bc658b9070a77c files/readline-5.1-cleanups.patch 3817
+SHA256 ee377cfa90050aad3bf47d9b9a62eaa6430c0fdf7f8780240f3ddc75730a434e files/readline-5.1-cleanups.patch 3817
 MD5 73869a19bab0f37a7ee46e377d2bac15 files/readline-5.1-rlfe-build.patch 252
+RMD160 7e9085f685b7732d0ef0ecdcc5538b7d84bb7d1f files/readline-5.1-rlfe-build.patch 252
+SHA256 45f3ac7973b5d5af4a79575fe0b6c364bb444dbbe42f43b600b1dd1d99dcac55 files/readline-5.1-rlfe-build.patch 252
 MD5 d5beb2bc88ccec6e3344a6094004e4bc files/readline-5.1-rlfe-libutil.patch 3056
+RMD160 3686693b76e73ba05c95a378abc20de61d442b5b files/readline-5.1-rlfe-libutil.patch 3056
+SHA256 8f990b4abe53f93774bcc08a67040fc39129e6b7862108869771124e56fab1e2 files/readline-5.1-rlfe-libutil.patch 3056
 MD5 acf485e32b4ff28ae6aec238c3a4581c files/readline-5.1-rlfe-uclibc.patch 308
+RMD160 faf47fc33fc8708e902becaf632543e2ee43a917 files/readline-5.1-rlfe-uclibc.patch 308
+SHA256 03e95b53d0c5b3c713d0ea6460d5cc77873c92688fb75ecb8837a18e0fe59296 files/readline-5.1-rlfe-uclibc.patch 308
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 f57994b50a6ef31969945eef6dfa6a80 readline-4.3-r5.ebuild 2765
+RMD160 86b1d664f52ea5861923e7d72cbee59f5c119c48 readline-4.3-r5.ebuild 2765
+SHA256 802200062c819b1dd93e9c33141157b4ca7207ef7dfa997c6b7696a70d93f511 readline-4.3-r5.ebuild 2765
 MD5 6af52eb762dd5c0220974c9c853181c2 readline-4.3-r6.ebuild 3091
+RMD160 c78e6e35ea10b175fabc86c694cb1ae8019c169b readline-4.3-r6.ebuild 3091
+SHA256 bd9f02f0cdcebc5a69d8f4791953dcf3fea8059d1361c855f223a931237a6db7 readline-4.3-r6.ebuild 3091
 MD5 5c962060bc5f3a5bb5935407f4fdf1a8 readline-5.0-r2.ebuild 2781
+RMD160 68667102685a9750c4b8cf5a224157d95240f5b3 readline-5.0-r2.ebuild 2781
+SHA256 d57a566a03f6a2676011d998eab1329299ec9bccc79a50eea1c4f132ffdf9891 readline-5.0-r2.ebuild 2781
 MD5 21c45284ab57e8c8b764e376fa19f880 readline-5.1-r2.ebuild 3064
+RMD160 f847c87947d7ef4bc8058b06c2860b388f5620da readline-5.1-r2.ebuild 3064
+SHA256 e026a51254d49d156682a380633177575df53d42ce093702dbf570fbffb24c4e readline-5.1-r2.ebuild 3064
+MD5 e85e1fec7dcb0d6b9a7b64ab939a3fc1 readline-5.1_p2.ebuild 3161
+RMD160 f7597c8ad1264b96449dfdc3f9e70ede5eb3d4d4 readline-5.1_p2.ebuild 3161
+SHA256 ad1fa972a90beb3102f4f2c4c435c6a3d366fddb3e833202e24ea237f402dbb8 readline-5.1_p2.ebuild 3161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDvQEKAiZjviIA2XgRApSaAKCM59HLqu+SeYNvdNwWc3/sA9TSxgCgy1oG
-UIefKvWEsHb1gS+dQV+Ccxk=
-=hX6f
+iD8DBQFD5Qld2+ySkm8kpY0RAi8jAKCZvMq9gaYoc9+2yuCoMvbicwKp2ACfTBuE
+99FpEOtGgVQfABMu4zkO1pM=
+=Ah3U
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/digest-readline-5.1_p2 b/sys-libs/readline/files/digest-readline-5.1_p2
new file mode 100644
index 000000000000..5f3ee530055d
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-5.1_p2
@@ -0,0 +1,9 @@
+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
diff --git a/sys-libs/readline/readline-5.1_p2.ebuild b/sys-libs/readline/readline-5.1_p2.ebuild
new file mode 100644
index 000000000000..ee9d80713185
--- /dev/null
+++ b/sys-libs/readline/readline-5.1_p2.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_p2.ebuild,v 1.1 2006/02/04 20:06:39 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
+}