Add fix from upstream for CTRL+C display.

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

4 files changed, 46 insertions, 19 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index ddb1a658dc36..c09a652d3629 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.196 2014/03/13 09:21:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.197 2014/03/28 02:10:02 vapier Exp $
+
+*readline-6.3-r3 (28 Mar 2014)
+
+  28 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-6.3-readline-sigint-cleanup.patch, +readline-6.3-r3.ebuild,
+  -readline-6.3-r2.ebuild:
+  Add fix from upstream for CTRL+C display.
 
 *readline-6.3-r2 (13 Mar 2014)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 6246914a1b01..34b491573b80 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -5,6 +5,7 @@ AUX readline-5.0-no_rpath.patch 363 SHA256 59df6107772d1a93550bacc267a2c00f9dfd6
 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-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
@@ -38,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-r2.ebuild 4568 SHA256 8dd44806b0c91ab7d1944f21f3faced2db05f67ed2ab0838a58af2c5d16aa6d8 SHA512 396082d5a70830ff4f103d41380ee3abe7c56b1025dee89dde142ba97d3d64c159620018467ae050de6792c2941f8824b23f09577573335f249752c050b485e8 WHIRLPOOL 49dd674ff84f9c3a6d87bf7f10063f25d5499453cf3b8137398d6f0931ce3c6cfaa7ef55240f455412e64066fa0a182eb9853a7b4bf81b0530025bb2e8d6b695
-MISC ChangeLog 25419 SHA256 900fabfa46801ac12cd7a0e0872b5a26fcb5192c55db4c1614168a2586a5b506 SHA512 105d730e463817ac074f7652c8fc0d3971e2a21a402e3d21dbe4bdbebe5fcdbf76f263626c9477383ee5aca33837d9a14ac53bd0c3ba40feb530e4b2d55ee028 WHIRLPOOL 0df523a9a6825ef90d318d28964a3ad3d2d13710fe3f75578562d3931732470078a4092c060227da91fa518116c44d960d424e2ff5571aacdf832d4495554b6c
+EBUILD readline-6.3-r3.ebuild 4615 SHA256 787a2529325f87fe6c3d28a73f503c14ffded12d3176f922b56271b4d7db5d5c SHA512 3b9e1096152d0812a2b449bb51fe4cba41cf419af2df661035a632bef8c968f069b201dc3238ffda0520a72e16efdfc2dfbc5cf7d988cf9077792f3c01c9d4bd WHIRLPOOL 78159952a916abba4fe71b14ee9f8d533db143ee16e5bc670f9f8c3c8629684e7b7579599a6d820cbbf4a141bf039a7bef6c168e69623e358cc3704bec605d5c
+MISC ChangeLog 25651 SHA256 4a0fef536f007332af161c2780cda98dfbb6f4c9ca451ba7fa9b2e35ea1abdc8 SHA512 fe586b1e0bfbc78156dd87e4f3e2d22b739831c468926c0ec6d6f1b8b512c6179ff4217ab5db3a6e7197af108ef5ce26a5889893698c4c2b1264eac2783d6055 WHIRLPOOL f3cc0f3ab2a1fca38d43dc013b5ee252cad49ae671e0f74a4828143935b32b399e3d8967b7044061f22de5287a1f4b4bb14d81979595109f4895dabc422036e7
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIXifAAoJEPGu1DbS6WIAlE4P/RT2v3y+Gn/gXOJYXLq1cfv2
-pdAZ9y5SAAJ82c6QH539ISBBjSw2eNFFTRSnE3SQs+m7ek/hjVTn8fsXwOxOmrSz
-OsSDiINP2+3X8YGiw90cLt8G0owVjBd2hdDdaVRsP4THGHp4MP3L641xcrXEQj1x
-pb2gV0Z6q4tlElApb2X7+yTiGDptadkuHngxI4MjpyczHW8fbtgLStBQqVhHRW7l
-2VVlWgTA7P6CsLHmJTlvCbG5jr1THpLzVQ5+LTKr74XPb88LWxoHhSP8DCn7/EJW
-dwCHD1S03RCrF+DyLRPtIi0q6v7NG20851AcQxfmKsa2HciWNZgXaUAjFIr4JpIk
-mzT+Nx7FGTKSrt1fUwpefhg2LkAYju9fP2Y3VzctAJQ6NUuaU0506O9RJF0CDRzL
-lhYjl4XCzccBqp1w9HJra71kXcP6sBhXK9ud9u1WzZ3hjcZHMoxrtZvWBeFz/oZV
-aLskDX1LeUI2jeiHu++ekhws8oWxDfzrdw0kfUz9KZCYfvJFI3JhUSrTu7NUsrZV
-ftjsdn09QR0CNk5niWZLXdWl+8ghOnUisDtRmqYNo92otWMvop9IV40vR92tbj+w
-EiwC4exSvGPhBy0Ciy3cj+rmLM7c4RF080LqmU9FTtLhX0GPVDWTR0vfpGa7A0X9
-CAOIeX8JZuzmiWUYE43O
-=Cnu3
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.3-readline-sigint-cleanup.patch b/sys-libs/readline/files/readline-6.3-readline-sigint-cleanup.patch
new file mode 100644
index 000000000000..58a04ffe95ee
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.3-readline-sigint-cleanup.patch
@@ -0,0 +1,18 @@
+https://lists.gnu.org/archive/html/bug-bash/2014-03/msg00168.html
+
+*** ../bash-4.3-patched/lib/readline/display.c	2013-12-27 13:10:56.000000000 -0500
+--- lib/readline/display.c	2014-03-27 11:52:45.000000000 -0400
+***************
+*** 2678,2682 ****
+    if (_rl_echoing_p)
+      {
+!       _rl_move_vert (_rl_vis_botlin);
+        _rl_vis_botlin = 0;
+        fflush (rl_outstream);
+--- 2678,2683 ----
+    if (_rl_echoing_p)
+      {
+!       if (_rl_vis_botlin > 0)	/* minor optimization plus bug fix */
+! 	_rl_move_vert (_rl_vis_botlin);
+        _rl_vis_botlin = 0;
+        fflush (rl_outstream);
diff --git a/sys-libs/readline/readline-6.3-r2.ebuild b/sys-libs/readline/readline-6.3-r3.ebuild
index 7ebc73926c51..e5ee1b3189f0 100644
--- a/sys-libs/readline/readline-6.3-r2.ebuild
+++ b/sys-libs/readline/readline-6.3-r3.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-r2.ebuild,v 1.1 2014/03/13 09:21:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3-r3.ebuild,v 1.1 2014/03/28 02:10:02 vapier Exp $
 
 EAPI=4
 
@@ -55,8 +55,9 @@ 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
-	epatch "${FILESDIR}"/${PN}-6.3-dispatch-multikey.patch #504440
+	epatch "${FILESDIR}"/${P}-vi-last.patch
+	epatch "${FILESDIR}"/${P}-dispatch-multikey.patch #504440
+	epatch "${FILESDIR}"/${P}-readline-sigint-cleanup.patch
 
 	# Force ncurses linking. #71420
 	# Use pkg-config to get the right values. #457558