Version bump. Fix tgoto test in rlfe example #385091 by Agostino Sarubbo. Use pkg-config to get ncurses linking info #457558 by Travis Hansen. Export AR ourselves to use a better default #484866 by Agostino Sarubbo.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 171 insertions, 6 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 2a3d00a933d1..fa18ad265d99 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.183 2013/02/17 23:40:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.184 2013/12/25 23:44:29 vapier Exp $
+
+*readline-6.2_p5 (25 Dec 2013)
+
+  25 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-6.2-rlfe-tgoto.patch, +readline-6.2_p5.ebuild:
+  Version bump.  Fix tgoto test in rlfe example #385091 by Agostino Sarubbo.
+  Use pkg-config to get ncurses linking info #457558 by Travis Hansen.  Export
+  AR ourselves to use a better default #484866 by Agostino Sarubbo.
 
   17 Feb 2013; Zac Medico <zmedico@gentoo.org> readline-6.2_p4.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 33bf539f6709..a040166e3823 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX readline-5.0-no_rpath.patch 363 SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b SHA512 c0344c5b831433ad3a8499a91d36615e849a9b520f8ca35cd9cae6d5bc55729adbf97d003e335d210cb3806b2f39af273b4b5f98380dac371dc184053e245bb2 WHIRLPOOL c0d2fe9d1d1f36cf89279f315c373a7385d255ebbeab8ebf1ede7b99196660611499c7db85554b036ad3df4f0b4375558b1d1ce7cbae5f5731172181f7d167ac
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6 SHA512 23f88aee11a9ebe15406293695f3de2a7a6c52b8b138c199c64f9dbb9b59d9063f12f8693656e61611e72f6298f7d919016cd240434e78ea2232876690a8b738 WHIRLPOOL ae87d544fa32dbd2b6f27f164dd4e6d0e8a3f399d4a9bde81bcb631985c6e69db11705dc372c21a4f9d3a26cf4279023aeae97fd0d243ca8e1c0e547b59084a4
 AUX readline-6.1-rlfe-freebsd.patch 387 SHA256 c601fd268665a3217ecd720b266960f3182e6adcd61dbcbba8a0f8ada2a5b4d3 SHA512 ea29eba911aa119f447684f1d115a80c7dc9a3f324d5f5d136eea05012c1bdce3675ca3098fd78dc2056ef6f21abbaf8d4e017df2eefd7140cd8bd2f41312d25 WHIRLPOOL 2a9e3f381e4feced527d111b67fd975f5cca5bed8cda6710521a9eb394a887182d165a63bbf019d80cc92f92ca7a388da06c12cf99d27483670b281f9b8c8b6d
+AUX readline-6.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c WHIRLPOOL daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a
 DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
 DIST readline-6.1.tar.gz 2261725 SHA256 f0caf608c06ccd6d56b3bee1843458d509c53f9b53dffffe07cc11d8f03fa969 SHA512 4e8e9c7786040042b14018f2d831439b5351183f68dc56ee94e9d09d972bece175312cfd97cb36c53ec9a0b7feedc7c69c35d175474d56ffb60cb24cf8149295 WHIRLPOOL ad6f1d1c3bdce03d53b412e05c0c4df1f36e6e7af9a60105467e838eba155349dca50500e55b9805ed4e6c3334b044f25f3aa2cdef7769a0be67606c49579030
@@ -33,6 +34,7 @@ DIST readline62-001 1388 SHA256 38a86c417437692db01069c8ab40a9a8f548e67ad9af0390
 DIST readline62-002 1714 SHA256 1e6349128cb573172063ea007c67af79256889c809973002ca66c5dfc503c7d4 SHA512 e86cb15b4df7b2a4cf68148a3e2414b48f70ad23d9685764627906164a74f31967ba8247510229aa19dfb7f6e8e92ff89164896e79b2d7320d3a62187a9173f5 WHIRLPOOL 444fa6eaa6b3e13728224f49a012f969f736d9b448d4c7da6cf0fdd3cfb33d24ca7566801d0ffa5a642fa581571c485e3c913b4a057a096a665735a84d9fbfe8
 DIST readline62-003 1911 SHA256 cb2131ff352d6e5f82edc09755191f74220b15f026bdb6c52624931c79622374 SHA512 863a4f0725df357fdd4a2ea738a8b81d850f36652705a45a415762a643fcf32f71ecb29f9faf9acd84d0b4b67580329adc491ab3562f0ad6f4b808768539301e WHIRLPOOL 86d10b4c23eef4c64ece0a4537f13cf68198888cfdd83eb38124da8610b971e87dfcdbd64c52fd21ca6d3753298b6582ce15378112d575944ff7d9b68baea3a6
 DIST readline62-004 3335 SHA256 09bd342479ea5bb8b6411bfdf7d302fab2e521d1d241bcb8344d3bad5d9f5476 SHA512 d5c80fb49748b586867a4df0900a73257a2973653c00e1403b9ba4eb5b265cdf6b32b6432f10c23482051f173fe63c18f2b569940b9a609ee29da60ce0ae38b2 WHIRLPOOL 471ace4d86d241d11fb494e885b6e6f78a5938bcbd7f438250e0410849ed2c94ae6743162576412d7d2b7125c2151b009d97295578a716327d8a9cd003543884
+DIST readline62-005 2143 SHA256 ef02905e4d544a5a511142e8b8282e325411200c7eaca4287f413f3ea85cc1f4 SHA512 8717df6034b64cc185e006cd0a00ba80b2cc06406420fb4e080affc4bfe2d4bab07b4d0c8fdd1f5b95692ee6b572199731daeaa64c17a0d799853e132d130e90 WHIRLPOOL 5469407cbc196bfffff890d288ac8dc1a11c34a9ac87baba615587617a3e540331cf54db89de861c8fcc126a443afc91af108d9e94f6234ec80c1ade219b51a0
 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.1.ebuild 2742 SHA256 e304fe6f2f16dee587d263f189bc61fa5ccad77a31ca66b7389d2656a9af39e1 SHA512 e962f75d8e794ca425a65438a76e766954549455e7eed66227ec282379fba08e8fc3c5cfcca7c1dd94396df611f3281b13688c675dd12b02d35434f4c5172a0d WHIRLPOOL 8d1898c5fea15b3e0ed62624709688e22d31f8a2c9571dee397ddfce7c246ea5fa781535631fe22b708af0fcaea57315f07c09c31a021d2dbe787a784e00e6ac
@@ -41,12 +43,23 @@ EBUILD readline-6.2.ebuild 2945 SHA256 46153673d5b541aecc2cbf6c7f197cab389578386
 EBUILD readline-6.2_p1-r1.ebuild 3084 SHA256 bafb44ebd824fb0dab209b5f265590414ac8344bae6b3a95475e7907492f525f SHA512 9afee11c6a3327fd18f84194a7020a0c1be86ed03db13c4844256231dc599d7cef95e71a56af30b74b7a0e4017ef7d0175cb173a242d5af963cafd42a5e23be9 WHIRLPOOL bc5eca21cef784a91a1bcd0bb35f4b5ad2d917fbde47827afde5a909cd782c3cb36ad7fa2789866060680acfa588c1dda9ec4a8776cb7398117a31ce0fc1be6f
 EBUILD readline-6.2_p1.ebuild 2799 SHA256 46f1bfd64da0567020272753773a9f26e7495f032ad637052156d103dd0fac61 SHA512 2bab810722e0947a87c9888b7d9b474e2315108355e39aeb1ede3a5a5a0507ffc8def3b85f4156d27e0e15442493ad334327322625ff2070395c869c90d6f695 WHIRLPOOL fad086179da6155f054c25bdc8a3672e6d82095ac198420f47012836c21f40253648c4fc75f6524314f22eaef0d43f8a58256a753ab05a18e0975fdb48efbc04
 EBUILD readline-6.2_p4.ebuild 3093 SHA256 59eee6ed50e0068055d138f30395af25a01e4d9fc7aa96ae040204f2ed925104 SHA512 bda29f2462a6d42723be65c14ab760c475412e89f83eb22ae5887a7cc0ff8ea362ffbbcdcdc8855f6efb51496354464d3f252838526e64d7608c2b5a0bfe17eb WHIRLPOOL ef5c8e16d8fcd6f9b2907d8aab2f1fb669abca38b6775fb6e75446501429f89fa650762ba2c28b5cd0ddab031b41cfb3f44bd0c81dee3e8a991e77aa845c0299
-MISC ChangeLog 23121 SHA256 113fbf3ab834bfa3aede6615c0ff34f235c30061382bef3ad0124374de4b9055 SHA512 49ec1456da7f16a84b09fc5c8623c7cd850742c70a218db6eb48066171e53eb94f5ce9102eddbd77763c2fcc3765b1f730910551fa94789324e3ece90506a69e WHIRLPOOL 3a357ca015cc194a8351defb59d74b1112669ea95fa509d68ac06dc46fb28b544c7b4810a640e266e9426fdf2035a7093d729ee88dbb7c762576431f21c30f2e
+EBUILD readline-6.2_p5.ebuild 3481 SHA256 5b1133b422874fd82bc80536fe05d3dd3cf8bd06f16da306b93ffce3c80d3179 SHA512 923f9d8434da5086c0b95b742cf2d6932d67c655f2d080869a12469a13b744efb905c8f773c2b70546636786225d6d9638ad6a778fea94c8be696293ef7350f6 WHIRLPOOL dde151e7671a6354e5c937cd90f163c20c76bf8fd92a164dcaeff5158455ce473c2e3e60184e64a888edd6ab5a74184b62494587f2bf21974103e7901aa66726
+MISC ChangeLog 23492 SHA256 ac9f4657abba316cf07a6e1d53545429b0693699061f55f2154ca9d5a033096b SHA512 af90650e06fb59208ee677aec2f9af74e02e06c49b69fac4a6c1b1c66733907bf98aeac5f1f025c631f0561466698682c03c8930ad12e7368a57b93ed43ceb87 WHIRLPOOL 4fbeeb9d5a328db46ba309b1bb502ab992898220b2e6bd17c8d8c5454e0d7c30420fbc9a11b94f19d80880f5f54a30e5e1d34ab678ddd63e606f54a26d4b88e5
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEhanYACgkQ/ejvha5XGaO+XwCdEwbCdWhRkq9TdoS2wd27EMOh
-QQUAnjr7X7g2H5RFYG7JRKm8Rs964qAr
-=BJ7q
+iQIcBAEBCAAGBQJSu23jAAoJELEHsLL7fEFWmmgQALaYhXmyDbAcc8LpyCUqRuia
+HR6lXzfXULDMkxmgCBYOlIJNny9l2y+qsTnMAzQ3x54ID9q+LD68DDsdLEkaSUwu
+7fCQA/65mfBHCgOpCE4vzO9nq2W8XjX28Z/10KJzIMjavfBliaoqb4msWsMNPG2d
+EZK1RhDa8LGZ/hFwcV0Xn2fSI7jkE8n8UFHfShBlStAX4QtaWs+AFKI2gtVCrqVQ
+XsMyNLiTGEHU8Sj6j/VWKH8grrfXmBVu4IsWpryS7qbjp1Vyx+bOY78Yh19EH96Z
+iacBAyJqm8XyHTcC9HviZ/tYLiJQIEFTV+NDw2QJPwX4wf2jPzLhPiT/1CbPQOIM
+aAWtd9R+h3MK3QtyhP90VD5lmuza4q3IiAYB5o5vRodidwOIcwgmJwgYyVBQYlpU
+ZWMPDryg7mOEpkXZt1OuMYYSp3C7C9njrxXLc2VJeaXjahhf9g6DZ+M+jQgEVJBO
+MMNDaUpoI1kOWcAzs+hGjU2gMmUj8U153qZR3RRtz3hhAReslaUyIPt18cZWcPGw
+RooGk69c4SOPXCbHqAXZZ56mQXebndFp7hge8fKV4fVCmsogGSxABLOCNYmPCMa2
++cF9OtiI4SrViVgiT+W1m0+raLqP2huwRdpdqaWi6G2rMDzNP+RxMSNFra8l2T1B
+VkFkRd29l3tCsGH/n78p
+=Z/+V
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
new file mode 100644
index 000000000000..b898bf053ecc
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/385091
+
+https://lists.gnu.org/archive/html/bug-readline/2011-10/msg00000.html
+
+--- a/examples/rlfe/configure
++++ b/examples/rlfe/configure
+@@ -4062,6 +4062,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++extern char *tgoto(char *, int, int);
+ main()
+ {
+  exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
diff --git a/sys-libs/readline/readline-6.2_p5.ebuild b/sys-libs/readline/readline-6.2_p5.ebuild
new file mode 100644
index 000000000000..9e7db6ac884e
--- /dev/null
+++ b/sys-libs/readline/readline-6.2_p5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5.ebuild,v 1.1 2013/12/25 23:44:29 vapier Exp $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs flag-o-matic
+
+# 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 ~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"
+DEPEND="${RDEPEND}"
+
+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}-5.2-no-ignore-shlib-errors.patch #216952
+	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	sed -i \
+		-e "s:^SHLIB_LIBS=:SHLIB_LIBS='$($(tc-getPKG_CONFIG) ncurses --libs)':" \
+		support/shobj-conf || 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
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	tc-export AR
+
+	# 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.
+	econf \
+		--cache-file="${S}"/config.cache \
+		--with-curses \
+		$(use_enable static-libs static)
+
+	if ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe
+		econf --cache-file="${S}"/config.cache
+	fi
+}
+
+src_compile() {
+	emake
+
+	if ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe
+		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
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a readline history #4411
+
+	if ! tc-is-cross-compiler; then
+		dobin examples/rlfe/rlfe
+	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}
+}