Fix bug #134943 - compile failure with newer versions of berkdb.

Package-Manager: portage-2.1.1

5 files changed, 103 insertions, 12 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 1b05ca4f0c0e..d9a71a36bd10 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.135 2006/09/05 03:30:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.136 2006/09/15 06:22:18 robbat2 Exp $
+
+  15 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.6-db4-configure.in.patch,
+  courier-imap-4.0.6.ebuild:
+  Fix bug #134943 - compile failure with newer versions of berkdb.
 
   05 Sep 2006; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.4.ebuild:
   Marked stable on mips.
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 7c6fba37a7c3..7535d55c3bc5 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -114,6 +114,14 @@ AUX courier-imap-4.0.4-courier-pop3d.rc6 937 RMD160 aa08726aefd6fd3dad6cf2003de8
 MD5 39f278a2acfa843594dc20efedefc97f files/courier-imap-4.0.4-courier-pop3d.rc6 937
 RMD160 aa08726aefd6fd3dad6cf2003de853869eb2d71a files/courier-imap-4.0.4-courier-pop3d.rc6 937
 SHA256 70c526347c8c53888df1bc6602d242376e9ef885a2b125d5292363c082dc4fca files/courier-imap-4.0.4-courier-pop3d.rc6 937
+AUX courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596 RMD160 4181b19b76f32a215ba128008a05debabad8550c SHA1 ee09d483434368ce6332eb8cf36a0f220f448bd8 SHA256 9c715dccaac533e151c194aaf0900cc89d6650c3704b7e87125cf6b2cd10a5a3
+MD5 e96a64b0b8a1ea09ba59b9f79dfbd829 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596
+RMD160 4181b19b76f32a215ba128008a05debabad8550c files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596
+SHA256 9c715dccaac533e151c194aaf0900cc89d6650c3704b7e87125cf6b2cd10a5a3 files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch 1596
+AUX courier-imap-4.0.6-db4-configure.in.patch 1623 RMD160 10dcea6643be49b1be4241a02cd153a508898332 SHA1 8d3b10d1ba88f7714831a0908d177c0a21e658bd SHA256 809e730d6fb147bc1e8b59c6f23127cf3a38b14a00d723161cd6c85b1ab5e957
+MD5 c1fdae0da5552decc362bc031c3a4b5b files/courier-imap-4.0.6-db4-configure.in.patch 1623
+RMD160 10dcea6643be49b1be4241a02cd153a508898332 files/courier-imap-4.0.6-db4-configure.in.patch 1623
+SHA256 809e730d6fb147bc1e8b59c6f23127cf3a38b14a00d723161cd6c85b1ab5e957 files/courier-imap-4.0.6-db4-configure.in.patch 1623
 AUX courier-imap-gentoo.readme 2827 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 SHA1 72c4f79c6ed08c4423925b05303f97287b8d95d1 SHA256 fbfe0396d87bcfe2722df94b2c68ef1a1993edcf776c8572604aed0390e4061f
 MD5 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
 RMD160 1429340ccc518b019a42dd274a7c15f01f125d25 files/courier-imap-gentoo.readme 2827
@@ -187,14 +195,14 @@ EBUILD courier-imap-4.0.4.ebuild 10133 RMD160 e4ae0cb639f6d57e19d4c3ec0d78b4a717
 MD5 f6347b347fdcb27c4d4742aca2ff2a81 courier-imap-4.0.4.ebuild 10133
 RMD160 e4ae0cb639f6d57e19d4c3ec0d78b4a717783003 courier-imap-4.0.4.ebuild 10133
 SHA256 3c1954127b014de8b409bd566783fb753a243f5317a206eaf657aa22f44fb7de courier-imap-4.0.4.ebuild 10133
-EBUILD courier-imap-4.0.6.ebuild 10143 RMD160 f893d27625f91f4cb698ca8a00f5b2cd5421b096 SHA1 856041ebf54da83ddfe84359b9ee11a1590106c9 SHA256 315773a28ae1dc8689be9d4e7747f3593568a142676d8e722bf4ceeb0fd19a25
-MD5 86e376fb4f55a255202c9e173b8b35ed courier-imap-4.0.6.ebuild 10143
-RMD160 f893d27625f91f4cb698ca8a00f5b2cd5421b096 courier-imap-4.0.6.ebuild 10143
-SHA256 315773a28ae1dc8689be9d4e7747f3593568a142676d8e722bf4ceeb0fd19a25 courier-imap-4.0.6.ebuild 10143
-MISC ChangeLog 25381 RMD160 667c8d98dc1718ed52bf21fd8d5591ef6b02a919 SHA1 18d02d22c9c0678de7471e67bd5106d19715c32e SHA256 c59e1603a86e3086f4e7c1d9ab37f63470dbe64bd5f5738fb9e637220ac9b7f2
-MD5 179432aac2b2b99e0497a74f7eac630b ChangeLog 25381
-RMD160 667c8d98dc1718ed52bf21fd8d5591ef6b02a919 ChangeLog 25381
-SHA256 c59e1603a86e3086f4e7c1d9ab37f63470dbe64bd5f5738fb9e637220ac9b7f2 ChangeLog 25381
+EBUILD courier-imap-4.0.6.ebuild 10143 RMD160 1845f2c7a15f3261218dd95af6500ef24211502b SHA1 04d1a40afeff63101bbc6008787fa2641b0b5050 SHA256 07b68251272c3a484f644cfad8f8e6e3e6a2a5e1c93737d120de94f700622103
+MD5 c20b020002dd54e24e42ca4ca8514850 courier-imap-4.0.6.ebuild 10143
+RMD160 1845f2c7a15f3261218dd95af6500ef24211502b courier-imap-4.0.6.ebuild 10143
+SHA256 07b68251272c3a484f644cfad8f8e6e3e6a2a5e1c93737d120de94f700622103 courier-imap-4.0.6.ebuild 10143
+MISC ChangeLog 25644 RMD160 3f5abf91d5193a64f4baa7baca506e91b9d7af38 SHA1 c7c14a28aac3bba92006753299e8d06f85e99437 SHA256 dd9e59c2add07bead2a85f2b45ca9f017f7038b7479780f6a9a39f2c915d3bc7
+MD5 3257d77925432cf3577c7f42afe04a51 ChangeLog 25644
+RMD160 3f5abf91d5193a64f4baa7baca506e91b9d7af38 ChangeLog 25644
+SHA256 dd9e59c2add07bead2a85f2b45ca9f017f7038b7479780f6a9a39f2c915d3bc7 ChangeLog 25644
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 metadata.xml 280
diff --git a/net-mail/courier-imap/courier-imap-4.0.6.ebuild b/net-mail/courier-imap/courier-imap-4.0.6.ebuild
index edb8de3b0457..f05ffa7d2fad 100644
--- a/net-mail/courier-imap/courier-imap-4.0.6.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6.ebuild,v 1.2 2006/08/25 21:17:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6.ebuild,v 1.3 2006/09/15 06:22:18 robbat2 Exp $
 
 inherit eutils gnuconfig
 IUSE="fam berkdb gdbm debug ipv6 nls selinux"
@@ -71,8 +71,8 @@ src_unpack() {
 	# These patches should fix problem detecting Berkeley DB.
 	# We now can compile with db4 support.
 	if use berkdb; then
-		epatch ${FILESDIR}/${PN}-4.0.1-db4-bdbobj_configure.in.patch
-		epatch ${FILESDIR}/${PN}-4.0.1-db4-configure.in.patch
+		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
+		epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
 	fi
 
 	export WANT_AUTOCONF="2.5"
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
new file mode 100644
index 000000000000..b2c802c548bf
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch
@@ -0,0 +1,35 @@
+--- courier-imap-3.0.7-orig/bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
++++ courier-imap-3.0.7/bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,23 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++  do
++        AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++        	AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++        		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++          		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++            		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++
++  done
++FOUND_DB=0
++AC_CHECK_FUNC(db_create_4004, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4003, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
new file mode 100644
index 000000000000..8f6e40693a9f
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch
@@ -0,0 +1,42 @@
+--- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
++++ configure.in	2004-11-16 16:03:06.743324584 -0800
+@@ -11,7 +11,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
+@@ -150,16 +149,22 @@
+ 
+ if test "$db" != "gdbm"
+ then
++  for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++    do
++	AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++		AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++			AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	  	AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	    	AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	      	AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++    done
++  AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+ 
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		AC_CHECK_LIB(db, db_env_create,
+-				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
+ fi
+ 
+ LIBS="$saveLIBS"