Version bump

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

3 files changed, 184 insertions, 15 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index bf1424cd9fa5..b95f19dad7fd 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.199 2014/03/31 06:59:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.200 2014/04/16 09:15:02 polynomial-c Exp $
+
+*readline-6.3_p5 (16 Apr 2014)
+
+  16 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> +readline-6.3_p5.ebuild:
+  Version bump.
 
 *readline-6.3_p3 (31 Mar 2014)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 068f471f2085..60298dbed573 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -36,27 +36,30 @@ DIST readline62-005 2143 SHA256 ef02905e4d544a5a511142e8b8282e325411200c7eaca428
 DIST readline63-001 1366 SHA256 1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2 WHIRLPOOL ed0b0ce066ab4764851d81e44d708cc9e2f3fe36ac4788243c81b3e25aa0995d054c1caf0a788c25969c7cdc6b2bad55a9c9c64286f485194b4e76bc453edf74
 DIST readline63-002 1297 SHA256 39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4 WHIRLPOOL ca878e614ee233748f7017f5606fe2e96bb8374b33e4a571c5901594d7f329fd19b217abcf9cb844fa96374bff9e044712ed1017d6d99936f700da030202231d
 DIST readline63-003 985 SHA256 ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12 WHIRLPOOL 3615b462024e836f0854c2ffaf1282b42462a0da90c8ce248a47e9ea5a0ce00892135c1b725f9fb8ef1fafb1e88e02649c664373ba41683ca2457aafdd12ac93
+DIST readline63-004 1363 SHA256 4547b906fb2570866c21887807de5dee19838a60a1afb66385b272155e4355cc SHA512 6b683e9fe28831885135391b5a23bc580cacf0ffe720951a80f545574eda4eb064fe189801d44329b2eb2d3577db5a90f9e5ad9ed131e7e8a8ae349511632721 WHIRLPOOL 49deb89325cb582538027855169067c4224504d8aa944f8c6f34c07afd0bab30690e01a573ab67279d851b75c6e33e236f19a9fc9eb0271cd1f10d9b91fd0203
+DIST readline63-005 1664 SHA256 877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b41208d9bf9060274b SHA512 b0332d7f999376788155341319d138a899a2278c338a6faaac89ecf3ed1e2248a07413dd810a76996bf25f211de787182b55f34ab3d7d31eb7519d7a48ebed32 WHIRLPOOL d10a4a6a9ea20e2e9bb9180e0a0511796ea0ca247bec17f2357ee8a759ac5adc877f5f838c3d1f45157014d88306f1b1dc7e9633c2bbd4a7125b9b8df5c0c0e8
 EBUILD readline-4.3_p5.ebuild 1591 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a SHA512 0fe334f4cf3e1a4b0d00bcea4bbdac0664db730462e7dfc8fc231a70795e05fa97285ae301b0b0aa01154cd9f6def741bc2e21a7b82831daa51b3f2ff552a439 WHIRLPOOL 87337d29334668dba75f965228acbd3d850059f0b0a3a34282d4c263b418ee2f99dc0eac1ccef59a09c71b4ba2ee13e5924cfdf48d3a514d7a0732b82bad261c
 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
 EBUILD readline-6.3_p3.ebuild 4526 SHA256 ca1df987ee82e4e8fc69353af7e470e0db96747e4a2e9d011b626813729ff452 SHA512 77c26718a513be274f211f6d3f5eb7dbfb4211d2fad4da68c26e4cc31ef5a8d333b00cbb7aaa8123f9db2f6fab1b8f0393f42a48db7e16a62f0c9e52933d247b WHIRLPOOL 984f9a3d2d685ee54cbff13689ef0e9ca03a76c9fcee1c8c976fe6a51143568b61ade929a9a6a4c99edb94ecc94c95a745b78c74391db7068e3db49811c5014e
-MISC ChangeLog 26168 SHA256 f249f85dcf7863741a6476ff5d96ddccac3f2cff1309a5556f0cfd97ae0086fd SHA512 3f44dc1c8f1520cd13b6629086aec069bf525e96264e1bdad9bc30afc214ef6778a4019cdc393a9560c78a91a0f930b0c2b465197be28bb10f7f80383e06426a WHIRLPOOL f060cf573a866e3de1052bb11fe02f7355c21a79f92f31b00e724df35c669947067499f9692f7fcac22bed75f23bebb96efbf729c9cea5665258f34f518d8b69
+EBUILD readline-6.3_p5.ebuild 4464 SHA256 cddb97e13fc0dddf125074fcb35c97df1bb6998bd3c4187b3444314ccc7fd023 SHA512 8e03c7c1d409cd6e5d7e4fe4ca1ff2ff8099640d36f90262944f5d13ec045855e6c8c83e26774650d4cb10aac2f85475dbdd225c9e1e638067e941149c5b00de WHIRLPOOL 5508455e61d298fa727e6d3aac4e08cde1fbb2ee79c3a8ab8f2f1911658039b5bcaa76e88a4456ffafe88eb04de3640eda81009d22d15f6609d9aad14848a5c2
+MISC ChangeLog 26296 SHA256 77e99a2ef90f4a5f4dc427caa323c3040e238d4bd49ca15e9e9720a99c06eb06 SHA512 25ddab9e3d92e799a7a348af64d8aaeaf9973f1ee161fc6396c5e3687ff7e5c16639d67b8c393bc386c6b241cb86a4bf4b6ba8962d955d64a361b913acb8b50f WHIRLPOOL 1ab8ada9ed8463eb37add97f62b0f2968a4f31de557a9a425969b98481a8773d44047286cfe26bf96cad41d54fae38adb70d45a35fa551173516b7b2434f9805
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTORJoAAoJEPiazRVxLXTFchMP/1kYcEs9BJ++Uv2S5wFceV+t
-QNkvMwwXjKLFy71A3ifQTHM/081ZnN2tN6z2mM6y0vw6M17bonJf19Jje5ug70Ee
-eb2MC/jVbJWj+5qqd0r7eov87v2cK982LQasyVlcDAdjC08gXVOSml2Xr87HKyyG
-ZvCOa1AKmxZnRgPgys1a7062z32PASf3M1C/lvaz1ZFjXJkFy3j5jmJ/skv2fbvq
-HeGv+yKhxPhSWaddCj5HQHrJeQd4NQWFBTGf3ufTBW+Dw8HdozW29sqpc6Weant1
-+HnT5/vMFRRdY2eeQMrN6bbftbMPAf0l8ArtiC2pYKJZ9mf2CNrYiBzVq8xrvNkm
-QkqgbiS6rTFQStjtMOczWoD+eBT2znSdtFZdWzRGk9cAH7N4aMw1AXuTEOBBBzSo
-oUxBrzpwZNVSX/XrCt87N3M7BGNwDPNvZOuaAU4GHzzgFDcoctt3YUlaRhKZVCcM
-tVs7BS7oBiI2AiiElOu+MrqMnducU4CZzyuhjxLEGvMkknJQqRgaz4WDSJyL8E+Y
-CkXl8/PMC3/RJS2t8dHEXhOHgQoN8c0/cQhrMgfDogErIt383+5c+ZI1Dh6lXKOk
-OO/2GYyCjMU0PlITae55cPQf5zii+ZrYbAemix14fdAAjLMOPFMcRNTR7wBQvxi4
-VYC3tWGvs/mYQErEN/B8
-=u2le
+iQIcBAEBCAAGBQJTTkoXAAoJEPiazRVxLXTFfmYQAKO9f5AeQ85Q53SlGXKVQzV+
+W2Xl1ObHHZLJ8DaOMETtsOBnzoGPiMbbBsobgHcXU1+9BpIR9BMAO+xCQp2gCg1O
+RYkGoHvMyC5AG3oQEeWwLg+SLCWMfx/k3Ns52rO+phKIZkQzZXKDuwtWPhVC+JZF
+RxmJHEw9PUOTzqGTPXLP1Azuo0WNJ+1NHhB71TrWkqpCGb56G8Bhd39RefYREgIC
+rEvEWbGiwzytmISdQHqxJ0ZX6aypQN25t4rQ3iB5NPYqS1GEsJi6lWMxQkI22zFH
+sZ1nOOgEal+bWZAyIexs0VdpexywmTk2Ib2D/U31C2/8XL4ZeQII4i1FHMcG6n8j
+sjCNWbA3YEsiqk2epceDT4M8fOC4WmJ5YLbk4c7w5K2AWxKN550qtyFbCutxTJKU
+JW5eEkhv+vKB09Jhv9gs8/HYTkRIIr5vaiiHdbIY5XD3W6qjs1OCwIm8H2s0+esC
+VkBob3Jz6NX0cRmLe3zL1Nydj+7qVVaeQ2INlxRYv71PZCNyjo6hm2toQVaasIOH
+kIphMzj7UGI2bWBUa3T9d034Lp0bKDnQTMaEEc1jIvgNbbpNzbhKBDmTCe6tzLe3
+SmGvpYGC/eWK4hC8wBpyTnendpQOhN97UG+/zah4jRmVds9C20Xs5GFcV5HbX68R
+QWbnmtTon0GslqVgtyzF
+=YsFr
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.3_p5.ebuild b/sys-libs/readline/readline-6.3_p5.ebuild
new file mode 100644
index 000000000000..490f32c7bcdf
--- /dev/null
+++ b/sys-libs/readline/readline-6.3_p5.ebuild
@@ -0,0 +1,161 @@
+# 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_p5.ebuild,v 1.1 2014/04/16 09:15:02 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.3-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
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# 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}
+}