Force some cross-compile tests to the right answer #503312 by Hristo Venev. Add fix from upstream for vi mode.

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

4 files changed, 56 insertions, 18 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index ea93539890bc..97185f2480ac 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,14 @@
 # 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.194 2014/02/28 22:29:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.195 2014/03/10 00:53:24 vapier Exp $
+
+*readline-6.3-r1 (10 Mar 2014)
+
+  10 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-6.3-vi-last.patch, +readline-6.3-r1.ebuild,
+  -readline-6.3.ebuild:
+  Force some cross-compile tests to the right answer #503312 by Hristo Venev.
+  Add fix from upstream for vi mode.
 
   28 Feb 2014; Mike Frysinger <vapier@gentoo.org> readline-6.3.ebuild:
   Unmask for all.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 92d09bd266b4..578b8beb158f 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.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c WHIRLPOOL daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a
+AUX readline-6.3-vi-last.patch 785 SHA256 6286aaa9b21d6d90f711b2cc4e986639fc7b3154a3f1333a99fee2f222273244 SHA512 3e65d09928989c0fa06b3dc758216278b8f6e6cd9fd2da84f5424aa4f714e49d7456796a929b57b3b2a712ccebbadbf3f49c3df62f56b77fb81b7fad5f1aaf48 WHIRLPOOL 79019c4df2a95813695b351df71274d4a893cbb79cbb77fa2636fc45bfbabea8f23cf8fa8dcb2d1963646234241dd1ad0b38d7665f0ad41593665319c0c0055a
 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
@@ -36,23 +37,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
-EBUILD readline-6.3.ebuild 4076 SHA256 7394822cc3f7fd87bd555f6bb0e41ce3342c9f6dff4195daee67310fa58357b7 SHA512 37f214f2e287188775f929439da92e194af71315d473be4ba8c8f66ee8e0d421b54f39c429e2ceede70d97ea940933a49ac59f05e3e145b83354871fac3e637a WHIRLPOOL afde157c2772c2436af1a6edb76b3e1c4c69846b1ee88763afed52de4a0973f655e284d23d61e22d730dfdeb052e79beadd00cea438b26d531ce96498716d190
-MISC ChangeLog 24884 SHA256 fda9511cea7e3efe519daf32270d60f9844095f755aeaf35d7c7190f6a8c7977 SHA512 c9a5d08cbbccb329819e630421acf8ac0e45696c9f82550e1966a7b5ffcf1a88d3292522d5164adef4482a8ffd5fcbee6a343a895091c24c878da3e0080ba6ab WHIRLPOOL 249b89f4215946130c6eab3c76588fc6a1bca9f36b20855e818cec2f516dc18c61d98492b2bf594c2bea224208f8d84a6996a87c04839c068174582fa7be5301
+EBUILD readline-6.3-r1.ebuild 4504 SHA256 1911273604299b577ad15ea06b5af8856d5e1dc6d9faff82504566b590a2f16c SHA512 2f6616dce2d630c4476c39bb1ff50f8555c4b663c507d72cf2ba511dafc467c8cec58783b6383b6f6bf7856aa8b371bd3459f96cb78ec8cb3468d8f5a1eca9e4 WHIRLPOOL 86e4643c7fd6c2800784783f4d1eaa45eaa68d8eb910b063d2cfc46d0b3c32c731335c7e308059d4c0b7993ec5c3b14865a3d9569ec9ba8cbaedf3591c5d5593
+MISC ChangeLog 25168 SHA256 3e79a6d92dae1df7814e145cb14b206fe45a79954cb86e10b81be9b3bc619191 SHA512 810753efba9efa1d7310eae48a01d0e8067ed6d71aa081f4969f64dca1de0cb2f1c2949e527298bc3c03efc9d7826ab0f117c59351868eadfac8d58c7f9e628d WHIRLPOOL 7b62e0f1c1b657eb77f63df6a83cfccbe26e043daa77b3c5a325597e7ce48a2e3440f93ee5e9774302271b76405032a6df32aa6ef6d6e841dc8b01678bd1fff8
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTEQ3fAAoJEPGu1DbS6WIAJ0QP/3UPxluF56CSnBpELxAcHcBb
-9xwlTJ8rwrhZtDnAQk5MZPYqNFWPico/hIkMcdCgxzXIYiw9Ss7lOOtxG7FTYqcX
-OwTJbb31I/fBd8zAJv0KIq5ImkjMIbydacB8Ze1mHCGRz6w7sdJbBuNmZIbYEmBv
-PaVuHy2tD8PMLNBq+bzIJnkPibJid2mrdEFTEL4l7ahsFMsrYCxoBaaXMjWWnxz3
-V3v7uJHD81KALbbyMIWvEBvF7vLksuvcJh0TEZSS7QOAG/ZGdvltpf3N6umaPGjy
-mn3Uwo0flyHA9i+TY8l7Cf6cEl2uXUKXIdeHsezgFhkfIqeWqbmlDm7l8d4GXl19
-66kG1kxX32ijPfWoLMXl+H6y0fDUDUrdPoVCqmNowsj3ObTGkIUXAnZiA0A1xQ22
-I5fyDhE9DkwPomQY/0NfiOzbM93+Gdx4tKhHi2jSvRnboVflmgyzvu740IMt2E1B
-uHhgZGYYELBj553LItnBvJeCYN0PHQ0aTzmciTqcUxohxY37+GAsujzPQI49ju3U
-MWD1qY+7tFdIEtiAntPOSlKMWRirPu3RyCJkKTD7iiswuryUyZZOTjFhIPNlPgvb
-3uUcQWb5J70R7/uYdORntnq90XCzXw2YVqn2PEjpyt+H9dYyM6uRrADatP7QwDyd
-ygy6ilDiIJTfRD74uOI5
-=aVro
+iQIcBAEBCAAGBQJTHQ0KAAoJEPGu1DbS6WIAUYAP/2Zu3eYfe4YfQ/DjOaO6OgdQ
+IK4M6ppErIQh8Nlgan0Ji4AEQRpgfCp48efTlRESP/hpcmV8eE8nVHdZeaG+ZUDC
+ISWysfOrGUSqTH/7rEC7YZSfCA8zTqCLO8z0DGr7t4UhuEL0vzPWpVsCmDIxBelH
+4wNHZwcIX80BA2ZHqSnHpgKvI0LulmwRBa6rNsP+yTQ3AR75Sm9mbKofAMhkKLgi
+l7MaAnKnYm9ZLVDkhgid95XQdGzyivHO1qSjjU9tDYtiwYvZAGZihFr2levuYgGg
+syVNiQcNV7AOOFrMzam5jxjcoTk1rTQlknpCjK3Ht3g3CH9n4zlts01UgA4g2tzL
+w3l3JwJLUqm7anWNAHGFa7WxK86rahAAqIWI8oNM/8qUy9Ep+E7aOFZOTCfaWvRR
+tomCBntt0uLVw+rmuE4RtWRGebrznxGiuq3lmjAqBEFEOIGD9Lc4W6LOKye1oCdi
+wed1aTsSiYElaYyfnZiiPlYixxPkZSxCgi17ruDqBkQlwmUjmwFy7CixIZg9WRYi
+s+SQr/+4RutgBB2Xs9nEqw0U5gAQAg6nKEm/vsEWkr7Mn1MjK4QNIAnttke7G6d7
+WXkSmJ4Cnm3Yftn1rRk+wls9cisA44NpxR858qXRUDpzwlc4eHvNPh+CTzI2IxL1
+oJuE18xDbDZwy83XZtkb
+=gDHr
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.3-vi-last.patch b/sys-libs/readline/files/readline-6.3-vi-last.patch
new file mode 100644
index 000000000000..2a0b0cddc281
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.3-vi-last.patch
@@ -0,0 +1,19 @@
+fix from upstream
+
+https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00015.html
+
+*** ../bash-4.3/lib/readline/readline.c	2013-10-28 14:58:06.000000000 -0400
+--- lib/readline/readline.c	2014-03-07 15:20:33.000000000 -0500
+***************
+*** 965,969 ****
+    if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+        key != ANYOTHERKEY &&
+!       rl_key_sequence_length == 1 &&	/* XXX */
+        _rl_vi_textmod_command (key))
+      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+--- 965,969 ----
+    if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+        key != ANYOTHERKEY &&
+!       _rl_dispatching_keymap == vi_movement_keymap &&
+        _rl_vi_textmod_command (key))
+      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
diff --git a/sys-libs/readline/readline-6.3.ebuild b/sys-libs/readline/readline-6.3-r1.ebuild
index 5e47f6fd9e82..627d15dfc7be 100644
--- a/sys-libs/readline/readline-6.3.ebuild
+++ b/sys-libs/readline/readline-6.3-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2014/02/28 22:29:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3-r1.ebuild,v 1.1 2014/03/10 00:53:24 vapier 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/
+# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
 PLEVEL=${PV##*_p}
 MY_PV=${PV/_p*}
 MY_PV=${MY_PV/_/-}
@@ -55,6 +55,7 @@ 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
+	epatch "${FILESDIR}"/${PN}-6.3-vi-last.patch
 
 	# Force ncurses linking. #71420
 	# Use pkg-config to get the right values. #457558
@@ -85,6 +86,15 @@ src_configure() {
 	# 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.