sys-libs/readline: sync

Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

14 files changed, 100 insertions, 1456 deletions

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 27b74c2223..83956ce54b 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,22 +1,5 @@
 DIST host-libtool-0.1.0.tar.gz 388867 SHA256 a32c9046e7f63b84ea41228ed54b17b98789ce129f7d02c215840dbecb15c8f5 SHA512 d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5 WHIRLPOOL 5b002500155ad6d2400ba65950827db76f1c91ccc09f11fc726f71c23452d364d32229a6a92334ef3a77e72c53c353dee53b56601691868a3ab26adc0983c36b
-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
 DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda
-DIST readline52-001 874 SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5 SHA512 65b92b5e03c20566eb3c7626e3ee9631e2b26932c34f2f95d88ae731df2805bcf63fc1215b97c97a2948e83b9373e3985ca1f64a598d84f1457bb33b605e5d9c WHIRLPOOL a11176d2bd2e02c5d81dc2791946251e89133d74d8621874db638a3854415e184934589b9c04d066035ca83f00b0de5e06876fddc7d6ca8e33203559b1eeda9c
-DIST readline52-002 1433 SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78 SHA512 9d5b5549c355e80608d76b532bdf358a4e26dac0b62f7c51055bb15ea831a74ad2ef25391ddc2b1615bff8974a2e89a8045567fb0c6d2726dde37aa02a0e6b31 WHIRLPOOL f45f3641984fbb519344f8be6cffb863ee9dd07dd4a59c83d8a722770e84d35be8722970e87afa47b7db6c568bf45cea8904136a92dcfab85e0c5f6b04591077
-DIST readline52-003 1204 SHA256 2a55d2ecb1c9b0147aeb193a6323616ab31c1c525a83b2db3a994b15594ba934 SHA512 7f1722adea9bb9a94277cfbc66d47f600654a0d43bce7def1405e1bb925e5fb324615dd588d1ff2555e6bdebbe3b4609237ba7f52d80689a45f80935e440a37c WHIRLPOOL ad2bf92f7bcdd50f1bf2cacf917339590a9614237712f55f6432f0f6b7354b1a4c336be7784689749809d91b8f9e1b8e518642d315f84ee2a2fb4ff3235d1ad9
-DIST readline52-004 2192 SHA256 a03b65633781efa7c3aae5d57162985e7b7a3c10acf0f2621be610e16f27e5f2 SHA512 e0c0f87ca14a3d473aa31627385f1cb9c2daaf685d8bc0c25bfb2214d5665077a74c4589e3ff5bbc6d0e8b5321ac7fe0c4f7620761d46bbdca787a751e6dbd02 WHIRLPOOL c4f95b2bdc4d2e87983f307d484276cac5e8cd1a14fdef316cba91f53e274a87928f5b7701e098d6d8e9e522320925b086786513f70599cc749dd010e27f9638
-DIST readline52-005 8029 SHA256 06001896514148a757ea6edbbd40c4fc4331dc653847244386c37b138b150f64 SHA512 bd7af4e71f1572811b37bccb68d5ebc20f2e7c21850d9ec55bc48fdf756f9ebaac888b0fc6d83b70e94e335056646e5021ec86b26100a976883ff72ee6d8d521 WHIRLPOOL 6fed5902600d880b181cde7962d0d8eb8f1552770cddf7e80fa2547da7f8f1b8da4dda06d1875510974c897136cfe36079c80aaa83ce81aafab5af39675f393b
-DIST readline52-006 2820 SHA256 dfef3e982c0adf8bb5a9b7d0468ec8f5f18138b325e28759437464de5be71013 SHA512 3523800517b24fa512f3bc8750ecb83be73d57c7d48636ac3aa6b681ee185b6460ce8461a046734b64d78834f89d18d4c9c1de92d1eee94294eeae7e2911ce93 WHIRLPOOL b85c88d1bba3ac13d7379a6018d1d2a8c5fde78af37b28eeaf18e2ce3257e220b7ed36e106b649bd35f45b83703e7d5749a7ebe7e606857a8c774f4197a5f648
-DIST readline52-007 1523 SHA256 775b028c7b761397ac6ae1bdfbac7e896dc3b9b3adc2f91312499180ca13bdd1 SHA512 fe9471b237713ef7ce53fd0cf7bbb5a60720c64ec3df9dc58146d9c187511f0a6f480ae3f3b65168723e416ba4f08c67a2add0b01ede1149f72e7fc2ef21050f WHIRLPOOL 0a737ca595dcf8ce11f22e07b0927ba35f76981b7dcab38931536f38f9f94cf57882a555f3d0993b3b9d986156deaa8742db5ad50767beb7b68bda4cd067d3ba
-DIST readline52-008 2277 SHA256 a21b4e0bf0530b878bad24d5be23d18a9e03a75a31ae30844dc0933bb3d77ecd SHA512 a864e970006146533dac885b00f53dcf1471f95d6143d8874fe8c8e056477d6c237cf2814625bf2031844285484757fa0ccf66d064ac2065ac62a21384d67c93 WHIRLPOOL 2ec34f16bb51f2def75d6ba70a99073a8164157000bc2cdd84590060e7192c7c5aaedb67a89fa8602b02c5db3636262f6bd6d49321ca1130b9571d6d5c6285b4
-DIST readline52-009 1332 SHA256 138d5e0f0709a47a2d1621295a3dd5e3cc73b63b5cc28dab03abc4e94fe95ecf SHA512 a19ca5b5875208f8ea4804461c1ba1b0e27feabb0a2a0db1fe9ea94b8d84e366e754688f5d8840f48c6bc22a02b0abcbaf35dd3361784b7db4e9e83629d840be WHIRLPOOL 707c8bbe7492f7744d43b8c90e4ae83a44fae0932bb7007725d6e75c0748cac4bb3a6b20823cb546760d1c0009c31ebaac6088e6e3a71b0ffc5bf8329538301f
-DIST readline52-010 1543 SHA256 83f8c1aadb86b1a2fad8821a9c6be72a8de5afd7fd9fde58a30b3b57d939693e SHA512 851b7ee9fa3ab84e570723d445ade084fbb5af17fd4131520650f53000e93cb7c799c56cb00e8f906b230524b2fdda60970e72a44d1673d9bcd2c4de7ae400f8 WHIRLPOOL c491a42ac29463172c56408362ac3f3787b5f18e7050a72e73ed1191519c0093591b1ff095b8ec056af001016b47f654d4db46df86fd02b643b9ff3e8ee8ecee
-DIST readline52-011 886 SHA256 08ad3384ab0906e6fa4cc417eb8c43ff59375bcead15fd5c8e31730f0413b3d6 SHA512 b4d813c3aa9c1f35962ea8ca6ad1abb34f4ed3ab91dd31eb1fc5e9b9e54da032e6fbfea583e472cc6d8c6baa4f2ad8f63efc22c749fd713e0704474aad74f0ae WHIRLPOOL 4d3b05ed68601a96d2046a917051f87263ee60b5a4f5e44211f8f6d4dd26cd55e88f119ef0fd1c92dace7de88e981155dbfc64e595f2d59d2af430585f70adad
-DIST readline52-012 3870 SHA256 20f0243be2299c23213492cc2c19cfd15cc528d2b566a76a2de58306bb9e4c9e SHA512 2964c1c3a234223216ca3a099c42d8ee7de94fa7bee73ac346cc9991b9a11ad0406d3f9d785548f15170bf803714f4ffb0c2dfad19bb633358805c9b2e2873d3 WHIRLPOOL fa4bb64304b266dc24565ca4c5396aec8a5192998bb2322906be45e40389ef10141f0bdf243a33438384508d74387b4fb645b9189264742ae6a10e5600a57af3
-DIST readline52-013 5147 SHA256 0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060ad30ebe98144d5 SHA512 6c9addc3b130d5f034488cc9506f22bd183794fd1a8ac820c674b39761c8c47df1b69dc41c8be60054a068b2ae5fb63a76268b977ea07b33a8fcc4a829b55a8f WHIRLPOOL 17a956bb00d99819067f81dbe73ab1e573f0079b0c328ecede4082b98a03b20ff2d5629daf639abc1ff19b3b9d13e3c8d23a5bfa85b4712337611ef3a4d91aff
-DIST readline52-014 1244 SHA256 6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817 SHA512 d262861e67b79059de3967ba820ce02a7d28eff33175ecb30b748d24c08f3a151da3c53430fc2d26da5934f198075c55d2f616b93fabd297d60b9c82bae17cf0 WHIRLPOOL ff137bf6e56989e24a378dfc15c1831a7f0f458442781bffe07c429e04f21d674993ab523198341918a1cd540d2bd8806ec0c9283f879d7346f0c26b920eeca8
-DIST readline62-001 1388 SHA256 38a86c417437692db01069c8ab40a9a8f548e67ad9af0390221b024b1c39b4e3 SHA512 e505161a9ab28f6c1086a6a4ecc5a82da9001d79e4c2b7c44cd82e86dca90bc726ee2387a31e8b4c6893b240877a766fdd913ee7294389722214e6281c518478 WHIRLPOOL 28c63b09a62fa1b64902b04a3c5607da742f7f308648262736240138fa7c957f21856556c8dd2dc08749acf143c271907c69124a978191a5ddb21a6dcf9ee70a
 DIST readline63-001 1366 SHA256 1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2 WHIRLPOOL ed0b0ce066ab4764851d81e44d708cc9e2f3fe36ac4788243c81b3e25aa0995d054c1caf0a788c25969c7cdc6b2bad55a9c9c64286f485194b4e76bc453edf74
 DIST readline63-002 1297 SHA256 39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4 WHIRLPOOL ca878e614ee233748f7017f5606fe2e96bb8374b33e4a571c5901594d7f329fd19b217abcf9cb844fa96374bff9e044712ed1017d6d99936f700da030202231d
 DIST readline63-003 985 SHA256 ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12 WHIRLPOOL 3615b462024e836f0854c2ffaf1282b42462a0da90c8ce248a47e9ea5a0ce00892135c1b725f9fb8ef1fafb1e88e02649c664373ba41683ca2457aafdd12ac93
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-extern.patch b/sys-libs/readline/files/readline-5.1-rlfe-extern.patch
deleted file mode 100644
index 3ec2cb36ac..0000000000
--- a/sys-libs/readline/files/readline-5.1-rlfe-extern.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- examples/rlfe/extern.h.orig	2006-09-28 11:33:35.372527000 +0200
-+++ examples/rlfe/extern.h	2006-09-28 11:39:01.460499000 +0200
-@@ -27,6 +27,14 @@
- #define __attribute__(x)
- #endif
- 
-+#ifndef __P
-+# if defined(__STDC__) || defined(__cplusplus)
-+#  define __P(p) p
-+# else
-+#  define __P
-+# endif
-+#endif /* __P */
-+
- /* pty.c */
- extern int   OpenPTY __P((char **));
- extern void  InitPTY __P((int));
diff --git a/sys-libs/readline/files/readline-5.2-aixdll.patch b/sys-libs/readline/files/readline-5.2-aixdll.patch
deleted file mode 100644
index e7e819d7b8..0000000000
--- a/sys-libs/readline/files/readline-5.2-aixdll.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Switch creation of shared libraries on AIX to AIX native style,
-where a shared object is packed into an archive library.
-Additionally, create that shared objects using linker flag '-G'
-as suggested in various AIX documentations.
-But when doing so, there's no need for a static library in its common sense.
-Instead, symlink the shlib/libX.a to static (top-level) build directory.
-diff -ru readline-5.2.orig/configure.in readline-5.2/configure.in
---- readline-5.2.orig/configure.in	2008-03-20 09:47:38.000000000 +0100
-+++ readline-5.2/configure.in	2008-03-20 09:47:48.000000000 +0100
-@@ -238,6 +238,9 @@
- 	if test "$SHLIB_STATUS" = 'unsupported'; then
- 		opt_shared_libs=no
- 	fi
-+	if test "$opt_shared_libs" = yes -a "$SHLIB_STATUS" = 'aixdll'; then
-+		opt_static_libs=no
-+	fi
- 
- 	# shared library versioning
- 	# quoted for m4 so I can use character classes
-diff -ru readline-5.2.orig/configure readline-5.2/configure
---- readline-5.2.orig/configure	2008-03-20 09:47:38.000000000 +0100
-+++ readline-5.2/configure	2008-03-20 09:47:48.000000000 +0100
-@@ -8468,6 +8468,9 @@
- 	if test "$SHLIB_STATUS" = 'unsupported'; then
- 		opt_shared_libs=no
- 	fi
-+	if test "$opt_shared_libs" = yes -a "$SHLIB_STATUS" = 'aixdll'; then
-+		opt_static_libs=no
-+	fi
- 
- 	# shared library versioning
- 	# quoted for m4 so I can use character classes
-diff -ru readline-5.2.orig/shlib/Makefile.in readline-5.2/shlib/Makefile.in
---- readline-5.2.orig/shlib/Makefile.in	2008-03-20 09:47:38.000000000 +0100
-+++ readline-5.2/shlib/Makefile.in	2008-03-20 09:47:48.000000000 +0100
-@@ -162,6 +162,15 @@
- 	@echo "Please send the changes you made to bash-maintainers@gnu.org"
- 	@echo "for inclusion in future bash and readline releases."
- 
-+aixdll: libreadline.a libhistory.a
-+libreadline.a: $(SHARED_READLINE)
-+	$(AR) q $@ $?
-+	ln -sf shlib/$@ ../$@
-+
-+libhistory.a: $(SHARED_HISTORY)
-+	$(AR) q $@ $?
-+	ln -sf shlib/$@ ../$@
-+
- $(SHARED_READLINE):	$(SHARED_OBJ)
- 	$(RM) $@
- 	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
-@@ -180,11 +189,19 @@
- installdirs: $(topdir)/support/mkdirs
- 	-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir)
- 
--install: installdirs $(SHLIB_STATUS)
-+install-supported: installdirs supported
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY)
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE)
- 	@echo install: you may need to run ldconfig
- 
-+install-unsupported: unsupported
-+
-+install-aixdll: installdirs aixdll
-+	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" libhistory.a
-+	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" libreadline.a
-+
-+install: install-$(SHLIB_STATUS)
-+
- uninstall:
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY)
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE)
-diff -ru readline-5.2.orig/support/shlib-install readline-5.2/support/shlib-install
---- readline-5.2.orig/support/shlib-install	2008-03-20 09:47:38.000000000 +0100
-+++ readline-5.2/support/shlib-install	2008-03-20 09:47:48.000000000 +0100
-@@ -144,7 +144,7 @@
- 	fi
- 	;;
- 
--solaris2*|aix4.[2-9]*|aix[5-9].*|osf*|irix[56]*|sysv[45]*|dgux*|interix*)
-+solaris2*|osf*|irix[56]*|sysv[45]*|dgux*|interix*)
- 	# libname.so -> libname.so.M
- 	${echo} ${RM} ${INSTALLDIR}/$LINK1
- 	if [ -z "$uninstall" ]; then
-diff -ru readline-5.2.orig/support/shobj-conf readline-5.2/support/shobj-conf
---- readline-5.2.orig/support/shobj-conf	2008-03-20 09:47:38.000000000 +0100
-+++ readline-5.2/support/shobj-conf	2008-03-20 09:56:29.000000000 +0100
-@@ -249,24 +249,26 @@
- 
- aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)		# lightly tested by jik@cisco.com
- 	SHOBJ_CFLAGS=-fpic
--	SHOBJ_LD='ld'
--	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
--	SHOBJ_XLDFLAGS='-G'
-+	SHOBJ_LD='$(CC)'
-+	SHOBJ_LDFLAGS='-shared -Wl,-G -Wl,-bdynamic -Wl,-bexpall'
- 
--	SHLIB_XLDFLAGS='-bM:SRE'
-+	SHLIB_XLDFLAGS='-Wl,-blibpath:${libdir}:/usr/lib:lib'
- 	SHLIB_LIBS='-lcurses -lc'
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-+
-+	SHLIB_STATUS='aixdll'
- 	;;
- 
- aix4.[2-9]*|aix[5-9].*)
- 	SHOBJ_CFLAGS=-K
- 	SHOBJ_LD='ld'
--	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
--	SHOBJ_XLDFLAGS='-G'
-+	SHOBJ_LDFLAGS='-G -bdynamic -bexpall'
- 
--	SHLIB_XLDFLAGS='-bM:SRE'
-+	SHLIB_XLDFLAGS='-blibpath:${libdir}:/usr/lib:lib'
- 	SHLIB_LIBS='-lcurses -lc'
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
-+
-+	SHLIB_STATUS='aixdll'
- 	;;
- 
- #
diff --git a/sys-libs/readline/files/readline-5.2-interix.patch b/sys-libs/readline/files/readline-5.2-interix.patch
deleted file mode 100644
index a06eb68a97..0000000000
--- a/sys-libs/readline/files/readline-5.2-interix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-reported upstream: http://lists.gnu.org/archive/html/bug-readline/2011-05/msg00005.html
-
-diff -ru -x config* readline-5.2.orig/examples/rlfe/os.h readline-5.2/examples/rlfe/os.h
---- readline-5.2.orig/examples/rlfe/os.h	Mon Jan 21 08:04:30 2008
-+++ readline-5.2/examples/rlfe/os.h	Mon Jan 21 08:20:21 2008
-@@ -208,7 +208,9 @@
- #   include <cytermio.h>
- #  endif
- # else /* TERMIO */
--#  include <sgtty.h>
-+#  ifndef __INTERIX
-+#    include <sgtty.h>
-+#  endif
- # endif /* TERMIO */
- #endif /* POSIX */
- 
-diff -ru -x config* readline-5.2.orig/examples/rlfe/rlfe.c readline-5.2/examples/rlfe/rlfe.c
---- readline-5.2.orig/examples/rlfe/rlfe.c	Mon Jan 21 08:04:30 2008
-+++ readline-5.2/examples/rlfe/rlfe.c	Mon Jan 21 08:14:45 2008
-@@ -77,6 +77,10 @@
- 
- #include <sys/wait.h>
- 
-+#ifdef __INTERIX
-+#  include <sys/select.h>
-+#endif
-+
- #ifdef READLINE_LIBRARY
- #  include "readline.h"
- #  include "history.h"
-@@ -545,7 +549,14 @@
- #endif
- 
-   t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \
--		 ECHOK | ECHOKE | ECHONL | ECHOPRT );
-+		 ECHOK | ECHONL 
-+#ifdef ECHOKE
-+		 | ECHOKE 
-+#endif
-+#ifdef ECHOPRT
-+		 | ECHOPRT 
-+#endif
-+		 );
-   t.c_iflag &= ~ICRNL;
-   t.c_iflag |= IGNBRK;
-   t.c_cc[VMIN] = 1;
diff --git a/sys-libs/readline/files/readline-5.2-mint.patch b/sys-libs/readline/files/readline-5.2-mint.patch
deleted file mode 100644
index b24e2db377..0000000000
--- a/sys-libs/readline/files/readline-5.2-mint.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Patch by Alan Hourihane for FreeMiNT
-http://archives.gentoo.org/gentoo-alt/msg_c989ade3c4f92f866fe1c40ff2da0c4a.xml
-
-diff -ur readline-5.2/examples/rlfe/rlfe.c readline-5.2-mint/examples/rlfe/rlfe.c
---- readline-5.2/examples/rlfe/rlfe.c	2008-03-11 19:23:25.800436592 +0000
-+++ readline-5.2-mint/examples/rlfe/rlfe.c	2008-03-11 19:23:38.877438387 +0000
-@@ -541,6 +541,13 @@
-   add_special_char(t.c_cc[VDISCARD]);
- #endif
- 
-+#ifndef ECHOKE
-+#define ECHOKE 0
-+#endif
-+#ifndef ECHOPRT
-+#define ECHOPRT 0
-+#endif
-+
-   t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \
- 		 ECHOK | ECHOKE | ECHONL | ECHOPRT );
-   t.c_iflag &= ~ICRNL;
-Only in readline-5.2: readline-5.2-mint.patch
-diff -ur readline-5.2/support/shobj-conf readline-5.2-mint/support/shobj-conf
---- readline-5.2/support/shobj-conf	2006-04-11 14:15:43.000000000 +0100
-+++ readline-5.2-mint/support/shobj-conf	2008-03-11 17:34:33.588499957 +0000
-@@ -487,6 +487,11 @@
- 	SHLIB_STATUS=unsupported
- 	;;
- 
-+mint*)
-+	SHOBJ_STATUS=unsupported
-+	SHLIB_STATUS=unsupported
-+	;;
-+
- cygwin*)
- 	SHOBJ_LD='$(CC)'
-         SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a'
-diff -ur readline-5.2/terminal.c readline-5.2-mint/terminal.c
---- readline-5.2/terminal.c	2006-09-28 15:11:10.000000000 +0100
-+++ readline-5.2-mint/terminal.c	2008-03-11 17:34:53.147437815 +0000
-@@ -641,7 +641,7 @@
- int
- rl_crlf ()
- {
--#if defined (NEW_TTY_DRIVER)
-+#if defined (NEW_TTY_DRIVER) || defined(__MINT__)
-   if (_rl_term_cr)
-     tputs (_rl_term_cr, 1, _rl_output_character_function);
- #endif /* NEW_TTY_DRIVER */
diff --git a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
deleted file mode 100644
index fc63491131..0000000000
--- a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-dont ignore errors in the shlib subdir
-
-http://bugs.gentoo.org/216952
-
---- Makefile.in
-+++ Makefile.in
-@@ -194,7 +194,7 @@
- 
- shared:	force
- 	-test -d shlib || mkdir shlib
--	-( cd shlib ; ${MAKE} ${MFLAGS} all )
-+	( cd shlib ; ${MAKE} ${MFLAGS} all )
- 
- documentation: force
- 	-test -d doc || mkdir doc
-@@ -238,7 +238,7 @@
- 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
- 
- install-shared: installdirs install-headers shared install-doc
--	-( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
-+	( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
- 	
- uninstall-shared: maybe-uninstall-headers
- 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
diff --git a/sys-libs/readline/files/readline-5.2-solaris-fPIC.patch b/sys-libs/readline/files/readline-5.2-solaris-fPIC.patch
deleted file mode 100644
index dd3aa5a6cc..0000000000
--- a/sys-libs/readline/files/readline-5.2-solaris-fPIC.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* when using -fpic, the .got section must fit into 4K, which on Solaris
-  it doesn't ("relocation truncated to fit: R_SPARC_GOT13")
-* http://lists.gnu.org/archive/html/bug-readline/2008-04/msg00000.html
-
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -80,15 +80,17 @@
- 	;;
- 
- sunos5*-*gcc*|solaris2*-*gcc*)
--	SHOBJ_CFLAGS=-fpic
- 	SHOBJ_LD='${CC}'
- 	ld_used=`gcc -print-prog-name=ld`
- 	if ${ld_used} -V 2>&1 | grep GNU >/dev/null 2>&1; then
- 		# This line works for the GNU ld
- 		SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
-+		# http://sourceware.org/ml/binutils/2001-08/msg00361.html
-+		SHOBJ_CFLAGS=-fPIC
- 	else
- 		# This line works for the Solaris linker in /usr/ccs/bin/ld
- 		SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
-+		SHOBJ_CFLAGS=-fpic
- 	fi
- 
- #	SHLIB_XLDFLAGS='-R $(libdir)'
diff --git a/sys-libs/readline/files/readline-6.1-darwin-shlib-versioning.patch b/sys-libs/readline/files/readline-6.1-darwin-shlib-versioning.patch
deleted file mode 100644
index ababffa6fe..0000000000
--- a/sys-libs/readline/files/readline-6.1-darwin-shlib-versioning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-- drop forcing MACOSX_DEPLOYMENT_TARGET
-- no reason to call the compiler with -v
-- build an installname like libreadline.6.dylib iso
-  libreadline.6.1.dylib, like on Linux, so we don't have to rebuild half
-  of our system every time readline gets a bump
-
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -163,13 +163,13 @@
- 	
- 	SHOBJ_CFLAGS='-fno-common'
- 
--	SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
-+	SHOBJ_LD='${CC}'
- 
- 	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
- 	SHLIB_LIBSUFF='dylib'
- 
- 	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
--	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/`basename $@ $(SHLIB_MINOR)$(SHLIB_DOT)$(SHLIB_LIBSUFF)`$(SHLIB_DOT)$(SHLIB_LIBSUFF)  -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)'
- 
- 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
- 	;;
diff --git a/sys-libs/readline/files/readline-6.2-libtool.patch b/sys-libs/readline/files/readline-6.2-libtool.patch
deleted file mode 100644
index aa052c1ae0..0000000000
--- a/sys-libs/readline/files/readline-6.2-libtool.patch
+++ /dev/null
@@ -1,686 +0,0 @@
---- shlib/Makefile.in.orig	2014-04-15 11:05:22 +0200
-+++ shlib/Makefile.in	2014-04-15 11:43:33 +0200
-@@ -78,14 +78,14 @@
- # changes to bash-maintainers@gnu.org.
- #
- SHOBJ_CC = @SHOBJ_CC@
--SHOBJ_CFLAGS = @SHOBJ_CFLAGS@
--SHOBJ_LD = @SHOBJ_LD@
-+SHOBJ_CFLAGS_shared = @SHOBJ_CFLAGS@
-+SHOBJ_LD_shared = @SHOBJ_LD@
- 
--SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
--SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@
-+SHOBJ_LDFLAGS_shared = @SHOBJ_LDFLAGS@
-+SHOBJ_XLDFLAGS_shared = @SHOBJ_XLDFLAGS@
- SHOBJ_LIBS = @SHOBJ_LIBS@
- 
--SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@
-+SHLIB_XLDFLAGS_shared = @SHLIB_XLDFLAGS@
- SHLIB_LIBS = @SHLIB_LIBS@
- 
- SHLIB_DOT = @SHLIB_DOT@
-@@ -95,7 +95,7 @@
- SHLIB_LIBVERSION = @SHLIB_LIBVERSION@
- SHLIB_DLLVERSION = @SHLIB_DLLVERSION@
- 
--SHLIB_STATUS = @SHLIB_STATUS@
-+SHLIB_STATUS_shared = @SHLIB_STATUS@
- 
- TERMCAP_LIB = @TERMCAP_LIB@
- 
-@@ -109,13 +109,52 @@
- 
- CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS) $(CFLAGS)
- 
--.SUFFIXES:	.so
-+SHARED_TARGET = @SHARED_TARGET@ # using libtool when empty
-+
-+SHLIB_STATUS_ = libtool
-+SHLIB_STATUS = $(SHLIB_STATUS_$(SHARED_TARGET))
-+
-+SO_shared = so
-+SO_       = lo # use libtool when SHARED_TARGET is empty
-+SO        = $(SO_$(SHARED_TARGET))
-+
-+LIBTOOL_ = libtool
-+LIBTOOL = $(LIBTOOL_$(SHARED_TARGET))
-+
-+LTTAG_CC_    = --tag=CC
-+LTCLEAN_     = $(LIBTOOL) --mode=clean
-+LTCOMPILE_   = $(LIBTOOL) --mode=compile
-+LTINSTALL_   = $(LIBTOOL) --mode=install
-+LTLINK_      = $(LIBTOOL) --mode=link
-+LTUNINSTALL_ = $(LIBTOOL) --mode=uninstall
-+
-+SHOBJ_CFLAGS_ =
-+SHOBJ_LD_ = $(SHOBJ_CC)
-+SHOBJ_LDFLAGS_ = -shared -version-info `echo $(SHLIB_MAJOR)$(SHLIB_MINOR) | sed -e 's/\./:/g'`
-+SHLIB_XLDFLAGS_ = -rpath $(libdir)
-+
-+LTTAG_CC    = $(LTTAG_CC_$(SHARED_TARGET))
-+LTCLEAN     = $(LTCLEAN_$(SHARED_TARGET))
-+LTCOMPILE   = $(LTCOMPILE_$(SHARED_TARGET))
-+LTINSTALL   = $(LTINSTALL_$(SHARED_TARGET))
-+LTLINK      = $(LTLINK_$(SHARED_TARGET))
-+LTUNINSTALL = $(LTUNINSTALL_$(SHARED_TARGET))
-+
-+SHOBJ_CFLAGS = $(SHOBJ_CFLAGS_$(SHARED_TARGET))
-+SHOBJ_LD = $(SHOBJ_LD_$(SHARED_TARGET))
-+SHOBJ_LDFLAGS = $(SHOBJ_LDFLAGS_$(SHARED_TARGET))
-+SHLIB_XLDFLAGS = $(LDFLAGS) $(SHLIB_XLDFLAGS_$(SHARED_TARGET))
-+
-+.SUFFIXES:	.so .lo
- 
- .c.so:
- 	${RM} $@
- 	$(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -o $*.o $< 
- 	$(MV) $*.o $@
- 
-+.c.lo:
-+	$(LTCOMPILE) $(LTTAG_CC) $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -o $*.lo $<
-+
- # The name of the main library target.
- 
- SHARED_READLINE = $(SHLIB_LIBPREF)readline$(SHLIB_DOT)$(SHLIB_LIBVERSION)
-@@ -141,14 +180,14 @@
- 	   posixstat.h posixdir.h posixjmp.h tilde.h rlconf.h rltty.h \
- 	   ansi_stdlib.h tcap.h xmalloc.h rlprivate.h rlshell.h rlmbutil.h
- 
--SHARED_HISTOBJ = history.so histexpand.so histfile.so histsearch.so shell.so \
--		 mbutil.so
--SHARED_TILDEOBJ = tilde.so
--SHARED_OBJ = readline.so vi_mode.so funmap.so keymaps.so parens.so search.so \
--	  rltty.so complete.so bind.so isearch.so display.so signals.so \
--	  util.so kill.so undo.so macro.so input.so callback.so terminal.so \
--	  text.so nls.so misc.so xmalloc.so xfree.so $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) \
--	  compat.so
-+SHARED_HISTOBJ = history.$(SO) histexpand.$(SO) histfile.$(SO) histsearch.$(SO) shell.$(SO) \
-+		 mbutil.$(SO)
-+SHARED_TILDEOBJ = tilde.$(SO)
-+SHARED_OBJ = readline.$(SO) vi_mode.$(SO) funmap.$(SO) keymaps.$(SO) parens.$(SO) search.$(SO) \
-+	  rltty.$(SO) complete.$(SO) bind.$(SO) isearch.$(SO) display.$(SO) signals.$(SO) \
-+	  util.$(SO) kill.$(SO) undo.$(SO) macro.$(SO) input.$(SO) callback.$(SO) terminal.$(SO) \
-+	  text.$(SO) nls.$(SO) misc.$(SO) xmalloc.$(SO) xfree.$(SO) $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) \
-+	  compat.$(SO)
- 
- ##########################################################################
- 
-@@ -156,6 +195,8 @@
- 
- supported: $(SHARED_LIBS)
- 
-+libtool: libreadline.la libhistory.la
-+
- unsupported:
- 	@echo "Your system and compiler (${host_os}-${CC}) are not supported by the"
- 	@echo "${topdir}/support/shobj-conf script."
-@@ -164,13 +205,15 @@
- 	@echo "Please send the changes you made to bash-maintainers@gnu.org"
- 	@echo "for inclusion in future bash and readline releases."
- 
-+libreadline.la \
- $(SHARED_READLINE):	$(SHARED_OBJ)
--	$(RM) $@
--	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
-+	$(LTCLEAN) $(RM) $@
-+	$(LTLINK) $(LTTAG_CC) $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
- 
--$(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so xfree.so
--	$(RM) $@
--	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
-+libhistory.la \
-+$(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.$(SO) xfree.$(SO)
-+	$(LTCLEAN) $(RM) $@
-+	$(LTLINK) $(LTTAG_CC) $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.$(SO) xfree.$(SO) $(SHLIB_LIBS)
- 
- # Since tilde.c is shared between readline and bash, make sure we compile 
- # it with the right flags when it's built as part of readline
-@@ -179,22 +222,43 @@
- 	$(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -DREADLINE_LIBRARY -c -o tilde.o $(topdir)/tilde.c
- 	$(MV) tilde.o $@
- 
-+tilde.lo:        tilde.c
-+	$(LTCOMPILE) $(LTTAG_CC) $(SHOBJ_CC) -c $(CCFLAGS) $(SHOBJ_CFLAGS) -DREADLINE_LIBRARY -c -o tilde.lo $(topdir)/tilde.c
-+
- installdirs: $(topdir)/support/mkdirs
- 	-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir)
- 	-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(bindir)
- 
--install: installdirs $(SHLIB_STATUS)
-+install: install-$(SHLIB_STATUS)
-+
-+install-supported: installdirs $(SHLIB_STATUS)
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY)
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE)
- 	@echo install: you may need to run ldconfig
- 
--uninstall:
-+install-libtool: installdirs $(SHLIB_STATUS)
-+	$(LTINSTALL) $(INSTALL_DATA) libhistory.la $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALL_DATA) libreadline.la $(DESTDIR)$(libdir)
-+
-+install-unsupported:
-+	@echo install: shared libraries not supported
-+
-+uninstall: uninstall-$(SHLIB_STATUS)
-+
-+uninstall-supported:
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY)
- 	$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE)
- 	@echo uninstall: you may need to run ldconfig
- 
-+uninstall-libtool:
-+	$(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/libhistory.la
-+	$(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/libreadline.la
-+
-+uninstall-unsupported:
-+	@echo uninstall: shared libraries not supported
-+
- clean mostlyclean:	force
--	$(RM) $(SHARED_OBJ) $(SHARED_LIBS)
-+	$(LTCLEAN) $(RM) $(SHARED_OBJ) $(SHARED_LIBS) libreadline.la libhistory.la
- 
- distclean maintainer-clean: clean
- 	$(RM) Makefile
-@@ -206,178 +270,178 @@
- .NOEXPORT:
- 
- # Dependencies
--bind.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h
--bind.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--bind.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--bind.so: $(topdir)/rltypedefs.h
--bind.so: $(topdir)/tilde.h $(topdir)/history.h
--compat.so: $(topdir)/rlstdc.h
--callback.so: $(topdir)/rlconf.h
--callback.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h
--callback.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--callback.so: $(topdir)/rltypedefs.h
--callback.so: $(topdir)/tilde.h
--complete.so: $(topdir)/ansi_stdlib.h posixdir.h $(topdir)/posixstat.h
--complete.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--complete.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--complete.so: $(topdir)/rltypedefs.h
--complete.so: $(topdir)/tilde.h
--display.so: $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h
--display.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--display.so: $(topdir)/tcap.h
--display.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--display.so: $(topdir)/rltypedefs.h
--display.so: $(topdir)/tilde.h $(topdir)/history.h
--funmap.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--funmap.so: $(topdir)/rltypedefs.h
--funmap.so: $(topdir)/rlconf.h $(topdir)/ansi_stdlib.h
--funmap.so: ${BUILD_DIR}/config.h $(topdir)/tilde.h
--histexpand.so: $(topdir)/ansi_stdlib.h
--histexpand.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
--histexpand.so: ${BUILD_DIR}/config.h
--histfile.so: $(topdir)/ansi_stdlib.h
--histfile.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
--histfile.so: ${BUILD_DIR}/config.h
--history.so: $(topdir)/ansi_stdlib.h
--history.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
--history.so: ${BUILD_DIR}/config.h
--histsearch.so: $(topdir)/ansi_stdlib.h
--histsearch.so: $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
--histsearch.so: ${BUILD_DIR}/config.h
--input.so: $(topdir)/ansi_stdlib.h
--input.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--input.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--input.so: $(topdir)/rltypedefs.h
--input.so: $(topdir)/tilde.h
--isearch.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--isearch.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--isearch.so: $(topdir)/rltypedefs.h
--isearch.so: $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h
--keymaps.so: emacs_keymap.c vi_keymap.c
--keymaps.so: $(topdir)/keymaps.h $(topdir)/chardefs.h $(topdir)/rlconf.h
--keymaps.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--keymaps.so: $(topdir)/rltypedefs.h
--keymaps.so: ${BUILD_DIR}/config.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h
--kill.so: $(topdir)/ansi_stdlib.h
--kill.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--kill.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--kill.so: $(topdir)/tilde.h $(topdir)/history.h  $(topdir)/rltypedefs.h
--macro.so: $(topdir)/ansi_stdlib.h
--macro.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--macro.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--macro.so: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h
--mbutil.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--mbutil.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h
--mbutil.so: $(topdir)/chardefs.h $(topdir)/rlstdc.h
--misc.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--misc.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--misc.so: $(topdir)/rltypedefs.h
--misc.so: $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h
--nls.so: $(topdir)/ansi_stdlib.h
--nls.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+bind.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h
-+bind.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+bind.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+bind.$(SO): $(topdir)/rltypedefs.h
-+bind.$(SO): $(topdir)/tilde.h $(topdir)/history.h
-+compat.$(SO): $(topdir)/rlstdc.h
-+callback.$(SO): $(topdir)/rlconf.h
-+callback.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h
-+callback.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+callback.$(SO): $(topdir)/rltypedefs.h
-+callback.$(SO): $(topdir)/tilde.h
-+complete.$(SO): $(topdir)/ansi_stdlib.h posixdir.h $(topdir)/posixstat.h
-+complete.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+complete.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+complete.$(SO): $(topdir)/rltypedefs.h
-+complete.$(SO): $(topdir)/tilde.h
-+display.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/posixstat.h
-+display.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+display.$(SO): $(topdir)/tcap.h
-+display.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+display.$(SO): $(topdir)/rltypedefs.h
-+display.$(SO): $(topdir)/tilde.h $(topdir)/history.h
-+funmap.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+funmap.$(SO): $(topdir)/rltypedefs.h
-+funmap.$(SO): $(topdir)/rlconf.h $(topdir)/ansi_stdlib.h
-+funmap.$(SO): ${BUILD_DIR}/config.h $(topdir)/tilde.h
-+histexpand.$(SO): $(topdir)/ansi_stdlib.h
-+histexpand.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
-+histexpand.$(SO): ${BUILD_DIR}/config.h
-+histfile.$(SO): $(topdir)/ansi_stdlib.h
-+histfile.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
-+histfile.$(SO): ${BUILD_DIR}/config.h
-+history.$(SO): $(topdir)/ansi_stdlib.h
-+history.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
-+history.$(SO): ${BUILD_DIR}/config.h
-+histsearch.$(SO): $(topdir)/ansi_stdlib.h
-+histsearch.$(SO): $(topdir)/history.h $(topdir)/histlib.h $(topdir)/rltypedefs.h
-+histsearch.$(SO): ${BUILD_DIR}/config.h
-+input.$(SO): $(topdir)/ansi_stdlib.h
-+input.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+input.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+input.$(SO): $(topdir)/rltypedefs.h
-+input.$(SO): $(topdir)/tilde.h
-+isearch.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+isearch.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+isearch.$(SO): $(topdir)/rltypedefs.h
-+isearch.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h
-+keymaps.$(SO): emacs_keymap.c vi_keymap.c
-+keymaps.$(SO): $(topdir)/keymaps.h $(topdir)/chardefs.h $(topdir)/rlconf.h
-+keymaps.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+keymaps.$(SO): $(topdir)/rltypedefs.h
-+keymaps.$(SO): ${BUILD_DIR}/config.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h
-+kill.$(SO): $(topdir)/ansi_stdlib.h
-+kill.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+kill.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+kill.$(SO): $(topdir)/tilde.h $(topdir)/history.h  $(topdir)/rltypedefs.h
-+macro.$(SO): $(topdir)/ansi_stdlib.h
-+macro.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+macro.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+macro.$(SO): $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rltypedefs.h
-+mbutil.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+mbutil.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/rltypedefs.h
-+mbutil.$(SO): $(topdir)/chardefs.h $(topdir)/rlstdc.h
-+misc.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+misc.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+misc.$(SO): $(topdir)/rltypedefs.h
-+misc.$(SO): $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h
-+nls.$(SO): $(topdir)/ansi_stdlib.h
-+nls.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
- nls.o: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
- nls.o: $(topdir)/rltypedefs.h
- nls.o: $(topdir)/tilde.h $(topdir)/history.h $(topdir)/rlstdc.h  
--parens.so: $(topdir)/rlconf.h ${BUILD_DIR}/config.h
--parens.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--parens.so: $(topdir)/rltypedefs.h
--parens.so: $(topdir)/tilde.h
--rltty.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--rltty.so: $(topdir)/rltty.h $(topdir)/tilde.h
--rltty.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--rltty.so: $(topdir)/rltypedefs.h
--search.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--search.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--search.so: $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h
--search.so: $(topdir)/rltypedefs.h
--signals.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--signals.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--signals.so: $(topdir)/history.h $(topdir)/tilde.h
--signals.so: $(topdir)/rltypedefs.h
--terminal.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--terminal.so: $(topdir)/tcap.h
--terminal.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--terminal.so: $(topdir)/tilde.h $(topdir)/history.h
--terminal.so: $(topdir)/rltypedefs.h
--text.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--text.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--text.so: $(topdir)/rltypedefs.h
--text.so: $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h
--tilde.so: $(topdir)/ansi_stdlib.h ${BUILD_DIR}/config.h $(topdir)/tilde.h
--undo.so: $(topdir)/ansi_stdlib.h
--undo.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--undo.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--undo.so: $(topdir)/rltypedefs.h
--undo.so: $(topdir)/tilde.h $(topdir)/history.h
--util.so: $(topdir)/posixjmp.h $(topdir)/ansi_stdlib.h
--util.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--util.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--util.so: $(topdir)/rltypedefs.h $(topdir)/tilde.h
--vi_mode.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
--vi_mode.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
--vi_mode.so: $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h
--vi_mode.so: $(topdir)/rltypedefs.h
--xfree.so: ${BUILD_DIR}/config.h
--xfree.so: $(topdir)/ansi_stdlib.h
--xmalloc.so: ${BUILD_DIR}/config.h
--xmalloc.so: $(topdir)/ansi_stdlib.h
--
--bind.so: $(topdir)/rlshell.h
--histfile.so: $(topdir)/rlshell.h
--nls.so: $(topdir)/rlshell.h
--readline.so: $(topdir)/rlshell.h
--shell.so: $(topdir)/rlshell.h
--terminal.so: $(topdir)/rlshell.h
--histexpand.so: $(topdir)/rlshell.h
--
--bind.so: $(topdir)/rlprivate.h
--callback.so: $(topdir)/rlprivate.h
--complete.so: $(topdir)/rlprivate.h
--display.so: $(topdir)/rlprivate.h
--input.so: $(topdir)/rlprivate.h
--isearch.so: $(topdir)/rlprivate.h
--kill.so: $(topdir)/rlprivate.h
--macro.so: $(topdir)/rlprivate.h
--mbutil.so: $(topdir)/rlprivate.h
--misc.so: $(topdir)/rlprivate.h
--nls.so: $(topdir)/rlprivate.h   
--parens.so: $(topdir)/rlprivate.h
--readline.so: $(topdir)/rlprivate.h
--rltty.so: $(topdir)/rlprivate.h 
--search.so: $(topdir)/rlprivate.h
--signals.so: $(topdir)/rlprivate.h
--terminal.so: $(topdir)/rlprivate.h
--text.so: $(topdir)/rlprivate.h
--undo.so: $(topdir)/rlprivate.h
--util.so: $(topdir)/rlprivate.h
--vi_mode.so: $(topdir)/rlprivate.h
--
--bind.so: $(topdir)/xmalloc.h
--complete.so: $(topdir)/xmalloc.h
--display.so: $(topdir)/xmalloc.h
--funmap.so: $(topdir)/xmalloc.h
--histexpand.so: $(topdir)/xmalloc.h
--histfile.so: $(topdir)/xmalloc.h
--history.so: $(topdir)/xmalloc.h
--input.so: $(topdir)/xmalloc.h
--isearch.so: $(topdir)/xmalloc.h
--keymaps.so: $(topdir)/xmalloc.h
--kill.so: $(topdir)/xmalloc.h
--macro.so: $(topdir)/xmalloc.h
--mbutil.so: $(topdir)/xmalloc.h
--misc.so: $(topdir)/xmalloc.h
--readline.so: $(topdir)/xmalloc.h
--savestring.so: $(topdir)/xmalloc.h
--search.so: $(topdir)/xmalloc.h
--shell.so: $(topdir)/xmalloc.h
--terminal.so: $(topdir)/xmalloc.h
--text.so: $(topdir)/xmalloc.h
--tilde.so: $(topdir)/xmalloc.h
--undo.so: $(topdir)/xmalloc.h
--util.so: $(topdir)/xmalloc.h
--vi_mode.so: $(topdir)/xmalloc.h
--xfree.so: $(topdir)/xmalloc.h
--xmalloc.so: $(topdir)/xmalloc.h
-+parens.$(SO): $(topdir)/rlconf.h ${BUILD_DIR}/config.h
-+parens.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+parens.$(SO): $(topdir)/rltypedefs.h
-+parens.$(SO): $(topdir)/tilde.h
-+rltty.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+rltty.$(SO): $(topdir)/rltty.h $(topdir)/tilde.h
-+rltty.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+rltty.$(SO): $(topdir)/rltypedefs.h
-+search.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+search.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+search.$(SO): $(topdir)/ansi_stdlib.h $(topdir)/history.h $(topdir)/tilde.h
-+search.$(SO): $(topdir)/rltypedefs.h
-+signals.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+signals.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+signals.$(SO): $(topdir)/history.h $(topdir)/tilde.h
-+signals.$(SO): $(topdir)/rltypedefs.h
-+terminal.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+terminal.$(SO): $(topdir)/tcap.h
-+terminal.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+terminal.$(SO): $(topdir)/tilde.h $(topdir)/history.h
-+terminal.$(SO): $(topdir)/rltypedefs.h
-+text.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+text.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+text.$(SO): $(topdir)/rltypedefs.h
-+text.$(SO): $(topdir)/history.h $(topdir)/tilde.h $(topdir)/ansi_stdlib.h
-+tilde.$(SO): $(topdir)/ansi_stdlib.h ${BUILD_DIR}/config.h $(topdir)/tilde.h
-+undo.$(SO): $(topdir)/ansi_stdlib.h
-+undo.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+undo.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+undo.$(SO): $(topdir)/rltypedefs.h
-+undo.$(SO): $(topdir)/tilde.h $(topdir)/history.h
-+util.$(SO): $(topdir)/posixjmp.h $(topdir)/ansi_stdlib.h
-+util.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+util.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+util.$(SO): $(topdir)/rltypedefs.h $(topdir)/tilde.h
-+vi_mode.$(SO): $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
-+vi_mode.$(SO): $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
-+vi_mode.$(SO): $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h
-+vi_mode.$(SO): $(topdir)/rltypedefs.h
-+xfree.$(SO): ${BUILD_DIR}/config.h
-+xfree.$(SO): $(topdir)/ansi_stdlib.h
-+xmalloc.$(SO): ${BUILD_DIR}/config.h
-+xmalloc.$(SO): $(topdir)/ansi_stdlib.h
-+
-+bind.$(SO): $(topdir)/rlshell.h
-+histfile.$(SO): $(topdir)/rlshell.h
-+nls.$(SO): $(topdir)/rlshell.h
-+readline.$(SO): $(topdir)/rlshell.h
-+shell.$(SO): $(topdir)/rlshell.h
-+terminal.$(SO): $(topdir)/rlshell.h
-+histexpand.$(SO): $(topdir)/rlshell.h
-+
-+bind.$(SO): $(topdir)/rlprivate.h
-+callback.$(SO): $(topdir)/rlprivate.h
-+complete.$(SO): $(topdir)/rlprivate.h
-+display.$(SO): $(topdir)/rlprivate.h
-+input.$(SO): $(topdir)/rlprivate.h
-+isearch.$(SO): $(topdir)/rlprivate.h
-+kill.$(SO): $(topdir)/rlprivate.h
-+macro.$(SO): $(topdir)/rlprivate.h
-+mbutil.$(SO): $(topdir)/rlprivate.h
-+misc.$(SO): $(topdir)/rlprivate.h
-+nls.$(SO): $(topdir)/rlprivate.h   
-+parens.$(SO): $(topdir)/rlprivate.h
-+readline.$(SO): $(topdir)/rlprivate.h
-+rltty.$(SO): $(topdir)/rlprivate.h 
-+search.$(SO): $(topdir)/rlprivate.h
-+signals.$(SO): $(topdir)/rlprivate.h
-+terminal.$(SO): $(topdir)/rlprivate.h
-+text.$(SO): $(topdir)/rlprivate.h
-+undo.$(SO): $(topdir)/rlprivate.h
-+util.$(SO): $(topdir)/rlprivate.h
-+vi_mode.$(SO): $(topdir)/rlprivate.h
-+
-+bind.$(SO): $(topdir)/xmalloc.h
-+complete.$(SO): $(topdir)/xmalloc.h
-+display.$(SO): $(topdir)/xmalloc.h
-+funmap.$(SO): $(topdir)/xmalloc.h
-+histexpand.$(SO): $(topdir)/xmalloc.h
-+histfile.$(SO): $(topdir)/xmalloc.h
-+history.$(SO): $(topdir)/xmalloc.h
-+input.$(SO): $(topdir)/xmalloc.h
-+isearch.$(SO): $(topdir)/xmalloc.h
-+keymaps.$(SO): $(topdir)/xmalloc.h
-+kill.$(SO): $(topdir)/xmalloc.h
-+macro.$(SO): $(topdir)/xmalloc.h
-+mbutil.$(SO): $(topdir)/xmalloc.h
-+misc.$(SO): $(topdir)/xmalloc.h
-+readline.$(SO): $(topdir)/xmalloc.h
-+savestring.$(SO): $(topdir)/xmalloc.h
-+search.$(SO): $(topdir)/xmalloc.h
-+shell.$(SO): $(topdir)/xmalloc.h
-+terminal.$(SO): $(topdir)/xmalloc.h
-+text.$(SO): $(topdir)/xmalloc.h
-+tilde.$(SO): $(topdir)/xmalloc.h
-+undo.$(SO): $(topdir)/xmalloc.h
-+util.$(SO): $(topdir)/xmalloc.h
-+vi_mode.$(SO): $(topdir)/xmalloc.h
-+xfree.$(SO): $(topdir)/xmalloc.h
-+xmalloc.$(SO): $(topdir)/xmalloc.h
- 
- complete.o: $(topdir)/rlmbutil.h
- display.o: $(topdir)/rlmbutil.h
-@@ -391,72 +455,72 @@
- text.o: $(topdir)/rlmbutil.h
- vi_mode.o: $(topdir)/rlmbutil.h
- 
--bind.so: $(topdir)/bind.c
--callback.so: $(topdir)/callback.c
--compat.so: $(topdir)/compat.c
--complete.so: $(topdir)/complete.c
--display.so: $(topdir)/display.c
--funmap.so: $(topdir)/funmap.c
--input.so: $(topdir)/input.c
--isearch.so: $(topdir)/isearch.c
--keymaps.so: $(topdir)/keymaps.c $(topdir)/emacs_keymap.c $(topdir)/vi_keymap.c
--kill.so: $(topdir)/kill.c
--macro.so: $(topdir)/macro.c
--mbutil.so: $(topdir)/mbutil.c
--misc.so: $(topdir)/mbutil.c
--nls.so: $(topdir)/nls.c
--parens.so: $(topdir)/parens.c
--readline.so: $(topdir)/readline.c
--rltty.so: $(topdir)/rltty.c
--savestring.so: $(topdir)/savestring.c
--search.so: $(topdir)/search.c
--shell.so: $(topdir)/shell.c
--signals.so: $(topdir)/signals.c
--terminal.so: $(topdir)/terminal.c
--text.so: $(topdir)/text.c
--tilde.so: $(topdir)/tilde.c
--undo.so: $(topdir)/undo.c
--util.so: $(topdir)/util.c
--vi_mode.so: $(topdir)/vi_mode.c
--xfree.so: $(topdir)/xfree.c
--xmalloc.so: $(topdir)/xmalloc.c
--
--histexpand.so: $(topdir)/histexpand.c
--histfile.so: $(topdir)/histfile.c
--history.so: $(topdir)/history.c
--histsearch.so: $(topdir)/histsearch.c
--
--bind.so: bind.c
--callback.so: callback.c
--comapt.so: compat.c
--complete.so: complete.c
--display.so: display.c
--funmap.so: funmap.c
--input.so: input.c
--isearch.so: isearch.c
--keymaps.so: keymaps.c emacs_keymap.c vi_keymap.c
--kill.so: kill.c
--macro.so: macro.c
--mbutil.so: mbutil.c
--misc.so: misc.c
--nls.so: nls.c
--parens.so: parens.c
--readline.so: readline.c
--rltty.so: rltty.c
--savestring.so: savestring.c
--search.so: search.c
--signals.so: signals.c
--shell.so: shell.c
--terminal.so: terminal.c
--text.so: text.c
--tilde.so: tilde.c
--undo.so: undo.c
--util.so: util.c
--vi_mode.so: vi_mode.c
--xfree.so: xfree.c
--xmalloc.so: xmalloc.c
--
--histexpand.so: histexpand.c
--histfile.so: histfile.c
--history.so: history.c
--histsearch.so: histsearch.c
-+bind.$(SO): $(topdir)/bind.c
-+callback.$(SO): $(topdir)/callback.c
-+compat.$(SO): $(topdir)/compat.c
-+complete.$(SO): $(topdir)/complete.c
-+display.$(SO): $(topdir)/display.c
-+funmap.$(SO): $(topdir)/funmap.c
-+input.$(SO): $(topdir)/input.c
-+isearch.$(SO): $(topdir)/isearch.c
-+keymaps.$(SO): $(topdir)/keymaps.c $(topdir)/emacs_keymap.c $(topdir)/vi_keymap.c
-+kill.$(SO): $(topdir)/kill.c
-+macro.$(SO): $(topdir)/macro.c
-+mbutil.$(SO): $(topdir)/mbutil.c
-+misc.$(SO): $(topdir)/mbutil.c
-+nls.$(SO): $(topdir)/nls.c
-+parens.$(SO): $(topdir)/parens.c
-+readline.$(SO): $(topdir)/readline.c
-+rltty.$(SO): $(topdir)/rltty.c
-+savestring.$(SO): $(topdir)/savestring.c
-+search.$(SO): $(topdir)/search.c
-+shell.$(SO): $(topdir)/shell.c
-+signals.$(SO): $(topdir)/signals.c
-+terminal.$(SO): $(topdir)/terminal.c
-+text.$(SO): $(topdir)/text.c
-+tilde.$(SO): $(topdir)/tilde.c
-+undo.$(SO): $(topdir)/undo.c
-+util.$(SO): $(topdir)/util.c
-+vi_mode.$(SO): $(topdir)/vi_mode.c
-+xfree.$(SO): $(topdir)/xfree.c
-+xmalloc.$(SO): $(topdir)/xmalloc.c
-+
-+histexpand.$(SO): $(topdir)/histexpand.c
-+histfile.$(SO): $(topdir)/histfile.c
-+history.$(SO): $(topdir)/history.c
-+histsearch.$(SO): $(topdir)/histsearch.c
-+
-+bind.$(SO): bind.c
-+callback.$(SO): callback.c
-+comapt.$(SO): compat.c
-+complete.$(SO): complete.c
-+display.$(SO): display.c
-+funmap.$(SO): funmap.c
-+input.$(SO): input.c
-+isearch.$(SO): isearch.c
-+keymaps.$(SO): keymaps.c emacs_keymap.c vi_keymap.c
-+kill.$(SO): kill.c
-+macro.$(SO): macro.c
-+mbutil.$(SO): mbutil.c
-+misc.$(SO): misc.c
-+nls.$(SO): nls.c
-+parens.$(SO): parens.c
-+readline.$(SO): readline.c
-+rltty.$(SO): rltty.c
-+savestring.$(SO): savestring.c
-+search.$(SO): search.c
-+signals.$(SO): signals.c
-+shell.$(SO): shell.c
-+terminal.$(SO): terminal.c
-+text.$(SO): text.c
-+tilde.$(SO): tilde.c
-+undo.$(SO): undo.c
-+util.$(SO): util.c
-+vi_mode.$(SO): vi_mode.c
-+xfree.$(SO): xfree.c
-+xmalloc.$(SO): xmalloc.c
-+
-+histexpand.$(SO): histexpand.c
-+histfile.$(SO): histfile.c
-+history.$(SO): history.c
-+histsearch.$(SO): histsearch.c
---- examples/rlfe/Makefile.in.orig	2014-04-15 11:49:12 +0200
-+++ examples/rlfe/Makefile.in	2014-04-15 11:49:27 +0200
-@@ -49,7 +49,7 @@
- all:	rlfe
- 
- rlfe: $(OFILES)
--	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-+	$(LTLINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS)
- 
- rlfe-$(VERSION).tar.gz:
- 	tar czf $@ $(CFILES) $(HFILES) $(EXTRA_DIST)
diff --git a/sys-libs/readline/files/readline-6.3-read-eof.patch b/sys-libs/readline/files/readline-6.3-read-eof.patch
new file mode 100644
index 0000000000..f74aad63be
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.3-read-eof.patch
@@ -0,0 +1,54 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-12/msg00152.html
+
+*** ../bash-4.3-patched/lib/readline/readline.c	2014-10-01 13:08:28.000000000 -0400
+--- lib/readline/readline.c	2014-12-20 22:37:28.000000000 -0500
+***************
+*** 580,592 ****
+  	}
+  
+!       /* EOF typed to a non-blank line is a <NL>.  If we want to change this,
+! 	 to force any existing line to be ignored when read(2) reads EOF,
+! 	 for example, this is the place to change. */
+        if (c == EOF && rl_end)
+! 	c = NEWLINE;
+  
+        /* The character _rl_eof_char typed to blank line, and not as the
+! 	 previous character is interpreted as EOF. */
+!       if (((c == _rl_eof_char && lastc != c) || c == EOF) && !rl_end)
+  	{
+  #if defined (READLINE_CALLBACKS)
+--- 587,620 ----
+  	}
+  
+!       /* EOF typed to a non-blank line is ^D the first time, EOF the second
+! 	 time in a row.  This won't return any partial line read from the tty.
+! 	 If we want to change this, to force any existing line to be returned
+! 	 when read(2) reads EOF, for example, this is the place to change. */
+        if (c == EOF && rl_end)
+! 	{
+! 	  if (RL_SIG_RECEIVED ())
+! 	    {
+! 	      RL_CHECK_SIGNALS ();
+! 	      if (rl_signal_event_hook)
+! 		(*rl_signal_event_hook) ();		/* XXX */
+! 	    }
+! 
+! 	  /* XXX - reading two consecutive EOFs returns EOF */
+! 	  if (RL_ISSTATE (RL_STATE_TERMPREPPED))
+! 	    {
+! 	      if (lastc == _rl_eof_char || lastc == EOF)
+! 		rl_end = 0;
+! 	      else
+! 	        c = _rl_eof_char;
+! 	    }
+! 	  else
+! 	    c = NEWLINE;
+! 	}
+  
+        /* The character _rl_eof_char typed to blank line, and not as the
+! 	 previous character is interpreted as EOF.  This doesn't work when
+! 	 READLINE_CALLBACKS is defined, so hitting a series of ^Ds will
+! 	 erase all the chars on the line and then return EOF. */
+!       if (((c == _rl_eof_char && lastc != c) || c == EOF) && rl_end == 0)
+  	{
+  #if defined (READLINE_CALLBACKS)
diff --git a/sys-libs/readline/readline-5.2_p14.ebuild b/sys-libs/readline/readline-5.2_p14.ebuild
deleted file mode 100644
index b3695ca2d6..0000000000
--- a/sys-libs/readline/readline-5.2_p14.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p14.ebuild,v 1.2 2010/01/05 00:54:25 vapier Exp $
-
-# This version is just for the ABI .5 library
-
-inherit eutils multilib flag-o-matic
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-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="${PV:0:1}"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}"
-
-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
-
-	# missing patch for 'support/shlib-install' in p12 (netbsd, aix5, interix).
-	epatch "${FILESDIR}"/${PN}-5.2_p12-shlib-install.patch
-	epatch "${FILESDIR}"/${PN}-5.2-interix.patch
-	epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch
-	epatch "${FILESDIR}"/${PN}-5.2-aixdll.patch
-	epatch "${FILESDIR}"/${PN}-5.2-mint.patch
-	epatch "${FILESDIR}"/${PN}-5.2-solaris-fPIC.patch
-
-	# force ncurses linking #71420
-	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
-}
-
-src_compile() {
-	append-flags -D_GNU_SOURCE
-
-	econf \
-		--with-curses \
-		--disable-static \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		|| die
-	emake -C shlib || die
-}
-
-src_install() {
-	emake -C shlib DESTDIR="${D}" install || die
-	rm -f "${ED}"/usr/lib*/*$(get_libname)
-}
diff --git a/sys-libs/readline/readline-6.2_p1-r1.ebuild b/sys-libs/readline/readline-6.2_p1-r1.ebuild
deleted file mode 100644
index e6305e4847..0000000000
--- a/sys-libs/readline/readline-6.2_p1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p1-r1.ebuild,v 1.4 2012/04/30 01:36:43 vapier Exp $
-
-inherit eutils multilib toolchain-funcs flag-o-matic libtool
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-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"
-HOSTLTV="0.1.0"
-HOSTLT="host-libtool-${HOSTLTV}"
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches) ${HOSTLT_URI}"
-HOSTLT_S=${WORKDIR}/${HOSTLT}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${HOSTLT}.tar.gz
-	S="${HOSTLT_S}" elibtoolize
-
-	unpack ${MY_P}.tar.gz
-
-	cd "${S}"
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
-
-	epatch "${FILESDIR}"/${PN}-5.1-rlfe-extern.patch
-	epatch "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch
-	epatch "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch
-	epatch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch
-	epatch "${FILESDIR}"/${PN}-5.2-interix.patch
-	epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch
-	epatch "${FILESDIR}"/${PN}-6.0-mint.patch
-	epatch "${FILESDIR}"/${PN}-6.1-darwin-shlib-versioning.patch
-	epatch "${FILESDIR}"/${PN}-6.2-libtool.patch
-
-	# 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
-
-	# support OSX Lion, Mountain Lion and Mavericks
-	sed -i -e 's/darwin10\*/darwin1\[0123\]\*/g' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_compile() {
-	cd "${HOSTLT_S}" || die
-	econf $(use_enable static-libs static)
-	export PATH=${HOSTLT_S}:${PATH}
-
-	cd "${S}"
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	export LDFLAGS="-L${S}/shlib ${LDFLAGS}" # search local dirs first
-	econf \
-		--cache-file="${S}"/config.cache \
-		--with-curses \
-		--disable-shared # use libtool instead
-	emake shared || die
-
-	if ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe
-		econf --cache-file="${S}"/config.cache
-		emake LTLINK='libtool --mode=link --tag=CC' || die
-	fi
-}
-
-src_install() {
-	export PATH=${HOSTLT_S}:${PATH}
-
-	emake DESTDIR="${D}" install-shared || die
-
-	if ! tc-is-cross-compiler; then
-		libtool --mode=install install examples/rlfe/rlfe "${ED%/}${DESTTREE}"/bin || die
-	fi
-
-	# must come after installing rlfe, bug #455512
-	gen_usr_ldscript -a readline history #4411
-
-	dodoc CHANGELOG CHANGES README USAGE NEWS
-	docinto ps
-	dodoc doc/*.ps
-	dohtml -r doc
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 4) #29865
-	preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 5) #29865
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 4)
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 5)
-}
diff --git a/sys-libs/readline/readline-6.3_p8-r1.ebuild b/sys-libs/readline/readline-6.3_p8-r1.ebuild
deleted file mode 100644
index 5bd4fad69e..0000000000
--- a/sys-libs/readline/readline-6.3_p8-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.2 2014/12/29 07:42:08 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal libtool
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-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"
-HOSTLTV="0.1.0"
-HOSTLT="host-libtool-${HOSTLTV}"
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches) ${HOSTLT_URI}"
-HOSTLT_S=${WORKDIR}/${HOSTLT}
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# see bug 530890 before installing on OS X
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${HOSTLT}.tar.gz
-	S="${HOSTLT_S}" elibtoolize
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	epatch "${FILESDIR}"/${PN}-5.1-rlfe-extern.patch
-	epatch "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch
-	epatch "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch
-	epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch
-	epatch "${FILESDIR}"/${PN}-6.0-mint.patch
-	epatch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch
-	epatch "${FILESDIR}"/${PN}-6.1-aix-soname.patch
-	epatch "${FILESDIR}"/${PN}-6.1-aix-expfull.patch
-	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	epatch "${FILESDIR}"/${PN}-6.3-libtool.patch
-	epatch "${FILESDIR}"/${PN}-6.3-interix.patch
-	epatch "${FILESDIR}"/${PN}-6.3-darwin-shlib-versioning.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
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# 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
-
-	# support more recent OS X versions
-	sed -i -e 's/darwin10\*/darwin1\[01234\]\*/g' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_configure() {
-	cd "${HOSTLT_S}" || die
-	econf $(use_enable static-libs static)
-	export PATH="${HOSTLT_S}:${PATH}"
-	cd "${S}"
-
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-	export LDFLAGS="-L${S}/shlib ${LDFLAGS}" # search local dirs first
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--cache-file="${BUILD_DIR}"/config.cache \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-curses \
-		--disable-shared # use libtool instead
-
-	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE=${S}/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake shared || die
-
-	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
-			ln -sf ../../lib${l}.a lib${l}.a
-		done
-		emake LTLINK='libtool --mode=link --tag=CC' || die
-	fi
-}
-
-multilib_src_install() {
-	export PATH="${HOSTLT_S}:${PATH}"
-	emake DESTDIR="${D}" install-shared || die
-
-	if multilib_is_native_abi ; then
-		if ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-
-		# must come after installing rlfe, bug #455512
-		gen_usr_ldscript -a readline history #4411
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc USAGE
-	dohtml -r doc/.
-	docinto ps
-	dodoc doc/*.ps
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 4) #29865
-	preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 5) #29865
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 4)
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 5)
-}
diff --git a/sys-libs/readline/readline-6.3_p8-r01.1.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index 727da907e1..7aca649098 100644
--- a/sys-libs/readline/readline-6.3_p8-r01.1.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.2 2014/12/29 07:42:08 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal libtool
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal libtool ltprune
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
@@ -32,18 +31,16 @@ DESCRIPTION="Another cute console display library"
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 HOSTLTV="0.1.0"
 HOSTLT="host-libtool-${HOSTLTV}"
-HOSTLT_URI="http://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"
+HOSTLT_URI="https://github.com/haubi/host-libtool/releases/download/v${HOSTLTV}/${HOSTLT}.tar.gz"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches) ${HOSTLT_URI}"
 HOSTLT_S=${WORKDIR}/${HOSTLT}
 
 LICENSE="GPL-3"
 SLOT="0"
-
-# see bug 530890 before installing on OS X
 KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+IUSE="static-libs utils"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
 	abi_x86_32? (
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
@@ -53,6 +50,25 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
+	"${FILESDIR}"/${PN}-6.3-read-eof.patch
+
+	"${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch
+	"${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch
+	"${FILESDIR}"/${PN}-5.2-ia64hpux.patch
+	"${FILESDIR}"/${PN}-6.0-mint.patch
+	"${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch
+	"${FILESDIR}"/${PN}-6.1-aix-soname.patch
+	"${FILESDIR}"/${PN}-6.1-aix-expfull.patch
+	"${FILESDIR}"/${PN}-6.3-interix.patch
+	"${FILESDIR}"/${PN}-6.3-darwin-shlib-versioning.patch
+
+	"${FILESDIR}"/${PN}-6.3-libtool.patch # this enables building via libtool
+)
+
 src_unpack() {
 	unpack ${HOSTLT}.tar.gz
 	S="${HOSTLT_S}" elibtoolize
@@ -61,29 +77,16 @@ src_unpack() {
 
 src_prepare() {
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	epatch "${FILESDIR}"/${PN}-5.1-rlfe-extern.patch
-	epatch "${FILESDIR}"/${PN}-5.2-rlfe-aix-eff_uid.patch
-	epatch "${FILESDIR}"/${PN}-5.2-rlfe-hpux.patch
-	epatch "${FILESDIR}"/${PN}-5.2-ia64hpux.patch
-	epatch "${FILESDIR}"/${PN}-6.0-mint.patch
-	epatch "${FILESDIR}"/${PN}-6.0-rlfe-solaris.patch
-	epatch "${FILESDIR}"/${PN}-6.1-aix-soname.patch
-	epatch "${FILESDIR}"/${PN}-6.1-aix-expfull.patch
-	epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	epatch "${FILESDIR}"/${PN}-6.3-libtool.patch
-	epatch "${FILESDIR}"/${PN}-6.3-interix.patch
-	epatch "${FILESDIR}"/${PN}-6.3-darwin-shlib-versioning.patch
-	epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
+	epatch "${PATCHES[@]}"
 
 	# Force ncurses linking. #71420
-	# Use pkg-config (may vary on ABI) to get the right values. #457558
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
 	sed -i \
-		-e '/^SHLIB_LIBS=/s:=.*:="${ncurses_libs}":' \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
 		support/shobj-conf || die
 	sed -i \
-		-e '/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:' \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
 		examples/rlfe/configure || die
 
 	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
@@ -96,7 +99,7 @@ src_prepare() {
 	ln -s ../.. examples/rlfe/readline # for local readline headers
 }
 
-multilib_src_configure() {
+src_configure() {
 	mkdir -p "${WORKDIR}/${HOSTLT}-${ABI}" || die
 	cd "${WORKDIR}/${HOSTLT}-${ABI}" || die
 	ECONF_SOURCE="${HOSTLT_S}" econf $(use_enable static-libs static)
@@ -107,7 +110,7 @@ multilib_src_configure() {
 
 	# fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
-	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
 	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
 
 	# Make sure configure picks a better ar than `ar`. #484866
@@ -130,14 +133,18 @@ multilib_src_configure() {
 	append-ldflags -L.
 	export LDFLAGS="-L${BUILD_DIR}/shlib ${LDFLAGS}" # search local dirs first
 
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
 		--cache-file="${BUILD_DIR}"/config.cache \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--docdir='$(datarootdir)'/doc/${PF} \
 		--with-curses \
 		--disable-shared # use libtool instead
 
-	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
@@ -149,9 +156,9 @@ multilib_src_configure() {
 multilib_src_compile() {
 	export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}"
 	export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	emake shared || die
+	emake shared
 
-	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
@@ -159,22 +166,21 @@ multilib_src_compile() {
 			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
 			ln -sf ../../lib${l}.a lib${l}.a
 		done
-		emake LTLINK='libtool --mode=link --tag=CC' || die
+		emake LTLINK='libtool --mode=link --tag=CC'
 	fi
 }
 
 multilib_src_install() {
 	export PATH="${WORKDIR}/${HOSTLT}-${ABI}:${PATH}"
 	export ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	emake DESTDIR="${D}" install-shared || die
+	emake DESTDIR="${D}" install-shared
 
 	if multilib_is_native_abi ; then
-		if ! tc-is-cross-compiler; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
 			dobin examples/rlfe/rlfe
 		fi
-
-		# must come after installing rlfe, bug #455512
-		gen_usr_ldscript -a readline history #4411
 	fi
 }
 
@@ -184,14 +190,14 @@ multilib_src_install_all() {
 	dohtml -r doc/.
 	docinto ps
 	dodoc doc/*.ps
+
+	prune_libtool_files --all
 }
 
 pkg_preinst() {
 	preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 4) #29865
-	preserve_old_lib /$(get_libdir)/lib{history,readline}$(get_libname 5) #29865
 }
 
 pkg_postinst() {
 	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 4)
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}$(get_libname 5)
 }