Fixup the bash4 usage and go into slightly more detail on the berkdb prebuilt check so users do not block themselves out of their database.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

3 files changed, 42 insertions, 19 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 7caa5a10ac8b..2b4a4360c03d 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.359 2009/11/27 23:35:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.360 2009/11/28 00:28:26 robbat2 Exp $
+
+  28 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.4.19-r1.ebuild:
+  Fixup the bash4 usage and go into slightly more detail on the berkdb
+  prebuilt check so users do not block themselves out of their database.
 
   27 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   openldap-2.4.19-r1.ebuild:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index d8fbd2c19f1f..529de96f8bce 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -27,7 +27,7 @@ EBUILD openldap-2.3.43.ebuild 17845 RMD160 14dc97d9b79dbde77f124eeeebd162b5ea612
 EBUILD openldap-2.4.16.ebuild 15152 RMD160 54d5cced13910c8f81edc117a3dfb8db86248341 SHA1 a590c2e7aaf4a04459a76e755d26cb3747156305 SHA256 053f2dff9a03af6d2994d61fe01f637245e09744d3fc3a0bd62c7630d7004783
 EBUILD openldap-2.4.17-r1.ebuild 17425 RMD160 520100a05855c69c52dc0f952de15aae52d897ea SHA1 1034ffe92aca9986e0161c4473d3fe2d514cfcfd SHA256 0c900a92d19fec9b5300afcde77cf4ea4eed34e62e46f22cf1df9474b6e8a7bf
 EBUILD openldap-2.4.17.ebuild 15151 RMD160 dda10856a90ba7ddc898aab52f0cce079f067827 SHA1 453df712daf1861d39463ad2d05e127d43b53443 SHA256 9d65d9e3cef1badbda001ff5e79216d896a3865634d56f2e9b04664306e0ed4d
-EBUILD openldap-2.4.19-r1.ebuild 18354 RMD160 1a4b2526e75034d00777c27410af59bc4afc16e9 SHA1 3593792ca31f27229737f6596c8841ed2f0a9104 SHA256 1bb1cd97c95cd96a20a0f451bde349698f6f11c517f634738061f847aa4cdf04
+EBUILD openldap-2.4.19-r1.ebuild 19128 RMD160 1a518509bdaebc7c30e5e6ef9128347a3babd0c4 SHA1 4fa7764195db9957d0df549c84a5f78fb6615d11 SHA256 0488d233c256b8e6a75261820c1e149922f11f33b14c7097ea1049f20621fbd1
 EBUILD openldap-2.4.19.ebuild 17501 RMD160 7058461881bc146836cba0a8e9f867a7fd8728bc SHA1 f27435f04fafbf477bbb23f3d67900aac4e1bfb7 SHA256 afa573819347dd063fe4f67fccd606110da567ba143fdf52f3800f1080c436ba
-MISC ChangeLog 61595 RMD160 37ad41506bc0541ed0356c11538f3362056beb48 SHA1 93a64c36927a4cb1117c42c886bac83e0b6ba05d SHA256 7c3744ee6a117d2d1031a3e43b37a743901600f590f1fdcb6c5b7f5a2f51f010
+MISC ChangeLog 61821 RMD160 d262b121c57c92ebd2b1e6c3f6876855df4874e8 SHA1 f7bbdbf564e5e3d4bcbbb27fc480043fb95b0652 SHA256 12e5b34dbed0f5d82354106b39088b3c080ae38b54cabdd3154777e9d45b687c
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index 93870eebda07..f0bbde20a06d 100644
--- a/net-nds/openldap/openldap-2.4.19-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.4 2009/11/27 23:35:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.5 2009/11/28 00:28:26 robbat2 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -118,21 +118,37 @@ openldap_find_versiontags() {
 		fi
 	done
 
-	if use berkdb ; then
-		# Now we must check for the major version of sys-libs/db linked against.
-		SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd
-		if [ -f "${SLAPD_PATH}" ]; then
-			OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-				| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-			NEWVER="$(db_findver sys-libs/db)"
-			if [ "${OLDVER}" != "${NEWVER}" ]; then
-				eerror "	Your existing version of OpenLDAP was built against"
-				eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-				eerror "	${NEWVER} and your database would be inaccessible."
-				echo
-				openldap_upgrade_howto
-			fi
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd
+	if [ -f "${SLAPD_PATH}" ]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		NEWVER="$(use berkdb && db_findver sys-libs/db)"
+		local fail=0
+		if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then
+			:
+			# Nothing wrong here.
+		elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [ "${OLDVER}" != "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
 		fi
+		[ "${fail}" == "1" ] && openldap_upgrade_howto
 	fi
 
 	echo
@@ -228,9 +244,11 @@ build_contrib_module() {
 	# <dir> <sources> <outputname>
 	cd "${S}/contrib/slapd-modules/$1"
 	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')"
 	"${lt}" --mode=compile --tag=CC \
 		"${CC}" \
-		-DSLAPD_OVER_${1^^}=SLAPD_MOD_DYNAMIC \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
 		-I../../../include -I../../../servers/slapd ${CFLAGS} \
 		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
 	einfo "Linking contrib-module: $3"