Update multikey patch from upstream #504440#8 by Martin von Gagern.

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

4 files changed, 30 insertions, 22 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index c09a652d3629..dd096762998e 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,12 @@
 # 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.197 2014/03/28 02:10:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.198 2014/03/28 19:04:47 vapier Exp $
+
+*readline-6.3-r4 (28 Mar 2014)
+
+  28 Mar 2014; Mike Frysinger <vapier@gentoo.org> +readline-6.3-r4.ebuild,
+  -readline-6.3-r3.ebuild, files/readline-6.3-dispatch-multikey.patch:
+  Update multikey patch from upstream #504440#8 by Martin von Gagern.
 
 *readline-6.3-r3 (28 Mar 2014)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 34b491573b80..396c59df8316 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -4,7 +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-dispatch-multikey.patch 562 SHA256 18bc327fe392bb849779915c11cf91ff5ddb1bc9ece7fa87fa5a6bebee00c302 SHA512 69c71e9d42018d518016003f6295c115cc4ebb16a90788029b0edf2a60b5958386bd251a74836d3417a2f89cb26d9f06c3d52d2cbe9ea5379a9b9e016516ba2b WHIRLPOOL 94d477285ec5c443dd8664391535c6c5006f3d8ad4521ecb91dbd2bb86bb8a75938456c35d0b5f99f78d7412ecac9bc0b0ead087ffa67e1b0b90924f4326bcf4
+AUX readline-6.3-dispatch-multikey.patch 708 SHA256 3a35fbcf69fd36ac0b1bcce75d963f48848a8c64b4d15c9bad90cf314383f9da SHA512 db812c7c8b438b3439d0ecf8300a191c89a1ad2e089cd60c64a22c4891701397aa0d4b087e9c5eb0894539273ed9686b31102482be9d47198da4947c7ac2197a WHIRLPOOL 085cfbba03fba2f22191ed86deaa10e8fd2ce639746fdc8c9eb21d53d46e7689659fbf64757ff8ee87762d04f3abd077ff28f7f22e85473f56dd81254875d22c
 AUX readline-6.3-readline-sigint-cleanup.patch 592 SHA256 9be9ddc07f6344597ab43fd3104bb1f2c14ace9532ce72247a11b775e824d056 SHA512 87b425568d73b78638d7c14bb31710af634c16e38d16d1a4d765c0652ccf1d5ae03e36d4670470419e5eb28051bebfe88cb93431c9738d4a26417a288248a5e0 WHIRLPOOL a98828a28df8000d6d7770c02b1f5bed9a8df5dd5db29bf610414821e4d5a87a96d032a8acef7af90631473a5330d55d818202a3472e271ac4ba31296f936a7e
 AUX readline-6.3-vi-last.patch 785 SHA256 6286aaa9b21d6d90f711b2cc4e986639fc7b3154a3f1333a99fee2f222273244 SHA512 3e65d09928989c0fa06b3dc758216278b8f6e6cd9fd2da84f5424aa4f714e49d7456796a929b57b3b2a712ccebbadbf3f49c3df62f56b77fb81b7fad5f1aaf48 WHIRLPOOL 79019c4df2a95813695b351df71274d4a893cbb79cbb77fa2636fc45bfbabea8f23cf8fa8dcb2d1963646234241dd1ad0b38d7665f0ad41593665319c0c0055a
 DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
@@ -39,23 +39,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-r3.ebuild 4615 SHA256 787a2529325f87fe6c3d28a73f503c14ffded12d3176f922b56271b4d7db5d5c SHA512 3b9e1096152d0812a2b449bb51fe4cba41cf419af2df661035a632bef8c968f069b201dc3238ffda0520a72e16efdfc2dfbc5cf7d988cf9077792f3c01c9d4bd WHIRLPOOL 78159952a916abba4fe71b14ee9f8d533db143ee16e5bc670f9f8c3c8629684e7b7579599a6d820cbbf4a141bf039a7bef6c168e69623e358cc3704bec605d5c
-MISC ChangeLog 25651 SHA256 4a0fef536f007332af161c2780cda98dfbb6f4c9ca451ba7fa9b2e35ea1abdc8 SHA512 fe586b1e0bfbc78156dd87e4f3e2d22b739831c468926c0ec6d6f1b8b512c6179ff4217ab5db3a6e7197af108ef5ce26a5889893698c4c2b1264eac2783d6055 WHIRLPOOL f3cc0f3ab2a1fca38d43dc013b5ee252cad49ae671e0f74a4828143935b32b399e3d8967b7044061f22de5287a1f4b4bb14d81979595109f4895dabc422036e7
+EBUILD readline-6.3-r4.ebuild 4615 SHA256 cdcc5bbfc62cff0e6a68ff3ddba2f6feba3a388442a11be03732175546f90383 SHA512 abc9c3af4f888d870d85933430b36c8aec7d2c5505268edca77905f79fbcda90e7d8c253404f8e51bd0c5c838837e60578535a5384c0727c9b33b00c63c31293 WHIRLPOOL 9f771da8ea1b55e357f3372707f9d498f5204ea399f920820f78f85533de0bdcdd2a5b5fe8f491b2cb9ac3f42900d59048a2967b94053239bfdf078bf6871057
+MISC ChangeLog 25900 SHA256 da58e764959e50927a6ebc9c58349ab433998275b3d1078f79075d3413f62e59 SHA512 2931fc370faaa39c76d6143f50874b1c472e5b383d66780381103ac901b95200c927fbc90c030868b768b5cbab2412b3bdeb79ca94edd77df600154fc78243f2 WHIRLPOOL e3a106f5825dde2be30e9bdf6c63bb3d62e6fc64b81591023b0831557c6150753f2c1d5776e9b4b4dfd701928599d308b047bb2926bdd2df3d7f2cc045b3392c
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNNoBAAoJEPGu1DbS6WIAf6kQAJBEBu0GwhLAm1M/ab0g4hNL
-cYrkHTezx72NNFRjU76X2h0taQ7MMtgL0iWVrzzxKNAcimY1/+XU4vDm3At/rOeB
-aDgmYI2YDfxHx0zvP4ZsrFS04g2txkfwj0Ee8WdK9JPQ4m5+LUFXG/So6RT/jRDa
-ZMJ/HAXd0EgiejnWKHcVe6e/Xr4k6AAfTRXxyUAZOHfhxEAl2yKhxMfSVH8P4Dp1
-WqWfndbmAueBmkRD2x4r6hlhXBJ+lyhzTeZpsYTFwqSjwUjzZLWcEmgU7C2Logg6
-YtG1HWqgC6db+fGBAqJ0CL5OlwEJ4hn4817qNC2T1EaaX1poZEE1OOXSqQoYVBpw
-QN9I/5M3+c8M+Dyn9zpmpKtSCESJPU5czR21+/sSNMWkFIv+sdYSwNJT9+bdA/1L
-NLvyVVQErqfZlTcRA5U6t4r8+xoF2SedKIRhrvRTMW22coBfKBru+HFMt/bD8nfr
-rniTwMcBgkqPVkrgv37QdquTsMpRkAWNkmX3qVGmV9kCD93c9qz5Ap8gd9ndWim2
-JX++PeIKKDhwChzl7C4Fk88swAyUMUjJMWV8/jXgrwPs1nvaLT9MivMMy8LI9xKk
-15ttW0eooiReoDfcUYokGk+rmo9WvvlAsFIIAj8q9qTq8WCqfqtC/cO7cLNjA4Yk
-JJ+dHUKEau+7IDBc5rFy
-=gQrY
+iQIcBAEBCAAGBQJTNcfUAAoJEPGu1DbS6WIAqdUP/jHrISt4/iNyIuJcOwvDRfgU
+nXPEGvX7N1AOcjCoGqXBUFiQKS7fkJW3IRqcVNjbCse0A6mu4PVjVsvCHl6K25+4
+ap6jM420pxFfI5Ati+t1p2bTqF1csy37sgOJe3XPsTHmrEQlG7Tc35VX7ADZXXUz
+BS3RzqgtkKJtDy/Q2r5oVVJUOmeXmr1/8XbI4JrhEY1l3eCpizTMTqC+VQ2WV97l
+E25U3T/LbLB/v9NUfctfEKfqjpn9AWt9SHk2ex9iYHp3nDv9PIn0xyXZ3y5B1Q+I
+qJsg1sD7avG+QY8+VkflkuO/ia95ilhNth6KaILJI5hZfkSQg54W3LbDMTGI9wFP
+m5x+3aJIfwvuG/7IWV/VsGKxsz3ICPYAor79HbRETkDCQcDxQmQZBcBZy8MGgV4T
+HKHHb33Y6YXlFyVyNSfzPeC1WiTWiGObHl+DBRAo8DCdZ/uoyR8OaYZv+Z3QhWNe
+ogN3P7fWQV8FMBLbc0JZr6NxtR8JfmLAk5ybO2YQFwzWuhUnhYEttyY1HqlwgdX8
+qHkbYz0NNSYv8pGpZJpI7HChYBIhBdXka/qgwT7OCyTfGxychu6db7/I1JIAOIW+
+sHdNihEp81DzPKUrgH3gDnoQqG3CQ8G0qSP8A0kspuY5lBl+HbMhR3qzcxQKwWYb
+WbBPc93rahS/o7VKmT6d
+=I4ls
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch b/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch
index 347c33952f10..88995bfa21bd 100644
--- a/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch
+++ b/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch
@@ -1,8 +1,9 @@
 https://bugs.gentoo.org/504440
-https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html
+v1: https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html
+v2: https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00034.html
 
 *** ../bash-4.3/lib/readline/readline.c	2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c	2014-03-10 11:01:19.000000000 -0400
+--- lib/readline/readline.c	2014-03-10 14:15:02.000000000 -0400
 ***************
 *** 745,749 ****
   
@@ -10,9 +11,10 @@ https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html
 !   if (r == 0)			/* success! */
       {
         _rl_keyseq_chain_dispose ();
---- 745,749 ----
+--- 745,750 ----
   
     RL_CHECK_SIGNALS ();
-!   if (r == 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
+!   /* We only treat values < 0 specially to simulate recursion. */
+!   if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
       {
         _rl_keyseq_chain_dispose ();
diff --git a/sys-libs/readline/readline-6.3-r3.ebuild b/sys-libs/readline/readline-6.3-r4.ebuild
index e5ee1b3189f0..780ba280cb4d 100644
--- a/sys-libs/readline/readline-6.3-r3.ebuild
+++ b/sys-libs/readline/readline-6.3-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.1 2014/03/28 02:10:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3-r4.ebuild,v 1.1 2014/03/28 19:04:47 vapier Exp $
 
 EAPI=4