Added support for linking to SASLv1 (SASL1=yes)

3 files changed, 37 insertions, 5 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index c32e22172fb5..64466d9b77c8 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.42 2003/07/10 23:22:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.43 2003/07/12 09:28:02 raker Exp $
+
+  12 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4.ebuild:
+  Adding support for linking to SASLv1.  (SASL1=yes)  Not putting this
+  behind a use variable as people are expecting to link against SASLv2
+  normally.
 
   10 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.22.ebuild:
   AF_UNIX and process title support.
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index f0b7a1db237d..f01e1f280475 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -3,8 +3,8 @@ MD5 1a8b70deaf20576b9bbefd93574edb41 openldap-2.1.22.ebuild 6018
 MD5 405655723adfa7c4470f1984f5463dd1 openldap-2.0.27.ebuild 2325
 MD5 6b611092dd59bc62ddba9578e60e23b2 openldap-2.0.25-r1.ebuild 2530
 MD5 5f9e081b9be4ec33dea8b4d169d2ed2b openldap-2.1.21.ebuild 5295
-MD5 eb8b8d8734b22b2eb2a52d2b2573f10a ChangeLog 9766
-MD5 3060483dd0aeccc60e1fc73c7e90e880 openldap-2.0.27-r4.ebuild 5389
+MD5 b5504fa649b85546ff662126fb2632c2 ChangeLog 9995
+MD5 8384a845ed32efc83b203716b93b601c openldap-2.0.27-r4.ebuild 6026
 MD5 646fd34831ae403ecda2103b01f49a0f files/slapd-2.1.conf 278
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r2 65
diff --git a/net-nds/openldap/openldap-2.0.27-r4.ebuild b/net-nds/openldap/openldap-2.0.27-r4.ebuild
index c5c3da40a2fe..be84bacb9fa8 100644
--- a/net-nds/openldap/openldap-2.0.27-r4.ebuild
+++ b/net-nds/openldap/openldap-2.0.27-r4.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.0.27-r4.ebuild,v 1.6 2003/07/09 07:36:05 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r4.ebuild,v 1.7 2003/07/12 09:28:02 raker Exp $
 
 inherit eutils
 
@@ -30,6 +30,21 @@ RDEPEND="virtual/glibc
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if [ "${SASL1}" != "yes" ]; then
+		ewarn ""
+		ewarn "For linking with SASLv1..." 
+		ewarn "emerge dev-libs/cyrus-sasl-1.5.27-r6 (or newest 1.x series build)"
+		ewarn "SASL1=yes emerge ${PVR}.ebuild"
+		ewarn ""
+		sleep 2
+	else
+		ewarn ""
+		ewarn "You are building ${PVR} linking to SASLv1"
+		ewarn ""
+	fi
+}
+
 pkg_preinst() {
 	if ! grep -q ^ldap: /etc/group
 	then
@@ -95,6 +110,11 @@ src_compile() {
 		&& myconf="${myconf} --enable-ldbm --with-ldbm-api=gdbm" \
    		|| myconf="${myconf} --enable-ldbm --with-ldbm-api=berkeley"
 
+	if [ "${SASL1}" = "yes" ]; then
+		myconf="${myconf} --with-cyrus-sasl"
+	else
+		myconf="${myconf} --without-cyrus-sasl"
+	fi
 
 	econf \
 		--libexecdir=/usr/lib/openldap \
@@ -103,7 +123,6 @@ src_compile() {
 		--enable-phonetic \
 		--enable-dynamic \
 		--enable-ldap \
-		--without-cyrus-sasl \
 		--disable-spasswd \
 		--enable-passwd \
 		--enable-shell \
@@ -182,4 +201,12 @@ pkg_postinst() {
 	chmod 0640 /etc/openldap/slapd.conf
 	chown root:ldap /etc/openldap/slapd.conf.default
 	chmod 0640 /etc/openldap/slapd.conf.default
+
+	if [ "${SASL1}" != "yes" ]; then
+		einfo ""
+		einfo "For linking with SASLv1..." 
+		einfo "emerge dev-libs/cyrus-sasl-1.5.27-r6 (or newest 1.x series build)"
+		einfo "SASL1=yes emerge ${PVR}.ebuild"
+		einfo ""
+	fi
 }