Bump to latest official patch release

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 10 insertions, 44 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/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