fix bug #31037

3 files changed, 46 insertions, 29 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 36cfdd52a591..5f4ed2d6d4fb 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.48 2003/10/12 23:42:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.49 2003/10/29 02:21:41 robbat2 Exp $
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.22-r1.ebuild:
+  fix bug #31037
 
 *openldap-2.1.22-r1 (12 Oct 2003)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index fdbe1c95cc47..a90bf0dc49ae 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,6 +1,12 @@
-MD5 62149973636ec267f047c3ebd0f89901 files/2.0/slapd 620
-MD5 646fd34831ae403ecda2103b01f49a0f files/2.0/slapd.conf 278
-MD5 80adb9dc3133bd47fbc1168fd29788ee files/2.0/slurpd 505
+MD5 47104263b39077ee597f1025ddb8821a openldap-2.1.22-r1.ebuild 6036
+MD5 d8d00496a60c0dca4a147b336d5c5f69 openldap-2.0.25-r2.ebuild 2608
+MD5 bd436317c0d7e218e3bb3a418b3ba1af openldap-2.1.22.ebuild 5260
+MD5 803a7dd0676c1bb70fead91bec230189 openldap-2.0.27.ebuild 2260
+MD5 04f32e3d256415e0edcef72258fe1346 openldap-2.0.25-r1.ebuild 2517
+MD5 228e3ed7b74f4090d52d5d766ac35d3e openldap-2.1.21.ebuild 5292
+MD5 61f7489f4f592e69a6ee79a5a845632d ChangeLog 11079
+MD5 4d29062be2f73fa15f9bd0f184eba498 openldap-2.0.25-r3.ebuild 6258
+MD5 e19f6635f7d8e8e7b5469e9dc94c7c84 openldap-2.0.27-r4.ebuild 6421
 MD5 ab26c55b61650f4081e4a9c28f972671 files/openldap-2.1.22-perlsedfoo.patch 1029
 MD5 646fd34831ae403ecda2103b01f49a0f files/slapd-2.1.conf 278
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
@@ -10,23 +16,17 @@ MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r4 65
 MD5 2f3032e2a972520d1a5d428e11a6eb82 files/openldap-2.0.27-db3-gentoo.patch 5995
 MD5 8da86adedbe551c680dd6e102dfc303d files/gencert.sh 3505
 MD5 d4aef53a2d2ebe6e6df8cfcf33494908 files/digest-openldap-2.1.22-r1 65
-MD5 460d3869f98a805e246ce497ac7f5dc5 files/slapd-2.1.rc6 614
+MD5 e67e76ddf0b91a7e72527f5be23b265d files/slapd-2.1.rc6 613
 MD5 97907dada58b504e9fb662b011d62c99 files/rfc2252-bork.patch 1319
-MD5 a10c9fd548df5774f91a6a10ed604041 files/slurpd-2.1.rc6 508
-MD5 b6dfea76b039b194c4f403d9e7cebde0 files/slapd-2.1-r1.rc6 709
+MD5 7b4433b94f0fc68972a0a5a4bbff1cf7 files/slurpd-2.1.rc6 507
+MD5 f742d1da61d191f626b5b6e9986e79a6 files/slapd-2.1-r1.rc6 708
 MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
 MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
 MD5 43181f48b522ce05011ff4d0a0b061f7 files/digest-openldap-2.1.21 65
 MD5 d4aef53a2d2ebe6e6df8cfcf33494908 files/digest-openldap-2.1.22 65
-MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
-MD5 427c91c528ea2cc1719df18d5339706f files/slurpd.rc6 504
+MD5 618aff7f8ec17a4090f07c56d461e775 files/slapd.rc6 590
+MD5 56c55ee6e524dd55c3d38531e792eaa2 files/slurpd.rc6 503
 MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
-MD5 68e4c0b4b6db2b603e270ad9b0c1c7fa openldap-2.1.22-r1.ebuild 5727
-MD5 63a967c1c320ba41db8fcacae617976a openldap-2.0.25-r2.ebuild 2609
-MD5 96a3e746518a370c5dc15d9c7cc1fecb openldap-2.1.22.ebuild 5261
-MD5 10ed874ce6ccd74b96f43f0ca516e0a8 openldap-2.0.27.ebuild 2261
-MD5 f4c89948381790589a6f38ae0161ad06 openldap-2.0.25-r1.ebuild 2518
-MD5 459cb8bf52dffe9ee3fa9ed0bf5f2dae openldap-2.1.21.ebuild 5293
-MD5 a1c40f82a7b117697e4a67422951adff ChangeLog 10980
-MD5 6912e8d5b7848ce0efd35115dde53bc1 openldap-2.0.25-r3.ebuild 6259
-MD5 15624967a8285df9b6aedfcf1f50c83d openldap-2.0.27-r4.ebuild 6422
+MD5 cc51c5bb0ff8712653668de9697487fa files/2.0/slapd 619
+MD5 646fd34831ae403ecda2103b01f49a0f files/2.0/slapd.conf 278
+MD5 f1fa172a58f551bfa314b39b0725a77f files/2.0/slurpd 504
diff --git a/net-nds/openldap/openldap-2.1.22-r1.ebuild b/net-nds/openldap/openldap-2.1.22-r1.ebuild
index ac09ea09c476..a19fc0f5b38f 100644
--- a/net-nds/openldap/openldap-2.1.22-r1.ebuild
+++ b/net-nds/openldap/openldap-2.1.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.22-r1.ebuild,v 1.1 2003/10/12 23:42:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.22-r1.ebuild,v 1.2 2003/10/29 02:21:41 robbat2 Exp $
 
 inherit eutils
 
@@ -15,11 +15,9 @@ IUSE="ssl tcpd readline ipv6 gdbm sasl kerberos odbc perl slp berkdb debug samba
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
-	berkdb? ( >=sys-libs/db-4.1 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/readline-4.1 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
 	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
 	odbc? ( dev-db/unixODBC )
@@ -27,6 +25,14 @@ DEPEND=">=sys-libs/ncurses-5.1
 	perl? ( >=dev-lang/perl-5.6 )
 	samba? ( >=dev-libs/openssl-0.9.6 )"
 
+# if USE=berkdb
+#	pull in sys-libs/db
+# else if USE=gdbm
+#	pull in sys-libs/gdbm
+# else
+#	pull in sys-libs/db
+DEPEND="berkdb? ( >=sys-libs/db-4.1 ) : ( gdbm? ( >=sys-libs/gdbm-1.8.0 ) : ( >=sys-libs/db-4.1 ) )"
+
 pkg_preinst() {
 	enewgroup ldap 439
 	enewuser ldap 439 /dev/null /usr/lib/openldap ldap
@@ -69,13 +75,20 @@ src_compile() {
 	myconf="${myconf} `use_enable perl`"
 	myconf="${myconf} `use_enable slp`"
 
-	use berkdb \
-		&& myconf="${myconf} --enable-ldbm --enable-bdb --with-ldbm-api=berkeley"
-
-	# only turn off bdb if berkdb is not in USE
-	use gdbm && [ ! `use berkdb` ] \
-		&& myconf="${myconf} --enable-ldbm --disable-bdb --with-ldbm-api=gdbm" \
-		|| myconf="${myconf} --enable-ldbm --enable-bdb --with-ldbm-api=berkeley"
+	myconf="${myconf} --enable-ldbm"
+	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley'
+	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm'
+	if use berkdb; then
+		einfo "Using Berkeley DB for local backend"
+		myconf="${myconf} ${myconf_berkdb}"
+	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}"
+	fi
 
 	# alas, for BSD only
 	#myconf="${myconf} --with-fetch"
@@ -89,7 +102,7 @@ src_compile() {
 	myconf="${myconf} --enable-local --enable-proctitle"
 
 	# disabled options
-	# --enable-bdb --with-bdb-module=dynamic
+	# --with-bdb-module=dynamic
 	# --enable-dnsserv --with-dnsserv-module=dynamic
 
 	econf \