huge cleanup in a hazmat suit. fixes a slew of bugs.

23 files changed, 429 insertions, 668 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index e8b3522d8198..e9875b55593d 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,25 @@
 # 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.29 2003/04/17 16:53:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.30 2003/05/11 19:18:21 liquidx Exp $
+
+*openldap-2.1.19 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> openldap-2.1.19.ebuild:
+  wholesale changes to how this ebuild is installed. fixes :
+   - wrong pid file directory in both config and init.d (#13057)
+   - debugging enabled for syslogging (#16131)
+   - version bumped 2.1 series and omit redundant kerberos patch (#16341)
+   - fixed /var/tmp paths in *.la (#12084)  
+
+*openldap-2.0.27-r3 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> openldap-2.0.27-r3.ebuild,
+  files/2.0/slapd, files/2.0/slapd.conf, files/2.0/slurpd:
+  
+  wholesale changes to how this ebuild is installed. fixes :
+   - wrong pid file directory in both config and init.d (#13057)
+   - debugging enabled for syslogging (#16131)
+   - fixed /var/tmp paths in *.la (#12084)
 
   23 Feb 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27*.ebuild :
   Changed --disable-sasl to --without-cyrus-sasl as noted by Matt
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
new file mode 100644
index 000000000000..03824f15567e
--- /dev/null
+++ b/net-nds/openldap/Manifest
@@ -0,0 +1,24 @@
+MD5 86a13849ab636d3bc22ebd718ec3a95a ChangeLog 7334
+MD5 66c478b68fe23e7beb49a11175a89c40 openldap-2.0.27-r3.ebuild 3956
+MD5 56353b208cd2f1c14f17700e5a4d74af openldap-2.1.19.ebuild 4266
+MD5 7e223bf5e395fd7b935ed34f7833724a openldap-2.0.25-r1.ebuild 2420
+MD5 fff1c376523766e56dcb20916ee25919 openldap-2.0.27-r2.ebuild 3025
+MD5 a4010ca341fd815df8a6875a8fe289ef openldap-2.0.27.ebuild 2306
+MD5 293bb36ba16124176601d1d57beb92da openldap-2.1.12.ebuild 3335
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r3 65
+MD5 cc41a12a9b455803861b9919a0b86d55 files/digest-openldap-2.1.19 65
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r2 65
+MD5 bd86dfd482d437884ca6305acc3aa2a1 files/digest-openldap-2.1.12 65
+MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
+MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
+MD5 b6dfea76b039b194c4f403d9e7cebde0 files/slapd-2.1-r1.rc6 709
+MD5 44c7dbcfe29bc1df9e576e5010c4674f files/slapd-2.1.conf 251
+MD5 460d3869f98a805e246ce497ac7f5dc5 files/slapd-2.1.rc6 614
+MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
+MD5 a10c9fd548df5774f91a6a10ed604041 files/slurpd-2.1.rc6 508
+MD5 427c91c528ea2cc1719df18d5339706f files/slurpd.rc6 504
+MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
+MD5 0ca38c285b94f57088a73fedcecb9e34 files/2.0/slapd 615
+MD5 44c7dbcfe29bc1df9e576e5010c4674f files/2.0/slapd.conf 251
+MD5 80adb9dc3133bd47fbc1168fd29788ee files/2.0/slurpd 505
diff --git a/net-nds/openldap/files/2.0/slapd b/net-nds/openldap/files/2.0/slapd
new file mode 100644
index 000000000000..ed67f9daf983
--- /dev/null
+++ b/net-nds/openldap/files/2.0/slapd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slapd,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ldap-server"
+	start-stop-daemon --start --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ldap-server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd
+	eend $?
+}
diff --git a/net-nds/openldap/files/2.0/slapd.conf b/net-nds/openldap/files/2.0/slapd.conf
new file mode 100644
index 000000000000..9a82209503ea
--- /dev/null
+++ b/net-nds/openldap/files/2.0/slapd.conf
@@ -0,0 +1,8 @@
+# conf.d file for the openldap-2.1 series
+#
+# To enable both the standard unciphered server and the ssl encrypted
+# one uncomment this line or set any other server starting options
+# you may desire.
+#
+# OPTS="-h \'ldaps://0.0.0.0/ ldap://0.0.0.0/\'"
+
diff --git a/net-nds/openldap/files/2.0/slurpd b/net-nds/openldap/files/2.0/slurpd
new file mode 100644
index 000000000000..425c2e9b5747
--- /dev/null
+++ b/net-nds/openldap/files/2.0/slurpd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slurpd,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting slurpd"
+	start-stop-daemon --start --quiet --exec /usr/lib/openldap/slurpd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping slurpd"
+	start-stop-daemon --stop --quiet --exec /usr/lib/openldap/slurpd
+	eend $?
+}
diff --git a/net-nds/openldap/files/digest-openldap-1.2.13-r6 b/net-nds/openldap/files/digest-openldap-1.2.13-r6
deleted file mode 100644
index 9ebf3dd24869..000000000000
--- a/net-nds/openldap/files/digest-openldap-1.2.13-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9613c1f8211c058e0b13788355b0e580 openldap-1.2.13.tgz 1034063
diff --git a/net-nds/openldap/files/digest-openldap-2.0.25-r2 b/net-nds/openldap/files/digest-openldap-2.0.25-r2
deleted file mode 100644
index 8f386fb0e4ef..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.0.25-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57ed9ea3d872595076d6eab7b93337bd openldap-2.0.25.tgz 1304098
diff --git a/net-nds/openldap/files/digest-openldap-2.0.25-r3 b/net-nds/openldap/files/digest-openldap-2.0.25-r3
deleted file mode 100644
index 8f386fb0e4ef..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.0.25-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57ed9ea3d872595076d6eab7b93337bd openldap-2.0.25.tgz 1304098
diff --git a/net-nds/openldap/files/digest-openldap-2.0.27-r1 b/net-nds/openldap/files/digest-openldap-2.0.27-r3
index 06cad419992d..06cad419992d 100644
--- a/net-nds/openldap/files/digest-openldap-2.0.27-r1
+++ b/net-nds/openldap/files/digest-openldap-2.0.27-r3
diff --git a/net-nds/openldap/files/digest-openldap-2.1.10 b/net-nds/openldap/files/digest-openldap-2.1.10
deleted file mode 100644
index 6fc6b4ed1170..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a716dd0307c6145679fd3e1e41b78ad5 openldap-2.1.10.tgz 2057363
diff --git a/net-nds/openldap/files/digest-openldap-2.1.19 b/net-nds/openldap/files/digest-openldap-2.1.19
new file mode 100644
index 000000000000..72f79ae27d0c
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.1.19
@@ -0,0 +1 @@
+MD5 e78402b3c0ef8b78aa00521a87f9f47b openldap-2.1.19.tgz 2031944
diff --git a/net-nds/openldap/files/digest-openldap-2.1.9 b/net-nds/openldap/files/digest-openldap-2.1.9
deleted file mode 100644
index 8cb5fdf4b2b8..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6cdaac44e3852c8792becd092b6ca02e openldap-2.1.9.tgz 2051094
diff --git a/net-nds/openldap/files/slapd.rc5 b/net-nds/openldap/files/slapd.rc5
deleted file mode 100644
index 13e51dea99a7..000000000000
--- a/net-nds/openldap/files/slapd.rc5
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=ldap-server
-EXE="/usr/lib/openldap/slapd"
-opts="start stop restart"
-
-start() {
-		ebegin "Starting ${SERVICE}"
-		start-stop-daemon --start --quiet --exec $EXE 1>&2
-		eend $? "Error starting ${SERVICE}."
-}
-
-stop() {
-		ebegin "Stopping ${SERVICE}"
-		start-stop-daemon --stop --quiet --exec $EXE 1>&2
-		eend $? "Error stopping ${SERVICE}."
-}
-
-restart() {
-		stop
-		start
-}
-
-doservice ${@}
-
-
diff --git a/net-nds/openldap/files/slurpd.rc5 b/net-nds/openldap/files/slurpd.rc5
deleted file mode 100644
index 01824858809e..000000000000
--- a/net-nds/openldap/files/slurpd.rc5
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=slurpd
-EXE="/usr/lib/openldap/slurpd"
-opts="start stop restart"
-
-start() {
-		ebegin "Starting ${SERVICE}"
-		start-stop-daemon --start --quiet --exec $EXE 1>&2
-		eend $? "Error starting ${SERVICE}."
-}
-
-stop() {
-		ebegin "Stopping ${SERVICE}"
-		start-stop-daemon --stop --quiet --exec $EXE 1>&2
-		eend $? "Error stopping ${SERVICE}."
-}
-
-restart() {
-		stop
-		start
-}
-
-doservice ${@}
-
-
diff --git a/net-nds/openldap/openldap-1.2.13-r6.ebuild b/net-nds/openldap/openldap-1.2.13-r6.ebuild
deleted file mode 100644
index 475ef9c69bcc..000000000000
--- a/net-nds/openldap/openldap-1.2.13-r6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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-1.2.13-r6.ebuild,v 1.12 2003/02/13 15:13:18 vapier Exp $
-
-inherit gnuconfig
-
-IUSE="gdbm tcpd"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="LDAP suite of application and development tools"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-HOMEPAGE="http://www.OpenLDAP.org/"
-
-SLOT="0"
-LICENSE="OPENLDAP"
-KEYWORDS="x86 sparc ~alpha"
-
-DEPEND=">=sys-libs/ncurses-5.1
-        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-        gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use alpha && gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-	use tcpd && myconf="${myconf} --enable-wrappers"
-	use gdbm && myconf="${myconf} --enable-ldbm --with-ldbm-api=gdbm"
-	use gdbm || myconf="${myconf} --disable-ldbm"
-
-	./configure --host=${CHOST} --enable-passwd --enable-shell --enable-shared \
-	--enable-static --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib \
-	--mandir=/usr/share/man --libexecdir=/usr/lib/openldap ${myconf}
-	assert "bad configure"
-
-	make depend || die
-	make || die "compile problem"
-	cd tests ; make || die
-}
-
-src_install() {
-	make prefix=${D}/usr sysconfdir=${D}/etc/openldap localstatedir=${D}/var/lib \
-	mandir=${D}/usr/share/man libexecdir=${D}/usr/lib/openldap install
-	assert "install problem"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-	docinto devel ; dodoc doc/devel/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/slapd.rc6 slapd
-	newexe ${FILESDIR}/slurpd.rc6 slurpd
-
-	cd ${D}/etc/openldap
-	for i in *
-	do
-		cp $i $i.orig
-		sed -e "s:${D}::" $i.orig > $i
-		rm $i.orig
-	done
-}
diff --git a/net-nds/openldap/openldap-2.0.25-r2.ebuild b/net-nds/openldap/openldap-2.0.25-r2.ebuild
deleted file mode 100644
index cac1c97e2dbd..000000000000
--- a/net-nds/openldap/openldap-2.0.25-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.25-r2.ebuild,v 1.7 2003/02/13 15:13:30 vapier Exp $
-
-IUSE="ssl tcpd sasl readline ipv6 berkdb gdbm ldap"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="LDAP suite of application and development tools"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-HOMEPAGE="http://www.OpenLDAP.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="OPENLDAP"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	tcpd?	  ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl?	  ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl?     ( >=dev-libs/cyrus-sasl-1.5.27 )
-	berkdb? ( >=sys-libs/db-3.2.9 )
-	gdbm?   ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-src_compile() {
-	local myconf
-
-	use tcpd \
-		&& myconf="${myconf} --enable-wrappers" \
-		|| myconf="${myconf} --disable-wrappers"
-
-	use ssl \
-		&& myconf="${myconf} --with-tls" \
-		|| myconf="${myconf} --without-tls"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	if use berkdb; then
-		myconf="${myconf} --enable-ldbm --with-ldbm-api=berkeley"
-	elif use gdbm; then
-		myconf="${myconf} --enable-ldbm --with-ldbm-api=gdbm"
-	elif use ldap-none; then
-		myconf="${myconf} --disable-ldbm"
-	else
-		myconf="${myconf} --enable-ldbm --with-ldbmi-api=auto"
-	fi
-	use ipv6 && myconf="${myconf} --enable-ipv6" \
-		|| myconf="${myconf} --disable-ipv6"
-	use sasl && myconf="${myconf} --enable-cyrus-sasl" \
-		|| myconf="${myconf} --disable-cyrus-sasl"
-
-
-	econf \
-		--enable-passwd \
-		--enable-shell \
-		--enable-shared \
-		--enable-static \
-		--localstatedir=/var/state/openldap \
-		--libexecdir=/usr/lib/openldap \
-		${myconf} || die "bad configure"
-
-	make depend || die
-	make || die
-	cd tests ; make || die
-}
-
-src_install() {
-	einstall \
-		sysconfdir=${D}/etc/openldap \
-		localstatedir=${D}/var/state/openldap \
-		libexecdir=${D}/usr/lib/openldap \
-		|| die "install problem"
-
-	#fix ${D} in manpages
-	cd ${S}/doc/man
-	make DESTDIR=${D} clean all install || die "install doc problem"
-	cd ${S}
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-	docinto devel ; dodoc doc/devel/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/slapd.rc6 slapd
-	newexe ${FILESDIR}/slurpd.rc6 slurpd
-
-	cd ${D}/etc/openldap
-	for i in *
-	do
-		dosed $i
-	done
-}
diff --git a/net-nds/openldap/openldap-2.0.25-r3.ebuild b/net-nds/openldap/openldap-2.0.25-r3.ebuild
deleted file mode 100644
index a57535bca810..000000000000
--- a/net-nds/openldap/openldap-2.0.25-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.25-r3.ebuild,v 1.5 2003/02/13 15:13:36 vapier Exp $
-
-IUSE="ssl tcpd readline ipv6 berkdb gdbm ldap"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="LDAP suite of application and development tools"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-HOMEPAGE="http://www.OpenLDAP.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="OPENLDAP"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	tcpd?	  ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl?	  ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	berkdb? ( >=sys-libs/db-3.2.9 )
-	gdbm?   ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-src_compile() {
-	local myconf
-
-	use tcpd \
-		&& myconf="${myconf} --enable-wrappers" \
-		|| myconf="${myconf} --disable-wrappers"
-
-	use ssl \
-		&& myconf="${myconf} --with-tls" \
-		|| myconf="${myconf} --without-tls"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	if use berkdb; then
-		myconf="${myconf} --enable-ldbm --with-ldbm-api=berkeley"
-	elif use gdbm; then
-		myconf="${myconf} --enable-ldbm --with-ldbm-api=gdbm"
-	elif use ldap-none; then
-		myconf="${myconf} --disable-ldbm"
-	else
-		myconf="${myconf} --enable-ldbm --with-ldbmi-api=auto"
-	fi
-	use ipv6 && myconf="${myconf} --enable-ipv6" \
-		|| myconf="${myconf} --disable-ipv6"
-
-	econf \
-		--enable-passwd \
-		--enable-shell \
-		--enable-shared \
-		--enable-static \
-		--libexecdir=/usr/lib/openldap \
-		${myconf} || die "bad configure"
-
-	make depend || die
-	make || die
-	cd tests ; make || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/slapd.rc6 slapd
-	newexe ${FILESDIR}/slurpd.rc6 slurpd
-
-}
diff --git a/net-nds/openldap/openldap-2.0.27-r1.ebuild b/net-nds/openldap/openldap-2.0.27-r1.ebuild
deleted file mode 100644
index 10f8450d1525..000000000000
--- a/net-nds/openldap/openldap-2.0.27-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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-r1.ebuild,v 1.4 2003/02/23 22:11:09 raker Exp $
-
-DESCRIPTION="LDAP suite of application and development tools"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-HOMEPAGE="http://www.OpenLDAP.org/"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="OPENLDAP"
-IUSE="ssl tcpd readline ipv6 gdbm ldap kerberos odbc"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/db-3
-	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 )
-	kerberos? ( >=app-crypt/krb5-1.2.6 )
-	odbc?     ( dev-db/unixODBC )"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_preinst() {
-        if ! grep -q ^ldap: /etc/group
-        then
-                groupadd -g 439 ldap || die "problem adding group ldap"
-        fi
-        if ! grep -q ^ldap: /etc/passwd
-        then
-                useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
-                        || die "problem adding user ldap"
-        fi
-}
-
-
-src_compile() {
-	local myconf
-
-	if [ -n "$DEBUG" ]; then
-		myconf="--enable-debug"
-	else
-		myconf="--disable-debug"
-	fi
-
-	use kerberos \
-		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
-		|| myconf="${myconf} --without-kerberos --disable-kpasswd"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	use ssl \
-		&& myconf="${myconf} --with-tls" \
-		|| myconf="${myconf} --without-tls"
-
-	use tcpd \
-		&& myconf="${myconf} --enable-wrappers" \
-		|| myconf="${myconf} --disable-wrappers"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6" \
-		|| myconf="${myconf} --disable-ipv6"
-
-	use odbc && myconf="${myconf} --enable-sql" \
-		|| myconf="${myconf} --disable-sql"
-
-	econf \
-		--libexecdir=/usr/lib/openldap \
-		--enable-crypt \
-		--enable-modules \
-		--enable-phonetic \
-		--enable-dynamic \
-		--enable-ldap \
-		--without-cyrus-sasl \
-		--disable-spasswd \
-		--enable-passwd \
-		--enable-shell \
-		--enable-slurpd \
-		--enable-ldbm \
-		--with-ldbm-api=auto \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-
-	make || die "make failed"
-
-	cd tests ; make || die "make tests failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	chmod ldap:ldap ${D}/etc/openldap/slapd.conf
-	dodir /var/lib/openldap-data
-	chmod ldap:ldap ${D}var/lib/openldap-data
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/slapd-2.1.rc6 slapd
-	newexe ${FILESDIR}/slurpd-2.1.rc6 slurpd
-
-}
diff --git a/net-nds/openldap/openldap-2.0.27-r2.ebuild b/net-nds/openldap/openldap-2.0.27-r2.ebuild
index 3f6bf7889ae4..6f144f8e9dae 100644
--- a/net-nds/openldap/openldap-2.0.27-r2.ebuild
+++ b/net-nds/openldap/openldap-2.0.27-r2.ebuild
@@ -1,10 +1,13 @@
 # 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-r2.ebuild,v 1.5 2003/04/17 16:53:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r2.ebuild,v 1.6 2003/05/11 19:18:21 liquidx Exp $
+
+inherit eutils
 
 DESCRIPTION="LDAP suite of application and development tools"
 SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
 HOMEPAGE="http://www.OpenLDAP.org/"
+
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha"
 LICENSE="OPENLDAP"
@@ -23,32 +26,31 @@ RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
-inherit eutils
+MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
-        if ! grep -q ^ldap: /etc/group
-        then
-                groupadd -g 439 ldap || die "problem adding group ldap"
-        fi
-        if ! grep -q ^ldap: /etc/passwd
-        then
-                useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
-                        || die "problem adding user ldap"
-        fi
+	if ! grep -q ^ldap: /etc/group
+	then
+		groupadd -g 439 ldap || die "problem adding group ldap"
+	fi
+	if ! grep -q ^ldap: /etc/passwd
+	then
+		useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
+		|| die "problem adding user ldap"
+	fi
 }
 
 
-src_compile() {
-
-	epatch ${FILESDIR}/kerberos-2.0.diff.bz2
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/kerberos-2.0.diff.bz2	
+}
 
+src_compile() {
 	local myconf
 
-	if [ -n "$DEBUG" ]; then
-		myconf="--enable-debug"
-	else
-		myconf="--disable-debug"
-	fi
+	myconf="`use_enable debug`"
 
 	use kerberos \
 		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
@@ -66,10 +68,12 @@ src_compile() {
 		&& myconf="${myconf} --enable-wrappers" \
 		|| myconf="${myconf} --disable-wrappers"
 
-	use ipv6 && myconf="${myconf} --enable-ipv6" \
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6" \
 		|| myconf="${myconf} --disable-ipv6"
 
-	use odbc && myconf="${myconf} --enable-sql" \
+	use odbc \
+		&& myconf="${myconf} --enable-sql" \
 		|| myconf="${myconf} --disable-sql"
 
 	econf \
@@ -88,9 +92,9 @@ src_compile() {
 		--with-ldbm-api=auto \
 		${myconf} || die "configure failed"
 
-	make depend || die "make depend failed"
+	emake depend || die "make depend failed"
 
-	make || die "make failed"
+	emake || die "make failed"
 
 	cd tests ; make || die "make tests failed"
 
@@ -113,4 +117,10 @@ src_install() {
 	insinto /etc/conf.d
 	newins ${FILESDIR}/slapd-2.1.conf slapd.conf
 
+	# manually remove /var/tmp references in .la
+	# because it is packaged with an ancient libtool
+	for x in ${D}/usr/lib/lib*.la; do
+		sed -i -e "s:${D}::" ${x}
+	done
+
 }
diff --git a/net-nds/openldap/openldap-2.0.27-r3.ebuild b/net-nds/openldap/openldap-2.0.27-r3.ebuild
new file mode 100644
index 000000000000..4bea547a23dc
--- /dev/null
+++ b/net-nds/openldap/openldap-2.0.27-r3.ebuild
@@ -0,0 +1,153 @@
+# 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-r3.ebuild,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+
+inherit eutils
+
+IUSE="ssl tcpd readline ipv6 gdbm ldap kerberos odbc"
+
+DESCRIPTION="LDAP suite of application and development tools"
+SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+HOMEPAGE="http://www.OpenLDAP.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha"
+LICENSE="OPENLDAP"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	=sys-libs/db-3*
+	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 )
+	kerberos? ( >=app-crypt/krb5-1.2.6 )
+	odbc?     ( dev-db/unixODBC )"
+
+RDEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.1
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	if ! grep -q ^ldap: /etc/group
+	then
+		groupadd -g 439 ldap || die "problem adding group ldap"
+	fi
+	if ! grep -q ^ldap: /etc/passwd
+	then
+		useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
+		|| die "problem adding user ldap"
+	fi
+}
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# never worked anyway ?
+	epatch ${FILESDIR}/kerberos-2.0.diff.bz2
+	# force the use of db3 only, db4 has api breakages
+	epatch ${FILESDIR}/${P}-db3-gentoo.patch
+}
+
+src_compile() {
+	local myconf
+
+	# regenerate ./configure
+	cd ${S}
+	./autogen.sh --help
+
+	# must enable debug for syslog'ing (#16131)
+	myconf="--enable-debug --enable-syslog"
+
+	use kerberos \
+		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
+		|| myconf="${myconf} --without-kerberos --disable-kpasswd"
+
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+
+	use ssl \
+		&& myconf="${myconf} --with-tls" \
+		|| myconf="${myconf} --without-tls"
+
+	use tcpd \
+		&& myconf="${myconf} --enable-wrappers" \
+		|| myconf="${myconf} --disable-wrappers"
+
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6" \
+		|| myconf="${myconf} --disable-ipv6"
+
+	use odbc \
+		&& myconf="${myconf} --enable-sql" \
+		|| myconf="${myconf} --disable-sql"
+
+	use gdbm \
+		&& myconf="${myconf} --enable-ldbm --with-ldbm-api=gdbm" \
+   		|| myconf="${myconf} --enable-ldbm --with-ldbm-api=berkeley"
+
+
+	econf \
+		--libexecdir=/usr/lib/openldap \
+		--enable-crypt \
+		--enable-modules \
+		--enable-phonetic \
+		--enable-dynamic \
+		--enable-ldap \
+		--without-cyrus-sasl \
+		--disable-spasswd \
+		--enable-passwd \
+		--enable-shell \
+		--enable-slurpd \
+		${myconf} || die "configure failed"
+
+	emake depend || die "make depend failed"
+
+	emake || die "make failed"
+
+	cd tests ; make || die "make tests failed"
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "make install failed"
+	
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+	# make state directories
+	for x in data slurp ldbm; do
+		keepdir /var/lib/openldap-${x}
+		fowners ldap:ldap /var/lib/openldap-${x}
+		fperms 0700 /var/lib/openldap-${x}
+	done
+
+	# manually remove /var/tmp references in .la
+	# because it is packaged with an ancient libtool
+	for x in ${D}/usr/lib/lib*.la; do
+		sed -i -e "s:-L${S}[/]*libraries::" ${x}
+	done
+
+	# change slapd.pid location in configuration file
+	keepdir /var/run/openldap
+	fowners ldap:ldap /var/run/openldap
+	fperms 0755 /var/run/openldap
+	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf
+	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf.default
+	fowners root:ldap /etc/openldap/slapd.conf
+	fperms 0640 /etc/openldap/slapd.conf
+	fowners root:ldap /etc/openldap/slapd.conf.default
+	fperms 0640 /etc/openldap/slapd.conf.default
+	
+	# install our own init scripts
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/2.0/slapd slapd
+	newexe ${FILESDIR}/2.0/slurpd slurpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/2.0/slapd.conf slapd.conf
+	
+}
diff --git a/net-nds/openldap/openldap-2.1.10.ebuild b/net-nds/openldap/openldap-2.1.10.ebuild
deleted file mode 100644
index 45d2574adcb4..000000000000
--- a/net-nds/openldap/openldap-2.1.10.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.10.ebuild,v 1.4 2003/02/13 15:14:00 vapier Exp $
-
-IUSE="ssl tcpd readline ipv6 gdbm ldap sasl kerberos odbc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="LDAP suite of application and development tools"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-HOMEPAGE="http://www.OpenLDAP.org/"
-
-SLOT="0"
-KEYWORDS="-x86 -ppc"
-LICENSE="OPENLDAP"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.2a
-	>=sys-libs/db-4.0.14
-	>=net-libs/openslp-1.0.9
-	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/krb5-1.2.6 )
-	odbc?     ( dev-db/unixODBC )"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_preinst() {
-        if ! grep -q ^ldap: /etc/group
-        then
-                groupadd -g 439 ldap || die "problem adding group ldap"
-        fi
-        if ! grep -q ^ldap: /etc/passwd
-        then
-                useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
-                        || die "problem adding user ldap"
-        fi
-}
-
-
-src_compile() {
-	local myconf
-
-	if [ -z "$DEBUGBUILD" ]; then
-		myconf="--enable-debug"
-	else
-		myconf="--disable-debug"
-	fi
-
-	use sasl \
-		&& myconf="${myconf} --with-cyrus-sasl --enable-spasswd" \
-		|| myconf="${myconf} --without-cyrus-sasl --disable-spasswd"
-
-	use kerberos \
-		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
-		|| myconf="${myconf} --without-kerberos --disable-kpasswd"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	use ssl \
-		&& myconf="${myconf} --with-tls" \
-		|| myconf="${myconf} --without-tls"
-
-	use tcpd \
-		&& myconf="${myconf} --enable-wrappers" \
-		|| myconf="${myconf} --disable-wrappers"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6" \
-		|| myconf="${myconf} --disable-ipv6"
-
-        use odbc && myconf="${myconf} --enable-sql" \
-                || myconf="${myconf} --disable-sql"
-
-	econf \
-		--libexecdir=/usr/lib/openldap \
-		--enable-crypt \
-		--enable-dynamic \
-		--enable-lmpasswd \
-		--enable-modules \
-		--enable-phonetic \
-		--enable-rewrite \
-		--enable-slp \
-		--enable-ldap \
-		--enable-meta \
-		--enable-monitor \
-		--enable-passwd \
-		--enable-perl \
-		--enable-shell \
-		--enable-slurpd \
-		--enable-ldbm \
-		--with-ldbm-api=auto \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-
-	make || die "make failed"
-
-	cd tests ; make || die "make tests failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	chmod ldap:ldap ${D}/etc/openldap/slapd.conf
-        dodir /var/lib/openldap-data
-        chmod ldap:ldap ${D}var/lib/openldap-data
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/slapd-2.1.rc6 slapd
-	newexe ${FILESDIR}/slurpd-2.1.rc6 slurpd
-
-}
diff --git a/net-nds/openldap/openldap-2.1.19.ebuild b/net-nds/openldap/openldap-2.1.19.ebuild
new file mode 100644
index 000000000000..8b9afd0a77be
--- /dev/null
+++ b/net-nds/openldap/openldap-2.1.19.ebuild
@@ -0,0 +1,150 @@
+# 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.19.ebuild,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+
+IUSE="ssl tcpd readline ipv6 gdbm sasl kerberos odbc perl slp"
+
+inherit eutils
+
+DESCRIPTION="LDAP suite of application and development tools"
+SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+HOMEPAGE="http://www.OpenLDAP.org/"
+
+SLOT="0"
+KEYWORDS="-x86 -ppc"
+LICENSE="OPENLDAP"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-libs/db-4.0.14
+	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/krb5-1.2.6 )
+	odbc? ( dev-db/unixODBC )
+	slp? ( >=net-libs/openslp-1.0 )
+	perl? ( >=dev-lang/perl-5.6 )"
+	
+pkg_preinst() {
+	if ! grep -q ^ldap: /etc/group
+	then
+		groupadd -g 439 ldap || die "problem adding group ldap"
+	fi
+	if ! grep -q ^ldap: /etc/passwd
+	then
+		useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
+			|| die "problem adding user ldap"
+	fi
+}
+
+
+src_compile() {
+
+	local myconf
+
+	# enable debugging to syslog
+	myconf="--enable-debug --enable-syslog"
+	# enable slapd/slurpd servers
+	myconf="${myconf} --enable-ldap"
+	myconf="${myconf} --enable-slapd --enable-slurpd"
+
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6" \
+		|| myconf="${myconf} --disable-ipv6"
+
+	use sasl \
+		&& myconf="${myconf} --with-cyrus-sasl --enable-spasswd" \
+		|| myconf="${myconf} --without-cyrus-sasl --disable-spasswd"
+
+	use kerberos \
+		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
+		|| myconf="${myconf} --without-kerberos --disable-kpasswd"
+
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+
+	use ssl \
+		&& myconf="${myconf} --with-tls" \
+		|| myconf="${myconf} --without-tls"
+
+	# slapd options
+
+	use tcpd \
+		&& myconf="${myconf} --enable-wrappers" \
+		|| myconf="${myconf} --disable-wrappers"
+
+	use odbc \
+		&& myconf="${myconf} --enable-sql" \
+		|| myconf="${myconf} --disable-sql"
+		
+	use gdbm \
+		&& myconf="${myconf} --enable-ldbm --disable-bdb --with-ldbm-api=gdbm" \
+   		|| myconf="${myconf} --enable-ldbm --enable-bdb --with-ldbm-api=berkeley"
+
+	use perl \
+		&& myconf="${myconf} --enable-perl" \
+		|| myconf="${myconf} --disable-perl"
+
+	use slp \
+		&& myconf="${myconf} --enable-slp" \
+		|| myconf="${myconf} --disable-slp"
+
+	myconf="${myconf} --enable-dynamic --enable-modules"
+	myconf="${myconf} --enable-rewrite --enable-rlookups"
+	myconf="${myconf} --enable-meta --enable-monitor"
+	myconf="${myconf} --enable-null --enable-shell"
+	
+	# disabled options
+	# --enable-bdb --with-bdb-module=dynamic
+	# --enable-dnsserv --with-dnsserv-module=dynamic
+
+	econf \
+		--libexecdir=/usr/lib/openldap \
+		${myconf} || die "configure failed"
+
+	make depend || die "make depend failed"
+	make || die "make failed"
+	#cd tests ; make || die "make tests failed"
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+	# make state directories
+	for x in data slurp ldbm; do
+		keepdir /var/lib/openldap-${x}
+		fowners ldap:ldap /var/lib/openldap-${x}
+		fperms 0700 /var/lib/openldap-${x}
+	done
+
+	# manually remove /var/tmp references in .la
+	# because it is packaged with an ancient libtool
+	for x in ${D}/usr/lib/lib*.la; do
+		sed -i -e "s:-L${S}[/]*libraries::" ${x}
+	done
+
+	# change slapd.pid location in configuration file
+	keepdir /var/run/openldap
+	fowners ldap:ldap /var/run/openldap
+	fperms 0755 /var/run/openldap
+	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf
+	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf.default
+	fowners root:ldap /etc/openldap/slapd.conf
+	fperms 0640 /etc/openldap/slapd.conf
+	fowners root:ldap /etc/openldap/slapd.conf.default
+	fperms 0640 /etc/openldap/slapd.conf.default
+	
+	# install our own init scripts
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/2.0/slapd slapd
+	newexe ${FILESDIR}/2.0/slurpd slurpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/2.0/slapd.conf slapd.conf
+
+}
diff --git a/net-nds/openldap/openldap-2.1.9.ebuild b/net-nds/openldap/openldap-2.1.9.ebuild
deleted file mode 100644
index 3fe1c983a95c..000000000000
--- a/net-nds/openldap/openldap-2.1.9.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.9.ebuild,v 1.2 2003/02/13 15:14:12 vapier Exp $
-
-IUSE="ssl tcpd readline ipv6 gdbm ldap sasl kerberos odbc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="LDAP suite of application and development tools"
-SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
-HOMEPAGE="http://www.OpenLDAP.org/"
-
-SLOT="0"
-KEYWORDS="-x86 -ppc"
-LICENSE="OPENLDAP"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.2a
-	>=sys-libs/db-4.0.14
-	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/krb5-1.2.6 )
-	odbc?     ( dev-db/unixODBC )"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-src_compile() {
-	local myconf
-
-	if [ -n "$DEBUG" ]; then
-		myconf="--enable-debug"
-	else
-		myconf="--disable-debug"
-	fi
-
-	use sasl \
-		&& myconf="${myconf} --with-cyrus-sasl --enable-spasswd" \
-		|| myconf="${myconf} --without-cyrus-sasl --disable-spasswd"
-
-	use kerberos \
-		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
-		|| myconf="${myconf} --without-kerberos --disable-kpasswd"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	use ssl \
-		&& myconf="${myconf} --with-tls" \
-		|| myconf="${myconf} --without-tls"
-
-	use tcpd \
-		&& myconf="${myconf} --enable-wrappers" \
-		|| myconf="${myconf} --disable-wrappers"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6" \
-		|| myconf="${myconf} --disable-ipv6"
-
-        use odbc && myconf="${myconf} --enable-sql" \
-                || myconf="${myconf} --disable-sql"
-
-	econf \
-		--libexecdir=/usr/lib/openldap \
-		--enable-crypt \
-		--enable-dynamic \
-		--enable-lmpasswd \
-		--enable-modules \
-		--enable-phonetic \
-		--enable-rewrite \
-		--enable-slp \
-		--enable-meta \
-		--enable-monitor \
-		--enable-passwd \
-		--enable-perl \
-		--enable-shell \
-		--enable-slurpd \
-		--enable-ldbm \
-		--with-ldbm-api=auto \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-
-	make || die "make failed"
-
-	cd tests ; make || die "make tests failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/slapd.rc6 slapd
-	newexe ${FILESDIR}/slurpd.rc6 slurpd
-
-}