more quotation fixes and fix bug #156090

Package-Manager: portage-2.1.2_rc4

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index dcc1f3a269ad2021e548d94ad7bf40b674142c45..e22a25381cdaa22c9cd6b7686fc8e94989d9a2ab 100644 (file)
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.237 2006/12/23 20:20:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.238 2006/12/25 14:49:06 jokey Exp $
+
+  25 Dec 2006; Markus Ullmann <jokey@gentoo.org> openldap-2.1.30-r9.ebuild,
+  openldap-2.2.28-r6.ebuild, openldap-2.3.30-r1.ebuild,
+  openldap-2.3.31.ebuild:
+  more quotation fixes and fix bug #156090
 
   23 Dec 2006; Markus Ullmann <jokey@gentoo.org> -files/gencert.sh-2.2.27,
   openldap-2.1.30-r9.ebuild, openldap-2.2.28-r5.ebuild,

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 16d64051e4c818e7ff516029198eed5a734c7ec0..b6a2e89aef92f12b5133373fdfc1d9d254bb38c2 100644 (file)
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -123,18 +123,18 @@ EBUILD openldap-2.1.30-r8.ebuild 8278 RMD160 2dcf044cf7f6e5a2f5ae36734e91a917174
 MD5 b6cef48c62a0322e3e7a8433225f5cad openldap-2.1.30-r8.ebuild 8278
 RMD160 2dcf044cf7f6e5a2f5ae36734e91a9171741ddae openldap-2.1.30-r8.ebuild 8278
 SHA256 f43bd32d81fa68f1d033655bdfd4ebdb1e2e65acc663dc9c4f66085553e3efea openldap-2.1.30-r8.ebuild 8278
-EBUILD openldap-2.1.30-r9.ebuild 8128 RMD160 349f19aa8e6240133c11c2ba3ce1d69a651be453 SHA1 6631411994d64c9285dd310e873322613c5477f5 SHA256 f3c9b3cc3b5664d63be8cd21943d944841527f573606d78dfcf371e9a39231ee
-MD5 a0413c504432e0da495d44183c283754 openldap-2.1.30-r9.ebuild 8128
-RMD160 349f19aa8e6240133c11c2ba3ce1d69a651be453 openldap-2.1.30-r9.ebuild 8128
-SHA256 f3c9b3cc3b5664d63be8cd21943d944841527f573606d78dfcf371e9a39231ee openldap-2.1.30-r9.ebuild 8128
+EBUILD openldap-2.1.30-r9.ebuild 8178 RMD160 352ba04c264a815e064aa27a94c8ac3bdd0f62a1 SHA1 f5c1e12183c684494293a16e9158efcd31ec35db SHA256 8adaa6d771ad9055e2a6554d271626a471f714c8d806f96b81af5e8e01fafce8
+MD5 fb5a0b0bbdad76d3ec310c2d89c53fa2 openldap-2.1.30-r9.ebuild 8178
+RMD160 352ba04c264a815e064aa27a94c8ac3bdd0f62a1 openldap-2.1.30-r9.ebuild 8178
+SHA256 8adaa6d771ad9055e2a6554d271626a471f714c8d806f96b81af5e8e01fafce8 openldap-2.1.30-r9.ebuild 8178
 EBUILD openldap-2.2.28-r5.ebuild 13821 RMD160 3dd962eb630dcb127131bf6dfe9f247ee9dab248 SHA1 c846de1e994bcd6d65371fd263e2d756950e311e SHA256 a00cb15ad1ad6e742197f5833ba8422b53dcb61e84140072bd9e04226d705143
 MD5 791fc29bf2c7059358f7bac7a6c7bfdb openldap-2.2.28-r5.ebuild 13821
 RMD160 3dd962eb630dcb127131bf6dfe9f247ee9dab248 openldap-2.2.28-r5.ebuild 13821
 SHA256 a00cb15ad1ad6e742197f5833ba8422b53dcb61e84140072bd9e04226d705143 openldap-2.2.28-r5.ebuild 13821
-EBUILD openldap-2.2.28-r6.ebuild 12023 RMD160 9a7365c9e8c9caf87b1ef17683d88ddd60cfd12a SHA1 24f96632ea06e0ed024ec892f3794c5f555b8320 SHA256 0b6f76a8126b75bbf180554e73854c9e4a53e7514242cd10d80ead0c04c0986f
-MD5 d24168d82938b630a300f8c721ef51ff openldap-2.2.28-r6.ebuild 12023
-RMD160 9a7365c9e8c9caf87b1ef17683d88ddd60cfd12a openldap-2.2.28-r6.ebuild 12023
-SHA256 0b6f76a8126b75bbf180554e73854c9e4a53e7514242cd10d80ead0c04c0986f openldap-2.2.28-r6.ebuild 12023
+EBUILD openldap-2.2.28-r6.ebuild 12065 RMD160 c62172c3e59d5c9f918a865dfdebba9d89d0bc4b SHA1 1153f8befbbe1b581fba71ff87e5c0abc265a602 SHA256 2ae8e1b9792dcda472c96a525429ec4b351c48e4b116a7727a8c6293420a7a61
+MD5 a0d15f76c54b00d40cac2aa29c14e8c7 openldap-2.2.28-r6.ebuild 12065
+RMD160 c62172c3e59d5c9f918a865dfdebba9d89d0bc4b openldap-2.2.28-r6.ebuild 12065
+SHA256 2ae8e1b9792dcda472c96a525429ec4b351c48e4b116a7727a8c6293420a7a61 openldap-2.2.28-r6.ebuild 12065
 EBUILD openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 SHA1 159add9ffaea974e73cc15edfde3cd48dd1ea31c SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42
 MD5 de5dd9e1c32a1488d167678c67afbaa4 openldap-2.3.24-r1.ebuild 14268
 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 openldap-2.3.24-r1.ebuild 14268
@@ -143,18 +143,18 @@ EBUILD openldap-2.3.27-r3.ebuild 17913 RMD160 4ef009d1299514bdda6667694e176632f0
 MD5 e85cfe3479b0b0f669d58e42c3887d99 openldap-2.3.27-r3.ebuild 17913
 RMD160 4ef009d1299514bdda6667694e176632f084f51a openldap-2.3.27-r3.ebuild 17913
 SHA256 5939ae06f7bcbcb692d25d06cc0ecab477ae9f5ad031b447e36bc5146341c1b2 openldap-2.3.27-r3.ebuild 17913
-EBUILD openldap-2.3.30-r1.ebuild 16737 RMD160 e9bff4f1d125ee134477ce7c35da4b43cd9a72b9 SHA1 aaa633352649b7643ed424ba83e55b06be1e07b9 SHA256 4993a344796799d6e8c3d5165d0c6fcd96d58e6602d20c22f0a17bda455cd53e
-MD5 238575a5434c08f92f9434a848bc82b0 openldap-2.3.30-r1.ebuild 16737
-RMD160 e9bff4f1d125ee134477ce7c35da4b43cd9a72b9 openldap-2.3.30-r1.ebuild 16737
-SHA256 4993a344796799d6e8c3d5165d0c6fcd96d58e6602d20c22f0a17bda455cd53e openldap-2.3.30-r1.ebuild 16737
-EBUILD openldap-2.3.31.ebuild 16734 RMD160 2f5eceb89ee40b5a0e5ce7bb7fdc452257be7aa5 SHA1 5e20a97e8e9dfa1d6032622f31ab856b27752b24 SHA256 ef22fb63e0caf0b0f21943bbaf11ebbb9b2a8559074180a0c121a85dc294c241
-MD5 addd96bd4bcbba6b006be32e93f61bfc openldap-2.3.31.ebuild 16734
-RMD160 2f5eceb89ee40b5a0e5ce7bb7fdc452257be7aa5 openldap-2.3.31.ebuild 16734
-SHA256 ef22fb63e0caf0b0f21943bbaf11ebbb9b2a8559074180a0c121a85dc294c241 openldap-2.3.31.ebuild 16734
-MISC ChangeLog 41089 RMD160 f2ad18c6f11267485eeba7b02c00c27374eff41e SHA1 ef50a820f1c17c3c0aab9e040a6196ee9319ce17 SHA256 866480975e7878ac1e150040171296460e5fadaa04ee4c2ac7069eaef5c3516a
-MD5 6e8d3e9ce77afe1c0a624704e187667f ChangeLog 41089
-RMD160 f2ad18c6f11267485eeba7b02c00c27374eff41e ChangeLog 41089
-SHA256 866480975e7878ac1e150040171296460e5fadaa04ee4c2ac7069eaef5c3516a ChangeLog 41089
+EBUILD openldap-2.3.30-r1.ebuild 16702 RMD160 fe8ed68bb49f2184443a928f149aad4008fdc654 SHA1 7de3e28c3fdf5cfd33642dabd029d3ae0e3ab423 SHA256 e661420c05c760161273446fe95cadd9312e8a5b394c2d920e9ec1287eeee6a8
+MD5 ad67c38598307c2bfe7a46b862357a50 openldap-2.3.30-r1.ebuild 16702
+RMD160 fe8ed68bb49f2184443a928f149aad4008fdc654 openldap-2.3.30-r1.ebuild 16702
+SHA256 e661420c05c760161273446fe95cadd9312e8a5b394c2d920e9ec1287eeee6a8 openldap-2.3.30-r1.ebuild 16702
+EBUILD openldap-2.3.31.ebuild 16699 RMD160 d757678fa4973aaeeed3001e79468ef6c4e05bc4 SHA1 96b8047b838d0e3c6a9f04eb807f503b6e1fc816 SHA256 a8daba227a393e22674739048e56e8632c275317dcd4e4164ca587decea0a708
+MD5 31605cb83e52ec96f53d240e57735812 openldap-2.3.31.ebuild 16699
+RMD160 d757678fa4973aaeeed3001e79468ef6c4e05bc4 openldap-2.3.31.ebuild 16699
+SHA256 a8daba227a393e22674739048e56e8632c275317dcd4e4164ca587decea0a708 openldap-2.3.31.ebuild 16699
+MISC ChangeLog 41291 RMD160 0d904274dcbb1f0a2a00907f9922a416502bdcd1 SHA1 23bd39008c85f77142d2a89110a2592ce123c5e5 SHA256 b59ad56c7e4089a1e5530193a4862998541e57b6731dd45b0298a6700648edb9
+MD5 7d3a00acf1f4c8a5546d7c8dabb27313 ChangeLog 41291
+RMD160 0d904274dcbb1f0a2a00907f9922a416502bdcd1 ChangeLog 41291
+SHA256 b59ad56c7e4089a1e5530193a4862998541e57b6731dd45b0298a6700648edb9 ChangeLog 41291
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -186,7 +186,7 @@ SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFjZGGz974XjDVpbkRAisQAKCi4MeOBENYoyQN45HwRWT5dgUwuACdGy3E
-Vp8m5Ma8RJkKJtAAcR6kI1I=
-=MjnM
+iD8DBQFFj+cwz974XjDVpbkRAuqIAJ4zifhGbA13PK0qgXZlm1yo6QaY2ACfRLqh
+G2A+EoWQJ25WEXpYSTHks+A=
+=ToFT
 -----END PGP SIGNATURE-----

diff --git a/net-nds/openldap/openldap-2.1.30-r9.ebuild b/net-nds/openldap/openldap-2.1.30-r9.ebuild
index fdc9649d117c45ee7f22223e9dbaff7593c40231..02a963b178e6c35c8fefa918e2e11764dc69cb3a 100644 (file)
--- a/net-nds/openldap/openldap-2.1.30-r9.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r9.ebuild
@@ -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.1.30-r9.ebuild,v 1.2 2006/12/23 20:20:55 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r9.ebuild,v 1.3 2006/12/25 14:49:06 jokey Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -166,9 +166,9 @@ src_test() {
 }
 
 src_install() {
-       emake DESTDIR=${D} install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
 
-       dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
+       dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE "${FILESDIR}"/DB_CONFIG.fast.example
        docinto rfc ; dodoc doc/rfc/*.txt
 
        # make state directories
@@ -180,7 +180,7 @@ src_install() {
 
        # manually remove /var/tmp references in .la
        # because it is packaged with an ancient libtool
-       for x in ${D}/usr/lib/lib*.la; do
+       for x in "${D}"usr/lib/lib*.la; do
                sed -i -e "s:-L${S}[/]*libraries::" ${x}
        done
 
@@ -188,34 +188,32 @@ src_install() {
        keepdir /var/run/openldap
        fowners ldap:ldap /var/run/openldap
        fperms 0755 /var/run/openldap
-       for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-               sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-               sed -e "/database\tbdb$/acheckpoint     32      30 # <kbyte> <min>" -i ${D}/${f}
+       for f in etc/openldap/slapd.conf etc/openldap/slapd.conf.default; do
+               sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i "${D}"${f}
+               sed -e "/database\tbdb$/acheckpoint     32      30 # <kbyte> <min>" -i "${D}"${f}
                fowners root:ldap ${f}
                fperms 0640 ${f}
        done
 
        # install our own init scripts
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/2.0/slapd slapd
-       newexe ${FILESDIR}/2.0/slurpd slurpd
-       insinto /etc/conf.d
-       newins ${FILESDIR}/2.0/slapd.conf slapd
+       newinitd "${FILESDIR}"/2.0/slapd slapd
+       newinitd "${FILESDIR}"/2.0/slurpd slurpd
+       newconfd "${FILESDIR}"/2.0/slapd.conf slapd
 
        # install MDK's ssl cert script
        if use ssl || use samba; then
                dodir /etc/openldap/ssl
                exeinto /etc/openldap/ssl
-               doexe ${FILESDIR}/gencert.sh
+               doexe "${FILESDIR}"/gencert.sh
        fi
 }
 
 pkg_postinst() {
        if use ssl; then
                # make a self-signed ssl cert (if there isn't one there already)
-               if [ ! -e /etc/openldap/ssl/ldap.pem ]
+               if [ ! -e "${ROOT}"/etc/openldap/ssl/ldap.pem ]
                then
-                       cd /etc/openldap/ssl
+                       cd "${ROOT}"etc/openldap/ssl
                        yes "" | sh gencert.sh
                        chmod 640 ldap.pem
                        chown root:ldap ldap.pem
@@ -227,13 +225,13 @@ pkg_postinst() {
        # Since moving to running openldap as user ldap there are some
        # permissions problems with directories and files.
        # Let's make sure these permissions are correct.
-       chown ldap:ldap /var/run/openldap
-       chmod 0755 /var/run/openldap
-       chown root:ldap /etc/openldap/slapd.conf
-       chmod 0640 /etc/openldap/slapd.conf
-       chown root:ldap /etc/openldap/slapd.conf.default
-       chmod 0640 /etc/openldap/slapd.conf.default
-       chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+       chown ldap:ldap "${ROOT}"var/run/openldap
+       chmod 0755 "${ROOT}"var/run/openldap
+       chown root:ldap "${ROOT}"etc/openldap/slapd.conf
+       chmod 0640 "${ROOT}"etc/openldap/slapd.conf
+       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}
 
        # notes from bug #41297, bug #41039
        if use ssl; then

diff --git a/net-nds/openldap/openldap-2.2.28-r6.ebuild b/net-nds/openldap/openldap-2.2.28-r6.ebuild
index 26b8f3de3aaf957b65ba77accd88eeb90cd46501..03ef355cb1853f79b612165a5c9ec96bf95c2cf4 100644 (file)
--- a/net-nds/openldap/openldap-2.2.28-r6.ebuild
+++ b/net-nds/openldap/openldap-2.2.28-r6.ebuild
@@ -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.2.28-r6.ebuild,v 1.2 2006/12/23 20:20:55 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r6.ebuild,v 1.3 2006/12/25 14:49:06 jokey Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -220,8 +220,8 @@ src_compile() {
                --libexecdir=/usr/$(get_libdir)/openldap \
                ${myconf} || die "configure failed"
 
-       make depend || die "make depend failed"
-       make || die "make failed"
+       emake depend || die "make depend failed"
+       emake || die "make failed"
 
        # special kerberos stuff
        tc-export CC
@@ -239,7 +239,7 @@ src_test() {
 }
 
 src_install() {
-       make DESTDIR=${D} install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
 
        dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE "${FILESDIR}"/DB_CONFIG.fast.example
        docinto rfc ; dodoc doc/rfc/*.txt
@@ -255,13 +255,13 @@ src_install() {
                fperms 0700 /var/lib/openldap-${x}
        done
 
-       echo "OLDPF='${PF}'" >${D}${OPENLDAP_VERSIONTAG}
-       echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_VERSIONTAG}
-       echo "# to track versions for upgrading." >>${D}${OPENLDAP_VERSIONTAG}
+       echo "OLDPF='${PF}'" >"${D}"${OPENLDAP_VERSIONTAG}
+       echo "# do NOT delete this. it is used" >>"${D}"${OPENLDAP_VERSIONTAG}
+       echo "# to track versions for upgrading." >>"${D}"${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
+       for x in "${D}"usr/$(get_libdir)/lib*.la; do
                sed -i -e "s:-L${S}[/]*libraries::" ${x}
        done
 
@@ -273,32 +273,33 @@ src_install() {
        if ! use minimal; then
                # config modifications
                for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-                       sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-                       sed -e "/database\tbdb$/acheckpoint     32      30 # <kbyte> <min>" -i ${D}/${f}
+                       sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i "${D}"${f}
+                       sed -e "/database\tbdb$/acheckpoint     32      30 # <kbyte> <min>" -i "${D}"${f}
                        fowners root:ldap ${f}
                        fperms 0640 ${f}
                done
+
                # install our own init scripts
-               exeinto /etc/init.d
-               newexe "${FILESDIR}"/2.0/slapd slapd
-               newexe "${FILESDIR}"/2.0/slurpd slurpd
+               newinitd "${FILESDIR}"/2.0/slapd slapd
+               newinitd "${FILESDIR}"/2.0/slurpd slurpd
+               newconfd "${FILESDIR}"/2.0/slapd.conf slapd
+
                if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
+                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/{slapd,slurpd}
                fi
-               insinto /etc/conf.d
-               newins "${FILESDIR}"/2.0/slapd.conf slapd
+
                if use kerberos && [ -f "${S}"/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
                        insinto /usr/$(get_libdir)/openldap/openldap
                        doins "${S}"/contrib/slapd-modules/passwd/pw-kerberos.so || \
                        die "failed to install kerberos passwd module"
                fi
-       fi
 
-       # install MDK's ssl cert script
-       if use ssl || use samba; then
-               dodir /etc/openldap/ssl
-               exeinto /etc/openldap/ssl
-               doexe "${FILESDIR}"/gencert.sh
+               # install MDK's ssl cert script
+               if use ssl || use samba; then
+                       dodir /etc/openldap/ssl
+                       exeinto /etc/openldap/ssl
+                       doexe "${FILESDIR}"/gencert.sh
+               fi
        fi
 
        # keep old libs if needed
@@ -310,9 +311,9 @@ src_install() {
 pkg_postinst() {
        if use ssl; then
                # make a self-signed ssl cert (if there isn't one there already)
-               if [ ! -e /etc/openldap/ssl/ldap.pem ]
+               if [ ! -e "${ROOT}"etc/openldap/ssl/ldap.pem ]
                then
-                       cd /etc/openldap/ssl
+                       cd "${ROOT}"etc/openldap/ssl
                        yes "" | sh gencert.sh
                        chmod 640 ldap.pem
                        chown root:ldap ldap.pem
@@ -324,11 +325,11 @@ pkg_postinst() {
        # Since moving to running openldap as user ldap there are some
        # permissions problems with directories and files.
        # Let's make sure these permissions are correct.
-       chown ldap:ldap /var/run/openldap
-       chmod 0755 /var/run/openldap
-       chown root:ldap /etc/openldap/slapd.conf{,.default}
-       chmod 0640 /etc/openldap/slapd.conf{,.default}
-       chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+       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}
 
        if use ssl; then
                ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"

diff --git a/net-nds/openldap/openldap-2.3.30-r1.ebuild b/net-nds/openldap/openldap-2.3.30-r1.ebuild
index 5dd3200ac595df3dcb8f47874ead456075c34705..d2143ccd4be936b5726db2244f870d4fd391d0bb 100644 (file)
--- a/net-nds/openldap/openldap-2.3.30-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.30-r1.ebuild
@@ -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.30-r1.ebuild,v 1.2 2006/12/23 20:20:55 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.30-r1.ebuild,v 1.3 2006/12/25 14:49:06 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -387,15 +387,16 @@ src_install() {
                        fowners root:ldap ${f}
                        fperms 0640 ${f}
                done
+
                # install our own init scripts
-               exeinto /etc/init.d
-               newexe "${FILESDIR}"/2.0/slapd slapd
-               newexe "${FILESDIR}"/2.0/slurpd slurpd
+               newinitd "${FILESDIR}"/2.0/slapd slapd
+               newinitd "${FILESDIR}"/2.0/slurpd slurpd
+               newconfd "${FILESDIR}"/2.0/slapd.conf slapd
+
                if [ $(get_libdir) != lib ]; then
                        sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"/etc/init.d/{slapd,slurpd}
                fi
-               insinto /etc/conf.d
-               newins "${FILESDIR}"/2.0/slapd.conf slapd
+
                # install contributed modules
                docinto /
                if [ -e "${S}"/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];

diff --git a/net-nds/openldap/openldap-2.3.31.ebuild b/net-nds/openldap/openldap-2.3.31.ebuild
index 9e29133fc312f3141865c8284cb561c7d17e21a5..a714f77b1485d7c916723c502654ad2be4b93513 100644 (file)
--- a/net-nds/openldap/openldap-2.3.31.ebuild
+++ b/net-nds/openldap/openldap-2.3.31.ebuild
@@ -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.31.ebuild,v 1.2 2006/12/23 20:20:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.31.ebuild,v 1.3 2006/12/25 14:49:06 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -387,15 +387,16 @@ src_install() {
                        fowners root:ldap ${f}
                        fperms 0640 ${f}
                done
+
                # install our own init scripts
-               exeinto /etc/init.d
-               newexe "${FILESDIR}"/2.0/slapd slapd
-               newexe "${FILESDIR}"/2.0/slurpd slurpd
+               newinitd "${FILESDIR}"/2.0/slapd slapd
+               newinitd "${FILESDIR}"/2.0/slurpd slurpd
+               newconfd "${FILESDIR}"/2.0/slapd.conf slapd
+
                if [ $(get_libdir) != lib ]; then
                        sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"/etc/init.d/{slapd,slurpd}
                fi
-               insinto /etc/conf.d
-               newins "${FILESDIR}"/2.0/slapd.conf slapd
+
                # install contributed modules
                docinto /
                if [ -e "${S}"/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];