Potential fix for #43874.

4 files changed, 42 insertions, 12 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 4b1311623d0b..f9df6be91300 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.22 2004/03/21 09:37:23 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.23 2004/03/30 09:12:47 aliz Exp $
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> heimdal-0.6.ebuild,
+  files/heimdal-0.6-berkdb.patch:
+  Fixing berkdb support for heimdal. Should close  #43874.
 
   21 Mar 2004; Joshua Kinard <kumba@gentoo.org> heimdal-0.6.ebuild:
   Marked stable on mips.
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 66118577d030..739ea7c5d8a8 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,14 +1,15 @@
-MD5 52db1d56a608fe915449ae8f6ff91d3a ChangeLog 3295
-MD5 3076338903c640bb9e03b75adbe63604 heimdal-0.4e-r1.ebuild 1159
-MD5 c4a2a7d5b732d94e225dd82386cceff7 heimdal-0.5.1-r1.ebuild 2240
 MD5 fdd19765d39c772a4c1d5b47223e16c0 heimdal-0.5.1.ebuild 1317
+MD5 c4a2a7d5b732d94e225dd82386cceff7 heimdal-0.5.1-r1.ebuild 2240
+MD5 d0aa4f48342fc8c4550163330ec3d192 heimdal-0.6.ebuild 2574
 MD5 8fc197c92855920e4cf399b17501f1b1 heimdal-0.5.ebuild 1307
-MD5 8182b5d0228044295d4bfd0fec7db66c heimdal-0.6.ebuild 2516
-MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
-MD5 4b0bf925049fd324edb977fa85fb907f files/digest-heimdal-0.4e-r1 65
+MD5 841f1b3ef210302d451226b336af2033 ChangeLog 3456
+MD5 3076338903c640bb9e03b75adbe63604 heimdal-0.4e-r1.ebuild 1159
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
 MD5 9938c171c490847ed838372b75d29d0c files/digest-heimdal-0.5 64
-MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1 66
-MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1-r1 66
 MD5 9cf5addf22f494dcf6c5aa9d16a372a8 files/digest-heimdal-0.6 64
-MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
+MD5 4b0bf925049fd324edb977fa85fb907f files/digest-heimdal-0.4e-r1 65
+MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1-r1 66
 MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1 66
+MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
+MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
diff --git a/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch b/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch
new file mode 100644
index 000000000000..4b4ab86ca082
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6-berkdb.patch
@@ -0,0 +1,22 @@
+--- cf/db.m4	2004-03-30 09:00:23.315562886 +0000
++++ cf/db.m4	2004-03-30 09:00:47.278672201 +0000
+@@ -14,6 +14,8 @@
+ if test "$enable_berkeley_db" != no; then
+ 
+   AC_CHECK_HEADERS([				\
++	db4.2/db.h				\
++	db4.1/db.h				\
+ 	db4/db.h				\
+ 	db3/db.h				\
+ 	db.h					\
+@@ -24,6 +26,10 @@
+ 
+   AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
+   #include <stdio.h>
++  #ifdef HAVE_DB4_2_DB_H
++  #include <db4.2/db.h>
++  #ifdef HAVE_DB4_1_DB_H
++  #include <db4.1/db.h>
+   #ifdef HAVE_DB4_DB_H
+   #include <db4/db.h>
+   #elif defined(HAVE_DB3_DB_H)
diff --git a/app-crypt/heimdal/heimdal-0.6.ebuild b/app-crypt/heimdal/heimdal-0.6.ebuild
index 7406cae373c0..ac98ed2eebbb 100644
--- a/app-crypt/heimdal/heimdal-0.6.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.14 2004/03/21 09:37:23 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.15 2004/03/30 09:12:47 aliz Exp $
 
 inherit libtool eutils
 
@@ -17,7 +17,8 @@ PROVIDE="virtual/krb5"
 DEPEND="
 	ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
-	!app-crypt/kth-krb"
+	!app-crypt/kth-krb
+	sys-devel/autoconf"
 	# ldap? ( net-nds/openldap )
 	# With this enabled, we create a multiple stage
 	# circular dependency with USE="ldap kerberos"
@@ -28,12 +29,14 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gcc3.patch
 	epatch ${FILESDIR}/${P}-rxapps.patch
+	epatch ${FILESDIR}/${P}-berkdb.patch
 
 	# Um, I don't think the below is doing anything since automake is
 	# run in src_compile(), but I'll leave it alone since this ebuild
 	# isn't mine... (16 Feb 2004 agriffis)
 	cd ${S}/lib/krb5 || die
 	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in || die
+
 }
 
 src_compile() {