14 files changed, 10 insertions, 597 deletions
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index a98d4b6ab652..cda6de96c5bd 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,17 +1,8 @@
-AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
-AUX readline-5.0-darwin.patch 461 RMD160 43c4f4af91ab61d05dfb1561f3bbf68f2eb2c88a SHA1 9c971543144248c883db953c6547f520f61cfb83 SHA256 449a7cc02ca053511dff11d29481ff40e76eb9a3ac0b3f0e119fe4501d06587e
-AUX readline-5.0-del-backspace-policy.patch 1074 RMD160 785fc7768f3a017a56e9119f25fece1f58490275 SHA1 376d47bfefb1a9da8c908e2e5e07b2fa273bb142 SHA256 d607c4b902a838662df132badc7ea8a38cc041c0c9b224b34ffd28cf6a43fe7b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX readline-5.0-no_rpath.patch 363 RMD160 6a4ea25da4f683a77892a24f904de873579270fd SHA1 6e5e24e7965cd71abc8b09897de74b766a85461e SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b
-AUX readline-5.0-parallel.patch 849 RMD160 7cf35cf5796d681a324573c0662f5e832c976279 SHA1 b36244b69e27345375a02f035acb6f443bf27586 SHA256 38b03d28d11c5443e01b00de83cf2c789bd9b1380883bb61f59606eaa8834162
-AUX readline-5.0-self-insert.patch 2463 RMD160 e74e661a75538b8d94156372862ba8ee240cdda7 SHA1 215934976a623ef074a437c7ca48f88730e64b4a SHA256 fd41e508c1c08401a7e57265c0d518bbb878098916ee8a94e22c642ba84e8950
-AUX readline-5.0-solaris.patch 756 RMD160 d737e6b923f95f3e192ffa80a146b4d29dc00436 SHA1 731881649b4e020038b3c7ff4fa4b39f947bbd3e SHA256 3919ebedeabcc2d4816c1ad3eabdcad5cae02eb17780b4ffb3b2b0f8c4731f44
-AUX readline-5.1-cleanups.patch 3817 RMD160 ee6773b08e8dcc7f9f03239a52bc658b9070a77c SHA1 bb956a58584c992da59beec16598f26d86e38cf0 SHA256 ee377cfa90050aad3bf47d9b9a62eaa6430c0fdf7f8780240f3ddc75730a434e
-AUX readline-5.1-fbsd-pic.patch 287 RMD160 3950019e591400f83323a610ed7ab024f3dd534b SHA1 b815df9929b0de144ecd9db3a07f13924c573b4e SHA256 0de6b9ffd02d6ae06796d3c4cc76ca4a4c7807f42cd18c1081250792f780f3ac
-AUX readline-5.1-rlfe-build.patch 252 RMD160 7e9085f685b7732d0ef0ecdcc5538b7d84bb7d1f SHA1 2686f8f0a501f2c840e698ef768d7052e265c5b4 SHA256 45f3ac7973b5d5af4a79575fe0b6c364bb444dbbe42f43b600b1dd1d99dcac55
-AUX readline-5.1-rlfe-libutil.patch 530 RMD160 4f0d86709159d8299d51da21de99abd4ffa2ad1f SHA1 0667f4022fe0db3c90e167b66ab89f920f53e940 SHA256 b99dee7796e16598e4bed51a84b4daaff7b7f43532f8738e5581bdfe1068c69e
-AUX readline-5.1-rlfe-uclibc.patch 1694 RMD160 715127465c03df7329f23b1a12aece8001aca96c SHA1 c43ace7708b19e55ce59127b7c4ff8bd7683e670 SHA256 8045b4a37c1a3b19171fe4192161af46188223bdd61ab5e32561593f9c89270e
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
-AUX readline-5.2-rlfe-build.patch 350 RMD160 b6563fbd50795759543f3294c1bf93a9e485cf7b SHA1 de2c1a03e054bdc94c641ff943d2677fb0542d58 SHA256 2a6e8890363b367e4df890c4d4c1afa30437712fbdae98d8f04b7baed3b4c58c
 AUX readline-6.0-rlfe-build.patch 743 RMD160 49ddd8e98588ea3efbd2c8fd613e27fa52d70b95 SHA1 29e6ca942db168919973d79a0f11e0c9b88268ac SHA256 3a084fe0c976355031b2b7a467b60489e4d26d5d4c443b69f102e55fa8ca4f2b
 DIST readline-4.3.tar.gz 961662 RMD160 07aebeb250284d0ef68acf44d1c1ff8578e2ae2f SHA1 4e226fd5f6f919707f11b9e28d47b5487448895d SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 DIST readline-5.2.tar.gz 2037705 RMD160 983cbb25192e0a376b80cb2428fe8ee254a041c7 SHA1 18f3412c73068509d5f491b7b4535aeaf9522834 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
@@ -42,8 +33,14 @@ DIST readline60-003 1970 RMD160 9c6276146a6358d87bdf86ce0d1b9eb8e3a4a2e6 SHA1 f1
 DIST readline60-004 1840 RMD160 b03c01243ea3653cd5b7307c2546aae110603b60 SHA1 4fb45252521e063776bef3aecd874a524fc9c4f8 SHA256 f5cbb02ad37e682f0876d454a07bc2b4ad433a4b0f9f096893454bec1af3eafb
 EBUILD readline-4.3_p5.ebuild 1591 RMD160 d689f7d568d7e3b1115fbf89daf7c8840d801fa1 SHA1 6277a967c3304b2bbc54d2dac5b98d03cb539a68 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a
 EBUILD readline-5.2_p14.ebuild 1905 RMD160 292c4388861f43c7cbbb7f5eda9bb3afc5ef90e1 SHA1 c5ceb9f28c7f9a480881275919200671d4233ab5 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259
-EBUILD readline-6.0_p3.ebuild 2755 RMD160 6c3e1d0f6b2c3dce53ca0105af871e4b4951e59b SHA1 d6a7f26ab0f4999fc51401ae4ae4fbe5e7a593e2 SHA256 b194e9dd6d8c3fcd6aa9587baa9d5c084800d0035553602822027c715fd8965c
 EBUILD readline-6.0_p4.ebuild 2930 RMD160 13341b7a622100586d6125be11aa8d1411ed417d SHA1 75e195874ba9d2cc8d767a68a75fa8cbe9695a71 SHA256 ae92c8cd31f288e794ee0f7dd8684399e1dad06eadc9e047dc59e7d6cc742bcd
 EBUILD readline-6.1.ebuild 2763 RMD160 9eaa13d329dad4e02dda98bd14901fa9d1235d50 SHA1 e36a9684ed99554e6a8af3157014a82a390e34e6 SHA256 319296e7a776dc64ade0cfd51626be53064a746384385cf8cd256450d4f88b76
 MISC ChangeLog 18971 RMD160 16f5617b25758239852d89dfebbc8323a42fdd39 SHA1 699f66dfc9eabe40772aff47b1d2eb3f339f72ea SHA256 c40a4726c14def8e2369f64510363694401271ddeb33181ed6a2ce312c6b2662
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktqGlkACgkQTwhj9JtAlp6NrgD+MPEsUwm7JuRyIy24/guJiIFX
+uarKv07nXBcisee5/KwA/jTnKwFMwHZVXFjnaJK8Olpw8tgevqzXvL5DK9SZYB0j
+=PGdX
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/bash-3.0-etc-inputrc.patch b/sys-libs/readline/files/bash-3.0-etc-inputrc.patch
deleted file mode 100644
index 204e7978d3c1..000000000000
--- a/sys-libs/readline/files/bash-3.0-etc-inputrc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Patch readline's bind.c so that /etc/inputrc is read as a last resort
-following ~/.inputrc.  This is better than putting INPUTRC in
-the environment because INPUTRC will override even after the
-user creates a ~/.inputrc
-
---- bash-3.0/lib/readline/bind.c.agriffis	2004-03-03 22:39:32.000000000 -0500
-+++ bash-3.0/lib/readline/bind.c	2004-08-02 13:53:02.365731918 -0400
-@@ -781,6 +781,7 @@
-      1. the filename used for the previous call
-      2. the value of the shell variable `INPUTRC'
-      3. ~/.inputrc
-+     4. /etc/inputrc
-    If the file existed and could be opened and read, 0 is returned,
-    otherwise errno is returned. */
- int
-@@ -789,17 +790,20 @@
- {
-   /* Default the filename. */
-   if (filename == 0)
-+    filename = last_readline_init_file;
-+  if (filename == 0)
-+    filename = sh_get_env_value ("INPUTRC");
-+  if (filename == 0 || *filename == 0)
-     {
--      filename = last_readline_init_file;
--      if (filename == 0)
--        filename = sh_get_env_value ("INPUTRC");
--      if (filename == 0)
--	filename = DEFAULT_INPUTRC;
-+      /* If there's trouble reading DEFAULT_INPUTRC then fall back to
-+       * the system inputrc
-+       */
-+      filename = DEFAULT_INPUTRC;
-+      if (_rl_read_init_file (filename, 0) == 0)
-+	return 0;
-+      filename = "/etc/inputrc";
-     }
- 
--  if (*filename == 0)
--    filename = DEFAULT_INPUTRC;
--
- #if defined (__MSDOS__)
-   if (_rl_read_init_file (filename, 0) == 0)
-     return 0;
diff --git a/sys-libs/readline/files/readline-5.0-darwin.patch b/sys-libs/readline/files/readline-5.0-darwin.patch
deleted file mode 100644
index b8bcb9ccea3f..000000000000
--- a/sys-libs/readline/files/readline-5.0-darwin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Support Darwin8 properly.
-
-Patch by Kito.
-
-http://bugs.gentoo.org/99143
-
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -146,7 +146,7 @@
- 	SHLIB_LIBSUFF='dylib'
- 
- 	case "${host_os}" in
--	darwin7*)	SHOBJ_LDFLAGS=''
-+	darwin[78]*)	SHOBJ_LDFLAGS=''
- 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 			;;
- 	*)		SHOBJ_LDFLAGS='-dynamic'
diff --git a/sys-libs/readline/files/readline-5.0-del-backspace-policy.patch b/sys-libs/readline/files/readline-5.0-del-backspace-policy.patch
deleted file mode 100644
index b211dd781248..000000000000
--- a/sys-libs/readline/files/readline-5.0-del-backspace-policy.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-ripped from Debian's readline5_5.0-10.diff
-
-# DP: Handle Debian Backspace/Delete keyboard policy
-
-http://bugs.gentoo.org/74807
-
---- readline5-5.0~alpha.orig/terminal.c	2003-09-18 17:03:42.000000000 +0200
-+++ readline5-5.0~alpha/terminal.c	2003-09-27 17:15:30.000000000 +0200
-@@ -148,6 +148,9 @@
- /* Insert key */
- static char *_rl_term_kI;
- 
-+/* The key sequence sent by the Delete key, if any. */
-+static char *_rl_term_kD;
-+
- /* Cursor control */
- static char *_rl_term_vs;	/* very visible */
- static char *_rl_term_ve;	/* normal */
-@@ -314,6 +317,7 @@
-   { "ic", &_rl_term_ic },
-   { "im", &_rl_term_im },
-   { "kH", &_rl_term_kH },	/* home down ?? */
-+  { "kD", &_rl_term_kD },	/* delete */
-   { "kI", &_rl_term_kI },	/* insert */
-   { "kd", &_rl_term_kd },
-   { "ke", &_rl_term_ke },	/* end keypad mode */
-@@ -492,6 +496,7 @@
- 
-   rl_bind_keyseq_if_unbound (_rl_term_kh, rl_beg_of_line);	/* Home */
-   rl_bind_keyseq_if_unbound (_rl_term_at7, rl_end_of_line);	/* End */
-+  rl_bind_keyseq_if_unbound (_rl_term_kD, rl_delete);		/* Delete */
- 
-   _rl_keymap = xkeymap;
- }
diff --git a/sys-libs/readline/files/readline-5.0-parallel.patch b/sys-libs/readline/files/readline-5.0-parallel.patch
deleted file mode 100644
index eccb903f0f85..000000000000
--- a/sys-libs/readline/files/readline-5.0-parallel.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- readline-5.0/shlib/Makefile.in.old	2003-12-10 12:02:47 -0500
-+++ readline-5.0/shlib/Makefile.in	2005-06-27 18:06:02 -0400
-@@ -145,7 +145,10 @@
- 
- all: $(SHLIB_STATUS)
- 
--supported: $(SHARED_LIBS)
-+# Since the libs share some objects, make sure they're built separately
-+# and not in parallel
-+supported:
-+	set -e; for x in $(SHARED_LIBS); do $(MAKE) $$x; done
- 
- unsupported:
- 	@echo "Your system and compiler (${host_os}-${CC}) are not supported by the"
---- readline-5.0/Makefile.in.old	2004-04-22 16:44:37 -0400
-+++ readline-5.0/Makefile.in	2005-06-27 18:05:29 -0400
-@@ -145,7 +145,10 @@
- 
- everything: all examples
- 
--static: $(STATIC_LIBS)
-+# Since the libs share some objects, make sure they're built separately
-+# and not in parallel
-+static:
-+	set -e; for x in $(STATIC_LIBS); do $(MAKE) $$x; done
- 
- libreadline.a: $(OBJECTS)
- 	$(RM) $@
diff --git a/sys-libs/readline/files/readline-5.0-self-insert.patch b/sys-libs/readline/files/readline-5.0-self-insert.patch
deleted file mode 100644
index 3344df59200e..000000000000
--- a/sys-libs/readline/files/readline-5.0-self-insert.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-ripped from Debian's readline5_5.0-10.diff
-
-From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: Bug#290103: readline provided with bash: self-insert doesn't work correctly
-Date: Wed, 12 Jan 2005 20:35:17 +0100
-
-Package: bash3
-Version: 3.0-10
-Severity: normal
-Tags: patch
-
-Hello,
-having the following in .inputrc:
-
-$if Bash
-    ",2": " 2>&1"
-    ",n": " 2>/dev/null"
-    ",t": "/var/tmp/sithglan/"
-    ",b": "/opt/build/thomas/"
-    ",": self-insert
-$endif
-
-should expand ,2 to " 2>&1" but , still to ','. This isn't the case and
-I asked bash maintainer Chet Ramey to fix it and he did it. :-) The
-following patch will ship with the next version of bash.
-
-> > That is a bug in the released version of readline-5.0.  Shadow keymaps
-> > are implemented by using an extra character.  When a `shadowed' key
-> > (the `,' in your case) is bound to self-insert, the 5.0 code was
-> > trying to insert the extra character (256) rather than the `,'.
-
-*** bash-20050106.orig/lib/readline/readline.c	Fri Oct 15 14:36:55 2004
---- bash/lib/readline/readline.c	Sat Jan  8 23:51:44 2005
-***************
-*** 657,665 ****
-  	       the input queue with _rl_unget_char. */
-  	    {
-- #if 0
-- 	      r = _rl_dispatch (ANYOTHERKEY, FUNCTION_TO_KEYMAP (map, key));
-- #else
-- 	      /* XXX - experimental code -- might never be executed.  Save
-- 		 for later. */
-  	      Keymap m = FUNCTION_TO_KEYMAP (map, key);
-  	      int type = m[ANYOTHERKEY].type;
---- 657,660 ----
-***************
-*** 667,673 ****
-  	      if (type == ISFUNC && func == rl_do_lowercase_version)
-  		r = _rl_dispatch (_rl_to_lower (key), map);
-  	      else
-  		r = _rl_dispatch (ANYOTHERKEY, m);
-- #endif
-  	    }
-  	  else if (r && map[ANYOTHERKEY].function)
---- 662,681 ----
-  	      if (type == ISFUNC && func == rl_do_lowercase_version)
-  		r = _rl_dispatch (_rl_to_lower (key), map);
-+ 	      else if (type == ISFUNC && func == rl_insert)
-+ 		{
-+ 		  /* If the function that was shadowed was self-insert, we
-+ 		     somehow need a keymap with map[key].func == self-insert.
-+ 		     Let's use this one. */
-+ 		  int nt = m[key].type;
-+ 		  rl_command_func_t *nf = m[key].function;
-+ 
-+ 		  m[key].type = type;
-+ 		  m[key].function = func;
-+ 		  r = _rl_dispatch (key, m);
-+ 		  m[key].type = nt;
-+ 		  m[key].function = nf;
-+ 		}
-  	      else
-  		r = _rl_dispatch (ANYOTHERKEY, m);
-  	    }
-  	  else if (r && map[ANYOTHERKEY].function)
-
diff --git a/sys-libs/readline/files/readline-5.0-solaris.patch b/sys-libs/readline/files/readline-5.0-solaris.patch
deleted file mode 100644
index 927bac5c202b..000000000000
--- a/sys-libs/readline/files/readline-5.0-solaris.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-fixup solaris linker options
-
-http://bugs.gentoo.org/show_bug.cgi?id=81058
-
---- support/shobj-conf.orig
-+++ support/shobj-conf
-@@ -78,10 +78,14 @@
- sunos5*-*gcc*|solaris2*-*gcc*)
- 	SHOBJ_CFLAGS=-fpic
- 	SHOBJ_LD='${CC}'
--	# This line works for the Solaris linker in /usr/ccs/bin/ld
--	SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
--	# This line works for the GNU ld
--#	SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
-+	ld_used=`gcc -print-prog-name=ld`
-+	if ${ld_used} -V 2>&1 | grep -q GNU; then
-+		# This line works for the GNU ld
-+		SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
-+	else
-+		# This line works for the Solaris linker in /usr/ccs/bin/ld
-+		SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
-+	fi
- 
- #	SHLIB_XLDFLAGS='-R $(libdir)'
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
diff --git a/sys-libs/readline/files/readline-5.1-cleanups.patch b/sys-libs/readline/files/readline-5.1-cleanups.patch
deleted file mode 100644
index c1f7db670a67..000000000000
--- a/sys-libs/readline/files/readline-5.1-cleanups.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Cleanup misc warnings
-
-http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00034.html
-
---- readline-5.1/bind.c
-+++ readline-5.1/bind.c
-@@ -1506,8 +1506,6 @@ rl_variable_value (name)
-      const char *name;
- {
-   register int i;
--  int	v;
--  char *ret;
- 
-   /* Check for simple variables first. */
-   i = find_boolean_var (name);
-@@ -2170,7 +2168,6 @@ _rl_get_string_variable_value (name)
- {
-   static char numbuf[32];
-   char *ret;
--  int n;
- 
-   if (_rl_stricmp (name, "bell-style") == 0)
-     {
---- readline-5.1/callback.c
-+++ readline-5.1/callback.c
-@@ -43,6 +43,7 @@
- #include "rldefs.h"
- #include "readline.h"
- #include "rlprivate.h"
-+#include "xmalloc.h"
- 
- /* Private data for callback registration functions.  See comments in
-    rl_callback_read_char for more details. */
---- readline-5.1/display.c
-+++ readline-5.1/display.c
-@@ -1164,7 +1166,7 @@ update_line (old, new, current_line, oma
-   int col_lendiff, col_temp;
- #if defined (HANDLE_MULTIBYTE)
-   mbstate_t ps_new, ps_old;
--  int new_offset, old_offset, tmp;
-+  int new_offset, old_offset;
- #endif
- 
-   /* If we're at the right edge of a terminal that supports xn, we're
---- readline-5.1/isearch.c
-+++ readline-5.1/isearch.c
-@@ -67,10 +67,6 @@ static _rl_search_cxt *_rl_isearch_init 
- static void _rl_isearch_fini PARAMS((_rl_search_cxt *));
- static int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int));
- 
--/* Last line found by the current incremental search, so we don't `find'
--   identical lines many times in a row. */
--static char *prev_line_found;
--
- /* Last search string and its length. */
- static char *last_isearch_string;
- static int last_isearch_string_len;
---- readline-5.1/misc.c
-+++ readline-5.1/misc.c
-@@ -212,6 +212,8 @@ rl_digit_loop ()
-       if (r <= 0 || (RL_ISSTATE (RL_STATE_NUMERICARG) == 0))
-         break;
-     }
-+
-+  return 0;
- }
- 
- /* Create a default argument. */
---- readline-5.1/readline.c
-+++ readline-5.1/readline.c
-@@ -85,7 +85,7 @@ static void bind_arrow_keys_internal PAR
- static void bind_arrow_keys PARAMS((void));
- 
- static void readline_default_bindings PARAMS((void));
--static void reset_default_bindings PARAMS((void));
-+/* static void reset_default_bindings PARAMS((void)); */
- 
- static int _rl_subseq_result PARAMS((int, Keymap, int, int));
- static int _rl_subseq_getchar PARAMS((int));
-@@ -1054,6 +1054,7 @@ readline_default_bindings ()
- 
- /* Reset the default bindings for the terminal special characters we're
-    interested in back to rl_insert and read the new ones. */
-+/* Unused function
- static void
- reset_default_bindings ()
- {
-@@ -1063,6 +1064,7 @@ reset_default_bindings ()
-       rl_tty_set_default_bindings (_rl_keymap);
-     }
- }
-+*/
- 
- /* Bind some common arrow key sequences in MAP. */
- static void
---- readline-5.1/rltty.c
-+++ readline-5.1/rltty.c
-@@ -933,7 +933,6 @@ rltty_set_default_bindings (kmap)
- #if !defined (NO_TTY_DRIVER)
-   TIOTYPE ttybuff;
-   int tty;
--  static int called = 0;
- 
-   tty = fileno (rl_instream);
- 
---- readline-5.1/search.c
-+++ readline-5.1/search.c
-@@ -70,7 +70,6 @@ static int rl_history_search_pos;
- static char *history_search_string;
- static int history_string_size;
- 
--static UNDO_LIST *noninc_saved_undo_list;
- static void make_history_line_current PARAMS((HIST_ENTRY *));
- static int noninc_search_from_pos PARAMS((char *, int, int));
- static int noninc_dosearch PARAMS((char *, int));
---- readline-5.1/text.c
-+++ readline-5.1/text.c
-@@ -1239,7 +1239,7 @@ rl_change_case (count, op)
- #if defined (HANDLE_MULTIBYTE)
-   wchar_t wc, nwc;
-   char mb[MB_LEN_MAX+1];
--  int mblen, p;
-+  int mblen;
-   mbstate_t ps;
- #endif
- 
---- readline-5.1/vi_mode.c
-+++ readline-5.1/vi_mode.c
-@@ -1111,7 +1111,7 @@ int
- rl_vi_rubout (count, key)
-      int count, key;
- {
--  int p, opoint;
-+  int opoint;
- 
-   if (count < 0)
-     return (rl_vi_delete (-count, key));
diff --git a/sys-libs/readline/files/readline-5.1-fbsd-pic.patch b/sys-libs/readline/files/readline-5.1-fbsd-pic.patch
deleted file mode 100644
index 1e922a656808..000000000000
--- a/sys-libs/readline/files/readline-5.1-fbsd-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -125,7 +125,7 @@
- 
- # FreeBSD-3.x ELF
- freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
--	SHOBJ_CFLAGS=-fpic
-+	SHOBJ_CFLAGS=-fPIC
- 	SHOBJ_LD='${CC}'
- 
- 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-build.patch b/sys-libs/readline/files/readline-5.1-rlfe-build.patch
deleted file mode 100644
index 3429c0fb871d..000000000000
--- a/sys-libs/readline/files/readline-5.1-rlfe-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/rlfe/Makefile.in
-+++ examples/rlfe/Makefile.in
-@@ -22,7 +22,7 @@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- #LDFLAGS = -L$(READLINE_DIR)
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -L../..
- LIBS = -lreadline -lhistory -lncurses
- 
- CPP=@CPP@
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-libutil.patch b/sys-libs/readline/files/readline-5.1-rlfe-libutil.patch
deleted file mode 100644
index 83cfd18c61e0..000000000000
--- a/sys-libs/readline/files/readline-5.1-rlfe-libutil.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-On FreeBSD the openpty() function is provided by libutil. For this rason, it
-has to be linked in the final executable. The current test is broken because
-it sets LIBS but that variable never gets into the Makefile.
-
---- readline-5.1/examples/rlfe/Makefile.in
-+++ readline-5.1/examples/rlfe/Makefile.in
-@@ -25,7 +25,7 @@ CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- #LDFLAGS = -L$(READLINE_DIR)
- LDFLAGS = @LDFLAGS@ -L../..
--LIBS = -lreadline -lhistory -lncurses
-+LIBS = -lreadline -lhistory @LIBS@
- 
- CPP=@CPP@
- CPP_DEPEND=$(CC) -MM
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch b/sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch
deleted file mode 100644
index b60796f37bb1..000000000000
--- a/sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- examples/rlfe/pty.c
-+++ examples/rlfe/pty.c
-@@ -23,6 +23,7 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
- 
-@@ -34,7 +34,7 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
-+#if defined(HAVE_SYS_STROPTS_H)
- # include <sys/stropts.h>
- #endif
- 
---- examples/rlfe/rlfe.c
-+++ examples/rlfe/rlfe.c
-@@ -73,6 +73,9 @@
- #include <termios.h>
- 
- #include "config.h"
-+#include "extern.h"
-+
-+#include <sys/wait.h>
- 
- #ifdef READLINE_LIBRARY
- #  include "readline.h"
---- configure
-+++ configure
-@@ -4956,7 +4956,7 @@
- 
- 
- 
--for ac_header in sys/pte.h sys/stream.h sys/select.h sys/file.h
-+for ac_header in sys/pte.h sys/stream.h sys/select.h sys/file.h sys/stropts.h sys/wait.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-
---- configure.in
-+++ configure.in
-@@ -148,7 +148,7 @@
- 
- AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
- 		limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
--AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)
-+AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h sys/stropts.h sys/wait.h)
- 
- AC_CHECK_HEADERS(sys/ptem.h,,,
- [[
---- config.h.in
-+++ config.h.in
-@@ -141,6 +141,12 @@
- /* Define if you have the <sys/file.h> header file.  */
- #undef HAVE_SYS_FILE_H
- 
-+/* Define if you have the <sys/stropts.h> header file.  */
-+#undef HAVE_SYS_STROPTS_H
-+
-+/* Define if you have the <sys/wait.h> header file.  */
-+#undef HAVE_SYS_WAIT_H
-+
- /* Define if you have the <sys/ndir.h> header file.  */
- #undef HAVE_SYS_NDIR_H
- 
diff --git a/sys-libs/readline/files/readline-5.2-rlfe-build.patch b/sys-libs/readline/files/readline-5.2-rlfe-build.patch
deleted file mode 100644
index 9ad0b2d53f5c..000000000000
--- a/sys-libs/readline/files/readline-5.2-rlfe-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-make sure we link with the current build readline rather than
-the system installed one
-
---- examples/rlfe/Makefile.in
-+++ examples/rlfe/Makefile.in
-@@ -22,7 +22,7 @@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- #LDFLAGS = -L$(READLINE_DIR)
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -Lreadline
- LIBS = -lreadline -lhistory -lncurses @LIBS@
- 
- CPP=@CPP@
diff --git a/sys-libs/readline/readline-6.0_p3.ebuild b/sys-libs/readline/readline-6.0_p3.ebuild
deleted file mode 100644
index fb276cfdd0e9..000000000000
--- a/sys-libs/readline/readline-6.0_p3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p3.ebuild,v 1.9 2009/10/05 15:35:11 armin76 Exp $
-
-inherit autotools eutils multilib toolchain-funcs flag-o-matic
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-# We must be certain that we have a bash that is linked
-# to its internal readline, else we may get problems.
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-2.05b-r2"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd "${S}"
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	epatch "${FILESDIR}"/${PN}-6.0-rlfe-build.patch #151174
-	epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
-
-	# force ncurses linking #71420
-	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	# the bundled rlfe had its configure.in updated, but no one actually
-	# ran autoconf to have the configure file updated
-	ln -s ../.. examples/rlfe/readline
-	cd examples/rlfe
-	eautoconf
-}
-
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-
-	econf --with-curses || die
-	emake || die
-
-	if ! tc-is-cross-compiler ; then
-		cd examples/rlfe
-		append-ldflags -Lreadline
-		econf || die
-		emake || die "make rlfe failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	gen_usr_ldscript -a readline history #4411
-
-	if ! tc-is-cross-compiler; then
-		dobin examples/rlfe/rlfe || die
-	fi
-
-	dodoc CHANGELOG CHANGES README USAGE NEWS
-	docinto ps
-	dodoc doc/*.ps
-	dohtml -r doc
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
-}