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

4 files changed, 24 insertions, 72 deletions

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 ();
-     }