QA: fixing chown user.group to user:group, bug #35127

8 files changed, 121 insertions, 115 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 8bdace874220..a687bb65c8a2 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.33 2003/10/04 09:32:52 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.34 2003/12/14 22:52:15 spider Exp $
+
+  14 Dec 2003; <spider@gentoo.org> cyrus-imapd-2.1.11-r1.ebuild,
+  cyrus-imapd-2.1.12.ebuild, cyrus-imapd-2.1.13.ebuild,
+  cyrus-imapd-2.1.14.ebuild, cyrus-imapd-2.1.15-r1.ebuild,
+  cyrus-imapd-2.1.15.ebuild:
+  QA: fixing chown user.group to user:group, bug #35127
 
 *cyrus-imapd-2.1.15-r1 (04 Oct 2003)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index f7a101192478..0e947c4413f7 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,28 +1,28 @@
-MD5 b01c408b0da4bcb933633ef4957395cb cyrus-imapd-2.1.13.ebuild 6876
-MD5 b02d78daa9e8077f9cb1545011fa74d8 cyrus-imapd-2.1.15.ebuild 6984
-MD5 8137607660547cbe261c7efcae936491 cyrus-imapd-2.1.12.ebuild 6848
-MD5 2c63f3db93067a8b7c7dce460d2f9345 cyrus-imapd-2.1.15-r1.ebuild 7044
-MD5 0fc20824009e6d624507789570c22e88 cyrus-imapd-2.1.11-r1.ebuild 6270
-MD5 55a3646a96dbe9e7659d543f46a1b5f0 cyrus-imapd-2.1.14.ebuild 7002
-MD5 9363f91adcba86426b9369c904d8e4a1 ChangeLog 6472
+MD5 05e4091dcd99c664318dd3be333b96b9 ChangeLog 6737
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
-MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
-MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imapd-2.1.11-r1 71
-MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15-r1 155
-MD5 49f1642ca5d96db10f40a7c37a52dbd8 files/cyrus.rc6_2 631
+MD5 736a880e1423242b8891905114d19cf3 cyrus-imapd-2.1.11-r1.ebuild 6273
+MD5 edf1607078efdcd512a52888b4a99c40 cyrus-imapd-2.1.12.ebuild 6851
+MD5 b1daf482e36d46d569c8c3028d4e3c6f cyrus-imapd-2.1.13.ebuild 6879
+MD5 393b71595fffd87beaf71cad145b70ff cyrus-imapd-2.1.14.ebuild 7005
+MD5 49a85e1d6f14b63610741c1fce024c17 cyrus-imapd-2.1.15.ebuild 6987
+MD5 f53b5f6abe3087a08285f49b49c0bd2a cyrus-imapd-2.1.15-r1.ebuild 7043
 MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
+MD5 c6c0c19a7fdab57bee419fac05f20f36 files/2.1.14-db4.patch 2756
 MD5 75e1eaf365d192b2992bac8d61595a79 files/2.1.15-db4.patch 2759
+MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
+MD5 0e719522fa5fdeeb6299875a7ab67f36 files/cyrus.conf 1340
+MD5 49f1642ca5d96db10f40a7c37a52dbd8 files/cyrus.rc6_2 631
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-2.1.12-libwrap.patch 494
+MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
 MD5 cbd00df5ef9288b1c830d95fa5e5831f files/gentestcrt.sh 8799
-MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
-MD5 c6c0c19a7fdab57bee419fac05f20f36 files/2.1.14-db4.patch 2756
+MD5 df60f59cb6da75d7ca5e71a0d1ad52e7 files/imapd_2.conf 765
+MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imapd-2.1.11-r1 71
 MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
 MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
 MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imapd-2.1.14 155
 MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15 155
+MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
+MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
 MD5 f4074e463596703804133990ab7b00fd files/pam.d-imap 209
-MD5 df60f59cb6da75d7ca5e71a0d1ad52e7 files/imapd_2.conf 765
-MD5 0e719522fa5fdeeb6299875a7ab67f36 files/cyrus.conf 1340
+MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15-r1 155
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild
index b7632ff9b113..e188b0fb70c0 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-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/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild,v 1.4 2003/09/18 22:04:33 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild,v 1.5 2003/12/14 22:52:15 spider Exp $
 
 DESCRIPTION="The Cyrus IMAP Server"
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -95,51 +95,51 @@ src_install() {
 
 	dodir /var
 	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus.mail ${D}var/imap
+	chown -R cyrus:mail ${D}var/imap
 	keepdir /var/imap
 	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
+	chown -R cyrus:mail ${D}var/imap/db
 	keepdir /var/imap/db
 	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
+	chown -R cyrus:mail ${D}var/imap/log
 	keepdir /var/imap/log
 	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
+	chown -R cyrus:mail ${D}var/imap/msg
 	keepdir /var/imap/msg
 	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}var/imap/user
+	chown -R cyrus:mail ${D}var/imap/user
 	keepdir /var/imap/user
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus.mail ${D}var/imap/user/$i
+		chown -R cyrus:mail ${D}var/imap/user/$i
 		keepdir /var/imap/user/$i
 	done
 	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}var/imap/proc
+	chown -R cyrus:mail ${D}var/imap/proc
 	keepdir /var/imap/proc
 	mkdir -m 0755 ${D}var/imap/quota
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus.mail ${D}var/imap/quota/$i
+		chown -R cyrus:mail ${D}var/imap/quota/$i
 		keepdir /var/imap/quota/$i
 	done
 	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus.mail ${D}var/imap/sieve
+	chown -R cyrus:mail ${D}var/imap/sieve
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		chown -R cyrus:mail ${D}var/imap/sieve/$i
 		keepdir /var/imap/sieve/$i
 	done
 	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus.mail ${D}var/imap/socket
+	chown -R cyrus:mail ${D}var/imap/socket
 	keepdir /var/imap/socket
 	mkdir ${D}var/spool
 	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus.mail ${D}var/spool/imap
+	chown -R cyrus:mail ${D}var/spool/imap
 	keepdir /var/spool/imap
 	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus.mail ${D}var/spool/imap/stage.
+	chown -R cyrus:mail ${D}var/spool/imap/stage.
 	keepdir /var/spool/imap/stage.
 	# For hashimapspool
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus.mail ${D}var/spool/imap/$i
+		chown -R cyrus:mail ${D}var/spool/imap/$i
 		keepdir /var/spool/imap/$i
 	done
 
@@ -162,7 +162,7 @@ src_install() {
 		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
 		mkdir ${D}etc/cyrusimapd
 		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 	fi
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
index 4da1f0158979..9ee489d5ae3d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.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/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.8 2003/09/18 22:04:33 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.9 2003/12/14 22:52:15 spider Exp $
 
 inherit eutils
 
@@ -107,51 +107,51 @@ src_install() {
 
 	dodir /var
 	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus.mail ${D}var/imap
+	chown -R cyrus:mail ${D}var/imap
 	keepdir /var/imap
 	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
+	chown -R cyrus:mail ${D}var/imap/db
 	keepdir /var/imap/db
 	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
+	chown -R cyrus:mail ${D}var/imap/log
 	keepdir /var/imap/log
 	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
+	chown -R cyrus:mail ${D}var/imap/msg
 	keepdir /var/imap/msg
 	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}var/imap/user
+	chown -R cyrus:mail ${D}var/imap/user
 	keepdir /var/imap/user
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus.mail ${D}var/imap/user/$i
+		chown -R cyrus:mail ${D}var/imap/user/$i
 		keepdir /var/imap/user/$i
 	done
 	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}var/imap/proc
+	chown -R cyrus:mail ${D}var/imap/proc
 	keepdir /var/imap/proc
 	mkdir -m 0755 ${D}var/imap/quota
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus.mail ${D}var/imap/quota/$i
+		chown -R cyrus:mail ${D}var/imap/quota/$i
 		keepdir /var/imap/quota/$i
 	done
 	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus.mail ${D}var/imap/sieve
+	chown -R cyrus:mail ${D}var/imap/sieve
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		chown -R cyrus:mail ${D}var/imap/sieve/$i
 		keepdir /var/imap/sieve/$i
 	done
 	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus.mail ${D}var/imap/socket
+	chown -R cyrus:mail ${D}var/imap/socket
 	keepdir /var/imap/socket
 	mkdir ${D}var/spool
 	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus.mail ${D}var/spool/imap
+	chown -R cyrus:mail ${D}var/spool/imap
 	keepdir /var/spool/imap
 	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus.mail ${D}var/spool/imap/stage.
+	chown -R cyrus:mail ${D}var/spool/imap/stage.
 	keepdir /var/spool/imap/stage.
 	# For hashimapspool
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus.mail ${D}var/spool/imap/$i
+		chown -R cyrus:mail ${D}var/spool/imap/$i
 		keepdir /var/spool/imap/$i
 	done
 
@@ -174,7 +174,7 @@ src_install() {
 		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
 		mkdir ${D}etc/cyrusimapd
 		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 	fi
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
index a3bf140af730..05c8b8f3fa70 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.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/cyrus-imapd/cyrus-imapd-2.1.13.ebuild,v 1.4 2003/09/18 22:04:33 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild,v 1.5 2003/12/14 22:52:15 spider Exp $
 
 inherit eutils
 
@@ -107,51 +107,51 @@ src_install() {
 
 	dodir /var
 	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus.mail ${D}var/imap
+	chown -R cyrus:mail ${D}var/imap
 	keepdir /var/imap
 	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
+	chown -R cyrus:mail ${D}var/imap/db
 	keepdir /var/imap/db
 	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
+	chown -R cyrus:mail ${D}var/imap/log
 	keepdir /var/imap/log
 	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
+	chown -R cyrus:mail ${D}var/imap/msg
 	keepdir /var/imap/msg
 	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}var/imap/user
+	chown -R cyrus:mail ${D}var/imap/user
 	keepdir /var/imap/user
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus.mail ${D}var/imap/user/$i
+		chown -R cyrus:mail ${D}var/imap/user/$i
 		keepdir /var/imap/user/$i
 	done
 	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}var/imap/proc
+	chown -R cyrus:mail ${D}var/imap/proc
 	keepdir /var/imap/proc
 	mkdir -m 0755 ${D}var/imap/quota
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus.mail ${D}var/imap/quota/$i
+		chown -R cyrus:mail ${D}var/imap/quota/$i
 		keepdir /var/imap/quota/$i
 	done
 	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus.mail ${D}var/imap/sieve
+	chown -R cyrus:mail ${D}var/imap/sieve
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		chown -R cyrus:mail ${D}var/imap/sieve/$i
 		keepdir /var/imap/sieve/$i
 	done
 	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus.mail ${D}var/imap/socket
+	chown -R cyrus:mail ${D}var/imap/socket
 	keepdir /var/imap/socket
 	mkdir ${D}var/spool
 	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus.mail ${D}var/spool/imap
+	chown -R cyrus:mail ${D}var/spool/imap
 	keepdir /var/spool/imap
 	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus.mail ${D}var/spool/imap/stage.
+	chown -R cyrus:mail ${D}var/spool/imap/stage.
 	keepdir /var/spool/imap/stage.
 	# For hashimapspool
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus.mail ${D}var/spool/imap/$i
+		chown -R cyrus:mail ${D}var/spool/imap/$i
 		keepdir /var/spool/imap/$i
 	done
 
@@ -174,7 +174,7 @@ src_install() {
 		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
 		mkdir ${D}etc/cyrusimapd
 		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 	fi
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
index 9b88952bc6f5..9545b521f335 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.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/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.5 2003/09/19 02:16:36 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.6 2003/12/14 22:52:15 spider Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030703"
@@ -124,51 +124,51 @@ src_install() {
 
 	dodir /var
 	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus.mail ${D}var/imap
+	chown -R cyrus:mail ${D}var/imap
 	keepdir /var/imap
 	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
+	chown -R cyrus:mail ${D}var/imap/db
 	keepdir /var/imap/db
 	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
+	chown -R cyrus:mail ${D}var/imap/log
 	keepdir /var/imap/log
 	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
+	chown -R cyrus:mail ${D}var/imap/msg
 	keepdir /var/imap/msg
 	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}var/imap/user
+	chown -R cyrus:mail ${D}var/imap/user
 	keepdir /var/imap/user
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus.mail ${D}var/imap/user/$i
+		chown -R cyrus:mail ${D}var/imap/user/$i
 		keepdir /var/imap/user/$i
 	done
 	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}var/imap/proc
+	chown -R cyrus:mail ${D}var/imap/proc
 	keepdir /var/imap/proc
 	mkdir -m 0755 ${D}var/imap/quota
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus.mail ${D}var/imap/quota/$i
+		chown -R cyrus:mail ${D}var/imap/quota/$i
 		keepdir /var/imap/quota/$i
 	done
 	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus.mail ${D}var/imap/sieve
+	chown -R cyrus:mail ${D}var/imap/sieve
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		chown -R cyrus:mail ${D}var/imap/sieve/$i
 		keepdir /var/imap/sieve/$i
 	done
 	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus.mail ${D}var/imap/socket
+	chown -R cyrus:mail ${D}var/imap/socket
 	keepdir /var/imap/socket
 	mkdir ${D}var/spool
 	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus.mail ${D}var/spool/imap
+	chown -R cyrus:mail ${D}var/spool/imap
 	keepdir /var/spool/imap
 	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus.mail ${D}var/spool/imap/stage.
+	chown -R cyrus:mail ${D}var/spool/imap/stage.
 	keepdir /var/spool/imap/stage.
 	# For hashimapspool
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus.mail ${D}var/spool/imap/$i
+		chown -R cyrus:mail ${D}var/spool/imap/$i
 		keepdir /var/spool/imap/$i
 	done
 
@@ -191,7 +191,7 @@ src_install() {
 		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
 		mkdir ${D}etc/cyrusimapd
 		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 	fi
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
index f7fe5658fb4c..6f73a6a75327 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-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/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.1 2003/10/04 09:32:52 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.2 2003/12/14 22:52:15 spider Exp $
 
 inherit eutils fixheadtails
 IPV6_P="${P}-ipv6-20030819"
@@ -126,51 +126,51 @@ src_install() {
 
 	dodir /var
 	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus.mail ${D}var/imap
+	chown -R cyrus:mail ${D}var/imap
 	keepdir /var/imap
 	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
+	chown -R cyrus:mail ${D}var/imap/db
 	keepdir /var/imap/db
 	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
+	chown -R cyrus:mail ${D}var/imap/log
 	keepdir /var/imap/log
 	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
+	chown -R cyrus:mail ${D}var/imap/msg
 	keepdir /var/imap/msg
 	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}var/imap/user
+	chown -R cyrus:mail ${D}var/imap/user
 	keepdir /var/imap/user
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus.mail ${D}var/imap/user/$i
+		chown -R cyrus:mail ${D}var/imap/user/$i
 		keepdir /var/imap/user/$i
 	done
 	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}var/imap/proc
+	chown -R cyrus:mail ${D}var/imap/proc
 	keepdir /var/imap/proc
 	mkdir -m 0755 ${D}var/imap/quota
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus.mail ${D}var/imap/quota/$i
+		chown -R cyrus:mail ${D}var/imap/quota/$i
 		keepdir /var/imap/quota/$i
 	done
 	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus.mail ${D}var/imap/sieve
+	chown -R cyrus:mail ${D}var/imap/sieve
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		chown -R cyrus:mail ${D}var/imap/sieve/$i
 		keepdir /var/imap/sieve/$i
 	done
 	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus.mail ${D}var/imap/socket
+	chown -R cyrus:mail ${D}var/imap/socket
 	keepdir /var/imap/socket
 	mkdir ${D}var/spool
 	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus.mail ${D}var/spool/imap
+	chown -R cyrus:mail ${D}var/spool/imap
 	keepdir /var/spool/imap
 	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus.mail ${D}var/spool/imap/stage.
+	chown -R cyrus:mail ${D}var/spool/imap/stage.
 	keepdir /var/spool/imap/stage.
 	# For hashimapspool
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus.mail ${D}var/spool/imap/$i
+		chown -R cyrus:mail ${D}var/spool/imap/$i
 		keepdir /var/spool/imap/$i
 	done
 
@@ -193,7 +193,7 @@ src_install() {
 		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
 		mkdir ${D}etc/cyrusimapd
 		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 	fi
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
index c7625fefd9f2..84a324a7c196 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.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/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.2 2003/09/19 15:48:03 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.3 2003/12/14 22:52:15 spider Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030819"
@@ -124,51 +124,51 @@ src_install() {
 
 	dodir /var
 	mkdir -m 0750 ${D}var/imap
-	chown -R cyrus.mail ${D}var/imap
+	chown -R cyrus:mail ${D}var/imap
 	keepdir /var/imap
 	mkdir -m 0755 ${D}var/imap/db
-	chown -R cyrus.mail ${D}var/imap/db
+	chown -R cyrus:mail ${D}var/imap/db
 	keepdir /var/imap/db
 	mkdir -m 0755 ${D}var/imap/log
-	chown -R cyrus.mail ${D}var/imap/log
+	chown -R cyrus:mail ${D}var/imap/log
 	keepdir /var/imap/log
 	mkdir -m 0755 ${D}var/imap/msg
-	chown -R cyrus.mail ${D}var/imap/msg
+	chown -R cyrus:mail ${D}var/imap/msg
 	keepdir /var/imap/msg
 	mkdir -m 0755 ${D}var/imap/user
-	chown -R cyrus.mail ${D}var/imap/user
+	chown -R cyrus:mail ${D}var/imap/user
 	keepdir /var/imap/user
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
-		chown -R cyrus.mail ${D}var/imap/user/$i
+		chown -R cyrus:mail ${D}var/imap/user/$i
 		keepdir /var/imap/user/$i
 	done
 	mkdir -m 0755 ${D}var/imap/proc
-	chown -R cyrus.mail ${D}var/imap/proc
+	chown -R cyrus:mail ${D}var/imap/proc
 	keepdir /var/imap/proc
 	mkdir -m 0755 ${D}var/imap/quota
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
-		chown -R cyrus.mail ${D}var/imap/quota/$i
+		chown -R cyrus:mail ${D}var/imap/quota/$i
 		keepdir /var/imap/quota/$i
 	done
 	mkdir -m 0755 ${D}var/imap/sieve
-	chown -R cyrus.mail ${D}var/imap/sieve
+	chown -R cyrus:mail ${D}var/imap/sieve
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
-		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		chown -R cyrus:mail ${D}var/imap/sieve/$i
 		keepdir /var/imap/sieve/$i
 	done
 	mkdir -m 0755 ${D}var/imap/socket
-	chown -R cyrus.mail ${D}var/imap/socket
+	chown -R cyrus:mail ${D}var/imap/socket
 	keepdir /var/imap/socket
 	mkdir ${D}var/spool
 	mkdir -m 0750 ${D}var/spool/imap
-	chown -R cyrus.mail ${D}var/spool/imap
+	chown -R cyrus:mail ${D}var/spool/imap
 	keepdir /var/spool/imap
 	mkdir -m 0755 ${D}var/spool/imap/stage.
-	chown -R cyrus.mail ${D}var/spool/imap/stage.
+	chown -R cyrus:mail ${D}var/spool/imap/stage.
 	keepdir /var/spool/imap/stage.
 	# For hashimapspool
 	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
-		chown -R cyrus.mail ${D}var/spool/imap/$i
+		chown -R cyrus:mail ${D}var/spool/imap/$i
 		keepdir /var/spool/imap/$i
 	done
 
@@ -191,7 +191,7 @@ src_install() {
 		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
 		mkdir ${D}etc/cyrusimapd
 		cp server.crt server.key ${D}etc/cyrusimapd
-		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chown cyrus:root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
 	fi
 }