Some cleanup, remove unused versions
authorMarkus Ullmann <jokey@gentoo.org>
Sun, 11 Apr 2010 15:24:10 +0000 (15:24 +0000)
committerMarkus Ullmann <jokey@gentoo.org>
Sun, 11 Apr 2010 15:24:10 +0000 (15:24 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-nds/openldap/ChangeLog
net-nds/openldap/Manifest
net-nds/openldap/openldap-2.3.41-r1.ebuild [deleted file]
net-nds/openldap/openldap-2.3.41.ebuild [deleted file]
net-nds/openldap/openldap-2.3.43-r1.ebuild
net-nds/openldap/openldap-2.3.43.ebuild [deleted file]
net-nds/openldap/openldap-2.4.16.ebuild [deleted file]
net-nds/openldap/openldap-2.4.17-r1.ebuild [deleted file]
net-nds/openldap/openldap-2.4.17.ebuild [deleted file]
net-nds/openldap/openldap-2.4.19.ebuild [deleted file]

index bb0f9a0d15898de0d4dd1420e6d3f944a2ebd8dd..59fc622f1660a09b8c4835540d0cc547222f6fd4 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.369 2010/04/11 15:14:48 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.370 2010/04/11 15:24:10 jokey Exp $
+
+  11 Apr 2010; Markus Ullmann <jokey@gentoo.org> -openldap-2.3.41.ebuild,
+  -openldap-2.3.41-r1.ebuild, -openldap-2.3.43.ebuild,
+  openldap-2.3.43-r1.ebuild, -openldap-2.4.16.ebuild,
+  -openldap-2.4.17.ebuild, -openldap-2.4.17-r1.ebuild,
+  -openldap-2.4.19.ebuild:
+  Some cleanup, remove unused versions
 
 *openldap-2.4.21 (11 Apr 2010)
 
index 0be14a26dcd9d75e3ac7331d59ca745d9f680fcb..08f3227de068417abb268bd9769326ff51dd023b 100644 (file)
@@ -16,21 +16,11 @@ AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b467
 AUX slapd-initd 609 RMD160 3e1daa2bbbbec78aad265a1c4190098730a4234d SHA1 56d5f1d1f59e37bbcef2399847328c7963694f0a SHA256 840f984031b1fc84d4c6ba59c5ba0de5794be596215f0089c7739dba88d610d5
 AUX slapd-initd2 622 RMD160 750d7c59d1b7e47b0b21b96d301244c3ec3e28bf SHA1 a438adef50bfb925cc7550156b6dbefd68dcb856 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa
 AUX slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 SHA1 8ab66a984510fa91755cbcbac29883cea1435db7 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff
-DIST openldap-2.3.41.tgz 3800142 RMD160 441c7456c9fb5b3cd964c30c246849a9886ab368 SHA1 89f3c9818aa6364c74519fa774a776d72efba8aa SHA256 56fd1ee690df2d1ff164f6ba554fedfcfc13049d95dbdc440af11e56b0dfea0a
 DIST openldap-2.3.43.tgz 3803011 RMD160 3ecb789e5f4d4c939357e2e7220d793eb05402e7 SHA1 796b5db37ae5243b84f7b9c11217bbec44e0da8c SHA256 d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba8dc16974bff9f51a9f3d37e1
-DIST openldap-2.4.16.tgz 5097314 RMD160 96d4a46dc95ecb8c64f9bcbcbbb89c6539eb7638 SHA1 c84f3281d047804eb977403e66733b7dd0a998b1 SHA256 b87505c640007de48a82276c324842a90c6f788eedbef058d0aacdb70f4833c6
-DIST openldap-2.4.17.tgz 5423027 RMD160 8fe83a63a72d4976ad7cbdaa135acc817abca953 SHA1 a6efcf7b680f6c7665574002cac8f2eefd24b79a SHA256 4a18ce70154f5c0ffc1804698dba609d8f4aab3e74f01bbddf31b28b96403fc3
 DIST openldap-2.4.19.tgz 5474200 RMD160 89b6eb1bbf0290178a28a1447fb6240c5e8f79dc SHA1 4a78acae0dd6d51d22ff50eef77912e59b31779a SHA256 b7a2642f620f98bebf6b52a227ba66b93c5028c68088bf107b7403d2ce6e1533
 DIST openldap-2.4.21.tgz 5477877 RMD160 94f662e8fe1b009f5836cb9c19b095f1b159b1bd SHA1 cfcfff3df7804bab8eb0d9464d3712a3e32d677b SHA256 22eca357137c135b5561e2fa0e3336b280702acf2e5c4f40bc7aed1d1e8e9324
-EBUILD openldap-2.3.41-r1.ebuild 17841 RMD160 334926e9e5a8578c1a1a7831c8162155221064f0 SHA1 bc401fb8fb6ef2de4cc747582ab500a9519c2446 SHA256 cc47f9abe60b7dbf246e2ef24a261421f49058c22b64e34868c0a89b4e325f58
-EBUILD openldap-2.3.41.ebuild 17737 RMD160 b9da960bbcdab3109b6f8798a03b421dd565d345 SHA1 5f9e540e5c845870c0ee6caca7533396ef668146 SHA256 b6471d6ae1e95f79e5480f24bebb508aa7dc261e07c909c3221409593e49b961
-EBUILD openldap-2.3.43-r1.ebuild 17923 RMD160 00c9f5078cf1111f52387a5c0ff85e700ab8e81e SHA1 7f27710dd66d172acbf1d6634eb3171fce0f1b8c SHA256 61bd3d6169b4a151b70a11412fc260ecba176c7fa5b8119cb26ad3f2189a85ed
-EBUILD openldap-2.3.43.ebuild 17843 RMD160 d20d40ea898dfef1c4a0f27ea9df17f8de841700 SHA1 6cfb3debbf6fa9812527d0769c385a99b523e4f6 SHA256 c5ae01c566f28ef887c3894efe6c010e78ae5a3566efe55f4a909f6013496cdf
-EBUILD openldap-2.4.16.ebuild 15149 RMD160 c411580ae95560084133af6c7789854c3b409471 SHA1 2584f276025c6d399fb3d1fe37f214bef801889a SHA256 1c0484070bf412d1e99e7e6f3759c58f6cf760a428273049b305e5c7d4671f9c
-EBUILD openldap-2.4.17-r1.ebuild 17424 RMD160 5c68195f99906cc9a177d995db5954dbc24f1121 SHA1 06fda2ac339d64046fbc56d44372fc4a6144f913 SHA256 c9793d08aae5c44d916b3902f55b63c74ef165121b77689976a3b38177519e6d
-EBUILD openldap-2.4.17.ebuild 15150 RMD160 5acc74d8e3205edf9cda638166771555815647aa SHA1 1f1cf9b631086d169aee0e153ee970229c3b5fb6 SHA256 e14a4ce79e1f4e3e2cbebf36af1b6dd99319eaa81987c793698d04cd3a747e07
+EBUILD openldap-2.3.43-r1.ebuild 17911 RMD160 c36485dc0349902062afd53b35a06c6637b4192e SHA1 62d3c8181ce3b6807d7a3c89ade18eda58e621af SHA256 11d75698b1b61f6ded3160ddc471fa3f89335fea09ebfdb9e450246b47e22fdd
 EBUILD openldap-2.4.19-r1.ebuild 19705 RMD160 afc82305c7cbdb644a35951c0e094fbae55d4a92 SHA1 43d8720820112a43b645461a1401e18b9ca10819 SHA256 c58a0ada7480805a5310af39a4d11ef8d537d67fe5bf8c3fd9d489380cb70a88
-EBUILD openldap-2.4.19.ebuild 17501 RMD160 f7d66b3235fb38c2bfb2747a1c5d33ddfb18bafc SHA1 89815c6c7896a6511f93c768ea53d4180de5a874 SHA256 4c8c5ff586d6f074bc4863c66dfb7e7ca40f124e215f2a3ea29f7fdbd33b867b
 EBUILD openldap-2.4.21.ebuild 19906 RMD160 5b033cc028cc13ba7119a61f0611762f0d4eb5b3 SHA1 d0581cbc4aac9250610a027fa5837986aee8a18c SHA256 77125c3b9753018f83492254de9e8623dd19ae850a5844105b6f56edc3e7c927
-MISC ChangeLog 63673 RMD160 9421ade6ca3f120649dcb5edbbe85fc4ac8fba27 SHA1 0c50f5b9f85c14ac87b7b73fb6bd84689d697726 SHA256 644740e32654ab5c48832d802d0f483a23a479f642a7d503e80f9c08e140c969
+MISC ChangeLog 63978 RMD160 a0e0cc5d45d0b58d2b1df9f2ad8eb160444e7ab1 SHA1 d48e7157b9c11c6bd1e02514a9452d928e9cceea SHA256 03d6f7b849a023c4325a35b7d24abdfecb86a5e60dd7d56571b16462bf0a2798
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
diff --git a/net-nds/openldap/openldap-2.3.41-r1.ebuild b/net-nds/openldap/openldap-2.3.41-r1.ebuild
deleted file mode 100644 (file)
index 32f82ef..0000000
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41-r1.ebuild,v 1.5 2010/01/12 20:05:41 cardoe Exp $
-
-EAPI="1"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-AT_M4DIR="./build"
-inherit autotools db-use 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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl 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 )
-       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.5
-                               sys-libs/db:4.4
-                               sys-libs/db:4.3
-                               >=sys-libs/db-4.2.52_p2-r1:4.2
-                       )
-               )
-               !berkdb? (
-                       gdbm? ( sys-libs/gdbm )
-                       !gdbm? (
-                               || (    sys-libs/db:4.5
-                                       sys-libs/db:4.4
-                                       sys-libs/db:4.3
-                                       >=sys-libs/db-4.2.52_p2-r1:4.2
-                               )
-                       )
-               )
-               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 samba && ! use ssl ; then
-               eerror "LAN manager passwords need ssl flag set"
-               die "Please set ssl useflag"
-       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
-       # Fix gcc-4.4 compat, bug 264761
-       epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
-}
-
-src_compile() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       # 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}"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir 4.5 4.4 4.3 4.2 )
-               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}"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir 4.5 4.4 4.3 4.2 )
-               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_enable samba lmpasswd)"
-               # slapd overlay options
-               myconf="${myconf} --enable-dyngroup --enable-proxycache"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-               myconf="${myconf} --enable-syncprov"
-       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)"
-       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"
-
-       emake depend || die "make depend failed"
-       emake || 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 "${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
-               # use our config
-               rm "${D}"etc/openldap/slapd.con*
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # 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 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 libldap libldap_r liblber ; do
-                       preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               # Additionally, it overwrites
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-               # These lines force the permissions of various content to be correct
-               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 "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-       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 "usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
diff --git a/net-nds/openldap/openldap-2.3.41.ebuild b/net-nds/openldap/openldap-2.3.41.ebuild
deleted file mode 100644 (file)
index 1f2e3d3..0000000
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.13 2010/01/12 20:05:41 cardoe Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-AT_M4DIR="./build"
-inherit autotools db-use 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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl 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 )
-       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 !>=sys-libs/db-4.6 )
-               !berkdb? (
-                       gdbm? ( sys-libs/gdbm )
-                       !gdbm? ( >=sys-libs/db-4.2.52_p2-r1 !>=sys-libs/db-4.6 )
-               )
-               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 samba && ! use ssl ; then
-               eerror "LAN manager passwords need ssl flag set"
-               die "Please set ssl useflag"
-       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
-       # Fix gcc-4.4 compat, bug 264761
-       epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
-}
-
-src_compile() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       # 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}"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir)
-               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}"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir)
-               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_enable samba lmpasswd)"
-               # slapd overlay options
-               myconf="${myconf} --enable-dyngroup --enable-proxycache"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-               myconf="${myconf} --enable-syncprov"
-       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)"
-       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 "${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
-               # use our config
-               rm "${D}"etc/openldap/slapd.con*
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # 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 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 libldap libldap_r liblber ; do
-                       preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               # Additionally, it overwrites
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-               # These lines force the permissions of various content to be correct
-               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 "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-       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 "usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
index 367ec02c0684d9ce35fb4ab2f9b6cfb6f7476f41..a7cc6192a6a7a3241891c9f07adb9c6ca6f5c88d 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.7 2010/01/12 20:05:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.8 2010/04/11 15:24:10 jokey Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl samba sasl slp smbkrb5passwd ssl tcpd selinux"
 
 # note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
diff --git a/net-nds/openldap/openldap-2.3.43.ebuild b/net-nds/openldap/openldap-2.3.43.ebuild
deleted file mode 100644 (file)
index c3ddaca..0000000
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.13 2010/01/12 20:05:41 cardoe Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-AT_M4DIR="./build"
-inherit autotools db-use 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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl 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 )
-       sasl? ( dev-libs/cyrus-sasl )
-       !minimal? (
-               odbc? ( dev-db/unixODBC )
-               slp? ( net-libs/openslp )
-               perl? ( dev-lang/perl[-build] )
-               samba? ( dev-libs/openssl )
-               kerberos? ( virtual/krb5 )
-               berkdb? (
-                       || (    sys-libs/db:4.5
-                               sys-libs/db:4.4
-                               sys-libs/db:4.3
-                               >=sys-libs/db-4.2.52_p2-r1:4.2
-                       )
-               )
-               !berkdb? (
-                       gdbm? ( sys-libs/gdbm )
-                       !gdbm? (
-                               || (    sys-libs/db:4.5
-                                       sys-libs/db:4.4
-                                       sys-libs/db:4.3
-                                       >=sys-libs/db-4.2.52_p2-r1:4.2
-                               )
-                       )
-               )
-               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 samba && ! use ssl ; then
-               eerror "LAN manager passwords need ssl flag set"
-               die "Please set ssl useflag"
-       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_prepare() {
-       # 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
-       # Fix gcc-4.4 compat, bug 264761
-       epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
-}
-
-src_configure() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       # 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}"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir 4.5 4.4 4.3 4.2 )
-               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}"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir 4.5 4.4 4.3 4.2 )
-               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_enable samba lmpasswd)"
-               # slapd overlay options
-               myconf="${myconf} --enable-dyngroup --enable-proxycache"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-               myconf="${myconf} --enable-syncprov"
-       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)"
-       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"
-}
-
-src_compile() {
-       emake depend || die "make depend failed"
-       emake || 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 "${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
-               # use our config
-               rm "${D}"etc/openldap/slapd.con*
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # 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 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 libldap libldap_r liblber ; do
-                       preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               # Additionally, it overwrites
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-               # These lines force the permissions of various content to be correct
-               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 "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-       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 "usr/$(get_libdir)/${each}${LIBSUFFIX}"
-               done
-       done
-}
diff --git a/net-nds/openldap/openldap-2.4.16.ebuild b/net-nds/openldap/openldap-2.4.16.ebuild
deleted file mode 100644 (file)
index 48a3b2d..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.16.ebuild,v 1.3 2010/01/12 20:05:41 cardoe Exp $
-
-EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
-IUSE_CONTRIB="smbkrb5passwd kerberos"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-# openssl is needed to generate lanman-passwords required by samba
-RDEPEND="sys-libs/ncurses
-       icu? ( dev-libs/icu )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( !gnutls? ( dev-libs/openssl )
-               gnutls? ( net-libs/gnutls ) )
-       sasl? ( dev-libs/cyrus-sasl )
-       !minimal? (
-               odbc? ( !iodbc? ( dev-db/unixODBC )
-                       iodbc? ( dev-db/libiodbc ) )
-               slp? ( net-libs/openslp )
-               perl? ( dev-lang/perl[-build] )
-               samba? ( dev-libs/openssl )
-               berkdb? ( sys-libs/db )
-               smbkrb5passwd? (
-                       dev-libs/openssl
-                       app-crypt/heimdal )
-               kerberos? ( virtual/krb5 )
-       )
-       selinux? ( sec-policy/selinux-openldap )"
-DEPEND="${RDEPEND}"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-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
-}
-
-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
-       if [ "${FORCE_UPGRADE}" != "1" ]; then
-               die "You need to upgrade your database first"
-       else
-               eerror "You have the magical FORCE_UPGRADE=1 in place."
-               eerror "Don't say you weren't warned about data loss."
-       fi
-}
-
-pkg_setup() {
-       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_prepare() {
-       # 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 \
-               "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
-               "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-       # bug #116045 - still present in 2.4.15
-       epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
-
-       # bug #189817
-       epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-       cd "${S}"/build
-       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"
-
-       # wrong assumption that /bin/sh is /bin/bash
-       sed -i \
-               -e 's|/bin/sh|/bin/bash|g' \
-               "${S}"/tests/scripts/* || die "sed failed"
-}
-
-build_contrib_module() {
-       # <dir> <sources> <outputname>
-       cd "${S}/contrib/slapd-modules/$1"
-       einfo "Building contrib-module: $3"
-       $(tc-getCC) -shared \
-               -I../../../include -I../../../servers/slapd ${CFLAGS} -fPIC \
-               ${LDFLAGS} -o $3.so $2 || die "building $3 failed"
-}
-
-src_configure() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       use debug && myconf="${myconf} $(use_enable debug)"
-
-       # ICU usage is not configurable
-       export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)"
-
-       if ! use minimal ; then
-               # backends
-               myconf="${myconf} --enable-slapd"
-               if use berkdb ; then
-                       einfo "Using Berkeley DB for local backend"
-                       myconf="${myconf} --enable-bdb --enable-hdb"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir)
-               else
-                       ewarn
-                       ewarn "Note: if you disable berkdb, you can only use remote-backends!"
-                       ewarn
-                       ebeep 5
-                       myconf="${myconf} --disable-bdb --disable-hdb"
-               fi
-               for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
-                       myconf="${myconf} --enable-${backend}=mod"
-               done
-
-               myconf="${myconf} $(use_enable perl perl mod)"
-
-               if use odbc ; then
-                       local odbc_lib="unixodbc"
-                       use iodbc && odbc_lib="iodbc"
-                       myconf="${myconf} --enable-sql=mod --with-odbc=${odbc_lib}"
-               fi
-
-               # slapd options
-               myconf="${myconf} $(use_enable crypt) $(use_enable slp)"
-               myconf="${myconf} $(use_enable samba lmpasswd)"
-               if use experimental ; then
-                       myconf="${myconf} --enable-dynacl"
-                       myconf="${myconf} --enable-aci=mod"
-               fi
-               for option in aci cleartext modules rewrite rlookups slapi; do
-                       myconf="${myconf} --enable-${option}"
-               done
-
-               # slapd overlay options
-               # Compile-in the syncprov, the others as module
-               myconf="${myconf} --enable-syncprov=yes"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-       else
-               myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb"
-               myconf="${myconf} --disable-overlays"
-       fi
-
-       # basic functionality stuff
-       myconf="${myconf} $(use_enable ipv6)"
-       myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)"
-       myconf="${myconf} $(use_enable tcpd wrappers)"
-
-       local ssl_lib="no"
-       if use ssl || ( use ! minimal && use samba ) ; then
-               ssl_lib="openssl"
-               use gnutls && ssl_lib="gnutls"
-       fi
-
-       myconf="${myconf} --with-tls=${ssl_lib}"
-
-       for basicflag in dynamic local proctitle shared static syslog; do
-               myconf="${myconf} --enable-${basicflag}"
-       done
-
-       STRIP=/bin/true \
-       econf \
-               --libexecdir=/usr/$(get_libdir)/openldap \
-               ${myconf}
-}
-
-src_compile() {
-       emake depend || die "emake depend failed"
-       emake CC=$(tc-getCC) AR=$(tc-getAR) || die "emake failed"
-
-       if ! use minimal ; then
-               if use smbkrb5passwd ; then
-                       einfo "Building contrib-module: smbk5pwd"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-
-                       emake \
-                               DEFS="-DDO_SAMBA -DDO_KRB5" \
-                               KRB5_INC="$(krb5-config --cflags)" \
-                               CC=$(tc-getCC) libexecdir="/usr/$(get_libdir)/openldap" \
-                               || die "emake smbk5pwd failed"
-               fi
-
-               if use kerberos ; then
-                       cd "${S}/contrib/slapd-modules/passwd"
-                       einfo "Building contrib-module: pw-kerberos"
-                       $(tc-getCC) -shared \
-                               -I../../../include \
-                               ${CFLAGS} \
-                               $(krb5-config --cflags) \
-                               -DHAVE_KRB5 -fPIC \
-                               ${LDFLAGS} \
-                               -o pw-kerberos.so \
-                               kerberos.c || die "building pw-kerberos failed"
-               fi
-               # We could build pw-radius if GNURadius would install radlib.h
-               cd "${S}/contrib/slapd-modules/passwd"
-               einfo "Building contrib-module: pw-netscape"
-               $(tc-getCC) -shared \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -fPIC \
-                       ${LDFLAGS} \
-                       -o pw-netscape.so \
-                       netscape.c || die "building pw-netscape failed"
-
-               build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-               build_contrib_module "allop" "allop.c" "overlay-allop"
-               build_contrib_module "autogroup" "autogroup.c" "autogroup"
-               build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-               build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-               # lastmod may not play well with other overlays
-               build_contrib_module "lastmod" "lastmod.c" "lastmod"
-               build_contrib_module "nops" "nops.c" "nops-overlay"
-           build_contrib_module "trace" "trace.c" "trace"
-               # build slapi-plugins
-               cd "${S}/contrib/slapi-plugins/addrdnvalues"
-               einfo "Building contrib-module: addrdnvalues plugin"
-               $(tc-getCC) -shared \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -fPIC \
-                       ${LDFLAGS} \
-                       -o libaddrdnvalues-plugin.so \
-                       addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-
-       fi
-}
-
-src_test() {
-       cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${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/
-
-       # initial data storage dir
-       keepdir /var/lib/openldap-data
-       fowners ldap:ldap /var/lib/openldap-data
-       fperms 0700 /var/lib/openldap-data
-
-       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}"
-
-       # 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
-               # use our config
-               rm "${D}"etc/openldap/slapd.conf
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # install our own init scripts
-               newinitd "${FILESDIR}"/slapd-initd slapd
-               newconfd "${FILESDIR}"/slapd-confd slapd
-               if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd
-               fi
-
-               if use smbkrb5passwd ; then
-                       einfo "Install the smbk5pwd module"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install-mod || die "emake install smbk5pwd failed"
-                       newdoc README smbk5pwd-README
-               fi
-
-               einfo "Installing contrib modules"
-               cd "${S}/contrib/slapd-modules"
-               insinto /usr/$(get_libdir)/openldap/openldap
-               doins  */*.so
-               docinto contrib
-               newdoc addpartial/README addpartial-README
-               newdoc allop/README allop-README
-               doman allop/slapo-allop.5
-               newdoc autogroup/README autogroup-README
-               newdoc denyop/denyop.c denyop-denyop.c
-               newdoc dsaschema/README dsaschema-README
-               doman lastmod/slapo-lastmod.5
-               doman nops/slapo-nops.5
-               newdoc passwd/README passwd-README
-               cd "${S}/contrib/slapi-plugins"
-               insinto /usr/$(get_libdir)/openldap/openldap
-               doins  */*.so
-               docinto contrib
-               newdoc addrdnvalues/README addrdnvalues-README
-       fi
-}
-
-pkg_preinst() {
-       # keep old libs if any
-       preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-
-               # These lines force the permissions of various content to be correct
-               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}
-       fi
-
-       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 "---"
-       elog "An example file for tuning BDB backends with openldap is"
-       elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-
-       preserve_old_lib_notify usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
-}
diff --git a/net-nds/openldap/openldap-2.4.17-r1.ebuild b/net-nds/openldap/openldap-2.4.17-r1.ebuild
deleted file mode 100644 (file)
index e9345b9..0000000
+++ /dev/null
@@ -1,540 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.5 2010/01/12 20:05:41 cardoe Exp $
-
-EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
-IUSE_CONTRIB="smbkrb5passwd kerberos"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-# openssl is needed to generate lanman-passwords required by samba
-RDEPEND="sys-libs/ncurses
-       icu? ( dev-libs/icu )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( !gnutls? ( dev-libs/openssl )
-               gnutls? ( net-libs/gnutls ) )
-       sasl? ( dev-libs/cyrus-sasl )
-       !minimal? (
-               odbc? ( !iodbc? ( dev-db/unixODBC )
-                       iodbc? ( dev-db/libiodbc ) )
-               slp? ( net-libs/openslp )
-               perl? ( dev-lang/perl[-build] )
-               samba? ( dev-libs/openssl )
-               berkdb? ( sys-libs/db )
-               smbkrb5passwd? (
-                       dev-libs/openssl
-                       app-crypt/heimdal )
-               kerberos? ( virtual/krb5 )
-               cxx? ( dev-libs/cyrus-sasl )
-       )
-       selinux? ( sec-policy/selinux-openldap )"
-DEPEND="${RDEPEND}"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-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
-}
-
-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
-       if [ "${FORCE_UPGRADE}" != "1" ]; then
-               die "You need to upgrade your database first"
-       else
-               eerror "You have the magical FORCE_UPGRADE=1 in place."
-               eerror "Don't say you weren't warned about data loss."
-       fi
-}
-
-pkg_setup() {
-       if ! use sasl && use cxx ; then
-               die "To build the ldapc++ library you must emerge openldap with sasl support"
-       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_prepare() {
-       # 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 "${FILESDIR}"/${P}-gcc44.patch
-
-       epatch \
-               "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
-               "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-       # bug #116045 - still present in 2.4.17
-       epatch "${FILESDIR}"/${PN}-2.4.17-contrib-smbk5pwd.patch
-
-       # bug #189817
-       epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-       # bug #233633
-       epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
-
-       cd "${S}"/build
-       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"
-
-       # wrong assumption that /bin/sh is /bin/bash
-       sed -i \
-               -e 's|/bin/sh|/bin/bash|g' \
-               "${S}"/tests/scripts/* || die "sed failed"
-}
-
-build_contrib_module() {
-       lt="${S}/libtool"
-       # <dir> <sources> <outputname>
-       cd "${S}/contrib/slapd-modules/$1"
-       einfo "Compiling contrib-module: $3"
-       "${lt}" --mode=compile --tag=CC \
-               "${CC}" \
-               -I../../../include -I../../../servers/slapd ${CFLAGS} \
-               -o ${2%.c}.lo -c $2 || die "compiling $3 failed"
-       einfo "Linking contrib-module: $3"
-       "${lt}" --mode=link --tag=CC \
-               "${CC}" -module \
-               ${CFLAGS} \
-               ${LDFLAGS} \
-               -rpath /usr/$(get_libdir)/openldap/openldap \
-               -o $3.la ${2%.c}.lo || die "linking $3 failed"
-}
-
-src_configure() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       use debug && myconf="${myconf} $(use_enable debug)"
-
-       # ICU usage is not configurable
-       export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)"
-
-       if ! use minimal ; then
-               # backends
-               myconf="${myconf} --enable-slapd"
-               if use berkdb ; then
-                       einfo "Using Berkeley DB for local backend"
-                       myconf="${myconf} --enable-bdb --enable-hdb"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir)
-               else
-                       ewarn
-                       ewarn "Note: if you disable berkdb, you can only use remote-backends!"
-                       ewarn
-                       ebeep 5
-                       myconf="${myconf} --disable-bdb --disable-hdb"
-               fi
-               for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
-                       myconf="${myconf} --enable-${backend}=mod"
-               done
-
-               myconf="${myconf} $(use_enable perl perl mod)"
-
-               myconf="${myconf} $(use_enable odbc sql mod)"
-               if use odbc ; then
-                       local odbc_lib="unixodbc"
-                       use iodbc && odbc_lib="iodbc"
-                       myconf="${myconf} --with-odbc=${odbc_lib}"
-               fi
-
-               # slapd options
-               myconf="${myconf} $(use_enable crypt) $(use_enable slp)"
-               myconf="${myconf} $(use_enable samba lmpasswd)"
-               if use experimental ; then
-                       myconf="${myconf} --enable-dynacl"
-                       myconf="${myconf} --enable-aci=mod"
-               fi
-               for option in aci cleartext modules rewrite rlookups slapi; do
-                       myconf="${myconf} --enable-${option}"
-               done
-
-               # slapd overlay options
-               # Compile-in the syncprov, the others as module
-               myconf="${myconf} --enable-syncprov=yes"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-       else
-               myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb"
-               myconf="${myconf} --disable-overlays"
-       fi
-
-       # basic functionality stuff
-       myconf="${myconf} $(use_enable ipv6)"
-       myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)"
-       myconf="${myconf} $(use_enable tcpd wrappers)"
-
-       local ssl_lib="no"
-       if use ssl || ( use ! minimal && use samba ) ; then
-               ssl_lib="openssl"
-               use gnutls && ssl_lib="gnutls"
-       fi
-
-       myconf="${myconf} --with-tls=${ssl_lib}"
-
-       for basicflag in dynamic local proctitle shared static syslog; do
-               myconf="${myconf} --enable-${basicflag}"
-       done
-
-       tc-export CC AR CXX
-       STRIP=/bin/true \
-       econf \
-               --libexecdir=/usr/$(get_libdir)/openldap \
-               ${myconf}
-
-       if ! use minimal ; then
-                if use cxx ; then
-                       local myconf_ldapcpp
-                       myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include"
-                       cd "${S}/contrib/ldapc++"
-                       OLD_LDFLAGS="$LDFLAGS"
-                       OLD_CPPFLAGS="$CPPFLAGS"
-                       append-ldflags "-L../../libraries/liblber/.libs -L../../libraries/libldap/.libs"
-                       append-ldflags "-L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs"
-                       append-cppflags "-I../../../include"
-                       econf ${myconf_ldapcpp} \
-                               CC="${CC}" \
-                               CXX="${CXX}" \
-                               || die "econf ldapc++ failed"
-                       CPPFLAGS="$OLD_CPPFLAGS"
-                fi
-       fi
-}
-
-src_compile() {
-       emake depend || die "emake depend failed"
-       emake CC="${CC}" AR="${AR}" || die "emake failed"
-       lt="${S}/libtool"
-       export echo="echo"
-
-       if ! use minimal ; then
-                if use cxx ; then
-                       einfo "Building contrib library: ldapc++"
-                       cd "${S}/contrib/ldapc++"
-                       emake \
-                               CC="${CC}" CXX="${CXX}" \
-                               || die "emake ldapc++ failed"
-                fi
-
-               if use smbkrb5passwd ; then
-                       einfo "Building contrib-module: smbk5pwd"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-
-                       emake \
-                               DEFS="-DDO_SAMBA -DDO_KRB5" \
-                               KRB5_INC="$(krb5-config --cflags)" \
-                               CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \
-                               || die "emake smbk5pwd failed"
-               fi
-
-               if use kerberos ; then
-                       cd "${S}/contrib/slapd-modules/passwd"
-                       einfo "Compiling contrib-module: pw-kerberos"
-                       "${lt}" --mode=compile --tag=CC \
-                               "${CC}" \
-                               -I../../../include \
-                               ${CFLAGS} \
-                               $(krb5-config --cflags) \
-                               -DHAVE_KRB5 \
-                               -o kerberos.lo \
-                               -c kerberos.c || die "compiling pw-kerberos failed"
-                       einfo "Linking contrib-module: pw-kerberos"
-                       "${lt}" --mode=link --tag=CC \
-                               "${CC}" -module \
-                               ${CFLAGS} \
-                               ${LDFLAGS} \
-                               -rpath /usr/$(get_libdir)/openldap/openldap \
-                               -o pw-kerberos.la \
-                               kerberos.lo || die "linking pw-kerberos failed"
-               fi
-               # We could build pw-radius if GNURadius would install radlib.h
-               cd "${S}/contrib/slapd-modules/passwd"
-               einfo "Compiling contrib-module: pw-netscape"
-               "${lt}" --mode=compile --tag=CC \
-                       "${CC}" \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -o netscape.lo \
-                       -c netscape.c || die "compiling pw-netscape failed"
-               einfo "Linking contrib-module: pw-netscape"
-               "${lt}" --mode=link --tag=CC \
-                       "${CC}" -module \
-                       ${CFLAGS} \
-                       ${LDFLAGS} \
-                       -rpath /usr/$(get_libdir)/openldap/openldap \
-                       -o pw-netscape.la \
-                       netscape.lo || die "linking pw-netscape failed"
-
-               build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-               build_contrib_module "allop" "allop.c" "overlay-allop"
-               build_contrib_module "autogroup" "autogroup.c" "autogroup"
-               build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-               build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-               # lastmod may not play well with other overlays
-               build_contrib_module "lastmod" "lastmod.c" "lastmod"
-               build_contrib_module "nops" "nops.c" "nops-overlay"
-           build_contrib_module "trace" "trace.c" "trace"
-               # build slapi-plugins
-               cd "${S}/contrib/slapi-plugins/addrdnvalues"
-               einfo "Building contrib-module: addrdnvalues plugin"
-               "${CC}" -shared \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -fPIC \
-                       ${LDFLAGS} \
-                       -o libaddrdnvalues-plugin.so \
-                       addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-
-       fi
-}
-
-src_test() {
-       cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-       lt="${S}/libtool"
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${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/
-
-       # initial data storage dir
-       keepdir /var/lib/openldap-data
-       fowners ldap:ldap /var/lib/openldap-data
-       fperms 0700 /var/lib/openldap-data
-
-       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}"
-
-       # 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
-               # use our config
-               rm "${D}"etc/openldap/slapd.conf
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # install our own init scripts
-               newinitd "${FILESDIR}"/slapd-initd slapd
-               newconfd "${FILESDIR}"/slapd-confd slapd
-               if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd
-               fi
-
-                if use cxx ; then
-                       einfo "Install the ldapc++ library"
-                       cd "${S}/contrib/ldapc++"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed"
-                       newdoc README ldapc++-README
-                fi
-
-               if use smbkrb5passwd ; then
-                       einfo "Install the smbk5pwd module"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed"
-                       newdoc README smbk5pwd-README
-               fi
-
-               einfo "Installing contrib modules"
-               cd "${S}/contrib/slapd-modules"
-               for l in */*.la; do
-                       "${lt}" --mode=install cp ${l} \
-                               "${D}"usr/$(get_libdir)/openldap/openldap || \
-                               die "installing ${l} failed"
-               done
-               docinto contrib
-               newdoc addpartial/README addpartial-README
-               newdoc allop/README allop-README
-               doman allop/slapo-allop.5
-               newdoc autogroup/README autogroup-README
-               newdoc denyop/denyop.c denyop-denyop.c
-               newdoc dsaschema/README dsaschema-README
-               doman lastmod/slapo-lastmod.5
-               doman nops/slapo-nops.5
-               newdoc passwd/README passwd-README
-               cd "${S}/contrib/slapi-plugins"
-               insinto /usr/$(get_libdir)/openldap/openldap
-               doins  */*.so
-               docinto contrib
-               newdoc addrdnvalues/README addrdnvalues-README
-       fi
-}
-
-pkg_preinst() {
-       # keep old libs if any
-       preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-
-               # These lines force the permissions of various content to be correct
-               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}
-       fi
-
-       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 "---"
-       elog "An example file for tuning BDB backends with openldap is"
-       elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-
-       preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
-}
diff --git a/net-nds/openldap/openldap-2.4.17.ebuild b/net-nds/openldap/openldap-2.4.17.ebuild
deleted file mode 100644 (file)
index 7a33f97..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17.ebuild,v 1.3 2010/01/12 20:05:41 cardoe Exp $
-
-EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
-IUSE_CONTRIB="smbkrb5passwd kerberos"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-# openssl is needed to generate lanman-passwords required by samba
-RDEPEND="sys-libs/ncurses
-       icu? ( dev-libs/icu )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( !gnutls? ( dev-libs/openssl )
-               gnutls? ( net-libs/gnutls ) )
-       sasl? ( dev-libs/cyrus-sasl )
-       !minimal? (
-               odbc? ( !iodbc? ( dev-db/unixODBC )
-                       iodbc? ( dev-db/libiodbc ) )
-               slp? ( net-libs/openslp )
-               perl? ( dev-lang/perl[-build] )
-               samba? ( dev-libs/openssl )
-               berkdb? ( sys-libs/db )
-               smbkrb5passwd? (
-                       dev-libs/openssl
-                       app-crypt/heimdal )
-               kerberos? ( virtual/krb5 )
-       )
-       selinux? ( sec-policy/selinux-openldap )"
-DEPEND="${RDEPEND}"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-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
-}
-
-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
-       if [ "${FORCE_UPGRADE}" != "1" ]; then
-               die "You need to upgrade your database first"
-       else
-               eerror "You have the magical FORCE_UPGRADE=1 in place."
-               eerror "Don't say you weren't warned about data loss."
-       fi
-}
-
-pkg_setup() {
-       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_prepare() {
-       # 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 \
-               "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
-               "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-       # bug #116045 - still present in 2.4.17
-       epatch "${FILESDIR}"/${PN}-2.4.17-contrib-smbk5pwd.patch
-
-       # bug #189817
-       epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-       cd "${S}"/build
-       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"
-
-       # wrong assumption that /bin/sh is /bin/bash
-       sed -i \
-               -e 's|/bin/sh|/bin/bash|g' \
-               "${S}"/tests/scripts/* || die "sed failed"
-}
-
-build_contrib_module() {
-       # <dir> <sources> <outputname>
-       cd "${S}/contrib/slapd-modules/$1"
-       einfo "Building contrib-module: $3"
-       $(tc-getCC) -shared \
-               -I../../../include -I../../../servers/slapd ${CFLAGS} -fPIC \
-               ${LDFLAGS} -o $3.so $2 || die "building $3 failed"
-}
-
-src_configure() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       use debug && myconf="${myconf} $(use_enable debug)"
-
-       # ICU usage is not configurable
-       export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)"
-
-       if ! use minimal ; then
-               # backends
-               myconf="${myconf} --enable-slapd"
-               if use berkdb ; then
-                       einfo "Using Berkeley DB for local backend"
-                       myconf="${myconf} --enable-bdb --enable-hdb"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir)
-               else
-                       ewarn
-                       ewarn "Note: if you disable berkdb, you can only use remote-backends!"
-                       ewarn
-                       ebeep 5
-                       myconf="${myconf} --disable-bdb --disable-hdb"
-               fi
-               for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
-                       myconf="${myconf} --enable-${backend}=mod"
-               done
-
-               myconf="${myconf} $(use_enable perl perl mod)"
-
-               if use odbc ; then
-                       local odbc_lib="unixodbc"
-                       use iodbc && odbc_lib="iodbc"
-                       myconf="${myconf} --enable-sql=mod --with-odbc=${odbc_lib}"
-               fi
-
-               # slapd options
-               myconf="${myconf} $(use_enable crypt) $(use_enable slp)"
-               myconf="${myconf} $(use_enable samba lmpasswd)"
-               if use experimental ; then
-                       myconf="${myconf} --enable-dynacl"
-                       myconf="${myconf} --enable-aci=mod"
-               fi
-               for option in aci cleartext modules rewrite rlookups slapi; do
-                       myconf="${myconf} --enable-${option}"
-               done
-
-               # slapd overlay options
-               # Compile-in the syncprov, the others as module
-               myconf="${myconf} --enable-syncprov=yes"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-       else
-               myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb"
-               myconf="${myconf} --disable-overlays"
-       fi
-
-       # basic functionality stuff
-       myconf="${myconf} $(use_enable ipv6)"
-       myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)"
-       myconf="${myconf} $(use_enable tcpd wrappers)"
-
-       local ssl_lib="no"
-       if use ssl || ( use ! minimal && use samba ) ; then
-               ssl_lib="openssl"
-               use gnutls && ssl_lib="gnutls"
-       fi
-
-       myconf="${myconf} --with-tls=${ssl_lib}"
-
-       for basicflag in dynamic local proctitle shared static syslog; do
-               myconf="${myconf} --enable-${basicflag}"
-       done
-
-       STRIP=/bin/true \
-       econf \
-               --libexecdir=/usr/$(get_libdir)/openldap \
-               ${myconf}
-}
-
-src_compile() {
-       emake depend || die "emake depend failed"
-       emake CC=$(tc-getCC) AR=$(tc-getAR) || die "emake failed"
-
-       if ! use minimal ; then
-               if use smbkrb5passwd ; then
-                       einfo "Building contrib-module: smbk5pwd"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-
-                       emake \
-                               DEFS="-DDO_SAMBA -DDO_KRB5" \
-                               KRB5_INC="$(krb5-config --cflags)" \
-                               CC=$(tc-getCC) libexecdir="/usr/$(get_libdir)/openldap" \
-                               || die "emake smbk5pwd failed"
-               fi
-
-               if use kerberos ; then
-                       cd "${S}/contrib/slapd-modules/passwd"
-                       einfo "Building contrib-module: pw-kerberos"
-                       $(tc-getCC) -shared \
-                               -I../../../include \
-                               ${CFLAGS} \
-                               $(krb5-config --cflags) \
-                               -DHAVE_KRB5 -fPIC \
-                               ${LDFLAGS} \
-                               -o pw-kerberos.so \
-                               kerberos.c || die "building pw-kerberos failed"
-               fi
-               # We could build pw-radius if GNURadius would install radlib.h
-               cd "${S}/contrib/slapd-modules/passwd"
-               einfo "Building contrib-module: pw-netscape"
-               $(tc-getCC) -shared \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -fPIC \
-                       ${LDFLAGS} \
-                       -o pw-netscape.so \
-                       netscape.c || die "building pw-netscape failed"
-
-               build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-               build_contrib_module "allop" "allop.c" "overlay-allop"
-               build_contrib_module "autogroup" "autogroup.c" "autogroup"
-               build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-               build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-               # lastmod may not play well with other overlays
-               build_contrib_module "lastmod" "lastmod.c" "lastmod"
-               build_contrib_module "nops" "nops.c" "nops-overlay"
-           build_contrib_module "trace" "trace.c" "trace"
-               # build slapi-plugins
-               cd "${S}/contrib/slapi-plugins/addrdnvalues"
-               einfo "Building contrib-module: addrdnvalues plugin"
-               $(tc-getCC) -shared \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -fPIC \
-                       ${LDFLAGS} \
-                       -o libaddrdnvalues-plugin.so \
-                       addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-
-       fi
-}
-
-src_test() {
-       cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${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/
-
-       # initial data storage dir
-       keepdir /var/lib/openldap-data
-       fowners ldap:ldap /var/lib/openldap-data
-       fperms 0700 /var/lib/openldap-data
-
-       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}"
-
-       # 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
-               # use our config
-               rm "${D}"etc/openldap/slapd.conf
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # install our own init scripts
-               newinitd "${FILESDIR}"/slapd-initd slapd
-               newconfd "${FILESDIR}"/slapd-confd slapd
-               if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd
-               fi
-
-               if use smbkrb5passwd ; then
-                       einfo "Install the smbk5pwd module"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install-mod || die "emake install smbk5pwd failed"
-                       newdoc README smbk5pwd-README
-               fi
-
-               einfo "Installing contrib modules"
-               cd "${S}/contrib/slapd-modules"
-               insinto /usr/$(get_libdir)/openldap/openldap
-               doins  */*.so
-               docinto contrib
-               newdoc addpartial/README addpartial-README
-               newdoc allop/README allop-README
-               doman allop/slapo-allop.5
-               newdoc autogroup/README autogroup-README
-               newdoc denyop/denyop.c denyop-denyop.c
-               newdoc dsaschema/README dsaschema-README
-               doman lastmod/slapo-lastmod.5
-               doman nops/slapo-nops.5
-               newdoc passwd/README passwd-README
-               cd "${S}/contrib/slapi-plugins"
-               insinto /usr/$(get_libdir)/openldap/openldap
-               doins  */*.so
-               docinto contrib
-               newdoc addrdnvalues/README addrdnvalues-README
-       fi
-}
-
-pkg_preinst() {
-       # keep old libs if any
-       preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-
-               # These lines force the permissions of various content to be correct
-               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}
-       fi
-
-       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 "---"
-       elog "An example file for tuning BDB backends with openldap is"
-       elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-
-       preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
-}
diff --git a/net-nds/openldap/openldap-2.4.19.ebuild b/net-nds/openldap/openldap-2.4.19.ebuild
deleted file mode 100644 (file)
index 3ed7b0a..0000000
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19.ebuild,v 1.12 2010/01/12 20:05:41 cardoe Exp $
-
-EAPI="2"
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
-
-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 ~sparc-fbsd ~x86-fbsd"
-
-IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
-IUSE_CONTRIB="smbkrb5passwd kerberos"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-# openssl is needed to generate lanman-passwords required by samba
-RDEPEND="sys-libs/ncurses
-       icu? ( dev-libs/icu )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( !gnutls? ( dev-libs/openssl )
-               gnutls? ( net-libs/gnutls ) )
-       sasl? ( dev-libs/cyrus-sasl )
-       !minimal? (
-               odbc? ( !iodbc? ( dev-db/unixODBC )
-                       iodbc? ( dev-db/libiodbc ) )
-               slp? ( net-libs/openslp )
-               perl? ( dev-lang/perl[-build] )
-               samba? ( dev-libs/openssl )
-               berkdb? ( sys-libs/db )
-               smbkrb5passwd? (
-                       dev-libs/openssl
-                       app-crypt/heimdal )
-               kerberos? ( virtual/krb5 )
-               cxx? ( dev-libs/cyrus-sasl )
-       )
-       selinux? ( sec-policy/selinux-openldap )"
-DEPEND="${RDEPEND}"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-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
-}
-
-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
-       if [ "${FORCE_UPGRADE}" != "1" ]; then
-               die "You need to upgrade your database first"
-       else
-               eerror "You have the magical FORCE_UPGRADE=1 in place."
-               eerror "Don't say you weren't warned about data loss."
-       fi
-}
-
-pkg_setup() {
-       if ! use sasl && use cxx ; then
-               die "To build the ldapc++ library you must emerge openldap with sasl support"
-       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_prepare() {
-       # 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 "${FILESDIR}"/${PN}-2.4.17-gcc44.patch
-
-       epatch \
-               "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
-               "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-       # bug #116045 - still present in 2.4.19
-       epatch "${FILESDIR}"/${PN}-2.4.19-contrib-smbk5pwd.patch
-
-       # bug #189817
-       epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-       # bug #233633
-       epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
-
-       cd "${S}"/build
-       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"
-
-       # wrong assumption that /bin/sh is /bin/bash
-       sed -i \
-               -e 's|/bin/sh|/bin/bash|g' \
-               "${S}"/tests/scripts/* || die "sed failed"
-}
-
-build_contrib_module() {
-       lt="${S}/libtool"
-       # <dir> <sources> <outputname>
-       cd "${S}/contrib/slapd-modules/$1"
-       einfo "Compiling contrib-module: $3"
-       "${lt}" --mode=compile --tag=CC \
-               "${CC}" \
-               -I../../../include -I../../../servers/slapd ${CFLAGS} \
-               -o ${2%.c}.lo -c $2 || die "compiling $3 failed"
-       einfo "Linking contrib-module: $3"
-       "${lt}" --mode=link --tag=CC \
-               "${CC}" -module \
-               ${CFLAGS} \
-               ${LDFLAGS} \
-               -rpath /usr/$(get_libdir)/openldap/openldap \
-               -o $3.la ${2%.c}.lo || die "linking $3 failed"
-}
-
-src_configure() {
-       local myconf
-
-       #Fix for glibc-2.8 and ucred. Bug 228457.
-       append-flags -D_GNU_SOURCE
-
-       use debug && myconf="${myconf} $(use_enable debug)"
-
-       # ICU usage is not configurable
-       export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)"
-
-       if ! use minimal ; then
-               # backends
-               myconf="${myconf} --enable-slapd"
-               if use berkdb ; then
-                       einfo "Using Berkeley DB for local backend"
-                       myconf="${myconf} --enable-bdb --enable-hdb"
-                       # We need to include the slotted db.h dir for FreeBSD
-                       append-cppflags -I$(db_includedir)
-               else
-                       ewarn
-                       ewarn "Note: if you disable berkdb, you can only use remote-backends!"
-                       ewarn
-                       ebeep 5
-                       myconf="${myconf} --disable-bdb --disable-hdb"
-               fi
-               for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
-                       myconf="${myconf} --enable-${backend}=mod"
-               done
-
-               myconf="${myconf} $(use_enable perl perl mod)"
-
-               myconf="${myconf} $(use_enable odbc sql mod)"
-               if use odbc ; then
-                       local odbc_lib="unixodbc"
-                       use iodbc && odbc_lib="iodbc"
-                       myconf="${myconf} --with-odbc=${odbc_lib}"
-               fi
-
-               # slapd options
-               myconf="${myconf} $(use_enable crypt) $(use_enable slp)"
-               myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)"
-               if use experimental ; then
-                       myconf="${myconf} --enable-dynacl"
-                       myconf="${myconf} --enable-aci=mod"
-               fi
-               for option in aci cleartext modules rewrite rlookups slapi; do
-                       myconf="${myconf} --enable-${option}"
-               done
-
-               # slapd overlay options
-               # Compile-in the syncprov, the others as module
-               myconf="${myconf} --enable-syncprov=yes"
-               use overlays && myconf="${myconf} --enable-overlays=mod"
-
-       else
-               myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb"
-               myconf="${myconf} --disable-overlays --disable-syslog"
-       fi
-
-       # basic functionality stuff
-       myconf="${myconf} $(use_enable ipv6)"
-       myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)"
-       myconf="${myconf} $(use_enable tcpd wrappers)"
-
-       local ssl_lib="no"
-       if use ssl || ( use ! minimal && use samba ) ; then
-               ssl_lib="openssl"
-               use gnutls && ssl_lib="gnutls"
-       fi
-
-       myconf="${myconf} --with-tls=${ssl_lib}"
-
-       for basicflag in dynamic local proctitle shared static; do
-               myconf="${myconf} --enable-${basicflag}"
-       done
-
-       tc-export CC AR CXX
-       STRIP=/bin/true \
-       econf \
-               --libexecdir=/usr/$(get_libdir)/openldap \
-               ${myconf}
-
-       if ! use minimal ; then
-                if use cxx ; then
-                       local myconf_ldapcpp
-                       myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include"
-                       cd "${S}/contrib/ldapc++"
-                       OLD_LDFLAGS="$LDFLAGS"
-                       OLD_CPPFLAGS="$CPPFLAGS"
-                       append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs
-                       append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs
-                       append-cppflags -I../../../include
-                       econf ${myconf_ldapcpp} \
-                               CC="${CC}" \
-                               CXX="${CXX}" \
-                               || die "econf ldapc++ failed"
-                       CPPFLAGS="$OLD_CPPFLAGS"
-                fi
-       fi
-}
-
-src_compile() {
-       emake depend || die "emake depend failed"
-       emake CC="${CC}" AR="${AR}" || die "emake failed"
-       lt="${S}/libtool"
-       export echo="echo"
-
-       if ! use minimal ; then
-                if use cxx ; then
-                       einfo "Building contrib library: ldapc++"
-                       cd "${S}/contrib/ldapc++"
-                       emake \
-                               CC="${CC}" CXX="${CXX}" \
-                               || die "emake ldapc++ failed"
-                fi
-
-               if use smbkrb5passwd ; then
-                       einfo "Building contrib-module: smbk5pwd"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-
-                       emake \
-                               DEFS="-DDO_SAMBA -DDO_KRB5" \
-                               KRB5_INC="$(krb5-config --cflags)" \
-                               CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \
-                               || die "emake smbk5pwd failed"
-               fi
-
-               if use kerberos ; then
-                       cd "${S}/contrib/slapd-modules/passwd"
-                       einfo "Compiling contrib-module: pw-kerberos"
-                       "${lt}" --mode=compile --tag=CC \
-                               "${CC}" \
-                               -I../../../include \
-                               ${CFLAGS} \
-                               $(krb5-config --cflags) \
-                               -DHAVE_KRB5 \
-                               -o kerberos.lo \
-                               -c kerberos.c || die "compiling pw-kerberos failed"
-                       einfo "Linking contrib-module: pw-kerberos"
-                       "${lt}" --mode=link --tag=CC \
-                               "${CC}" -module \
-                               ${CFLAGS} \
-                               ${LDFLAGS} \
-                               -rpath /usr/$(get_libdir)/openldap/openldap \
-                               -o pw-kerberos.la \
-                               kerberos.lo || die "linking pw-kerberos failed"
-               fi
-               # We could build pw-radius if GNURadius would install radlib.h
-               cd "${S}/contrib/slapd-modules/passwd"
-               einfo "Compiling contrib-module: pw-netscape"
-               "${lt}" --mode=compile --tag=CC \
-                       "${CC}" \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -o netscape.lo \
-                       -c netscape.c || die "compiling pw-netscape failed"
-               einfo "Linking contrib-module: pw-netscape"
-               "${lt}" --mode=link --tag=CC \
-                       "${CC}" -module \
-                       ${CFLAGS} \
-                       ${LDFLAGS} \
-                       -rpath /usr/$(get_libdir)/openldap/openldap \
-                       -o pw-netscape.la \
-                       netscape.lo || die "linking pw-netscape failed"
-
-               build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-               build_contrib_module "allop" "allop.c" "overlay-allop"
-               build_contrib_module "allowed" "allowed.c" "allowed"
-               build_contrib_module "autogroup" "autogroup.c" "autogroup"
-               build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-               build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-               # lastmod may not play well with other overlays
-               build_contrib_module "lastmod" "lastmod.c" "lastmod"
-               build_contrib_module "nops" "nops.c" "nops-overlay"
-           build_contrib_module "trace" "trace.c" "trace"
-               # build slapi-plugins
-               cd "${S}/contrib/slapi-plugins/addrdnvalues"
-               einfo "Building contrib-module: addrdnvalues plugin"
-               "${CC}" -shared \
-                       -I../../../include \
-                       ${CFLAGS} \
-                       -fPIC \
-                       ${LDFLAGS} \
-                       -o libaddrdnvalues-plugin.so \
-                       addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-
-       fi
-}
-
-src_test() {
-       cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-       lt="${S}/libtool"
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${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/
-
-       # initial data storage dir
-       keepdir /var/lib/openldap-data
-       fowners ldap:ldap /var/lib/openldap-data
-       fperms 0700 /var/lib/openldap-data
-
-       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}"
-
-       # 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
-               # use our config
-               rm "${D}"etc/openldap/slapd.conf
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${D}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
-                       elog "Adding $(basename ${x})"
-                       sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
-               done
-               sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               fowners root:ldap /etc/openldap/slapd.conf
-               fperms 0640 /etc/openldap/slapd.conf
-               cp "${configfile}" "${configfile}".default
-               eend
-
-               # install our own init scripts
-               newinitd "${FILESDIR}"/slapd-initd slapd
-               newconfd "${FILESDIR}"/slapd-confd slapd
-               if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd
-               fi
-
-                if use cxx ; then
-                       einfo "Install the ldapc++ library"
-                       cd "${S}/contrib/ldapc++"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed"
-                       newdoc README ldapc++-README
-                fi
-
-               if use smbkrb5passwd ; then
-                       einfo "Install the smbk5pwd module"
-                       cd "${S}/contrib/slapd-modules/smbk5pwd"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed"
-                       newdoc README smbk5pwd-README
-               fi
-
-               einfo "Installing contrib modules"
-               cd "${S}/contrib/slapd-modules"
-               for l in */*.la; do
-                       "${lt}" --mode=install cp ${l} \
-                               "${D}"usr/$(get_libdir)/openldap/openldap || \
-                               die "installing ${l} failed"
-               done
-               docinto contrib
-               newdoc addpartial/README addpartial-README
-               newdoc allop/README allop-README
-               doman allop/slapo-allop.5
-               newdoc autogroup/README autogroup-README
-               newdoc denyop/denyop.c denyop-denyop.c
-               newdoc dsaschema/README dsaschema-README
-               doman lastmod/slapo-lastmod.5
-               doman nops/slapo-nops.5
-               newdoc passwd/README passwd-README
-               cd "${S}/contrib/slapi-plugins"
-               insinto /usr/$(get_libdir)/openldap/openldap
-               doins  */*.so
-               docinto contrib
-               newdoc addrdnvalues/README addrdnvalues-README
-       fi
-}
-
-pkg_preinst() {
-       # keep old libs if any
-       preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0
-}
-
-pkg_postinst() {
-       if ! use minimal ; then
-               # You cannot build SSL certificates during src_install that will make
-               # binary packages containing your SSL key, which is both a security risk
-               # and a misconfiguration if multiple machines use the same key and cert.
-               if use ssl; then
-                       install_cert /etc/openldap/ssl/ldap
-                       chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               fi
-
-               # These lines force the permissions of various content to be correct
-               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}
-       fi
-
-       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 "---"
-       elog "An example file for tuning BDB backends with openldap is"
-       elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-
-       preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
-}