--- /usr/portage/mail-filter/amavisd-new/amavisd-new-2.2.1.ebuild	2005-03-06 07:35:40.000000000 +0100
+++ /usr/local/portage/mail-filter/amavisd-new/amavisd-new-2.2.1.ebuild	2005-03-23 00:09:39.775547344 +0100
@@ -85,9 +85,6 @@
 }
 
 src_install() {
-	enewgroup amavis
-	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
-
 	dosbin amavisd amavisd-agent amavisd-nanny
 
 	insinto /etc
@@ -113,22 +110,10 @@
 	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
 
 	keepdir ${AMAVIS_ROOT}
-	fowners amavis:amavis ${AMAVIS_ROOT}
-	fperms 0750 ${AMAVIS_ROOT}
-
 	keepdir ${AMAVIS_ROOT}/db
-	fowners amavis:amavis ${AMAVIS_ROOT}/db
-
 	keepdir ${AMAVIS_ROOT}/quarantine
-	fowners amavis:amavis ${AMAVIS_ROOT}/quarantine
-
 	keepdir ${AMAVIS_ROOT}/tmp
-	fowners amavis:amavis ${AMAVIS_ROOT}/tmp
-	for i in whitelist blacklist spam_lovers; do
-		touch ${D}${AMAVIS_ROOT}/${i}
-		fowners amavis:amavis ${AMAVIS_ROOT}/${i}
-	done
-
+	
 	if $(has_version net-nds/openldap ) ; then
 		einfo "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
@@ -149,14 +134,26 @@
 }
 
 pkg_postinst() {
+	enewgroup amavis
+	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+	
+	for i in whitelist blacklist spam_lovers; do
+		if [ ! -f ${AMAVIS_ROOT}/${i} ]; then
+			touch ${AMAVIS_ROOT}/${i}
+		fi
+	done
+
 	if $(has_version mail-filter/razor) ; then
 		einfo "Setting up initial razor config files..."
 
 		razor-admin -create -home=${ROOT}${AMAVIS_ROOT}/.razor
 		sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
 			${ROOT}${AMAVIS_ROOT}/.razor/razor-agent.conf
-		chown -R amavis:amavis ${ROOT}${AMAVIS_ROOT}/.razor
 	fi
+	
+	chown -R amavis:amavis ${AMAVIS_ROOT}
+	find ${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find ${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo