--- /usr/portage/net-nds/openldap/openldap-2.3.41.ebuild	2008-03-19 01:06:50.000000000 +0100
+++ /usr/portage/net-nds/openldap/openldap-2.3.41.ebuild	2008-05-21 14:46:07.025821677 +0200
@@ -1,8 +1,10 @@ 
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.7 2008/03/18 23:38:54 jer Exp $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 AT_M4DIR="./build"
 inherit autotools db-use eutils flag-o-matic multilib ssl-cert toolchain-funcs versionator
@@ -30,12 +32,26 @@ 
 		slp? ( net-libs/openslp )
 		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.5
+				sys-libs/db:4.4
+				sys-libs/db:4.3
+				>=sys-libs/db-4.2.52_p2-r1:4.2
+			)
+		)
 		!berkdb? (
 			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !=sys-libs/db-4.6* )
+			!gdbm? (
+				|| (
+					sys-libs/db:4.5
+					sys-libs/db:4.4
+					sys-libs/db:4.3
+					>=sys-libs/db-4.2.52_p2-r1:4.2
+				)
+			)
 		)
 		smbkrb5passwd? (
 			dev-libs/openssl
 			app-crypt/heimdal
@@ -235,18 +251,18 @@ 
 		if use berkdb ; then
 			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 4.5 4.4 4.3 4.2)
 		elif use gdbm ; then
 			einfo "Using GDBM for local backend"
 			myconf="${myconf} ${myconf_gdbm}"
 		else
 			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
 			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 4.5 4.4 4.3 4.2)
 		fi
 		# extra backend stuff
 		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
 		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
@@ -291,11 +307,10 @@ 
 		--enable-shared \
 		--libexecdir=/usr/$(get_libdir)/openldap \
 		${myconf} || die "configure failed"
 
-	# Adding back -j1 as upstream didn't answer on parallel make issue yet
-	emake -j1 depend || die "make depend failed"
-	emake -j1 || die "make failed"
+	emake depend || die "make depend failed"
+	emake || die "make failed"
 
 	# openldap/contrib
 	tc-export CC
 	if ! use minimal ; then