[patch] openldap-2.3.41-no-db-46.patch

openldap-2.3.41-no-db-46.patch (text/plain), 1.69 KB, created by Nathan Sullivan on 2008-05-17 03:22:42 UTC

--- openldap-2.3.41.ebuild.orig	2008-05-17 13:20:29.000000000 +1000
+++ openldap-2.3.41.ebuild	2008-05-17 13:02:47.000000000 +1000
@@ -31,10 +31,10 @@
 		perl? ( dev-lang/perl )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
-		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+		berkdb? ( >=sys-libs/db-4.2.52_p2-r1 )
 		!berkdb? (
 			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 )
 		)
 		smbkrb5passwd? (
 			dev-libs/openssl
@@ -151,6 +151,20 @@
 
 }
 
+openldap_best_db_ver_not46() {
+	versions="4.5 4.4 4.3 4.2"
+	for x in $versions; do
+		if [ $(db_findver "=sys-libs/db-${x}*") ]; then
+			echo $x
+			return 0
+		fi
+	done
+
+	eerror "Error finding db version"
+	return 1
+}
+
+
 pkg_setup() {
 	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
 		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
@@ -236,7 +250,7 @@
 			einfo "Using Berkeley DB for local backend"
 			myconf="${myconf} ${myconf_berkdb}"
 			# We need to include the slotted db.h dir for FreeBSD
-			append-cppflags -I$(db_includedir)
+			append-cppflags -I$(db_includedir $(openldap_best_db_ver_not46) )
 		elif use gdbm ; then
 			einfo "Using GDBM for local backend"
 			myconf="${myconf} ${myconf_gdbm}"
@@ -245,7 +259,7 @@
 			ewarn "Berkeley DB for local backend"
 			myconf="${myconf} ${myconf_berkdb}"
 			# We need to include the slotted db.h dir for FreeBSD
-			append-cppflags -I$(db_includedir)
+			append-cppflags -I$(db_includedir $(openldap_best_db_ver_not46) )
 		fi
 		# extra backend stuff
 		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"