--- openldap-2.3.24-r2.ebuild   2006-09-11 12:36:20.000000000 +0000
+++ openldap-2.3.27.ebuild      2006-09-18 10:20:39.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.24-r2.ebuild,v 1.3 2006/09/11 12:22:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.24-r2.ebuild,v 1.2 2006/06/16 10:20:26 jokey Exp $

 inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator

@@ -204,7 +204,7 @@
        # patch contrib modules
        if ! use minimal ; then
            cd ${S}/contrib
-           epatch ${FILESDIR}/${P}-contrib-smbk5pwd.patch
+           epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch
        fi
 }

@@ -212,8 +212,8 @@
        local myconf

        # HDB is only available with BerkDB
-       myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley --enable-hdb=mod'
-       myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm --disable-hdb'
+       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

@@ -421,8 +421,7 @@
                        newexe statslog ldapstatslog || \
                        die "failed to install ldapstatslog script"
                fi
-               if [ -e
-                       ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
+               if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
                then
                        cd ${S}/contrib/slapi-plugins/addrdnvalues
                        newdoc README README.contrib.addrdnvalues