Closing #44799.

5 files changed, 34 insertions, 15 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index c70f9fe2fa8a..8896c4203471 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.33 2004/07/14 02:55:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.34 2004/07/15 01:11:59 aliz Exp $
+
+  15 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> metadata.xml,
+  mit-krb5-1.3.3-r1.ebuild, files/mit-krb5-1.3.3-autoheader.patch:
+  Fixed autohead args, closing #44799.
+  Updated description.
 
   13 Jul 2004; Tom Gall <tgall@gentoo.org> mit-krb5-1.3.1-r1.ebuild,
   mit-krb5-1.3.3-r1.ebuild:
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 8bc41006c141..c74505bb16fb 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,19 +1,20 @@
-MD5 3b8d1ce3e520591b53d0759814baeadf ChangeLog 6101
-MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
 MD5 0bc8c3fb7f52eb5985fa39124ed732d4 mit-krb5-1.3.1-r1.ebuild 4206
 MD5 2b97be6f009b7dc0581a1e0ac2bb24a1 mit-krb5-1.3.1.ebuild 4174
 MD5 e3356da2141e2002d88c2cb2e0bb5ec4 mit-krb5-1.3.3.ebuild 4219
-MD5 49cd10d0f4b86fc774c9c6b36d256226 mit-krb5-1.3.3-r1.ebuild 4283
-MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
-MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
-MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
-MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
-MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
+MD5 79336c040eb2d01caec90ca700897bbd mit-krb5-1.3.3-r1.ebuild 4315
+MD5 ccbf29859068bd1334fd48239fba4888 ChangeLog 6292
+MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
 MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
-MD5 1a722b032004738cd34e3ed16b8c75ca files/mit-krb5-1.3.1-res_search.patch 8486
+MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
 MD5 1a722b032004738cd34e3ed16b8c75ca files/mit-krb5-1.3.3-res_search.patch 8486
-MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
-MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
+MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
+MD5 1a722b032004738cd34e3ed16b8c75ca files/mit-krb5-1.3.1-res_search.patch 8486
+MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
 MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
+MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
+MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
+MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
 MD5 a76969580caa87329b1758711499ca61 files/mit-krb5-1.3.3-aname.patch 6329
+MD5 d7d381d8006526ba7f7d1c4620aabd2c files/mit-krb5-1.3.3-autoheader.patch 702
+MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch
new file mode 100644
index 000000000000..8d34e9189a63
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch
@@ -0,0 +1,13 @@
+--- src/include/Makefile.in	2004-07-15 00:53:34.096419331 +0000
++++ src/include/Makefile.in	2004-07-15 01:05:05.544231460 +0000
+@@ -28,7 +28,9 @@
+ 	(cd krb5; $(MAKE) autoconf.h)
+ $(srcdir)/krb5/autoconf.h.in: $(srcdir)/krb5/autoconf.stmp
+ $(srcdir)/krb5/autoconf.stmp: $(srcdir)/configure.in 
+-	cd $(srcdir) && $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
++        cd $(srcdir) && \
++                ($(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) || \
++                 $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS))
+ 	touch $(srcdir)/krb5/autoconf.stmp
+ 
+ krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml
index 551aeda9d5e1..755e96d935b5 100644
--- a/app-crypt/mit-krb5/metadata.xml
+++ b/app-crypt/mit-krb5/metadata.xml
@@ -8,5 +8,5 @@
 <maintainer>
  <email>rphillips@gentoo.org</email>
 </maintainer>
-<longdescription>Kerberos 5 implementation from KTH</longdescription>
+<longdescription>Kerberos 5 implementation from MIT</longdescription>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild
index bae317a610c7..c817ab067aad 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.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/mit-krb5/mit-krb5-1.3.3-r1.ebuild,v 1.12 2004/07/14 02:55:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild,v 1.13 2004/07/15 01:11:59 aliz Exp $
 
 inherit eutils
 
@@ -28,9 +28,9 @@ src_unpack() {
 	tar -zxf ${MY_P}.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${P}-res_search.patch
+	epatch ${FILESDIR}/${P}-autoheader.patch
 	cd ${S}/lib/krb5/os
 	epatch ${FILESDIR}/${P}-aname.patch
-	cd ${S}
 }
 
 src_compile() {