Version bump

Package-Manager: portage-2.1.2_rc3-r7

4 files changed, 585 insertions, 5 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 7a4b5f334db2..daca6c0d4645 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.234 2006/11/27 15:40:11 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.235 2006/12/23 15:01:56 jokey Exp $
+
+*openldap-2.3.31 (23 Dec 2006)
+
+  23 Dec 2006; Markus Ullmann <jokey@gentoo.org> +openldap-2.3.31.ebuild:
+  Version bump
 
 *openldap-2.3.30-r1 (27 Nov 2006)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index ad1fd44f96fe..2f8e0cc9dd21 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0/slapd 584 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 SHA1 5b9b3418b433c15df1a0cb72d2c7f8f361cf33e1 SHA256 25e592f3e3c163dacab29bfa9e4e0dda03ada5ae9cbda9440e148f5f29f10db4
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 files/2.0/slapd 584
@@ -119,6 +122,7 @@ DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c
 DIST openldap-2.3.24.tgz 3756405 RMD160 8b4be685de2c2a7ace1debe97d5bda2354b57a06 SHA1 e00f7a017d9223708b77b0df3a612d236789b380 SHA256 e5247204dc0a41fa9b14ec1110fd2c179210b2288b27ebdee0a465b9e8e100cf
 DIST openldap-2.3.27.tgz 3757519 RMD160 8c25c39689daa515f14e88611490ae6d8df0911c SHA1 c2b6ac3ec89d0f58d079592946d045dba45edafe SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7
 DIST openldap-2.3.30.tgz 3763533 RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 SHA1 99dd73df2bdf3ac303b2a81ee2c689a2ee09e13a SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b
+DIST openldap-2.3.31.tgz 3766559 RMD160 3a5bc3622d64c7af27901046144bc9e2952abf57 SHA1 4ee3cefdb82aaabb42fe25f791e8a0f48b046a16 SHA256 0b43259bc738f207f2bcd3adea6e819cdeab0fd92ba5992153dbe41563c56eb2
 EBUILD openldap-2.1.30-r6.ebuild 8172 RMD160 6eba4d1aabee219a8ec0460fb10243c1b8a72abc SHA1 3ae926b0b77950f9c6db61e8e64ee15dd22c515a SHA256 6084804273d3d263139d0c350b704fa4b08a1b454b477eb3c6b87f96031dbe9a
 MD5 1ab8461ac43c61a1ac1ea1e2855023ab openldap-2.1.30-r6.ebuild 8172
 RMD160 6eba4d1aabee219a8ec0460fb10243c1b8a72abc openldap-2.1.30-r6.ebuild 8172
@@ -183,10 +187,14 @@ EBUILD openldap-2.3.30.ebuild 17811 RMD160 7129a0dd1f3ea4961a7b38cba3f8e08447c3e
 MD5 931faa564721c6291dd0fe62226e4a22 openldap-2.3.30.ebuild 17811
 RMD160 7129a0dd1f3ea4961a7b38cba3f8e08447c3e0e9 openldap-2.3.30.ebuild 17811
 SHA256 ec1e74f4c38d8346603d8f29a725f222741c969f9eccc199a3464648c8746c03 openldap-2.3.30.ebuild 17811
-MISC ChangeLog 40232 RMD160 a930b9c21a404efe507529c661c03d534d1c848c SHA1 9d5e2fadaf8c8b7bb640573c346e91fb839ee271 SHA256 5d4291e7e7aa9018459181622408a0fe3f5b32b934ceffaa5300bf364aafdc77
-MD5 1627d9614b0c05efd5062ed1d5c281da ChangeLog 40232
-RMD160 a930b9c21a404efe507529c661c03d534d1c848c ChangeLog 40232
-SHA256 5d4291e7e7aa9018459181622408a0fe3f5b32b934ceffaa5300bf364aafdc77 ChangeLog 40232
+EBUILD openldap-2.3.31.ebuild 17797 RMD160 aaa87fc3c52b7e76eb586fb254c7d73f05f41f70 SHA1 32218b1372bf93a4661f42b6e6ac9fa7ea0117bf SHA256 ddf15700940b5c7d69f0994ede1dbd67c79f28d51e9ad16c056377684893987d
+MD5 392e2d19cb2aba4e1e53948a15ced714 openldap-2.3.31.ebuild 17797
+RMD160 aaa87fc3c52b7e76eb586fb254c7d73f05f41f70 openldap-2.3.31.ebuild 17797
+SHA256 ddf15700940b5c7d69f0994ede1dbd67c79f28d51e9ad16c056377684893987d openldap-2.3.31.ebuild 17797
+MISC ChangeLog 40351 RMD160 d3ee2dfe1d231fdf50164af1c2d67bc0ab756e82 SHA1 eb8fadf2047b91477bf3f85c839ba3d5ede36944 SHA256 48e008946a74ba22a9070d2dd15b1ac93b5269afa806c6a09ae5d537a54149d7
+MD5 19d21cf7b3596e0b8a15dd01d75d7252 ChangeLog 40351
+RMD160 d3ee2dfe1d231fdf50164af1c2d67bc0ab756e82 ChangeLog 40351
+SHA256 48e008946a74ba22a9070d2dd15b1ac93b5269afa806c6a09ae5d537a54149d7 ChangeLog 40351
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -239,3 +247,13 @@ SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/di
 MD5 e912b83e7dba93d81b8fad6d2df489b1 files/digest-openldap-2.3.30-r1 241
 RMD160 a308c1e798233f0f862c0d5556f2543075738d0b files/digest-openldap-2.3.30-r1 241
 SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/digest-openldap-2.3.30-r1 241
+MD5 1247d1d103d4ab02a26179ce98c3b19f files/digest-openldap-2.3.31 241
+RMD160 9c8f735c271be532aa62750728ed5002f0fb481c files/digest-openldap-2.3.31 241
+SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/digest-openldap-2.3.31 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFjUTqz974XjDVpbkRAs0gAKDWUUXCwuEB9z7j9ZZE7EOmuPoV+QCdEeWO
+UiUGL4SNDvQKpDWYSZjiEgQ=
+=NlBq
+-----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/digest-openldap-2.3.31 b/net-nds/openldap/files/digest-openldap-2.3.31
new file mode 100644
index 000000000000..ea5a28f93166
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.3.31
@@ -0,0 +1,3 @@
+MD5 fd8aa874590661c0fbc53ef3bf80c847 openldap-2.3.31.tgz 3766559
+RMD160 3a5bc3622d64c7af27901046144bc9e2952abf57 openldap-2.3.31.tgz 3766559
+SHA256 0b43259bc738f207f2bcd3adea6e819cdeab0fd92ba5992153dbe41563c56eb2 openldap-2.3.31.tgz 3766559
diff --git a/net-nds/openldap/openldap-2.3.31.ebuild b/net-nds/openldap/openldap-2.3.31.ebuild
new file mode 100644
index 000000000000..7fc49fa88124
--- /dev/null
+++ b/net-nds/openldap/openldap-2.3.31.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.31.ebuild,v 1.1 2006/12/23 15:01:56 jokey Exp $
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline
+samba sasl slp smbkrb5passwd ssl tcpd selinux"
+
+# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
+# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
+# mine at work)!
+# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
+
+RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
+RDEPEND="sys-libs/ncurses
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl )
+	readline? ( sys-libs/readline )
+	sasl? ( dev-libs/cyrus-sasl )
+	!minimal? (
+		odbc? ( dev-db/unixODBC )
+		slp? ( net-libs/openslp )
+		perl? ( dev-lang/perl )
+		samba? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+		berkdb? ( ${RDEPEND_BERKDB} )
+		!berkdb? (
+			gdbm? ( sys-libs/gdbm )
+			!gdbm? ( ${RDEPEND_BERKDB} )
+		)
+		smbkrb5passwd? (
+			dev-libs/openssl
+			app-crypt/heimdal
+		)
+	)
+	selinux? ( sec-policy/selinux-openldap )"
+
+DEPEND="${RDEPEND}
+		>=sys-devel/libtool-1.5.18-r1
+		>=sys-apps/sed-4"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+openldap_upgrade_howto() {
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	die "You need to upgrade your database first"
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	openldap_datadirs=""
+	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
+	fi
+	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	for each in ${openldap_datadirs}; do
+		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
+		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
+		if [ -d ${CURRENT_TAGDIR} ] &&  [ ${openldap_found_tag} == 0 ] ; then
+			einfo "- Checking ${each}..."
+			if [ -r ${CURRENT_TAG} ] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source ${CURRENT_TAG}
+				if [ "${OLDPF}" == "" ] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
+
+				# are we on the same branch?
+				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+
+}
+
+pkg_setup() {
+	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
+		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
+	fi
+
+	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
+	    einfo
+	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	    einfo
+	else
+	    openldap_find_versiontags
+	fi
+
+}
+
+pkg_preinst() {
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# According to MDK, the link order needs to be changed so that
+	# on systems w/ MD5 passwords the system crypt library is used
+	# (the net result is that "passwd" can be used to change ldap passwords w/
+	#  proper pam support)
+	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
+		${S}/servers/slapd/Makefile.in
+
+	# supersedes old fix for bug #31202
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
+
+	# ensure correct SLAPI path by default
+	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
+		${S}/include/ldap_defaults.h
+
+	EPATCH_OPTS="-p0 -d ${S}"
+
+	# ximian connector 1.4.7 ntlm patch
+	epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
+
+	# bug #132263
+	if use overlays ; then
+		epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch
+	fi
+
+	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
+	# do it perfectly.
+	cd ${S}/build
+	ln -s shtool install
+	ln -s shtool install.sh
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+
+	# bug #116045
+	# patch contrib modules
+	if ! use minimal ; then
+	    cd ${S}/contrib
+	    epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	# HDB is only available with BerkDB
+	myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod'
+	myconf_gdbm='--disable-bdb --enable-ldbm-api=gdbm --disable-hdb'
+
+	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
+
+	# enable slapd/slurpd servers if not doing a minimal build
+	if ! use minimal ; then
+		myconf="${myconf} --enable-slapd --enable-slurpd"
+		# base backend stuff
+		myconf="${myconf} --enable-ldbm"
+		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
+		# extra backend stuff
+		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
+		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
+		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
+		myconf="${myconf} --enable-null=mod --enable-shell=mod"
+		myconf="${myconf} --enable-relay=mod"
+		myconf="${myconf} `use_enable perl perl mod`"
+		myconf="${myconf} `use_enable odbc sql mod`"
+		# slapd options
+		myconf="${myconf} `use_enable crypt` `use_enable slp`"
+		myconf="${myconf} --enable-rewrite --enable-rlookups"
+		myconf="${myconf} --enable-aci --enable-modules"
+		myconf="${myconf} --enable-cleartext --enable-slapi"
+		myconf="${myconf} `use_with samba lmpasswd`"
+		# slapd overlay options
+		myconf="${myconf} --enable-dyngroup --enable-proxycache"
+		myconf="${myconf} `use_enable overlays`"
+	else
+		myconf="${myconf} --disable-slapd --disable-slurpd"
+		myconf="${myconf} --disable-bdb --disable-ldbm"
+		myconf="${myconf} --disable-hdb --disable-monitor"
+		myconf="${myconf} --disable-slurpd --disable-overlays"
+		myconf="${myconf} --disable-relay"
+	fi
+
+	# basic functionality stuff
+	myconf="${myconf} --enable-syslog --enable-dynamic"
+	myconf="${myconf} --enable-local --enable-proctitle"
+
+	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
+	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
+	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
+
+	if [ $(get_libdir) != "lib" ] ; then
+		append-ldflags -L/usr/$(get_libdir)
+	fi
+
+	STRIP=/bin/true \
+	econf \
+		--enable-static \
+		--enable-shared \
+		--libexecdir=/usr/$(get_libdir)/openldap \
+		${myconf} || die "configure failed"
+
+	make depend || die "make depend failed"
+	make || die "make failed"
+
+	# openldap/contrib
+	tc-export CC
+	if ! use minimal ; then
+		# dsaschema
+			einfo "Building contributed dsaschema"
+			cd ${S}/contrib/slapd-modules/dsaschema
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-Wall -o libdsaschema-plugin.so dsaschema.c || \
+			die "failed to compile dsaschema module"
+		# kerberos passwd
+		if use kerberos ; then
+			einfo "Building contributed pw-kerberos"
+			cd ${S}/contrib/slapd-modules/passwd/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
+			die "failed to compile kerberos password module"
+		fi
+		# netscape mta-md5 password
+			einfo "Building contributed pw-netscape"
+			cd ${S}/contrib/slapd-modules/passwd/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-o pw-netscape.so netscape.c || \
+			die "failed to compile netscape password module"
+		# smbk5pwd overlay
+		# Note: this modules builds, but may not work with
+		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
+		#   Kerberos.
+		if use smbkrb5passwd ; then
+			einfo "Building contributed smbk5pwd"
+			local mydef
+			local mykrb5inc
+			mydef="-DDO_SAMBA -DDO_KRB5"
+			mykrb5inc="-I/usr/include/heimdal/"
+			cd ${S}/contrib/slapd-modules/smbk5pwd && \
+			libexecdir="/usr/$(get_libdir)/openldap" \
+			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
+			die "failed to compile smbk5pwd module"
+		fi
+		# addrdnvalues
+			einfo "Building contributed addrdnvalues"
+			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
+			die "failed to compile addrdnvalues plugin"
+	fi
+}
+
+src_test() {
+	einfo
+	einfo "Doing tests"
+	einfo
+	cd tests ; make tests || die "make tests failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+	# openldap modules go here
+	# TODO: write some code to populate slapd.conf with moduleload statements
+	keepdir /usr/$(get_libdir)/openldap/openldap/
+
+	# make state directories
+	local dirlist="data"
+	if ! use minimal; then
+		dirlist="${dirlist} slurp ldbm"
+	fi
+	for x in ${dirlist}; do
+		keepdir /var/lib/openldap-${x}
+		fowners ldap:ldap /var/lib/openldap-${x}
+		fperms 0700 /var/lib/openldap-${x}
+	done
+
+	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
+	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
+	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
+
+	# manually remove /var/tmp references in .la
+	# because it is packaged with an ancient libtool
+	for x in ${D}/usr/$(get_libdir)/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
+
+	if ! use minimal; then
+		# config modifications
+		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
+			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
+			fowners root:ldap ${f}
+			fperms 0640 ${f}
+		done
+		# install our own init scripts
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/2.0/slapd slapd
+		newexe ${FILESDIR}/2.0/slurpd slurpd
+		if [ $(get_libdir) != lib ]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
+		fi
+		insinto /etc/conf.d
+		newins ${FILESDIR}/2.0/slapd.conf slapd
+		# install contributed modules
+		docinto /
+		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
+		then
+			cd ${S}/contrib/slapd-modules/dsaschema/
+			newdoc README README.contrib.dsaschema
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe libdsaschema-plugin.so || \
+			die "failed to install dsaschema module"
+		fi
+		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
+			cd ${S}/contrib/slapd-modules/passwd/
+			newdoc README README.contrib.passwd
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe pw-kerberos.so || \
+			die "failed to install kerberos passwd module"
+		fi
+		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
+			cd ${S}/contrib/slapd-modules/passwd/
+			newdoc README README.contrib.passwd
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
+			die "failed to install Netscape MTA-MD5 passwd module"
+		fi
+		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
+			cd ${S}/contrib/slapd-modules/smbk5pwd
+			newdoc README.contrib.smbk5pwd
+			libexecdir="/usr/$(get_libdir)/openldap" \
+			DESTDIR="${D}" make install-mod || \
+			die "failed to install smbk5pwd overlay module"
+		fi
+		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
+			cd ${S}/contrib/slapd-tools
+			exeinto /usr/bin
+			newexe statslog ldapstatslog || \
+			die "failed to install ldapstatslog script"
+		fi
+		if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
+		then
+			cd ${S}/contrib/slapi-plugins/addrdnvalues
+			newdoc README README.contrib.addrdnvalues
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe libaddrdnvalues-plugin.so || \
+			die "failed to install addrdnvalues plugin"
+		fi
+
+	fi
+
+	# install MDK's ssl cert script
+	if use ssl || use samba; then
+		dodir /etc/openldap/ssl
+		exeinto /etc/openldap/ssl
+		doexe ${FILESDIR}/gencert.sh
+	fi
+
+	# keep old libs if any
+	# from 2.1
+	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
+		preserve_old_lib ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
+		preserve_old_lib ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
+		preserve_old_lib ${each}
+	done
+	# from 2.2
+	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
+		preserve_old_lib ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
+		preserve_old_lib ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
+		preserve_old_lib ${each}
+	done
+}
+
+pkg_postinst() {
+	# keep old libs if any
+	# from 2.1
+	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
+		preserve_old_lib_notify ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
+		preserve_old_lib_notify ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
+		preserve_old_lib_notify ${each}
+	done
+	# from 2.2
+	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
+		preserve_old_lib_notify ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
+		preserve_old_lib_notify ${each}
+	done
+	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
+		preserve_old_lib_notify ${each}
+	done
+
+	if use ssl; then
+		# make a self-signed ssl cert (if there isn't one there already)
+		if [ ! -e /etc/openldap/ssl/ldap.pem ]
+		then
+			cd /etc/openldap/ssl
+			yes "" | sh gencert.sh
+			chmod 640 ldap.pem
+			chown root:ldap ldap.pem
+		else
+			einfo
+			einfo "An LDAP cert already appears to exist, no creating"
+			einfo
+		fi
+	fi
+
+	# Since moving to running openldap as user ldap there are some
+	# permissions problems with directories and files.
+	# Let's make sure these permissions are correct.
+	chown ldap:ldap /var/run/openldap
+	chmod 0755 /var/run/openldap
+	chown root:ldap /etc/openldap/slapd.conf{,.default}
+	chmod 0640 /etc/openldap/slapd.conf{,.default}
+	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+
+	if use ssl; then
+		ewarn
+		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+		ewarn "add 'TLS_REQCERT never' if you want to use them."
+		ewarn
+	fi
+
+	# Reference inclusion bug #77330
+	echo
+	einfo
+	einfo "Getting started using OpenLDAP? There is some documentation available:"
+	einfo "Gentoo Guide to OpenLDAP Authentication"
+	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+	einfo
+
+	# note to bug #110412
+	echo
+	einfo
+	einfo "An example file for tuning BDB backends with openldap is:"
+	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
+	einfo
+
+	if has_version "<net-nds/openldap-2.3" ; then
+		echo
+		einfo
+		einfo "*** Remember to run revdep-rebuild to update your packages ***"
+		einfo
+	fi
+}