libedit fix

4 files changed, 29 insertions, 9 deletions

diff --git a/app-crypt/kth-krb/ChangeLog b/app-crypt/kth-krb/ChangeLog
index eea980d716d9..a90d9f3101fa 100644
--- a/app-crypt/kth-krb/ChangeLog
+++ b/app-crypt/kth-krb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/kth-krb
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.27 2004/06/24 21:34:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.28 2004/09/18 13:10:58 aliz Exp $
+
+  18 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> kth-krb-1.2.2-r2.ebuild,
+  files/kth-krb-1.2.2-no_libedit.patch:
+  Don't check for el_init in -ledit, thanks to Jason Wever <wever@gentoo.org> 
+  for finding the bug.
 
   01 Jun 2004; Aron Griffis <agriffis@gentoo.org> kth-krb-1.2.1.ebuild,
   kth-krb-1.2.2.ebuild, kth-krb-1.2.ebuild:
diff --git a/app-crypt/kth-krb/Manifest b/app-crypt/kth-krb/Manifest
index 26aa8123493d..dea51c311abd 100644
--- a/app-crypt/kth-krb/Manifest
+++ b/app-crypt/kth-krb/Manifest
@@ -1,8 +1,8 @@
-MD5 52a579bde2213fc283c33e4cbfe826c8 kth-krb-1.2.2-r2.ebuild 1488
+MD5 545e894e262e4e8f3150819f2a0b7443 kth-krb-1.2.2-r2.ebuild 1562
 MD5 69d32d5170b231b3ef66b5155ea4eb0d kth-krb-1.2.ebuild 1226
 MD5 e87606cf19befa8f8b306d8e13c9ef28 kth-krb-1.2.2-r1.ebuild 1405
 MD5 436b871e33e72d2096e1a425c7655731 kth-krb-1.2.2.ebuild 1231
-MD5 b3a94b8588dd1c7c5fd6bc24e3ccb27d ChangeLog 3041
+MD5 2ad227a7a2fadbc1e3b82324ff29dd9b ChangeLog 3253
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 36b635e2f2e20133101035a1dc142f83 kth-krb-1.2.1.ebuild 1232
 MD5 a4d154cc6e477b4c6a443592fab2d4d6 files/kth-krb-1.2.2-fPIC.patch 702
@@ -11,6 +11,7 @@ MD5 55f56de790181ad8a1df5176a53551dd files/kth-gentoo-ssl.patch 6873
 MD5 38a19d9c77f2f822ae597ae120f34fc9 files/digest-kth-krb-1.2.1 63
 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2 63
 MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/kth-krb-1.2.2-berkdb.patch 542
+MD5 5f6a2cdfe29f03bdbfe4e0a05bfcdf9f files/kth-krb-1.2.2-no_libedit.patch 387
 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2-r1 63
 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2-r2 63
 MD5 be7f2f326e6022797dca6608b6248b7e files/02kth-krb 118
diff --git a/app-crypt/kth-krb/files/kth-krb-1.2.2-no_libedit.patch b/app-crypt/kth-krb/files/kth-krb-1.2.2-no_libedit.patch
new file mode 100644
index 000000000000..ebf87759ac3a
--- /dev/null
+++ b/app-crypt/kth-krb/files/kth-krb-1.2.2-no_libedit.patch
@@ -0,0 +1,10 @@
+--- cf/krb-readline.m4	2004-09-18 13:01:39.805429658 +0000
++++ cf/krb-readline.m4	2004-09-18 13:01:49.932972408 +0000
+@@ -6,7 +6,6 @@
+ dnl el_init
+ 
+ AC_DEFUN(KRB_READLINE,[
+-AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
+ if test "$ac_cv_func_el_init" = yes ; then
+ 	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
+ 		AC_TRY_COMPILE([#include <stdio.h>
diff --git a/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild b/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
index 7ef72fadd6be..499786d3d118 100644
--- a/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
+++ b/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild,v 1.5 2004/06/24 21:34:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild,v 1.6 2004/09/18 13:10:58 aliz Exp $
 
 inherit eutils
 
@@ -14,21 +14,25 @@ KEYWORDS="x86 ppc sparc alpha ia64 amd64 s390 hppa mips"
 IUSE="ssl afs"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
-	!amd64? ( afs? ( >=net-fs/openafs-1.2.2-r7 ) )"
+	!amd64? ( afs? ( >=net-fs/openafs-1.2.2-r7 ) )
+	sys-devel/autoconf"
 
 S=${WORKDIR}/krb4-${PV}
 
-src_compile() {
-	local myconf=""
-	echo ${PORTAGE_TMPDIR}
+src_unpack() {
+	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/kth-gentoo.patch
 	epatch ${FILESDIR}/kth-gentoo-ssl.patch
 	epatch ${FILESDIR}/${P}-berkdb.patch
 	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${P}-no_libedit.patch
 
-	use ssl && myconf="${myconf} --with-openssl=/usr"
+	autoconf || die
+}
 
+src_compile() {
+	use ssl && myconf="${myconf} --with-openssl=/usr"
 	use afs || myconf="${myconf} --without-afs-support"
 
 	econf \