Bump to latest official patch release

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

5 files changed, 28 insertions, 61 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index dd096762998e..bf1424cd9fa5 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,13 @@
 # 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.198 2014/03/28 19:04:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.199 2014/03/31 06:59:51 polynomial-c Exp $
+
+*readline-6.3_p3 (31 Mar 2014)
+
+  31 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -readline-6.3-r4.ebuild,
+  +readline-6.3_p3.ebuild, -files/readline-6.3-dispatch-multikey.patch,
+  -files/readline-6.3-vi-last.patch:
+  Bump to latest official patch release.
 
 *readline-6.3-r4 (28 Mar 2014)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 396c59df8316..068f471f2085 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -4,9 +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 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
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
@@ -35,27 +33,30 @@ DIST readline62-002 1714 SHA256 1e6349128cb573172063ea007c67af79256889c809973002
 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
+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
 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-r4.ebuild 4615 SHA256 cdcc5bbfc62cff0e6a68ff3ddba2f6feba3a388442a11be03732175546f90383 SHA512 abc9c3af4f888d870d85933430b36c8aec7d2c5505268edca77905f79fbcda90e7d8c253404f8e51bd0c5c838837e60578535a5384c0727c9b33b00c63c31293 WHIRLPOOL 9f771da8ea1b55e357f3372707f9d498f5204ea399f920820f78f85533de0bdcdd2a5b5fe8f491b2cb9ac3f42900d59048a2967b94053239bfdf078bf6871057
-MISC ChangeLog 25900 SHA256 da58e764959e50927a6ebc9c58349ab433998275b3d1078f79075d3413f62e59 SHA512 2931fc370faaa39c76d6143f50874b1c472e5b383d66780381103ac901b95200c927fbc90c030868b768b5cbab2412b3bdeb79ca94edd77df600154fc78243f2 WHIRLPOOL e3a106f5825dde2be30e9bdf6c63bb3d62e6fc64b81591023b0831557c6150753f2c1d5776e9b4b4dfd701928599d308b047bb2926bdd2df3d7f2cc045b3392c
+EBUILD readline-6.3_p3.ebuild 4526 SHA256 ca1df987ee82e4e8fc69353af7e470e0db96747e4a2e9d011b626813729ff452 SHA512 77c26718a513be274f211f6d3f5eb7dbfb4211d2fad4da68c26e4cc31ef5a8d333b00cbb7aaa8123f9db2f6fab1b8f0393f42a48db7e16a62f0c9e52933d247b WHIRLPOOL 984f9a3d2d685ee54cbff13689ef0e9ca03a76c9fcee1c8c976fe6a51143568b61ade929a9a6a4c99edb94ecc94c95a745b78c74391db7068e3db49811c5014e
+MISC ChangeLog 26168 SHA256 f249f85dcf7863741a6476ff5d96ddccac3f2cff1309a5556f0cfd97ae0086fd SHA512 3f44dc1c8f1520cd13b6629086aec069bf525e96264e1bdad9bc30afc214ef6778a4019cdc393a9560c78a91a0f930b0c2b465197be28bb10f7f80383e06426a WHIRLPOOL f060cf573a866e3de1052bb11fe02f7355c21a79f92f31b00e724df35c669947067499f9692f7fcac22bed75f23bebb96efbf729c9cea5665258f34f518d8b69
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+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
 -----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
deleted file mode 100644
index 88995bfa21bd..000000000000
--- a/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/504440
-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 14:15:02.000000000 -0400
-***************
-*** 745,749 ****
-  
-    RL_CHECK_SIGNALS ();
-!   if (r == 0)			/* success! */
-      {
-        _rl_keyseq_chain_dispose ();
---- 745,750 ----
-  
-    RL_CHECK_SIGNALS ();
-!   /* 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/files/readline-6.3-vi-last.patch b/sys-libs/readline/files/readline-6.3-vi-last.patch
deleted file mode 100644
index 2a0b0cddc281..000000000000
--- a/sys-libs/readline/files/readline-6.3-vi-last.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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-r4.ebuild b/sys-libs/readline/readline-6.3_p3.ebuild
index 780ba280cb4d..6f6c788d2231 100644
--- a/sys-libs/readline/readline-6.3-r4.ebuild
+++ b/sys-libs/readline/readline-6.3_p3.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-r4.ebuild,v 1.1 2014/03/28 19:04:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p3.ebuild,v 1.1 2014/03/31 06:59:51 polynomial-c Exp $
 
 EAPI=4
 
@@ -55,9 +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}"/${P}-vi-last.patch
-	epatch "${FILESDIR}"/${P}-dispatch-multikey.patch #504440
-	epatch "${FILESDIR}"/${P}-readline-sigint-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-6.3-readline-sigint-cleanup.patch
 
 	# Force ncurses linking. #71420
 	# Use pkg-config to get the right values. #457558