upstream patches and /etc/inputrc fixe #38955

5 files changed, 142 insertions, 3 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index cf4cdafa870b..ae6b5ceb7370 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/readline
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.37 2004/09/29 04:24:32 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.38 2004/09/29 13:54:21 vapier Exp $
+
+*readline-5.0-r1 (29 Sep 2004)
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-3.0-etc-inputrc.patch, +readline-5.0-r1.ebuild:
+  Add more patches from upstream and add support for /etc/inputrc #38955.
 
   29 Sep 2004; Lina Pezzella <j4rg0n@gentoo.org> readline-4.3-r6.ebuild:
   Fixed collisions with history(3) on macos.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index c6e4b877c26f..16e38a17c36e 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,14 +1,27 @@
-MD5 dee1c7380a127f890999befb7d14a4c8 ChangeLog 5625
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 674818b99b4f6b7a6c2c6586f121bc62 ChangeLog 5959
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 f72f4f19fcbf7bf962ae885d077142e0 readline-4.1-r5.ebuild 1762
 MD5 d3c4a60f05d3fdebd20bd21155c74fc8 readline-5.0.ebuild 2162
 MD5 c45be70cfbe979355e83578914ee1d41 readline-4.3-r4.ebuild 2380
 MD5 83dda0cb2f24ebf73ac0a8c92bc41661 readline-4.3-r5.ebuild 2640
 MD5 1026086175f3685832ab7c163c7c66af readline-4.3-r6.ebuild 3179
+MD5 101a71fff10aec638dd192ec5577c41d readline-5.0-r1.ebuild 2232
 MD5 f9e8af7cdcf7ac973c77fc6a712af5de files/digest-readline-4.1-r5 64
 MD5 630ead02f80504e86e85dc4957bd27cb files/digest-readline-5.0 65
 MD5 e9b856acd523c385a29d67cd3475885e files/digest-readline-4.3-r4 177
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
+MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
-MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678
+MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r1 350
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBWr6jHTu7gpaalycRAtcHAJ44uqs9kd5qrRFJd9opDeA1iQ8bHgCgsxGi
+BE8/JZwNLttpnXQbTLkWQtM=
+=HiAU
+-----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
new file mode 100644
index 000000000000..4331bd1da609
--- /dev/null
+++ b/sys-libs/readline/files/bash-3.0-etc-inputrc.patch
@@ -0,0 +1,39 @@
+--- 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/digest-readline-5.0-r1 b/sys-libs/readline/files/digest-readline-5.0-r1
new file mode 100644
index 000000000000..c31a1344ce93
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-5.0-r1
@@ -0,0 +1,6 @@
+MD5 9a39d15f1ed592883f8c6671e8c13120 readline-5.0.tar.gz 1808946
+MD5 5b47ed61b6b8413746750127c70e843d readline50-001 1702
+MD5 9f803005e7e4c7d675146a9a805acbf1 readline50-002 1337
+MD5 05d59c91f80fa99ab177783229b0f769 readline50-003 3841
+MD5 aa1f6343e47f8e024488c63281d77809 readline50-004 2411
+MD5 1dc2654e0161f2e7b4f536b12e1d54b7 readline50-005 2216
diff --git a/sys-libs/readline/readline-5.0-r1.ebuild b/sys-libs/readline/readline-5.0-r1.ebuild
new file mode 100644
index 000000000000..a553951c068e
--- /dev/null
+++ b/sys-libs/readline/readline-5.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r1.ebuild,v 1.1 2004/09/29 13:54:21 vapier Exp $
+
+inherit eutils gnuconfig
+
+# Official patches
+PLEVEL="x001 x002 x003 x004 x005"
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="mirror://gnu/readline/${P}.tar.gz
+	${PLEVEL//x/mirror://gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# We must be certain that we have a bash that is linked
+# to its internal readline, else we may get problems.
+DEPEND=">=app-shells/bash-2.05b-r2
+	>=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+	for x in ${PLEVEL//x}
+	do
+		epatch ${DISTDIR}/${PN}${PV/\.}-${x}
+	done
+
+	epatch ${FILESDIR}/bash-3.0-etc-inputrc.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
+	emake || die
+}
+
+src_install() {
+	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
+	# directory, since readline's configure automatically sets libdir for you.
+	make DESTDIR="${D}" install || die
+	dodir /$(get_libdir)
+	mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+
+	# Bug #4411
+	gen_usr_ldscript libreadline.so
+	gen_usr_ldscript libhistory.so
+
+	dodoc CHANGELOG CHANGES README USAGE NEWS
+	docinto ps
+	dodoc doc/*.ps
+	dohtml -r doc
+
+	# Backwards compatibility #29865
+	if [ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ] ; then
+		cp -a ${ROOT}/$(get_libdir)/libreadline.so.4* ${D}/$(get_libdir)/
+		touch ${D}/$(get_libdir)/libreadline.so.4*
+	fi
+}
+
+pkg_postinst() {
+	if [ -e ${ROOT}/$(get_libdir)/libreadline.so.4 ] ; then
+		ewarn "Your old readline libraries have been copied over."
+		ewarn "You should run 'revdep-rebuild --soname libreadline.so.4' asap."
+		ewarn "Once you have, you can safely delete /$(get_libdir)/libreadline.so.4*"
+	fi
+}