fix bug #39808, touching .keep files obsolete.

7 files changed, 29 insertions, 25 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 8d4fceecad7e..6fdaf7df9def 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/qmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.59 2004/01/29 03:29:09 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.60 2004/01/30 04:19:48 robbat2 Exp $
+
+  29 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r10.ebuild,
+  qmail-1.03-r8.ebuild, qmail-1.03-r9.ebuild:
+  fix bug #39808, touching .keep files obsolete.
 
   28 Jan 2004; Jon Portnoy <avenj@gentoo.org> qmail-1.03-r15.ebuild :
   AMD64 keywords.
diff --git a/net-mail/qmail/qmail-1.03-r10.ebuild b/net-mail/qmail/qmail-1.03-r10.ebuild
index 774558847d2e..e920093a6797 100644
--- a/net-mail/qmail/qmail-1.03-r10.ebuild
+++ b/net-mail/qmail/qmail-1.03-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r10.ebuild,v 1.24 2003/11/06 20:17:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r10.ebuild,v 1.25 2004/01/30 04:19:48 robbat2 Exp $
 
 inherit eutils
 
@@ -112,7 +112,7 @@ src_install() {
 	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
@@ -206,11 +206,11 @@ src_install() {
 	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
 	diropts -m 755 -o qmaill
 	dodir /var/log/qmail
-	touch ${D}/var/log/qmail/.keep
+	keepdir /var/log/qmail
 	dodir /var/log/qmail/qmail-send
-	touch ${D}/var/log/qmail/qmail-send/.keep
+	keepdir /var/log/qmail/qmail-send
 	dodir /var/log/qmail/qmail-smtpd
-	touch ${D}/var/log/qmail/qmail-smtpd/.keep
+	keepdir /var/log/qmail/qmail-smtpd
 
 	insinto /var/qmail/supervise/qmail-send
 	newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run
diff --git a/net-mail/qmail/qmail-1.03-r13.ebuild b/net-mail/qmail/qmail-1.03-r13.ebuild
index 2cf992220f48..96656c64ce7e 100644
--- a/net-mail/qmail/qmail-1.03-r13.ebuild
+++ b/net-mail/qmail/qmail-1.03-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r13.ebuild,v 1.5 2004/01/20 09:35:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r13.ebuild,v 1.6 2004/01/30 04:19:48 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha ~arm ~hppa ~mips"
+KEYWORDS="x86 ppc sparc alpha"
 DEPEND="virtual/glibc
 	sys-apps/groff
 	ssl? ( >=dev-libs/openssl-0.9.6g )
diff --git a/net-mail/qmail/qmail-1.03-r14.ebuild b/net-mail/qmail/qmail-1.03-r14.ebuild
index 5148664391bb..ea2fca123558 100644
--- a/net-mail/qmail/qmail-1.03-r14.ebuild
+++ b/net-mail/qmail/qmail-1.03-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r14.ebuild,v 1.4 2004/01/20 09:35:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r14.ebuild,v 1.5 2004/01/30 04:19:48 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -39,7 +39,7 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND="virtual/glibc
 	sys-apps/groff
 	ssl? ( >=dev-libs/openssl-0.9.6g )
diff --git a/net-mail/qmail/qmail-1.03-r15.ebuild b/net-mail/qmail/qmail-1.03-r15.ebuild
index 97b3075fac17..8a2949855342 100644
--- a/net-mail/qmail/qmail-1.03-r15.ebuild
+++ b/net-mail/qmail/qmail-1.03-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r15.ebuild,v 1.3 2004/01/29 03:29:09 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r15.ebuild,v 1.4 2004/01/30 04:19:48 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -38,7 +38,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 DEPEND="virtual/glibc
 	sys-apps/groff
 	ssl? ( >=dev-libs/openssl-0.9.6g )
diff --git a/net-mail/qmail/qmail-1.03-r8.ebuild b/net-mail/qmail/qmail-1.03-r8.ebuild
index 8ca55f2cda7f..5a99185c1f0f 100644
--- a/net-mail/qmail/qmail-1.03-r8.ebuild
+++ b/net-mail/qmail/qmail-1.03-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r8.ebuild,v 1.12 2003/11/06 20:17:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r8.ebuild,v 1.13 2004/01/30 04:19:48 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A modern replacement for sendmail which uses maildirs"
@@ -85,7 +85,7 @@ src_install() {
 	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
@@ -173,11 +173,11 @@ src_install() {
 	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
 	diropts -m 755 -o qmaill
 	dodir /var/log/qmail
-	touch ${D}/var/log/qmail/.keep
+	keepdir /var/log/qmail
 	dodir /var/log/qmail/qmail-send
-	touch ${D}/var/log/qmail/qmail-send/.keep
+	keepdir /var/log/qmail/qmail-send
 	dodir /var/log/qmail/qmail-smtpd
-	touch ${D}/var/log/qmail/qmail-smtpd/.keep
+	keepdir /var/log/qmail/qmail-smtpd
 
 	insinto /var/qmail/supervise/qmail-send
 	newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run
diff --git a/net-mail/qmail/qmail-1.03-r9.ebuild b/net-mail/qmail/qmail-1.03-r9.ebuild
index 21fd70bb5113..dcadd44951f3 100644
--- a/net-mail/qmail/qmail-1.03-r9.ebuild
+++ b/net-mail/qmail/qmail-1.03-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r9.ebuild,v 1.10 2003/11/06 20:17:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r9.ebuild,v 1.11 2004/01/30 04:19:48 robbat2 Exp $
 
 IUSE="ssl ldap"
 
@@ -105,7 +105,7 @@ src_install() {
 	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
@@ -193,11 +193,11 @@ src_install() {
 	chmod +t ${D}/var/qmail/supervise/qmail-smtpd
 	diropts -m 755 -o qmaill
 	dodir /var/log/qmail
-	touch ${D}/var/log/qmail/.keep
+	keepdir /var/log/qmail
 	dodir /var/log/qmail/qmail-send
-	touch ${D}/var/log/qmail/qmail-send/.keep
+	keepdir /var/log/qmail/qmail-send
 	dodir /var/log/qmail/qmail-smtpd
-	touch ${D}/var/log/qmail/qmail-smtpd/.keep
+	keepdir /var/log/qmail/qmail-smtpd
 
 	insinto /var/qmail/supervise/qmail-send
 	newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run