Drop old version
authorMarkus Ullmann <jokey@gentoo.org>
Fri, 6 Apr 2007 11:09:40 +0000 (11:09 +0000)
committerMarkus Ullmann <jokey@gentoo.org>
Fri, 6 Apr 2007 11:09:40 +0000 (11:09 +0000)
Package-Manager: portage-2.1.2.3

net-nds/openldap/ChangeLog
net-nds/openldap/Manifest
net-nds/openldap/files/digest-openldap-2.3.33 [deleted file]
net-nds/openldap/openldap-2.3.33.ebuild [deleted file]

index 0404e7228d621c22fb1e2d8478a6af4c5c99660c..172d1bd11f005f5898f561bb5f12a9ca8f78ce5d 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.261 2007/04/06 11:03:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.262 2007/04/06 11:09:40 jokey Exp $
+
+  06 Apr 2007; Markus Ullmann <jokey@gentoo.org> -openldap-2.3.33.ebuild:
+  Drop old version
 
 *openldap-2.3.34-r1 (06 Apr 2007)
 
index 08811483cd2172b99c234c5fb0dff72e298d1817..fc241f9e581fa1df07a9d9b6f657a2b3b211953a 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b
 MD5 d00ccd5b4b44ac1df463da80d5ebb8a1 files/DB_CONFIG.fast.example 746
 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 files/DB_CONFIG.fast.example 746
@@ -36,7 +39,6 @@ RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 files/slurpd-initd 494
 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff files/slurpd-initd 494
 DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA1 0b3a3b9b61f6f033685218957fb84ba1d58887de SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba
 DIST openldap-2.3.30.tgz 3763533 RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 SHA1 99dd73df2bdf3ac303b2a81ee2c689a2ee09e13a SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b
-DIST openldap-2.3.33.tgz 3787010 RMD160 b06c7a566d2b2673b479343efa32e8f852541f43 SHA1 594421dc510adb0bc80262b17fff20c113472609 SHA256 c0f14356b77858d52ab47306fd908d7e99159956c3fabb48ca6d8fb127372c4f
 DIST openldap-2.3.34.tgz 3791412 RMD160 78d01bb09bc2c0e3cc55cce96239072fa5641847 SHA1 f56fb1e2ef150d09f9b4aa8af9f47015de71d5a8 SHA256 be1e258de7bb15969ede7dfc0f0dc163b337393846d872be6c9f3fb87b8d0f0e
 DIST openldap-compatversions-patchset-1.0.tar.bz2 10547 RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c SHA1 eb6dfb169023e88f08ee93baabcf9293bc29e5f5 SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26
 EBUILD openldap-2.2.28-r7.ebuild 11822 RMD160 9ac18b128cbe7071cf978ed0cd007f9efaebc0fc SHA1 5d986ee8f6796143ae73e4e5d0c724f4ea21cb35 SHA256 e34b9bc86ebba150dc0e3efe4683521d1c401c47071d2201261576a971804b7c
@@ -47,10 +49,6 @@ EBUILD openldap-2.3.30-r2.ebuild 16355 RMD160 c48b061fd1d6dfd1475f6bd038983ff276
 MD5 533ce6d364b41297af03b9fd2aa1cc09 openldap-2.3.30-r2.ebuild 16355
 RMD160 c48b061fd1d6dfd1475f6bd038983ff276faf5cc openldap-2.3.30-r2.ebuild 16355
 SHA256 bad99f0a60f9c8a666533cf95ae098658216d59a5ad3d736cdd3c57ac3aca56d openldap-2.3.30-r2.ebuild 16355
-EBUILD openldap-2.3.33.ebuild 16354 RMD160 d976b3d739d72d377d70608b4723c46cf136f071 SHA1 634022738a3599b3741f468da416d158d318fdf1 SHA256 3aae7bfa23b8bbd2bff53a5e102231450fd6bf57d43a79794f1c079038fc8a1a
-MD5 6f4a67aee02b0f07948aecd2c54818cb openldap-2.3.33.ebuild 16354
-RMD160 d976b3d739d72d377d70608b4723c46cf136f071 openldap-2.3.33.ebuild 16354
-SHA256 3aae7bfa23b8bbd2bff53a5e102231450fd6bf57d43a79794f1c079038fc8a1a openldap-2.3.33.ebuild 16354
 EBUILD openldap-2.3.34-r1.ebuild 16572 RMD160 37120a930924dec1d38207ffb551ab6faa789865 SHA1 a9cba2b3e009156e0c5ca5cb639e042d05baf2c5 SHA256 3370b652beb02feac93cd8e8c3e99247fc81fc2128e54b17f9ca6d7644d9f3b6
 MD5 824e55b96cacd4aab40ee745cf4054c2 openldap-2.3.34-r1.ebuild 16572
 RMD160 37120a930924dec1d38207ffb551ab6faa789865 openldap-2.3.34-r1.ebuild 16572
@@ -59,10 +57,10 @@ EBUILD openldap-2.3.34.ebuild 16354 RMD160 5b671d299972cb62625d1b83b345b96f79e95
 MD5 8d89d0d955daf4f158a2c7a0ea1782b8 openldap-2.3.34.ebuild 16354
 RMD160 5b671d299972cb62625d1b83b345b96f79e95679 openldap-2.3.34.ebuild 16354
 SHA256 24578705b253a0a60cb54cbab501be9c699651a843a837d81ae8f5261a3c289e openldap-2.3.34.ebuild 16354
-MISC ChangeLog 46453 RMD160 53fff36af861115d9e4941bf565c0c2fa2f5de58 SHA1 4228b443b67eb3c6f6ad7a9fc2e1d21a02ad17da SHA256 322e7e4fd41856bef01b9c726fc630614cac18b0fa2ccf868fc732ae7f6d3581
-MD5 5485221780d6a8dfea356d34c69be2eb ChangeLog 46453
-RMD160 53fff36af861115d9e4941bf565c0c2fa2f5de58 ChangeLog 46453
-SHA256 322e7e4fd41856bef01b9c726fc630614cac18b0fa2ccf868fc732ae7f6d3581 ChangeLog 46453
+MISC ChangeLog 46547 RMD160 4c4efce2b41a59f1cd2c5dba8ae6701b7ce87e69 SHA1 65b1215d10b810f61c6d08631882cf9df050e685 SHA256 341679ec45db6fe282d68c5e60caaf1b80aa53055da9ee6f9198b5662a8e9f47
+MD5 7a6bc132fc7ac9f478d0a43a21395374 ChangeLog 46547
+RMD160 4c4efce2b41a59f1cd2c5dba8ae6701b7ce87e69 ChangeLog 46547
+SHA256 341679ec45db6fe282d68c5e60caaf1b80aa53055da9ee6f9198b5662a8e9f47 ChangeLog 46547
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -73,12 +71,16 @@ SHA256 61bde84c81976ceb65369263a2ed306e0ce296f57b832a15dad2d5f57fd5fc22 files/di
 MD5 e912b83e7dba93d81b8fad6d2df489b1 files/digest-openldap-2.3.30-r2 241
 RMD160 a308c1e798233f0f862c0d5556f2543075738d0b files/digest-openldap-2.3.30-r2 241
 SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/digest-openldap-2.3.30-r2 241
-MD5 43896b93a1f438a00afaee2ac013a82b files/digest-openldap-2.3.33 241
-RMD160 e0b76c5a0d24dcde7d48256735ff21eab7e82464 files/digest-openldap-2.3.33 241
-SHA256 6947a1a2ab466ec8d914b8f3d58cd8d8f2135962ffb23a840686bb48f7082081 files/digest-openldap-2.3.33 241
 MD5 a36a4d5b98e1e91f51e0cc934be7bb0f files/digest-openldap-2.3.34 241
 RMD160 7443a8589b0719ed79fadb01a2d9cd30bfff56a9 files/digest-openldap-2.3.34 241
 SHA256 556c93efd750d5e3b35ff047b524c5bf7dddb0f8fecd6992adf9e6b1606f1a99 files/digest-openldap-2.3.34 241
 MD5 a36a4d5b98e1e91f51e0cc934be7bb0f files/digest-openldap-2.3.34-r1 241
 RMD160 7443a8589b0719ed79fadb01a2d9cd30bfff56a9 files/digest-openldap-2.3.34-r1 241
 SHA256 556c93efd750d5e3b35ff047b524c5bf7dddb0f8fecd6992adf9e6b1606f1a99 files/digest-openldap-2.3.34-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGFip5z974XjDVpbkRAlldAJ4jGYAaI+dLmZXrpWCSZ9MHe5O+9wCguGP3
+3TMyD+BnkkDBgi4o0K1+DJQ=
+=VGJa
+-----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/digest-openldap-2.3.33 b/net-nds/openldap/files/digest-openldap-2.3.33
deleted file mode 100644 (file)
index 311cda1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 79d78ddbf14ac0792103665fadbefb26 openldap-2.3.33.tgz 3787010
-RMD160 b06c7a566d2b2673b479343efa32e8f852541f43 openldap-2.3.33.tgz 3787010
-SHA256 c0f14356b77858d52ab47306fd908d7e99159956c3fabb48ca6d8fb127372c4f openldap-2.3.33.tgz 3787010
diff --git a/net-nds/openldap/openldap-2.3.33.ebuild b/net-nds/openldap/openldap-2.3.33.ebuild
deleted file mode 100644 (file)
index a12b7ff..0000000
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.33.ebuild,v 1.2 2007/02/16 20:55:55 jokey Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-AT_M4DIR="./build"
-inherit autotools eutils flag-o-matic multilib ssl-cert 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="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? ( >=sys-libs/db-4.2.52_p2-r1 )
-               !berkdb? (
-                       gdbm? ( sys-libs/gdbm )
-                       !gdbm? ( >=sys-libs/db-4.2.52_p2-r1 )
-               )
-               smbkrb5passwd? (
-                       dev-libs/openssl
-                       app-crypt/heimdal
-               )
-       )
-       selinux? ( sec-policy/selinux-openldap )"
-DEPEND="${RDEPEND}"
-
-# 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
-
-       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"
-
-       # Adding back -j1 as upstream didn't answer on parallel make issue yet
-       emake -j1 depend || die "make depend failed"
-       emake -j1 || 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 "Doing tests"
-       cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-       emake 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
-               newinitd "${FILESDIR}"/slapd-initd slapd
-               newinitd "${FILESDIR}"/slurpd-initd slurpd
-               newconfd "${FILESDIR}"/slapd-confd slapd
-
-               if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"/etc/init.d/{slapd,slurpd}
-               fi
-
-               # 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" \
-                       emake DESTDIR="${D}" 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
-}
-
-pkg_preinst() {
-       # keep old libs if any
-       LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
-       for LIBSUFFIX in ${LIBSUFFIXES} ; do
-               for each in liblber libldap libldap_r ; do
-                       preserve_old_lib "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               if use ssl; then
-                       insinto /etc/openldap/ssl
-                       docert ldap
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-               chown ldap:ldap "${ROOT}"var/run/openldap
-               chmod 0755 "${ROOT}"var/run/openldap
-               chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default}
-               chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default}
-               chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm,slurp}
-       fi
-
-       # Reference inclusion bug #77330
-       echo
-       elog
-       elog "Getting started using OpenLDAP? There is some documentation available:"
-       elog "Gentoo Guide to OpenLDAP Authentication"
-       elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-       elog
-
-       # note to bug #110412
-       echo
-       elog
-       elog "An example file for tuning BDB backends with openldap is:"
-       elog "/usr/share/doc/${PF}/DB_CONFIG.fast.example.gz"
-       elog
-
-       LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
-       for LIBSUFFIX in ${LIBSUFFIXES} ; do
-               for each in liblber libldap libldap_r ; do
-                       preserve_old_lib_notify "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}