summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-12-29 18:19:46 +0000
committerMike Frysinger <vapier@gentoo.org>2013-12-29 18:19:46 +0000
commitd978e421cde75a4aaf0e6e3733025717490b60d3 (patch)
tree1eaa1c773a6f4794663adec3629c8da67da00a47 /sys-libs
parentDepend on newer cups-filters that integrate foomatic, and drop filters useflag (diff)
downloadhistorical-d978e421cde75a4aaf0e6e3733025717490b60d3.tar.gz
historical-d978e421cde75a4aaf0e6e3733025717490b60d3.tar.bz2
historical-d978e421cde75a4aaf0e6e3733025717490b60d3.zip
Update rlfe helper to use ncurses info via pkg-config #457558 by Travis Hansen.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/Manifest32
-rw-r--r--sys-libs/readline/readline-6.2_p5-r1.ebuild8
3 files changed, 26 insertions, 20 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index c152792932a9..9009fcd171ef 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# 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.186 2013/12/27 22:55:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.187 2013/12/29 18:19:39 vapier Exp $
+
+ 29 Dec 2013; Mike Frysinger <vapier@gentoo.org> readline-6.2_p5-r1.ebuild:
+ Update rlfe helper to use ncurses info via pkg-config #457558 by Travis
+ Hansen.
*readline-6.2_p5-r1 (27 Dec 2013)
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 6267872c22c7..115bfd64bb60 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -43,26 +43,24 @@ 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
-EBUILD readline-6.2_p5-r1.ebuild 3985 SHA256 e9af93f118f39ecfd35b903a1824c5970a5e5fad2ee090112973138cf42a7ab9 SHA512 dd0843f4583b68c38c2fbbc8fad34c6e44c268e8cba627fdf61c71b0c35a8535db7e4836ea03ccae2d66407c280ee0c8bc8455c1076ef7decb91a4ac68d8cda1 WHIRLPOOL 8c6f8cafa7cfb1c2b0e146eb97fda45809c1874d7bd1a38271ae6d56364744ee79ff4f6482ff59fbff0900df62958178e92bb11cdc07fd97f9b80eb1249a15ee
+EBUILD readline-6.2_p5-r1.ebuild 4115 SHA256 2f49f51a482cf4a3c468e37fc07a71de6336afba7e568cbaaf2a653e75e8d836 SHA512 c013b0a2f4acd2d0e0433c8a4675942ce63cddbd906928abcad5fca17e468a869276947d7773e33d7d42d2f0aac9ef64cafee66490dda7ecf288a1a39399aab9 WHIRLPOOL 849afe829ba869cc004bbc7309c9ec3d0587a63d7272733f8cf23efa803762e2ba6b66798302135b90f942827abcf8bba7a9932442622c369ae63e19f9d03b18
EBUILD readline-6.2_p5.ebuild 3450 SHA256 890f00067150e72d343efefbca148238c7e570899d28ba0b2e6e7ee73e429cba SHA512 0ca8fac669cdfa11f12e378f331102b6fd7b7222aca48f4ea401d332d1405f73ddf5250abd32aae1f99f7043c8e93d927e569f57dd5a262d4a1b6e01b140dd7d WHIRLPOOL 26f752a7f4ad02b3cbd1913cb6882e37943980ab34d637af529a81a03ba8b0db4026d76c6bc3a9dedbf362e05c53bc2f7d9efdc94ed43409296e543a22572de4
-MISC ChangeLog 23738 SHA256 5374177a5bccc85e040d9b75af25c2a5fcb683e2a580cc56584df88be916f71e SHA512 7b7f31ddfbc618e030c56586032ba666808397d24468c6e2ea9dded75b1052e93f52ac7f3523686a19ede73074a52800091ea330c28abb5d0260f1d355f8d4e0 WHIRLPOOL e441afac4bd0769dce0beda8d7efde0209f71bbd5bb02ad48b794739c0287465439de0d550392079aaa299e6eedd932aa3441ece3c0fde198fc2ee96ac202b1f
+MISC ChangeLog 23900 SHA256 72a993602b5b8a052463ed973c17af8c3845bed10b433034baee04937061dd93 SHA512 8bbb04dff70a5de3f6fd334aaedc5835aa10ba1fdcc424183a184114c0582d208659a407391bc5716741c8b10315027d60c219980737ce27d489099c024a56ee WHIRLPOOL a814d34acdcdfea5984443d1ad90b4fdabab502e8320e41f0f7f1285b80305bae037a11eeb6f36fde656da26480e21c143160c9cd3aee92ae85e71a6f620c3d4
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJSvgVvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQAMQAL6cgEt4lKLDvp9EdEiEdO0j
-JKuDgIbmtI/5WJCVRNAU/3Uz6C7zFDlQwhSBCA8tMmaPucSBwrJVl2Bpag3QtbVb
-xWVkg3iQcAsiVyzNMv8lczSkpo21NWMkgqklfKjBzSGA6oAOTsioT0aWcxax5v3F
-4XIOZJP9zq3thB3vsdH9lJQ3IB862G69NjjU9U+h8MDcIYH2n55ZoqK0KuMe4LH0
-Qy1nPwstK5xm/2UaAE9pkmkxZfdcHd7ESRfW82pdvMhsFD0f0YNQolUMzgl9i+lo
-ifczgDFsY3BH7Tskn5qPWOuKlAry88s5Wna/+xgywExCn2rkHoDuFJSSC1/gj/mY
-Uf/gQmr6dQywdBMfAD7ln3AmCLWqdeMHyiDY/g9yogDpwBBEW6J7QpkLtkRF9fny
-mbY6vsKT/Q8CbshQVA0PQBrQnwqfBcaPWU/xAfF3cYu+oeDCSoUEMVVBd9NNb1yv
-JvVWOtTLYpU91hznPqz/asYd5Gi5gk+bI0MB7pqjEu9t4AoBnBokP8t+4s01xQAT
-BcM+5fCbP4YIOR6PdLuefEyoTaJS4Mzlb0+jOVNwxnO3NAbDNqhZi2oJ8+dA84b1
-5erYxKIlXp6GGLD5wLmNLShU0dR0RFkSp66pOrb6AhYnxzZZoX3Kkj/eyd08+8qd
-ttwMPW6u95Bqxok9mCq0
-=TeAE
+iQIcBAEBCAAGBQJSwGfAAAoJELEHsLL7fEFWLgAP/2eSlgq9ZJ4pMu7mZfSDHtRg
+F03O9iUMFxAbXBV4QNRtx2oGbgw1+7m/jBV1vSr9g1zeoAjFzxsSRAkYjkobKE4c
+Z++U7EJNw4IN+6lCjyGGRoVCo/vmpVat52rqzRFH2VNrmNIlZuS6oaMrP97AguV+
+NSPHAI2Pjys4m3wnsXWJWYR8WBJPYbV58zrQVjmDp7cnkwMKe51bcddzztWPFxxI
+afazKI84p9+i4N4Yh/EjPM3oKttWzGk4f6spU86wGp10hqg9R1JFWsTnFR0Rk3MX
+rRn6qpE0pnQ25kbow48jiD5hyI2VXL7xyQ7fRH2AJTMJ4bzhN/Sga37En6txJokA
+6H33mbS3QWTWG4H61QF1W9/wOhnWmRRx57UuqgSEWJjJeFIdQZxevRofiSCpuGGe
+QB25iLVtSp/FINUVQY++yTb8MSmbImE1v9XcjIwlfrT9HykxeKnM1np5S7SHWLLK
+U6xMTXUkU720OqNyOZ0KkU05yQz6ses52uKTTnaQvgwoZkWtbmtFslWGrghB1POx
+X06jHmtv7icwPnXZLUzZXVsfUERFhZ2j0kLknMgsH0lquaaOarDN1I4o0JlZwS5D
+CAliwCu+8WxwzZblfXhgPybSIPvLEKKw/UhAg9E86Y8JgEeCQKFTVIdd6sWiq4Uv
+3r1ytVUZNoTMpNxLXprg
+=l0xk
-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sys-libs/readline/readline-6.2_p5-r1.ebuild
index beb2100e712a..dea3af2f8444 100644
--- a/sys-libs/readline/readline-6.2_p5-r1.ebuild
+++ b/sys-libs/readline/readline-6.2_p5-r1.ebuild
@@ -1,6 +1,6 @@
# 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-r1.ebuild,v 1.1 2013/12/27 22:55:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.2 2013/12/29 18:19:39 vapier Exp $
EAPI="4"
@@ -58,9 +58,13 @@ src_prepare() {
# Force ncurses linking. #71420
# Use pkg-config to get the right values. #457558
+ local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
sed -i \
- -e "s:^SHLIB_LIBS=:SHLIB_LIBS='$($(tc-getPKG_CONFIG) ncurses --libs)':" \
+ -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
support/shobj-conf || die
+ sed -i \
+ -e "/^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.