change to keepdir as per bug #35308

3 files changed, 30 insertions, 33 deletions

diff --git a/net-mail/qmail-ldap/ChangeLog b/net-mail/qmail-ldap/ChangeLog
index 015013be4cf5..c1ae0584e22b 100644
--- a/net-mail/qmail-ldap/ChangeLog
+++ b/net-mail/qmail-ldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/qmail-ldap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/ChangeLog,v 1.2 2003/12/14 23:11:37 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/ChangeLog,v 1.3 2003/12/26 01:14:58 robbat2 Exp $
+
+  25 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
+  qmail-ldap-1.03-r1.ebuild:
+  change to keepdir as per bug #35308
 
 *qmail-ldap-1.03-r1 (15 Dec 2003)
 
diff --git a/net-mail/qmail-ldap/Manifest b/net-mail/qmail-ldap/Manifest
index dffc1a0f6be6..4df173ca8d5a 100644
--- a/net-mail/qmail-ldap/Manifest
+++ b/net-mail/qmail-ldap/Manifest
@@ -1,35 +1,36 @@
-MD5 6179cb31698bb6c2061a486a317a1f54 ChangeLog 511
-MD5 d5a644e01d7ab6a655af176bc8a188f9 qmail-ldap-1.03-r1.ebuild 11842
-MD5 cdeca5e6a3d82ed7b85e372433576bb2 files/samples.ldif 821
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/Manifest,v 1.6 2003/12/26 01:15:15 robbat2 Exp $
+MD5 7f3931ccdee538ee5fcef1346a032009 qmail-ldap-1.03-r1.ebuild 11628
+MD5 a1dfc8f8d93c58b96aac427c543fab8f ChangeLog 632
 MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/rc 108
+MD5 931b3ed00571e8e2a22b550fcd1d7137 files/qmail-queue.patch.bz2 722
+MD5 3866e15deb8a69d44cacb5b3680d1b61 files/qmail-linksync.patch.bz2 687
+MD5 cdeca5e6a3d82ed7b85e372433576bb2 files/samples.ldif 821
+MD5 0078aede689ce77bc32e32124a5e7fbb files/homedir.patch.bz2 527
+MD5 1dcd3bb9666d5015bca6b7eb33478542 files/errno.patch.bz2 401
 MD5 b69ae80155ab4d0555b66a79ae5ab95d files/digest-qmail-ldap-1.03-r1 452
 MD5 c378c5845848ee31d70f0d05cbcf86be files/dot_qmail 12
-MD5 1dcd3bb9666d5015bca6b7eb33478542 files/errno.patch.bz2 401
-MD5 0078aede689ce77bc32e32124a5e7fbb files/homedir.patch.bz2 527
-MD5 1a590268c013010a19477f9eb7397972 files/qmail-control 805
-MD5 3866e15deb8a69d44cacb5b3680d1b61 files/qmail-linksync.patch.bz2 687
-MD5 931b3ed00571e8e2a22b550fcd1d7137 files/qmail-queue.patch.bz2 722
 MD5 8af1f30a164fbdec0d51d11ef82dcaa9 files/tls.patch.bz2 406
-MD5 04f43d57aee8dc0b8e2465eeb7035e2b files/control/ldapbasedn 19
+MD5 f0fff68af5993d02735358e3a3d3b12e files/qmail-control 804
 MD5 d24fa37b58967d2d8022c84c88148ed6 files/control/file 41
-MD5 44f0ea3c13cabc96782b1e26042865c4 files/control/defaultdelivery 11
-MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaultdomain 13
-MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaulthost 13
-MD5 4a4e6ef110d83f712d5df669e7ca3a0b files/control/dirmaker 24
+MD5 04f43d57aee8dc0b8e2465eeb7035e2b files/control/ldapbasedn 19
 MD5 f77794722007d48a2d7751684ac23580 files/control/ldaplogin 45
-MD5 91929a0ba1be35ed2656fc733674c210 files/control/ldapgid 5
-MD5 7a046b4c43e5e5848d27420909e096c2 files/control/qmail-pop3d-softlimit 9
-MD5 897316929176464ebc9ad085f31e7284 files/control/ldaplocaldelivery 2
+MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaultdomain 13
 MD5 0dbac736b055522776d091c24a941b38 files/control/ldapmessagestore 21
 MD5 40d7e85fdd014acc169817b5dc1c43da files/control/ldappassword 26
-MD5 b8419160170a41ae01abab13a3b887df files/control/ldapserver 10
+MD5 91929a0ba1be35ed2656fc733674c210 files/control/ldapgid 5
 MD5 0ce18f24e2bb34b7680aaf80ab44ec56 files/control/ldapuid 6
+MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaulthost 13
+MD5 b8419160170a41ae01abab13a3b887df files/control/ldapserver 10
+MD5 7a046b4c43e5e5848d27420909e096c2 files/control/qmail-pop3d-softlimit 9
+MD5 4a4e6ef110d83f712d5df669e7ca3a0b files/control/dirmaker 24
+MD5 897316929176464ebc9ad085f31e7284 files/control/ldaplocaldelivery 2
+MD5 44f0ea3c13cabc96782b1e26042865c4 files/control/defaultdelivery 11
 MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-pop3d-loglevel 2
-MD5 0ae1000c6026575b9a847a9cfa0badb4 files/control/qmail-smtpd-softlimit 8
 MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-start-loglevel 2
-MD5 34f7022d4bda6c19752a878f8da7289b files/supervise/run-qmailpop3dlog 100
+MD5 0ae1000c6026575b9a847a9cfa0badb4 files/control/qmail-smtpd-softlimit 8
 MD5 a04bed51dfb2bedba57a5b42e7eb71b9 files/supervise/run-qmailpop3d 448
+MD5 cc0cf4631ac9d86397660f91c62332b2 files/supervise/run-qmailsmtpd 270
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/supervise/run-qmailsmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/supervise/run-qmailsend 29
 MD5 834dad5113515d0f00981fdc1d07fa84 files/supervise/run-qmailsendlog 96
-MD5 cc0cf4631ac9d86397660f91c62332b2 files/supervise/run-qmailsmtpd 270
+MD5 23a2babf3049fe012de21c17e550b3e5 files/supervise/run-qmailsend 29
+MD5 34f7022d4bda6c19752a878f8da7289b files/supervise/run-qmailpop3dlog 100
diff --git a/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild b/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild
index c71dba6d808c..24cfc3698570 100644
--- a/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild
+++ b/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.3 2003/12/14 23:11:37 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.4 2003/12/26 01:14:58 robbat2 Exp $
 
 IUSE="ssl"
 
@@ -109,8 +109,7 @@ src_install() {
 		dodir /var/qmail/${i}
 	done
 
-	dodir /var/qmail/users
-	touch ${D}/var/qmail/users/.keep
+	keepdir /var/qmail/users
 
 	diropts -m 755 -o alias -g qmail
 	dodir /var/qmail/alias
@@ -202,14 +201,7 @@ src_install() {
 	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
 	chmod +t ${D}/var/qmail/supervise/qmail-pop3d
 	diropts -m 755 -o qmaill
-	dodir /var/log/qmail
-	touch ${D}/var/log/qmail/.keep
-	dodir /var/log/qmail/qmail-send
-	touch ${D}/var/log/qmail/qmail-send/.keep
-	dodir /var/log/qmail/qmail-smtpd
-	touch ${D}/var/log/qmail/qmail-smtpd/.keep
-	dodir /var/log/qmail/qmail-pop3d
-	touch ${D}/var/log/qmail/qmail-pop3d/.keep
+	keepdir /var/log/qmail /var/log/qmail/qmail-send /var/log/qmail/qmail-smtpd /var/log/qmail/qmail-pop3d
 
 	insinto /var/qmail/supervise/qmail-send
 	newins ${FILESDIR}/supervise/run-qmailsend run