readline is not necessary. bug #207151. patch from Daniel Robbins <drobbins@funtoo.org>

Package-Manager: portage-2.1.4.4

5 files changed, 70 insertions, 4 deletions

diff --git a/sys-apps/which/ChangeLog b/sys-apps/which/ChangeLog
index 41b1bed2e066..d5a2efd637a6 100644
--- a/sys-apps/which/ChangeLog
+++ b/sys-apps/which/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/which
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.26 2008/03/07 14:24:06 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.27 2008/03/13 18:42:21 cardoe Exp $
+
+*which-2.19-r1 (13 Mar 2008)
+
+  13 Mar 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/which-2.19-remove-readline.patch, which-2.19.ebuild,
+  +which-2.19-r1.ebuild:
+  readline is not necessary. bug #207151. patch from Daniel Robbins
+  <drobbins@funtoo.org>
 
   07 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> which-2.19.ebuild:
   amd64 stable
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index d7e5237df456..3399eb03d070 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX which-2.19-remove-readline.patch 422 RMD160 41f35e8213051f18eba38fc917150952307a9eb8 SHA1 d85a64310f15c4c53767b78b7424fe05b780311d SHA256 7e2b88cf8049158f002b0fbf78e3ed95602d25e28313e681b6e8a9415da53101
 AUX which-gentoo.patch 340 RMD160 e81259d570f204c6974af794f6e4d5f4df171e50 SHA1 d8eda78dec112fa24d40bdc744cd00997daa0040 SHA256 8b53ab961fe5d275451900313b64bffa407378ab0619220bb6229072035d3a8e
 DIST which-2.16.tar.gz 125696 RMD160 7724de067c9bcbb0d0ffe8476c3b0b9893c27a4c SHA1 247804c95e91583020b4d57ccb517a2997041bd5 SHA256 0ac8502e9985a3ac6b0e2aa4f2a60f91cad0dc0cca6dc9c1c142ebba4b8dd664
 DIST which-2.19.tar.gz 132810 RMD160 8f8cacefcc240a13b09062beb3c5f432729b9239 SHA1 8afe25516ae5d4d3c6d4ead5248f3420330d529c SHA256 7d79b874f65118ac846a0deb31a8fbd6816cd81e74930299c82103765d45cd52
 EBUILD which-2.16.ebuild 741 RMD160 1de27363e3d718c791244a576ff7d7b0dbb4b524 SHA1 27924db8d99d93ce84d8214fc29178e5f98da01c SHA256 5b0e9a2115f7576b7bb7618ab97dc710469af0dd9f8c9fd5a29c8f4581b1e994
-EBUILD which-2.19.ebuild 751 RMD160 7df435be5ecf272b45dde0b927f37b1ba7f49f87 SHA1 2da295b8245e8c95ebc9769a9d096ca70f07af96 SHA256 acee8c114a7ab71096ad287ee85d9ad3014c986b69e4e405987606767382022b
-MISC ChangeLog 2501 RMD160 af5345a8716540b0dca70034e1c543516e2f1dda SHA1 3b2f2d66d82bcabcc07032568e4139341a54e9c5 SHA256 509caabde9d2802ede282f7c3c35fbda22c74c206c011371526a6f8c4cc44611
+EBUILD which-2.19-r1.ebuild 812 RMD160 5bcd1fb7934ce9389f6a84b17054447976146885 SHA1 c9d34bf2fda6a027fe94d2bd478a20ee99379c19 SHA256 a6cc21759f95a4cb810042f5ff186a24fb0e4a361718a8fd9aeec3cf4ffb196f
+EBUILD which-2.19.ebuild 804 RMD160 bac27fce81a5e4cf2e517f2dbb1c0a44905778b2 SHA1 abc60478bac57665f479d6dff261660972c0249b SHA256 06d686422d7b3af6fd1f811e38dd4d9168c4854e9cf94f239b3babefa2cd4471
+MISC ChangeLog 2759 RMD160 4d08c97b249f7f00148fe4317d2e175fefaf0903 SHA1 d0fbab43d69d3fd8992af6e0cbd7d018229233f5 SHA256 197fde38a9c62418afc4b89b315aa1f1aa5895ea3f25b0c4ba5e885ea0e7805e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH2XWdoeSe8B0zEfwRAodFAJ9yXV9QJddn9XMzJZr5uCstzt0WXACfVDsc
+u8zhhhvh/ClalTzaJZrbbN0=
+=VKPm
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/which/files/which-2.19-remove-readline.patch b/sys-apps/which/files/which-2.19-remove-readline.patch
new file mode 100644
index 000000000000..ffc9490e9e52
--- /dev/null
+++ b/sys-apps/which/files/which-2.19-remove-readline.patch
@@ -0,0 +1,16 @@
+diff -urN which-2.19/tilde/xmalloc.h which-2.19-patched/tilde/xmalloc.h
+--- which-2.19/tilde/xmalloc.h	2008-01-16 10:07:57.000000000 -0600
++++ which-2.19-patched/tilde/xmalloc.h	2008-03-13 11:47:16.000000000 -0500
+@@ -23,12 +23,6 @@
+ #if !defined (_XMALLOC_H_)
+ #define _XMALLOC_H_
+ 
+-#if defined (READLINE_LIBRARY)
+-#  include "rlstdc.h"
+-#else
+-#  include <readline/rlstdc.h>
+-#endif
+-
+ #ifndef PTR_T
+ 
+ #ifdef __STDC__
diff --git a/sys-apps/which/which-2.19-r1.ebuild b/sys-apps/which/which-2.19-r1.ebuild
new file mode 100644
index 000000000000..f548abf38635
--- /dev/null
+++ b/sys-apps/which/which-2.19-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.19-r1.ebuild,v 1.1 2008/03/13 18:42:21 cardoe Exp $
+
+inherit eutils
+
+DESCRIPTION="Prints out location of specified executables that are in your path"
+HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
+SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/which-gentoo.patch
+	epatch "${FILESDIR}"/which-2.19-remove-readline.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS EXAMPLES NEWS README*
+}
diff --git a/sys-apps/which/which-2.19.ebuild b/sys-apps/which/which-2.19.ebuild
index 31c1c36fd9e7..7a35faa34611 100644
--- a/sys-apps/which/which-2.19.ebuild
+++ b/sys-apps/which/which-2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.19.ebuild,v 1.3 2008/03/07 14:24:06 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.19.ebuild,v 1.4 2008/03/13 18:42:21 cardoe Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/which-gentoo.patch
+	epatch "${FILESDIR}"/which-2.19-remove-readline.patch
 }
 
 src_install() {