Version bump.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

3 files changed, 127 insertions, 10 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 92ed8b7680f0..ab7f3b06481b 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.160 2010/05/09 17:43:31 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.161 2011/02/15 03:37:10 vapier Exp $
+
+*readline-6.2 (15 Feb 2011)
+
+  15 Feb 2011; Mike Frysinger <vapier@gentoo.org> +readline-6.2.ebuild:
+  Version bump.
 
   09 May 2010; Raúl Porcel <armin76@gentoo.org> readline-6.1.ebuild:
   alpha stable wrt #310819
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 666890be3026..76afcb00efad 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,11 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX readline-5.0-no_rpath.patch 363 RMD160 6a4ea25da4f683a77892a24f904de873579270fd SHA1 6e5e24e7965cd71abc8b09897de74b766a85461e SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
-AUX readline-6.0-rlfe-build.patch 743 RMD160 49ddd8e98588ea3efbd2c8fd613e27fa52d70b95 SHA1 29e6ca942db168919973d79a0f11e0c9b88268ac SHA256 3a084fe0c976355031b2b7a467b60489e4d26d5d4c443b69f102e55fa8ca4f2b
 AUX readline-6.1-rlfe-freebsd.patch 387 RMD160 079f61a66e3ff6e1d12f33fba49b41ad5840c5b4 SHA1 ffe93dcb95c3dc32fe8e5ad22cbf4d3a1fa2ef80 SHA256 c601fd268665a3217ecd720b266960f3182e6adcd61dbcbba8a0f8ada2a5b4d3
 DIST readline-4.3.tar.gz 961662 RMD160 07aebeb250284d0ef68acf44d1c1ff8578e2ae2f SHA1 4e226fd5f6f919707f11b9e28d47b5487448895d SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.2.tar.gz 2037705 RMD160 983cbb25192e0a376b80cb2428fe8ee254a041c7 SHA1 18f3412c73068509d5f491b7b4535aeaf9522834 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
-DIST readline-6.0.tar.gz 2270818 RMD160 9f886f437dfa3387cb3a4ce3439cefecffc2c789 SHA1 1e511b091514ef631c539552316787c75ace5262 SHA256 1199d905c025735b34cf67d03078585e18f84707052413279fe68ce48c1cc1de
 DIST readline-6.1.tar.gz 2261725 RMD160 b50f47a3952e354655056d9684b05ee65027e291 SHA1 54840a0dc907e7fa598d7ffcdcbd17bae69ace83 SHA256 f0caf608c06ccd6d56b3bee1843458d509c53f9b53dffffe07cc11d8f03fa969
+DIST readline-6.2.tar.gz 2277926 RMD160 5e7fb934e7c83cd0cd37463f7865bc257c3ea743 SHA1 a9761cd9c3da485eb354175fcc2fe35856bc43ac SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381
 DIST readline43-001 1126 RMD160 57c72678aba1dd571ac3e8e9e1ba13eecba9725e SHA1 23a75df0b127ec1e29e627471cdf5618862dc9b2 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955
 DIST readline43-002 738 RMD160 70a53adbf3cd0f6d4867d71f8d1be3b898833463 SHA1 4500d4ee9d447c6e35569bb965ecf2905aa2b11e SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226
 DIST readline43-003 2202 RMD160 951968e3e937db9f4847c128ad78b2aab20df002 SHA1 e68ff498502ab28ec12826c97fdc87249f0af874 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b
@@ -25,16 +27,19 @@ DIST readline52-011 886 RMD160 96f9ae01b83cbca082956b0c7f88679483f32728 SHA1 d2d
 DIST readline52-012 3870 RMD160 cf6ca8ced10d2e1a6cddefeb7871820f01c1f552 SHA1 3322f98db5845f40ae8e16ca1eb7e0e230bc5b8e SHA256 20f0243be2299c23213492cc2c19cfd15cc528d2b566a76a2de58306bb9e4c9e
 DIST readline52-013 5147 RMD160 a9d06dc1bef660882b5cff82728a8cd5bea47ff0 SHA1 fc4831d8f4dacd33293016fa6c5c84a13ac1c7e5 SHA256 0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060ad30ebe98144d5
 DIST readline52-014 1244 RMD160 ba23d53375546d95b7fed2641409722a964ec0f5 SHA1 b8c356d24cd300fbc65685e7a2273220a32fd458 SHA256 6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817
-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
-DIST readline60-004 1840 RMD160 b03c01243ea3653cd5b7307c2546aae110603b60 SHA1 4fb45252521e063776bef3aecd874a524fc9c4f8 SHA256 f5cbb02ad37e682f0876d454a07bc2b4ad433a4b0f9f096893454bec1af3eafb
 DIST readline61-001 1631 RMD160 b3c9c350089e2fc19c217b14e6058004fda7c5cb SHA1 b0bfd7a6693674b915995e6dd513bfdceed98946 SHA256 9adbc791c0b76d4f161623ad9e4a5938d763bf4067d59d180312d620d7c94dde
 DIST readline61-002 1177 RMD160 2a049b121df86c3a5234b5ca4953cf17b65c4ab3 SHA1 5af24e7f33d80b4a588f77153ef7df8d9c043380 SHA256 a19519cd56bf3c55d2ce226b70bae1a962ff0f40e2478d090dd12b6624c23d62
 EBUILD readline-4.3_p5.ebuild 1591 RMD160 d689f7d568d7e3b1115fbf89daf7c8840d801fa1 SHA1 6277a967c3304b2bbc54d2dac5b98d03cb539a68 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a
 EBUILD readline-5.2_p14.ebuild 1905 RMD160 292c4388861f43c7cbbb7f5eda9bb3afc5ef90e1 SHA1 c5ceb9f28c7f9a480881275919200671d4233ab5 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259
-EBUILD readline-6.0_p4.ebuild 2931 RMD160 c893cb5a03b9073002868967a3e4a8884f2f0865 SHA1 3e9b72d63131c8faec2c360b4408cc13692d4b08 SHA256 76f31753e9c5dc2892600982a98dd2757a9aae725cf306d926051a7f68d096e9
 EBUILD readline-6.1.ebuild 2753 RMD160 e3e5c5a0f3f050d2c3e6d0cdee247abb7d835285 SHA1 ceff28849214ea38e9ed345aaee9d40efc36fa77 SHA256 2a9e03b2f70ef47ce0b8d0ef774f338c2a9c1f037c8b1435b83e32c4bc3fbf9c
 EBUILD readline-6.1_p2.ebuild 2828 RMD160 8076605fe4ac9ecc9a68accb5377b5652cd73895 SHA1 0913705c3787ace8c57d1abb023e8afb81c3024c SHA256 2262f19f1df464b69948333f228cee1c0f792569709a65d3d3a255bef3c6de02
-MISC ChangeLog 20255 RMD160 49c7eb6a9d51252c13981ff759f44677968fd5fa SHA1 344653d5476d43e5acbf8c969215bbadd2b6b7ea SHA256 2ce47dc650b47ab74dd519dd7850c32cd1c60f053cce712d18672adfb57193d2
+EBUILD readline-6.2.ebuild 2955 RMD160 ed5cc8ee108604191e667131a4330074637773eb SHA1 950fee9ec5abf89b9e521294a1b052aec2dae983 SHA256 bfc0e3eb33d6061e013dffb4892c5e6859b65c04609ca9661ca28052a2fed4c0
+MISC ChangeLog 20372 RMD160 8218169bc440a060092d1532fca3b2fe9756286b SHA1 f15983869c4f11c1e41bca11c15d36d2fd828e6d SHA256 4101ca96e713942ae8ec5c7ebfc753f1846f94838e1bc03b6540856464ae49f9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1Z9OsACgkQaC/OocHi7Jap2AD+KEjsDY/KhCLZy3OjTXVoXVCL
+f42zdxQOsnrwe48xoR4A/3ytpXdzr5cKyybDDn1LFSdMv4dFC8TqSH+2biGnIOYb
+=c+PK
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.2.ebuild b/sys-libs/readline/readline-6.2.ebuild
new file mode 100644
index 000000000000..8990d1a9d36f
--- /dev/null
+++ b/sys-libs/readline/readline-6.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2.ebuild,v 1.1 2011/02/15 03:37:10 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_PV=${MY_PV/_/-}
+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-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~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}-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"
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline # for local readline headers
+}
+
+src_compile() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	econf --with-curses || die
+	emake || die
+
+	if ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe
+		append-ldflags -L.
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+			ln -sf ../../lib${l}.a lib${l}.a
+		done
+		econf || die
+		emake || die
+	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}
+}