Version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 174 insertions, 15 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 014357032b2c..c79945740200 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.192 2014/01/20 06:34:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.193 2014/02/27 10:08:13 polynomial-c Exp $
+
+*readline-6.3 (27 Feb 2014)
+
+  27 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> +readline-6.3.ebuild:
+  Version bump.
 
   20 Jan 2014; Mike Frysinger <vapier@gentoo.org> readline-6.2_p5-r1.ebuild:
   Depend on virtual/pkgconfig for ncurses needs #498586 by palme3000.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 44c90678bc06..a28399ac4338 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -7,6 +7,7 @@ AUX readline-6.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87ba
 DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
+DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda
 DIST readline43-001 1126 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955
 DIST readline43-002 738 SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226
 DIST readline43-003 2202 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b
@@ -35,22 +36,23 @@ EBUILD readline-4.3_p5.ebuild 1591 SHA256 a0f153f8c647359666a214d47647514853a17c
 EBUILD readline-5.2_p14.ebuild 1905 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259 SHA512 1ad3ccb540e9a50c5bcc6e37689b6534371d4038db57cefb826eb112cf8a28ac1b647cead266dbf5b13a14b0da541a4a3e42343ac67461eefae5670adfec947f WHIRLPOOL 9a72cccb826deffed24f144ec1aeceb3b2c5194a0f072bffba1de42eba0708931d9eb75482847316803796ddc6afa5bd0ca1ce71edd4aef0fc0d2cecc9be1a30
 EBUILD readline-6.2_p1.ebuild 2805 SHA256 b28b3345767cee1fa6f78e2f1298ba6c823c71ffa6dc3e21cc0b21bd561b54ad SHA512 811078d180819d329a84a69b00d6c5e99871b5e15ece17aca2797672a319c8dfbdfd55048ed4d2a1993562d51945dff08bc3d5635abb5f38c2f142c41037aae6 WHIRLPOOL 4b13d886ce70682ecd4fcc46fc3a1a8750e7b6d29c945383e1cb6a3eeed2e0d71d04810adfbf58f39aa1033c5ac642035e7c3c271860022f8712914f4dfba800
 EBUILD readline-6.2_p5-r1.ebuild 4153 SHA256 348c738565c1c46c4d426fce7f905309f0459eb62f6220bd1b0c9980af9ba935 SHA512 b51c64f0941c7ec760c113fa4cf2e9d7c67f278f1ba00c4de213e830c2144d3d01a2b51e85d60ee073f2dcfb213def427e579c58a73f8b7753b77eb9a3c4f304 WHIRLPOOL c24800b8a64a73e6fe215d835b8f7062562dcb05fabd673b7f5da5a03078c69e1cd6f194bac9d7524be28cdda6bf4cb944cccb982d361fc637f7bfd594afebdb
-MISC ChangeLog 24672 SHA256 3a638b0f27be3ba1cc7df7434d29b2fc336d0ef4bf2fa117955f6c75694ea1fa SHA512 4f09a12de8373414fdbbb7c9869477ca6b918317a03e6958fbaa5682f41e406ebe4323e3cfd07112fb311025088aa8ff84d7c740dd4a7772331da4f725fe6577 WHIRLPOOL 344654051ed21383c2edb0e4e084554b30563e414cdc4f641ee1cd2eefd6c4501efee3d509576d24d493639ae98451a058a2fa9b767e75b1e86188a4de292f1f
+EBUILD readline-6.3.ebuild 4083 SHA256 fcf25aeae7125b5cb7fbfbbb3ce6b355d7fdbc7e139fe317c10a07e1d7b94699 SHA512 0643fe877eb8f372d2a8bddc0517b747a055bcc0b35bddba0d086c64a3b3c1f9aa7b1c9c590079ac7aebcaa9e35c211849a5765629d050e32eee07ef8adfd214 WHIRLPOOL d3ad1ee1d999653955209a5e777b3b7850a53aab8044c1f4bdf159fa781b3a8727fe3a63d9c411950eeee50c21afc1bd9f31569f9c0590b93884832e6d499e3c
+MISC ChangeLog 24800 SHA256 a3c58c8dc87e6582db6d13a1fe42784d9411e2718f51f26aae6f9fb439e60367 SHA512 f114dd4db2173fd8a9bbbbe644824c95e86b19a41d0ca9d84b512fb9e3c2ca8ae0b00ac4eb671d36c4a56e2e678a2c9f67e7c0be7b4246417e05cd2e96003272 WHIRLPOOL 9bad639fa4c21760f54843b87f2f38cfcb194550ee6cd652d59e758d995c0f37847fe2838d2854eb10121d3f13e74db59f2dc584908df87c576d81e2da035b38
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3MOFAAoJEPGu1DbS6WIAm5gP/3bQgj7axE2i7S/yWczBobDJ
-OUw3v0Ns8SfF8Ox0gzlpinkfl3fVuVaJBtYisw9K0s1UTd/cWK4OVP3CRy+99ZAj
-JH/tcjShdaGheYKEAzd+7ZidBqCm7IWmSZESQeXDM/akiH0swM2bjknIiym1HSyg
-gZFrO5JiRNed5K6u4EY3y8HTU1K+kLJvKVSm2DxZfriLoxgjT+FmqKFvKoP7QVPb
-uxgz+RVD0qs7AvRNfX+uMyfSv84ygMgcQIodDn5yX8LLAgDqDUcNeIoxfIsLszGk
-O1ce149TEE5R7NJMkdow/POffsKRuDcUmlnwNKX/pWbXdDSYjA1HlVrNyARXHYZZ
-iql6Aq9nGianLNRr+X5LPI2g2L/OinE2iC4ix+Fx+CkBxB0iA1/+UYL7allaQn4E
-zQbSdjZmwHAa5mWBui3cf0KOriPpLZY7FfN0wrDH2MKgytOr9yZ/3XZJrgSWxbxn
-gMuBYwrwHEaCCu6XN1JkGyQXdfU5sQjYSaiFi6Ml5dLLbCuPxkcRhlm1e5Vvr+OI
-HcoT4XT1LXKbhQr0XaKXoTMolh8aBD4fMp5D2wtgS21qzQAnL4l+Cqa1LbfLlXEn
-45QTj4ikZr7auyvKD3MBdtDcT8Z2ydIyKTRY+QcutwU62CuSYgOoeLpRwaAfD7De
-uhrHS1Et9wDYvj7s8ZEV
-=nJ7x
+iQIcBAEBCAAGBQJTDw6OAAoJEPiazRVxLXTF3wAQAJujVXhqFYU6FvB7CpK5gCrL
+UfAgVsZZ6zDdiJ/d84I/lQLBfDHpjgVyrl7762pcWBeED0D5DV7RR+RgsSzvQ2OI
+FpO5V7y+xa2JyGF5AgvEP2DWmL98woDd0xRkDOyKOO3toKNDJctvgFlJOWvYpzyG
+xA4z/KdF7cPDiF/8ggxFiL2VSXyHY+HKOhkPElczIcxOFfN8s2sms/A0mPstRdi2
+tI821LnHXJzuCaUvVYZidpvT0f03nmdgPJAGyqQ2fXYhFUBgvhMJRQhCgLhOpJsO
+iP7j105lKcfQdt5Rm/zUUb9x9R8tzFDwnHVuD5KvZ3lB1dshasLudgSIvsDYK9gL
+vr0d+90XtTTlUekzqUw8mckRN8wN2q/xDyLllcq8WCJdX5GWqTFKRJiuYZEzl45C
+bNvVP6x6v9CSmnRanc7M23hJaH1BXYqywgc/1bi+q+nnCJvuiX/OZ2MNRFiDCXIL
+Dkrdy5OCPQMPcwPcLdJb2vErUxrcahGc8wqIcK1RKc2f7acat2XfoK1pElvUMAa6
+UDvKoLv5SMwL+PKAXECkwvraA49uNxfASV80R14yR1jPln2lQQScijOLM3DeT5vf
++u8tkHsyzUaNGMYfQBnv1pQCZA0PzMoTwv2XETVrecU8wuosliKzA4dNvp5eKxLV
+i4i4x7yc4bPr+8+5sarP
+=RHYm
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.3.ebuild b/sys-libs/readline/readline-6.3.ebuild
new file mode 100644
index 000000000000..705368b857fc
--- /dev/null
+++ b/sys-libs/readline/readline-6.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3.ebuild,v 1.1 2014/02/27 10:08:13 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# 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_configure() {
+	# 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
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--cache-file="${BUILD_DIR}"/config.cache \
+		--with-curses \
+		$(use_enable static-libs static)
+
+	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE=${S}/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		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
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_build_binaries ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc USAGE
+	dohtml -r doc/.
+	docinto ps
+	dodoc doc/*.ps
+}
+
+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}
+}