Cleanup [and testing CVS hook code, hence the slow cleanup].
authorRobin H. Johnson <robbat2@gentoo.org>
Sun, 8 Mar 2015 00:15:45 +0000 (00:15 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Sun, 8 Mar 2015 00:15:45 +0000 (00:15 +0000)
Package-Manager: portage-2.2.17/cvs/Linux x86_64

net-nds/openldap/ChangeLog
net-nds/openldap/Manifest
net-nds/openldap/openldap-2.4.28-r1.ebuild [deleted file]

index ce6f3798350ea7f8c4351b0d849b0794ab04ded5..ad9acaf71eeadb3967b095bd732efa58580bb5d8 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.493 2015/03/08 00:07:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.494 2015/03/08 00:15:40 robbat2 Exp $
+
+  08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org>
+  -openldap-2.4.28-r1.ebuild:
+  Cleanup.
 
   08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org> -openldap-2.4.24.ebuild:
   Cleanup.
index d25ac16e18a1b0c09385cd9b78f3f77369354b83..1a90c43196c8892f7b970f2249b7640fb3c334de 100644 (file)
@@ -36,7 +36,6 @@ AUX slapd.service.conf 443 SHA256 462adb8f6fc1a9f742c792b4392346d30949eed523453d
 AUX slapd.tmpfilesd 90 SHA256 8039a0190bd5b701f29661c63e03e4fb439a8eb50fdd7be5ce96a7f7f3aaeb1b SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec WHIRLPOOL 2fb28068fa2b8113041544bd88a58060aa309b012b58bd903b58e2ff853fec0882de2f2b0fa28da76eaa5550dcccbe7ed6e8b792df7f788b6bf0d324a0dc0e52
 AUX slurpd-initd 494 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff SHA512 d47c8ea473f3d9495583449d455581766b7bd3b913a314d720c514cfeae6b4e01973f1f2aa060f5cc5f2335fe57c2f4e78a56d02ba7859fc113cf69f6c233359 WHIRLPOOL 60bd05139e6af4710d265e71efe4aacaec468ae4289e8524870f157c2a36f427ef480cefed0f94c53414a2e31864127a6f5bf9ce3ebe0a217ff5e6aeaea020ef
 DIST openldap-2.3.43.tgz 3803011 SHA256 d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba8dc16974bff9f51a9f3d37e1 SHA512 2b0ebb35adbeed34673e1a55cc7a89b348ddee7ad6ce7f915ca3745198cee992aba7281bf0d56197dcfd59665935d5d3764db0ba487975e4dbc2a2507d6ea7a6 WHIRLPOOL 7457112bbad83d75f7ad01230da97511a8d983a98f7e31357dbffd79a7ed7e53057af781002cae8c610d3ad7834dfeefbd7f223798d45aea8cd00b70f5ee0e39
-DIST openldap-2.4.28.tgz 5436340 SHA256 332ab5b13dbc0f85b1112d7a6f3485069108bfbd4d2603c8b548adbfa9bbc371 SHA512 585f01cac1facf4e703b975d8132fe3cc4c5687d315f5825c5456971cdafae5f08f006c440764898789c1c87619428ac9629de0a499b83c3f63b7e4ccd46f1fe WHIRLPOOL 2c1b22b479a2f89e34f27831d5db8dae89a647c5368c862d9e9fbdc45840a5f352ec2be54d6acfc536dfb050d9941202efa627cd39972392e416397c281209c7
 DIST openldap-2.4.30.tgz 5440261 SHA256 fc013e528616f8578d9f221409c48af9b8937a62005e0bec88f6f1c4c8ff3d81 SHA512 89f032b069dc54cfe0c3149b85c5fedaf89b6b706c368da22852fed51c2574cb703823db1f4c52a9422d5274d4e70497f270fd558985675ab274d6025678c6f3 WHIRLPOOL 86009c7c269f9a0db93ba72e0aec04c15a5f89f39601468a2064fa814815d50a86e8a812979e060361a4f342ec5f21077d0ac5cc837d0c6b3e7af6dd926bc296
 DIST openldap-2.4.35.tgz 5486240 SHA256 16100374c147df0d82a5c52ca60da5eca1a5ea8b5a187467d40a78e3691e9eeb SHA512 b39232b4bab7ecb0ae14961adaa555590ca24ecbaeb3d94ea251e2de3bf7425ce364a2a488f9745fae17f106cdf198c852c73b5f2b910d329c598db435d6b31d WHIRLPOOL dccdbb7e858da3a5a6bec31956e13acac3ec604c4d40b88ff64ea9741feb32e70e7a9113f0e147996728214f494f8a858a55cbf6ceb1d5a8c6cc27e4aed44629
 DIST openldap-2.4.38.tgz 5506085 SHA256 88209a3599ec5d9354fc09bbe29b99db1ffa1b612127c06bad0c5265d0b31fd1 SHA512 df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666 WHIRLPOOL bb6a19b353f9dcde07afe78052ce9d5db5a2aaa09236b69d22da0879e74c4de8587312bad66939702db30af779f7ee9720ad792b73d225f004a1a90d80a6fed1
@@ -47,7 +46,6 @@ DIST rfc2307bis.schema-20120525 11922 SHA256 41f90e2eafab34925b8223887fa378fc4bb
 DIST rfc2307bis.schema-20140524 12262 SHA256 6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e WHIRLPOOL 40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de
 EBUILD openldap-2.3.43-r3.ebuild 18130 SHA256 6b80a022b58cddd5234af88b26704ae8673a087eeaf33780e77aefe9764ab9e4 SHA512 02539369713bebb149d1fb7327ac2ac0f7df3211320755bce17e46297941c8ac0015d89e6836f7896fe4c2807c1a705f079eaab0f1c22d27c740e423560029f3 WHIRLPOOL 20784ec12fd826a07a1f26154b3c26b2b82df2f8c70a75a1346b7e48cdc9655da1009e2d1760a010392def997f10f9f5b39ab860fe9562b3377251e25c71a7f0
 EBUILD openldap-2.3.43-r4.ebuild 18322 SHA256 32459f254d843acdff9a25fc0892b8fbaf810f9f8959bd4f67fe69794a4de1b0 SHA512 62c104c1d7db911524a79bc557bca1fa561e771c097397369244944bdbfb05bf0d6b7edd4ca866d33121dd52001d786b0328dd2fb9b217df8a8941378dec7641 WHIRLPOOL 0dd83b2806534ddd830b013059ce3e5edb4b2f05c3ac679d433c01f1dedb479246f5703ca61a6f3f42c3e2e4c03ec65a994fffbdd784375af804eba9bfc7e0b5
-EBUILD openldap-2.4.28-r1.ebuild 22002 SHA256 9980b9e7df99c662074dbc0aaaa4ab4daab6e0de7bec1492529526a39bdcc013 SHA512 0e6cf1678c90fdc3ece660af52228fefb03534978682ddef9304400863f815489799f0e9253f0a2788c4da9dd5c9e635fcf2d120d788488acdc6f34e74121bdb WHIRLPOOL dbb0087d8fd713c27314ecdb8a8a0584f8bba73c93cf9e98b42a8a2c66341228c55c4694997123abb9244664ba6c9763caff8a169730874c08b5c7cb23037a7d
 EBUILD openldap-2.4.30.ebuild 22020 SHA256 5742f38c245d0185c7feec8fd47ddbc40dfbe7ee88c36d16bd8984355c92e038 SHA512 52ec9c2a1fce93589314456de2c55bdab098d3327014d85cca55e83f86c59a183fd854493c4306d5ea32d7de9c2b78dac15ab44b3ce60eb193a99ae2961a29d2 WHIRLPOOL 8be58832c9c0c78381e168fee2fa67bedbdbf990c142c5784ce2adc02a864c1c4020a93d072bd2ab98b56f2782c5741f79a69543fe4cce18a2323fd9d9d7d476
 EBUILD openldap-2.4.35-r1.ebuild 22450 SHA256 6987728b036ceef21a0e0a1cb989bdb16649c74d4b4484b605282b8760aa4024 SHA512 c96e2dc7a71166b6c831e99139546dd9dee2e75c2a4a5a932a99d0db4fe407c155ce0b97b5793297995932fbce64210fd76a78e5190db9055866868b926b0cd7 WHIRLPOOL 208f161090d1cff405fa58842b9818a67f44afa6c41f5a4197eb113bf4e63ccc21d726af7c7ea1b4844702ecd6c68e9da2833b3a37bcba4d0bd38be958204853
 EBUILD openldap-2.4.38-r2.ebuild 24008 SHA256 69069ef4ec0cc311c3513b1487daa53deee6687a4e5679b165da02404af9aa6f SHA512 b762789712f266887672f6c36ef1b95654d0681855958c76a1200d564d625dfd76161d5dd8f5b7b1992d1c2729b70e23398530d672af463282715ba0166eb6ce WHIRLPOOL b94656976e6f30a451512dc3904c33bd39f0647b903f5a926e1e1a14b059cc5a26123491bd28cb064145c8fa68c78cebe292facbfe114e81e64f30249b628ecc
@@ -55,5 +53,5 @@ EBUILD openldap-2.4.39.ebuild 24012 SHA256 7097370f065bd4e6001be5b1e91aabca01702
 EBUILD openldap-2.4.40-r2.ebuild 26227 SHA256 2fac256a6c93c5098ddf67f18bd9a8cb71a706d0fb8fe7e78aa0dda257550628 SHA512 b2d6f3320749ebd91c8a62834d87dac4f7840d6aae8d3ed698108fc2e7a42f9d83043ef8bc8892031e96208377d763a4010321ce0469a36d76e4338a43f0107d WHIRLPOOL 333ab08c7a2a0345d221156bdf7bfd9ea88bad942b0d66ed21652ac0dbfd628904ec62f5a2f7bd1dcc83f6dee0563d8b69a79db4890966b654cfc74eb9ad704e
 EBUILD openldap-2.4.40-r3.ebuild 26233 SHA256 85868ef21a22a604537f419f8044966d9f30299c58e11411d81152342a791801 SHA512 4420594ab4483046a997e30f1b7cefc1a3ec38dec0183f941af83a6f255b2d55a015e89c90fbc3a4bf46e113d2a94fe34a35db9de6be57d690ab9c0e1256468a WHIRLPOOL 0e5c7fcce630bb4bd5dfc0e774a53de5cdebe4d34fd541f05707786ef3e932aaab9d584f93ba3815cf77ac83c56187a8e8440dfb42b5636ce7c692c4f0a3e5ad
 EBUILD openldap-2.4.40.ebuild 26665 SHA256 de9e846d0c1576dceb0fb8fb26123a4ba7078786a425d2af76ea4b9efedae7f2 SHA512 e52158c029504321199c5dc495c2f88d00d298fc19eda768cb3895d5d1f5e5afdfb8e21cfe55e322ca646c4d5125b8340ae03b7ff7147effe7e4d38a82f29d67 WHIRLPOOL 9a060d2ea77c2ca4587d481b47938a57e30c2027d831ee615f3e1fddc324f59d0b1dfc38b7bba762f8417ddf728f6a79397c4ad74c8d1d4e15feca63dab39232
-MISC ChangeLog 86837 SHA256 48b0ba76edc44efd3d71adf9991ec136affb794770ff7901d797a51fca98689f SHA512 3773af5a6f42f74094918817274ae12b465e22f1f50e14554fe3cfdfa295475c778c870b216a1d30376eef621ea8190fd8859ffc2b60c0295637378d8cd291e1 WHIRLPOOL 4b196209c4cec440270bfe7b28024b0734bd182b53e0018dcc856a7ffd792d80baa2e8c81cd8614662618a2923642d32ad089fc3a2eb1a9bddea9850925ec00a
+MISC ChangeLog 86932 SHA256 069b0f59dce943608e643eae940980110cbaf51124b260241bf640589bd842bf SHA512 6a7e22a3669714abae159572003d9702d67ba04407419b0ef1e3579b12470cb2a9401e0158bac0a013f493c776d80f67c5ee5fba6df845095523107a1a5fe924 WHIRLPOOL 5120557353bcd2f1faa4a503fac8af489ceee2c69b2bcf560cfdfd609fc735c4343d0491de3ec6614c1d5b3c45390a2291c2442ad0ff659992eeedff16a590bd
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild
deleted file mode 100644 (file)
index 6de7927..0000000
+++ /dev/null
@@ -1,662 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.19 2014/11/08 05:09:25 robbat2 Exp $
-
-EAPI="3"
-
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools user
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20100722
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz
-                http://simon.kisikew.org/src/ldap/${BIS_PN} -> ${BIS_P}"
-
-LICENSE="OPENLDAP GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-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
-       sys-devel/libtool
-       icu? ( dev-libs/icu )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? ( !gnutls? ( dev-libs/openssl )
-               gnutls? ( <net-libs/gnutls-3 ) )
-       sasl? ( dev-libs/cyrus-sasl )
-       !minimal? (
-               odbc? ( !iodbc? ( dev-db/unixODBC )
-                       iodbc? ( dev-db/libiodbc ) )
-               slp? ( net-libs/openslp )
-               perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-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-ldap )"
-DEPEND="${RDEPEND}
-       sys-apps/groff"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-openldap_filecount() {
-       local dir="$1"
-       find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-       # scan for all datadirs
-       openldap_datadirs=""
-       if [ -f "${EROOT}"/etc/openldap/slapd.conf ]; then
-               openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${EROOT}/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
-       have_files=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}`
-
-                               [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1
-
-                               # are we on the same branch?
-                               if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-                                       ewarn "   Versiontag doesn't match current major release!"
-                                       if [[ "${have_files}" == "1" ]] ; 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}"
-                               [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1
-                               if [[ "${have_files}" == "1" ]] ; 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
-                                       openldap_upgrade_howto
-                                       die "Please move the datadir ${CURRENT_TAGDIR} away"
-                               fi
-                       fi
-                       einfo
-               fi
-       done
-       [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present"
-
-       # Now we must check for the major version of sys-libs/db linked against.
-       SLAPD_PATH=${EROOT}/usr/$(get_libdir)/openldap/slapd
-       if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then
-               OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-                       | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-               NEWVER="$(use berkdb && db_findver sys-libs/db)"
-               local fail=0
-               if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then
-                       :
-                       # Nothing wrong here.
-               elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then
-                       eerror "        Your existing version of OpenLDAP was not built against"
-                       eerror "        any version of sys-libs/db, but the new one will build"
-                       eerror "        against ${NEWVER} and your database may be inaccessible."
-                       echo
-                       fail=1
-               elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then
-                       eerror "        Your existing version of OpenLDAP was built against"
-                       eerror "        sys-libs/db:${OLDVER}, but the new one will not be"
-                       eerror "        built against any version and your database may be"
-                       eerror "        inaccessible."
-                       echo
-                       fail=1
-               elif [ "${OLDVER}" != "${NEWVER}" ]; then
-                       eerror "        Your existing version of OpenLDAP was built against"
-                       eerror "        sys-libs/db:${OLDVER}, but the new one will build against"
-                       eerror "        ${NEWVER} and your database would be inaccessible."
-                       echo
-                       fail=1
-               fi
-               [ "${fail}" == "1" ] && openldap_upgrade_howto
-       fi
-
-       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
-       eerror "Additionally, rebuilding against different major versions of the"
-       eerror "sys-libs/db libraries will cause your database to be inaccessible."
-       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 '^(entry|context)CSN:' <${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
-       # Bug #322787
-       if use minimal && ! has_version "net-nds/openldap" ; then
-               einfo "No datadir scan needed, openldap not installed"
-       elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
-               einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-       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 "'"${EPREFIX}"'/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.28
-       epatch "${FILESDIR}"/${PN}-2.4.28-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
-
-       # bug #281495
-       epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
-
-       # bug #294350
-       epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
-
-       # unbreak /bin/sh -> dash
-       epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.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"
-
-       cd "${S}"
-       AT_NOEAUTOMAKE=yes eautoreconf
-}
-
-build_contrib_module() {
-       lt="${S}/libtool"
-       # <dir> <sources> <outputname>
-       cd "${S}/contrib/slapd-modules/$1"
-       einfo "Compiling contrib-module: $3"
-       # Make sure it's uppercase
-       local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')"
-       "${lt}" --mode=compile --tag=CC \
-               "${CC}" \
-               -D${define_name}=SLAPD_MOD_DYNAMIC \
-               -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 "${EPREFIX}"/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
-               # re-enable serverside overlay chains per bug #296567
-               # see ldap docs chaper 12.3.1 for details
-               myconf="${myconf} --enable-ldap"
-
-               # 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"
-                       if use iodbc ; then
-                               odbc_lib="iodbc"
-                               append-cppflags -I"${EPREFIX}"/usr/include/iodbc
-                       fi
-                       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
-
-       # connectionless ldap per bug #342439
-       append-cppflags -DLDAP_CONNECTIONLESS
-
-       tc-export CC AR CXX
-       STRIP=/bin/true \
-       econf \
-               --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-               ${myconf} || die "econf failed"
-}
-
-src_configure_cxx() {
-       # This needs the libraries built by the first build run.
-       # So we have to run it AFTER the main build, not just after the main
-       # configure.
-       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"
-                       LDFLAGS="${OLD_LDFLAGS}"
-                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++"
-                       src_configure_cxx
-                       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="${EPREFIX}/usr/$(get_libdir)/openldap" \
-                               || die "emake smbk5pwd failed"
-               fi
-
-               if use overlays ; then
-                       einfo "Building contrib-module: samba4"
-                       cd "${S}/contrib/slapd-modules/samba4"
-
-                       emake \
-                               CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \
-                               || die "emake samba4 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 "${EPREFIX}"/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 "${EPREFIX}"/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
-       use prefix || fowners ldap:ldap /var/lib/openldap-data
-       fperms 0700 /var/lib/openldap-data
-
-       echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-       echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-       echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-       # change slapd.pid location in configuration file
-       keepdir /var/run/openldap
-       use prefix || fowners ldap:ldap /var/run/openldap
-       fperms 0755 /var/run/openldap
-
-       if ! use minimal; then
-               # use our config
-               rm "${ED}"etc/openldap/slapd.conf
-               insinto /etc/openldap
-               newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
-               configfile="${ED}"etc/openldap/slapd.conf
-
-               # populate with built backends
-               ebegin "populate config with built backends"
-               for x in "${ED}"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${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-               use prefix || 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-2.4.28-r1 slapd
-               newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
-               if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${ED}"etc/init.d/slapd
-               fi
-               # If built without SLP, we don't need to be before avahi
-               use slp \
-                       || sed -i \
-                               -e '/before/{s/avahi-daemon//g}' \
-                               "${ED}"etc/init.d/slapd
-
-                if use cxx ; then
-                       einfo "Install the ldapc++ library"
-                       cd "${S}/contrib/ldapc++"
-                       emake DESTDIR="${D}" libexecdir="${EPREFIX}/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="${EPREFIX}/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed"
-                       newdoc README smbk5pwd-README
-               fi
-
-               if use overlays ; then
-                       einfo "Install the samba4 module"
-                       cd "${S}/contrib/slapd-modules/samba4"
-                       emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed"
-                       newdoc README samba4-README
-               fi
-
-               einfo "Installing contrib modules"
-               cd "${S}/contrib/slapd-modules"
-               for l in */*.la; do
-                       "${lt}" --mode=install cp ${l} \
-                               "${ED}"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
-
-               insinto /etc/openldap/schema
-               newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-       fi
-}
-
-pkg_preinst() {
-       # keep old libs if any
-       preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 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
-                       use prefix || chown ldap:ldap "${EROOT}"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
-
-               if use prefix; then
-                       # Warn about prefix issues with slapd
-                       eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-                       eerror "to start up, and requires that certain files directories be owned by"
-                       eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-                       eerror "directories, you will have to manually fix this yourself."
-               fi
-
-               # These lines force the permissions of various content to be correct
-               use prefix || chown ldap:ldap "${EROOT}"var/run/openldap
-               chmod 0755 "${EROOT}"var/run/openldap
-               use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default}
-               chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default}
-               use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data
-       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$(get_libname 0)
-}