Revbump to fix very long prompts in vi mode. Removed old

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

7 files changed, 53 insertions, 93 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 44f1fc72d774..4dd1ccb24afd 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,16 @@
 # 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.215 2014/08/23 15:34:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.216 2014/08/30 08:20:50 polynomial-c Exp $
+
+*readline-6.3_p8-r1 (30 Aug 2014)
+
+  30 Aug 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -readline-6.3_p6-r1.ebuild, +readline-6.3_p8-r1.ebuild,
+  +files/readline-6.3-fix-long-prompt-vi-search.patch,
+  -files/readline-6.3-horizontal-redisplay.patch,
+  -files/readline-6.3-readline-sigint-cleanup.patch,
+  -files/readline-6.3-revert-all-at-newline-history-segfault.patch:
+  Revbump to fix very long prompts in vi mode. Removed old.
 
   23 Aug 2014; Agostino Sarubbo <ago@gentoo.org> readline-6.2_p5-r1.ebuild:
   Stable for ia64, wrt bug #512012
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 446ad5d74f15..df2838d7f2eb 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-horizontal-redisplay.patch 1228 SHA256 14b61ed2f170cc390708dfdf9c18615b5616014ffe85bc5c30ada88007070eca SHA512 408449d87e0ab45cd18123b57be0cec3fc30276a8cea24eb2639654bfbdb11d73cbd80c8dfb049dac03062be3a416c97ee3593da18d9024b3d0d32cbc259b46b WHIRLPOOL 8422725e854e0e5a2c17f1fa11171f78dc5c027f2acaab171a979372496ad90bb97fc960b1d35827a30b2d34ae6bc1936bcac93e2ad92b5415945beabf1a45d6
-AUX readline-6.3-readline-sigint-cleanup.patch 592 SHA256 9be9ddc07f6344597ab43fd3104bb1f2c14ace9532ce72247a11b775e824d056 SHA512 87b425568d73b78638d7c14bb31710af634c16e38d16d1a4d765c0652ccf1d5ae03e36d4670470419e5eb28051bebfe88cb93431c9738d4a26417a288248a5e0 WHIRLPOOL a98828a28df8000d6d7770c02b1f5bed9a8df5dd5db29bf610414821e4d5a87a96d032a8acef7af90631473a5330d55d818202a3472e271ac4ba31296f936a7e
-AUX readline-6.3-revert-all-at-newline-history-segfault.patch 633 SHA256 8a0de2a2864214c39a695736e9c24deefb2412905f23859797d48758ac6862d1 SHA512 0d6db4a729f6d129c5ef07be6b8beabb113cab407295cdf002fa08aeb8168a1f578143a53f57da9dbfada8fea4bcf86d36f8a1a24e36b7ebe0e02872fe67436e WHIRLPOOL 6e10151c7871c3f42efc6fa6fcd6e75e14db5a262d1c32bee62d995a3d23e9a5214f2eabdd0bf71505125643f53fccf3372450c9c200b2cf4db6d0afe73209ac
+AUX readline-6.3-fix-long-prompt-vi-search.patch 669 SHA256 787f9ed371c550aeecfe5c57e250aa9bfc101dfccb19437fbca135e19610ef9b SHA512 19e8a342c305e6f68e13bf3eec619971a5bb8f2a542838a28f72e77f672f5e8e9f501f446facae3528e14646e6e41a29546837f0407a1ddaddf20244914d6d9d WHIRLPOOL 5636b9d0638be1b214b1710d42b7b812e8b8714e9aa0546be6d187992e6c0dc0fe513a11dd9386c1d8949c792775fc26c8d8cbe0b44ca5cba6854089332f4513
 DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182 WHIRLPOOL bad0852f5a97b747c79923bbef29dc48bb7730b96ba86dd444f63d9ee78fe0dda3edd249607dbaf98b3a8932b69cbcf0f79592cfc3757887791e38673dccb352
 DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3
 DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0
@@ -47,24 +45,24 @@ 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 4139 SHA256 8053449a5b412536871e2638d669f1c33c9db1ea489d2dab5a27384ee8a20199 SHA512 af79b7ca6b71e69cbff7b867de26e4897562b50239404db4b61ff7a260b275ec062a1a8b064ab40691501cd49e69193028844f7bdf049de34a8a0e7506eeb9a1 WHIRLPOOL 6fc061b3d034d463a1925b3c9f9e8bf8eacb8f8127c661a6bd49bb29636f358c15e1166d35128218b386ec1c459f91c243e677fbc5a56cd0ae9b20c4c6382e65
-EBUILD readline-6.3_p6-r1.ebuild 4541 SHA256 93690699fe252c921f319cb6a6ae5bad7afd663668cee1d4b0c4c4955d4eea33 SHA512 62c7ff0de7a9d9d5540c71bb6bb8f7ec252f76e9244447016229ad1ff0d84b9fa4283fa9f90d8911b1022dbb3812d351d1e428be1048f3492bb8e0a1340b0583 WHIRLPOOL 6206f9101b0008eb8fac30473481b59ca5c90163dae1a1cb74afc1f20468bd3be310e3fe8f5685e91236c93edc4cc1a820335d8baecb4df8a04c3a54c8dcc444
+EBUILD readline-6.3_p8-r1.ebuild 4528 SHA256 596758faf0acac437eed832b17ebac6fd7f70a99c4125d1151f926c08b448f27 SHA512 0b0f0e7d95d5c830b230b394b1992d588ba2a3c349875f27095b446ec71200f08a9b88474b00ac53960387c1d0ad432d80392194d8bafabe1e1a443f742bedfa WHIRLPOOL e81a9f3ce0735e342234891216b65347bf4f43edf257da7fafe56d395b5e17dca812dc117677a4ce3baa28862d8d3df8c3a936d6700314f722f24309dad60fc7
 EBUILD readline-6.3_p8.ebuild 4461 SHA256 59c8d73549c773d7b657bbce7ceec9ff78b13b6d66b3deeed7df8427da0b90c5 SHA512 7f8c0e3601505b18b1da5298f9ff50e4530ba90d935b725cd2a7262ddf23c12999fdc5438b4ea51f91084a23df8cf7bfac8e265e65e337a35aa671ca16dfe75c WHIRLPOOL a411dd003ba12d43742298e1d7d4492389a7020ad44760e75e2d47284566ba656c37a7a1c7c16627efeed2b32f9651ded9dffba90666b2a96be4d98e71d4543c
-MISC ChangeLog 28637 SHA256 64a0be9bf0b22413d6c341b7a2428c1ccfdf2892346fd43975fce91363eea75d SHA512 e9345d1d205d6f986508667c65c96c45b60981d442f0c2b70c7162c1e54dc2a7ae3748d74f3feb39d0ab6475299a4a3ea4978ec566ef0d9eaa7f81350e35550e WHIRLPOOL ddc7fb15cf708a3227bbc6970530301952a2df28004f1d3fb5cd6c80527897212f16eaf0125876cdfd70358e422d4aedac53c2d7b4a752773d287d4950541e64
+MISC ChangeLog 29080 SHA256 01a76985f831c856060a2816c3fe542e540b39c2e919ecb1be3503bc3a785154 SHA512 fc76f1c04971e5f14baaddaa91d17d3b3fe0fc4d6eebae102c31f5c504f493565e6ffa5a40a6ed9cd413d939a02f13d60b8548b9c9dd298258a55db272c52569 WHIRLPOOL 23c1904b15c9c3c53955b6af2d75e4bebf75d6d6993375438cdf599ab198e4a0146c2b8cbe5c51f762a50eb10c949352821fdab77f73b7ec76ef5707f5977d22
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT+LR0AAoJELp701BxlEWfA48P/i6uiKT1ytxSU5gnQFEqx96w
-TXfA/gO/Ya1BCshCqlgzwu/tfw4ARaR0OYzLweWoPIWzcVqVlnab7vGmpCXXi8uU
-TIjDSE/ebZX8mrOZXh5aJ03WhXxk8xnlQ8hBfc1jxqtMfrRSzLOJTI08RrTHRARg
-18nvmmlr1st7Iix+tSx/xYqDQabYiutGGGhomogMN3PlwCeUcBdqtwgtKZn7weJx
-JXiMXQ5x70/vC4Jsw6a3LyYDRBrhpVCEese8sJw08pBo0bZBq9QGx/d4YWsNlB88
-YzeumtagpJrn5il1ludBTlM5V/+nfZuCkWVuYTdy7ySkYpRzLtIN4Sx5eJjHDc+/
-JmE5HCmpHx+Zs6oUOSOPDJVi7PRn9OG1eteH/4lb6m1UB1o7N2LTsAvx7CrAQho+
-tCDj6CqaTmTbfR/g+/JD79QpwJME26QSus8jVFdMyz2oH1/Z8+DCGUeF8dmnDIRS
-j29XpE5lUB/ce+JZtpXEnZEhd6Zx+BJNgocr7H6xHNWAUbt9OlBqw2X+hcgavCxy
-SB9pHFSiCQytuGx9BLYLoeiW4IVsuYrJgIpQBJi1QSs/4BbBdGgJijd9QcbYMmAZ
-8nO2EV8FpP8mxa86f1T2oUMqYsLYxA8H/HhheKmejFNpwTpWJXgVFoK3QRv+65bc
-nn7Wu3OSM8LUaKxtyz9l
-=DDMB
+iQIcBAEBCAAGBQJUAYljAAoJEPiazRVxLXTFJnAP/jTOFjR98hln8mCoXZgbtwoo
+cm6x5sMJ9PFWyUGAaoVV0kwTPptDkiLSoCNOUZrrrVR+aQCM6gRb+HSNVffDaU2+
+QF7aRtAbuMcgfMaPdEpVpNuLkaSOkAUnvDdRkK4bt2LRLW6dwVDYLr6x1bz2iv1L
+GJeWH6Hh+z5NPJBjy9EgGvqSsY3iRI604ZCE6NataAceymHUY24oisoGjjLIDKFC
+AwBTedOyEWrGZcUczBdT4CCBAVt1GNmySO0yJhTz9WFqa+BY8xJIzRdkaKOvpkX8
+6gxLXiQB+bQwUueyOkWt8maxgXWDmQfm1DKIja4k+SFpR7LjRKQso1jPb+YEiK2H
+uA0z8E5E3ylcbrwCMlmYcdmTbuZUNVc9yXuxru2yZ9caxYQ7/slKmaX4xnoo8ftB
+PoyhO5PcLCx7wbvDdlIQpdcGcR/VP8FW+aWklGhPX9rGWD7VLaBCbJnw20UdvGRd
+DFqjeNADnIrJ5cWxSzlomHBGJAxO3teOfXs849dZ/vgnqcrGluI+dIRZh61OPIqv
+HkQU3QfRQRFPqyDo7voSSKHm+ETWqChY2kQORnzUDI/au5pBYR4vGCy/XHy3AQNM
+mO96O0r+WABbowCNgld6VCo0TPM0XXhBDaRMPbQ9kZ7IGkawKoXpCAVe3w7/TNBY
+9oU6Nktb8dobS4MiFtrC
+=SyNT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch b/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
new file mode 100644
index 000000000000..8bf2994deb70
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
@@ -0,0 +1,24 @@
+From 2774192e93991e3d85ccc37c714aa018e442af6d Mon Sep 17 00:00:00 2001
+From: Dylan Cali <calid1984@gmail.com>
+Date: Sat, 23 Aug 2014 02:26:05 -0500
+Subject: [PATCH] fix vi search prompt bug for long prompts
+
+---
+ display.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/display.c b/display.c
+index 4df1f73..e575b16 100644
+--- a/display.c
++++ b/display.c
+@@ -2259,7 +2259,7 @@ rl_message (va_alist)
+       va_start (args);
+       format = va_arg (args, char *);
+ #endif
+-      vsnprintf (msg_buf, msg_bufsiz - 1, format, args);
++      vsnprintf (msg_buf, msg_bufsiz, format, args);
+     }
+ #else
+   vsprintf (msg_buf, format, args);
+-- 
+1.7.10.4
diff --git a/sys-libs/readline/files/readline-6.3-horizontal-redisplay.patch b/sys-libs/readline/files/readline-6.3-horizontal-redisplay.patch
deleted file mode 100644
index 46286f49b045..000000000000
--- a/sys-libs/readline/files/readline-6.3-horizontal-redisplay.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-*** ../bash-4.3-patched/lib/readline/display.c	2014-04-08 18:19:36.000000000 -0400
---- lib/readline/display.c	2014-04-20 18:32:52.000000000 -0400
-***************
-*** 1638,1642 ****
-       the spot of first difference is before the end of the invisible chars,
-       lendiff needs to be adjusted. */
-!   if (current_line == 0 && !_rl_horizontal_scroll_mode &&
-        current_invis_chars != visible_wrap_offset)
-      {
---- 1638,1642 ----
-       the spot of first difference is before the end of the invisible chars,
-       lendiff needs to be adjusted. */
-!   if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
-        current_invis_chars != visible_wrap_offset)
-      {
-***************
-*** 1826,1831 ****
-  		_rl_last_c_pos += bytes_to_insert;
-  
-  	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-! 		goto clear_rest_of_line;
-  	    }
-  	}
---- 1826,1836 ----
-  		_rl_last_c_pos += bytes_to_insert;
-  
-+ 	      /* XXX - we only want to do this if we are at the end of the line
-+ 		 so we move there with _rl_move_cursor_relative */
-  	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-! 		{
-! 		  _rl_move_cursor_relative (ne-new, new);
-! 		  goto clear_rest_of_line;
-! 		}
-  	    }
-  	}
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
deleted file mode 100644
index 58a04ffe95ee..000000000000
--- a/sys-libs/readline/files/readline-6.3-readline-sigint-cleanup.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/files/readline-6.3-revert-all-at-newline-history-segfault.patch b/sys-libs/readline/files/readline-6.3-revert-all-at-newline-history-segfault.patch
deleted file mode 100644
index 7c60b208ef6f..000000000000
--- a/sys-libs/readline/files/readline-6.3-revert-all-at-newline-history-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html
-
---- readline-6.3/misc.c
-+++ readline-6.3/misc.c
-@@ -462,13 +462,13 @@
- 	  /* Set up rl_line_buffer and other variables from history entry */
- 	  rl_replace_from_history (entry, 0);	/* entry->line is now current */
- 	  /* Undo all changes to this history entry */
-+	  entry->data = 0;
- 	  while (rl_undo_list)
- 	    rl_do_undo ();
- 	  /* And copy the reverted line back to the history entry, preserving
- 	     the timestamp. */
- 	  FREE (entry->line);
- 	  entry->line = savestring (rl_line_buffer);
--	  entry->data = 0;
- 	}
-       entry = previous_history ();
-     }
diff --git a/sys-libs/readline/readline-6.3_p6-r1.ebuild b/sys-libs/readline/readline-6.3_p8-r1.ebuild
index 899183692802..77ac1479fdc5 100644
--- a/sys-libs/readline/readline-6.3_p6-r1.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r1.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_p6-r1.ebuild,v 1.1 2014/07/08 09:03:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.1 2014/08/30 08:20:50 polynomial-c Exp $
 
 EAPI=4
 
@@ -55,7 +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-revert-all-at-newline-history-segfault.patch
+	epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
 
 	# Force ncurses linking. #71420
 	# Use pkg-config to get the right values. #457558