Version bump. Bug #202230 by Jason Phillips <gentoo at jbpc.com>.

(Portage version: 2.1.4_rc9)

25 files changed, 52 insertions, 1528 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index aa2055a0f8a0..7c6c8b175255 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.111 2007/07/05 19:05:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.112 2007/12/27 12:21:42 ticho Exp $
+
+*amavisd-new-2.5.3 (27 Dec 2007)
+
+  27 Dec 2007; Andrej Kacian <ticho@gentoo.org>
+  -files/amavisd-new-2.2.1-qmail-lf-workaround.patch,
+  -files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch,
+  -files/amavisd-new-2.3.3-bsmtp-quarantine.patch,
+  -files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch,
+  -files/amavisd-new-2.4.4-qmail-lf-workaround.patch,
+  -amavisd-new-2.3.3-r2.ebuild, amavisd-new-2.4.1.ebuild,
+  -amavisd-new-2.4.2.ebuild, -amavisd-new-2.4.2-r1.ebuild,
+  -amavisd-new-2.4.3.ebuild, -amavisd-new-2.4.4.ebuild,
+  -amavisd-new-2.4.5-r1.ebuild, -amavisd-new-2.5.0.ebuild,
+  -amavisd-new-2.5.1.ebuild, amavisd-new-2.5.2.ebuild,
+  +amavisd-new-2.5.3.ebuild:
+  Version bump. Bug #202230 by Jason Phillips <gentoo at jbpc.com>. Shell
+  variables quoting fix. Old ebuilds cleanup.
 
 *amavisd-new-2.5.2 (05 Jul 2007)
 
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
deleted file mode 100644
index c10ef002ed13..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.17 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.051
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	<=dev-perl/net-server-0.90
-	>=virtual/perl-libnet-1.16
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.1
-	dev-perl/BerkeleyDB
-	virtual/mta
-	virtual/antivirus
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( >=mail-mta/sendmail-8.12 )"
-
-AMAVIS_ROOT=/var/amavis
-
-src_unpack() {
-	if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then
-		echo
-		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
-		ewarn "         Consider upgrading your SpamAssassin installation."
-		ebeep 3
-		epause
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		elog "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		elog "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		elog "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${PN}-2.2.1-qmail-lf-workaround.patch" || die "patch failed"
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.3.0-amavisd.conf-gentoo.patch" || die "patch failed"
-	epatch "${FILESDIR}/${P}-bsmtp-quarantine.patch" || die "patch failed"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(dnsdomainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	if $(has_version net-nds/openldap ) ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample-* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if $(has_version mail-filter/razor) ; then
-		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		else
-			elog "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
index 4edddb76d6ed..77fec030f325 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.11 2007/05/23 22:51:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.12 2007/12/27 12:21:42 ticho Exp $
 
 inherit eutils
 
@@ -59,7 +59,7 @@ src_unpack() {
 		epause
 	fi
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	if $(has_version mail-mta/courier) ; then
 		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
@@ -132,8 +132,8 @@ src_install() {
 	fi
 
 	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
+		if [ ! -f "${D}"/${AMAVIS_ROOT}/${i} ]; then
+			touch "${D}"/${AMAVIS_ROOT}/${i}
 		fi
 	done
 
@@ -141,9 +141,9 @@ src_install() {
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
 			elog "Setting up initial razor config files..."
 
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+				"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
 			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
@@ -151,8 +151,8 @@ src_install() {
 		fi
 	fi
 
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
 pkg_preinst() {
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
deleted file mode 100644
index 89d341b6a3d0..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.5 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.051
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	>=virtual/perl-libnet-1.16
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.1
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( >=mail-mta/sendmail-8.12 )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	if $(has_version "<mail-filter/spamassassin-3") ; then
-		echo
-		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
-		ewarn "         Consider upgrading your SpamAssassin installation."
-		ebeep 3
-		epause
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		elog "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		elog "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		elog "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
-	fi
-
-	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-
-	dobin p0f-analyzer.pl
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(dnsdomainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	if $(has_version net-nds/openldap ) ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if $(has_version mail-filter/razor) ; then
-		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		else
-			elog "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
deleted file mode 100644
index eccebf5f30df..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.5 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.051
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	>=virtual/perl-libnet-1.16
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.1
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( >=mail-mta/sendmail-8.12 )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	if $(has_version "<mail-filter/spamassassin-3") ; then
-		echo
-		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
-		ewarn "         Consider upgrading your SpamAssassin installation."
-		ebeep 3
-		epause
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		elog "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		elog "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		elog "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
-	fi
-
-	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(dnsdomainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	if $(has_version net-nds/openldap ) ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if $(has_version mail-filter/razor) ; then
-		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		else
-			elog "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
deleted file mode 100644
index 3baff9eedc50..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.5 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.051
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	>=virtual/perl-libnet-1.16
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.1
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( >=mail-mta/sendmail-8.12 )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	if $(has_version "<mail-filter/spamassassin-3") ; then
-		echo
-		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
-		ewarn "         Consider upgrading your SpamAssassin installation."
-		ebeep 3
-		epause
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		elog "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		elog "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		elog "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.4.2-amavisd.conf-gentoo.patch" || die "patch failed"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-
-	dobin p0f-analyzer.pl
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(dnsdomainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	if $(has_version net-nds/openldap ) ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if $(has_version mail-filter/razor) ; then
-		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		else
-			elog "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
deleted file mode 100644
index f794e6fe868b..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.7 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres milter"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.051
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	>=virtual/perl-libnet-1.16
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.1
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	if $(has_version "<mail-filter/spamassassin-3") ; then
-		echo
-		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
-		ewarn "         Consider upgrading your SpamAssassin installation."
-		ebeep 3
-		epause
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		elog "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		elog "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		elog "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
-	fi
-		elog "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
-
-	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-
-	dobin p0f-analyzer.pl
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(dnsdomainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	if $(has_version net-nds/openldap ) ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if $(has_version mail-filter/razor) ; then
-		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		fi
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
deleted file mode 100644
index 3c090bbc110f..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild,v 1.4 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="courier ldap milter mysql postgres qmail"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	dev-perl/Archive-Tar
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	>=virtual/perl-libnet-1.16
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.1
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use courier ; then
-		elog "Patching with courier support."
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		elog "Patching with qmail qmqp support."
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-	dobin p0f-analyzer.pl
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-		cd "${S}"
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ -f ${AMAVIS_ROOT}/${i} ]; then
-			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-		else
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if use ldap ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-
-	if [ -z "$(dnsdomainname)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	if has_version mail-filter/razor ; then
-		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version mail-filter/spamassassin ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"
-	ewarn "by default instead of to all interfaces. You will need to change $bind_addr"
-	ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different"
-	ewarn "host from amavisd or from other querying clients."
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild
deleted file mode 100644
index f27955dfda12..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild,v 1.2 2007/05/23 22:51:10 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="High-performance interface between the MTA and content checkers."
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="courier ldap milter mysql postgres qmail"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=dev-perl/Compress-Zlib-1.35
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	>=sys-libs/db-3.2
-	dev-perl/BerkeleyDB
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use courier ; then
-		elog "Patching with courier support."
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		elog "Patching with qmail qmqp support."
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
-}
-
-src_compile() {
-	if use milter ; then
-		cd "${S}/helper-progs"
-
-		econf --with-runtime-dir=${AMAVIS_ROOT} \
-			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
-			--with-user=amavis || die "helper-progs econf failed"
-		emake || die "helper-progs compile problem"
-
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
-	dobin p0f-analyzer.pl
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.rc6" amavisd
-	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
-
-	keepdir ${AMAVIS_ROOT}
-	keepdir ${AMAVIS_ROOT}/db
-	keepdir ${AMAVIS_ROOT}/quarantine
-	keepdir ${AMAVIS_ROOT}/tmp
-
-	newdoc test-messages/README README.samples
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \
-		test-messages/sample* amavisd.conf-default amavisd-agent \
-		amavisd-custom.conf
-
-	dodir /usr/share/doc/${PF}/html
-	insinto /usr/share/doc/${PF}/html
-	doins README_FILES/*.{html,css}
-	dodir /usr/share/doc/${PF}/html/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins README_FILES/images/*
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-		cd "${S}"
-	fi
-
-	for i in whitelist blacklist spam_lovers; do
-		if [ -f ${AMAVIS_ROOT}/${i} ]; then
-			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-		else
-			touch ${D}/${AMAVIS_ROOT}/${i}
-		fi
-	done
-
-	if use ldap ; then
-		elog "Adding ${P} schema to openldap schema dir."
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-		newins LDAP.schema ${PN}.schema.default || die
-	fi
-
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-
-	if [ -z "$(dnsdomainname)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
-			/etc/amavisd.conf
-	fi
-
-	if has_version mail-filter/razor ; then
-		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version mail-filter/spamassassin ; then
-		echo
-		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		elog "will be performed without it. Since you do not have SpamAssassin installed,"
-		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
-		elog "and comment out the line containing: "
-		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"
-	ewarn "by default instead of to all interfaces. You will need to change $bind_addr"
-	ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different"
-	ewarn "host from amavisd or from other querying clients."
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
-	echo
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-	chown -R amavis:amavis ${AMAVIS_ROOT}
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild
index 875372e68b1d..3afc00cb1cd2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v 1.1 2007/07/05 19:05:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v 1.2 2007/12/27 12:21:42 ticho Exp $
 
 inherit eutils
 
@@ -120,7 +120,7 @@ src_install() {
 		if [ -f ${AMAVIS_ROOT}/${i} ]; then
 			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
 		else
-			touch ${D}/${AMAVIS_ROOT}/${i}
+			touch "${D}"/${AMAVIS_ROOT}/${i}
 		fi
 	done
 
@@ -133,8 +133,8 @@ src_install() {
 		newins LDAP.schema ${PN}.schema.default || die
 	fi
 
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
 pkg_preinst() {
@@ -153,9 +153,9 @@ pkg_preinst() {
 		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
 			elog "Setting up initial razor config files..."
 
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+				"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		fi
 	fi
 }
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild
index 233e96abb728..6826314656a2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.5.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.1.ebuild,v 1.1 2007/06/18 16:03:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild,v 1.1 2007/12/27 12:21:42 ticho Exp $
 
 inherit eutils
 
@@ -54,12 +54,10 @@ src_unpack() {
 	cd "${S}"
 
 	if use courier ; then
-		elog "Patching with courier support."
 		epatch amavisd-new-courier.patch
 	fi
 
 	if use qmail ; then
-		elog "Patching with qmail qmqp support."
 		epatch amavisd-new-qmqpqq.patch
 	fi
 
@@ -120,7 +118,7 @@ src_install() {
 		if [ -f ${AMAVIS_ROOT}/${i} ]; then
 			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
 		else
-			touch ${D}/${AMAVIS_ROOT}/${i}
+			touch "${D}"/${AMAVIS_ROOT}/${i}
 		fi
 	done
 
@@ -133,8 +131,8 @@ src_install() {
 		newins LDAP.schema ${PN}.schema.default || die
 	fi
 
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
 pkg_preinst() {
@@ -153,9 +151,9 @@ pkg_preinst() {
 		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
 			elog "Setting up initial razor config files..."
 
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+				"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		fi
 	fi
 }
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.2.1-qmail-lf-workaround.patch b/mail-filter/amavisd-new/files/amavisd-new-2.2.1-qmail-lf-workaround.patch
deleted file mode 100644
index f4c7a8eb6d2e..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.2.1-qmail-lf-workaround.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- amavisd-new-2.2.1/amavisd.chris	2005-01-09 18:05:09.000000000 +0100
-+++ amavisd-new-2.2.1/amavisd	2005-01-09 18:05:47.360864816 +0100
-@@ -3948,9 +3948,9 @@
-         # to reduce the likelyhood of a qmail bare-LF bug (bare LF reported
-         # when CR and LF are separated by a TCP packet boundary) one may use
-         # this 'while' line, reading line by line, instead of the normal one:
--###     while (defined($_=$msg->getline)) {
-+        while (defined($_=$msg->getline)) {
- 
--        while ($msg->read($_, 16384) > 0) {
-+###     while ($msg->read($_, 16384) > 0) {
-           $smtp_handle->datasend($_)
-             or die "datasend timed out while sending body\n";
-         }
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
deleted file mode 100644
index 62f6cc66cd8b..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- amavisd.conf-sample	2005-05-01 21:54:59.000000000 +0200
-+++ amavisd.conf-sample.ticho	2005-05-01 21:54:38.000000000 +0200
-@@ -73,21 +73,21 @@
- 
- # Set the user and group to which the daemon will change if started as root
- # (otherwise just keeps the UID unchanged, and these settings have no effect):
--$daemon_user  = 'vscan';   # (no default;  customary: vscan or amavis)
--$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis or sweep)
-+$daemon_user  = 'amavis';   # (no default;  customary: vscan or amavis)
-+$daemon_group = 'amavis';   # (no default;  customary: vscan or amavis or sweep)
- 
- # Runtime working directory (cwd), and a place where
- # temporary directories for unpacking mail are created.
- # (no trailing slash, may be a scratch file system)
--$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is)
--#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
-+#$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is)
-+$TEMPBASE = "$MYHOME/tmp";      # prefer to keep home dir /var/amavis clean?
- 
--#$db_home = "$MYHOME/db";	# DB databases directory, default "$MYHOME/db"
-+$db_home = "$MYHOME/db";	# DB databases directory, default "$MYHOME/db"
- 
- # $helpers_home sets environment variable HOME, and is passed as option
- # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
- # on a normal persistent file system, not a scratch or temporary file system
--#$helpers_home = $MYHOME;	# (defaults to $MYHOME)
-+$helpers_home = $MYHOME;	# (defaults to $MYHOME)
- 
- # Run the daemon in the specified chroot jail if nonempty:
- #$daemon_chroot_dir = $MYHOME;  # (default is undef, meaning: do not chroot)
-@@ -152,7 +152,7 @@
- # feeding amavisd, e.g. with Postfix the 'Max procs' field in the
- # master.cf file, like the '2' in the:  smtp-amavis unix - - n - 2 smtp
- #
--$max_servers  =  2;   # number of pre-forked children          (default 2)
-+$max_servers  =  4;   # number of pre-forked children          (default 2)
- $max_requests = 20;   # retire a child after that many accepts (default 10)
- 
- $child_timeout=5*60;  # abort child if it does not complete each task in
-@@ -289,7 +289,7 @@
- # 3: server, client
- # 4: decompose parts
- # 5: more debug details
--$log_level = 2;		  # (defaults to 0)
-+$log_level = 0;		  # (defaults to 0)
- 
- # Customizable template for the most interesting log file entry (e.g. with
- # $log_level=0) (take care to properly quote Perl special characters like '\')
-@@ -445,9 +445,28 @@
- #            reject original client SMTP session, as the mail has already
- #            been enqueued.
- 
--$final_virus_destiny      = D_BOUNCE;  # (defaults to D_DISCARD)
--$final_banned_destiny     = D_BOUNCE;  # (defaults to D_BOUNCE)
--$final_spam_destiny       = D_BOUNCE;  # (defaults to D_BOUNCE)
-+########
-+#
-+# Please think about what you are doing when you set these options.
-+# If necessary, question your origanization's e-mail policies:
-+#
-+# D_BOUNCE contributes to the overall spread of virii and spam on the
-+# internet. Both the envelope and header from addresses can be forged
-+# accurately with no effort.
-+# 
-+# D_DISCARD breaks internet mail specifications. However, with a
-+# properly implemented Quaratine system, the concern for breaking the
-+# specification is addressed to some extent.
-+#
-+# D_PASS is the safest way to handle e-mails. You must implement
-+# client-side filtering to handle this method.
-+#
-+# -Cory Visi <merlin@gentoo.org> 07/28/04
-+#
-+#######
-+$final_virus_destiny      = D_DISCARD;  # (defaults to D_DISCARD)
-+$final_banned_destiny     = D_DISCARD;  # (defaults to D_BOUNCE)
-+$final_spam_destiny       = D_DISCARD;  # (defaults to D_BOUNCE)
- $final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
- 
- # Alternatives to consider for spam:
-@@ -588,7 +607,7 @@
- #   or a directory (no trailing slash)
- #   (the default value is undef, meaning no quarantine)
- #
--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = "$MYHOME/quarantine";
- 
- #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
- 
-@@ -728,7 +747,7 @@
- $defang_virus  = 1;  # default is false: don't modify mail body
- $defang_banned = 1;  # default is false: don't modify mail body
- # $defang_bad_header     = 1;  # default is false: don't modify mail body
--# $defang_undecipherable = 1;  # default is false: don't modify mail body
-+$defang_undecipherable = 1;  # default is false: don't modify mail body
- # $defang_spam = 1;  # default is false: don't modify mail body
- 
- $remove_existing_x_scanned_headers = 0; # leave existing X-Virus-Scanned alone
-@@ -1433,7 +1452,7 @@
- # NOTE: if $daemon_chroot_dir is nonempty, the directories will be
- #       relative to the chroot directory specified;
- 
--$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
-+$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin:/opt/bin';
- 
- # For external programs specify one string or a search list of strings (first
- # match wins). The string (or: each string in a list) may be an absolute path,
-@@ -1489,7 +1508,7 @@
- # of the option local_tests_only. See Mail::SpamAssassin man page.
- # If set to 1, no SA tests that require internet access will be performed.
- #
--$sa_local_tests_only = 1;   # (default: false)
-+$sa_local_tests_only = 0;   # (default: false)
- #$sa_auto_whitelist = 1;    # turn on AWL in SA 2.63 or older (irrelevant
-                             # for SA 3.0, its cf option is use_auto_whitelist)
- 
-@@ -1548,7 +1567,7 @@
- #$sa_spam_report_header = 0; # insert X-Spam-Report header field? default false
- 
- # stop anti-virus scanning when the first scanner detects a virus?
--#$first_infected_stops_scan = 1;  # default is false, all scanners in a section
-+$first_infected_stops_scan = 1;  # default is false, all scanners in a section
-                                   # are called
- 
- # @av_scanners is a list of n-tuples, where fields semantics is:
-@@ -1833,7 +1852,7 @@
- 
-   ### http://www.nai.com/
-   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
--    '--secure -rv --mime --summary --noboot - {}', [0], [13],
-+    '--secure --mime --program --mailbox -rv --mime --summary --noboot --timeout 180 - {}', [0], [13],
-     qr/(?x) Found (?:
-         \ the\ (.+)\ (?:virus|trojan)  |
-         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
-@@ -1945,7 +1964,7 @@
- 
-   ### http://www.f-prot.com/   - backs up F-Prot Daemon
-   ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
--    '-dumb -archive -packed {}', [0,8], [3,6],
-+    '-dumb -ai -archive -packed -server {}', [0,8], [3,6],
-     qr/Infection: (.+)|\s+contains\s+(.+)$/ ],
- 
-   ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.3.3-bsmtp-quarantine.patch b/mail-filter/amavisd-new/files/amavisd-new-2.3.3-bsmtp-quarantine.patch
deleted file mode 100644
index fb5c4c513d43..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.3.3-bsmtp-quarantine.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- amavisd	2005-10-24 11:10:20.000000000 +0200
-+++ amavisd.new	2005-10-24 11:11:08.000000000 +0200
-@@ -4718,7 +4718,7 @@
-   $via =~ /^bsmtp:(.*)\z/si or die "Bad fwd method: $via";
-   my($bsmtp_file_final) = $1; my($mbxname);
-   my($s) = $msginfo->sender;  # defanged sender name for use in filename
--  $s =~ tr/a-zA-Z0-9@._+-]/=/c;
-+  $s =~ tr/a-zA-Z0-9@._+-/=/c;
-   $s = substr($s,0,100)."..."  if length($s) > 100+3;
-   $s =~ s/\@/_at_/g; $s =~ s/^(\.{0,2})\z/_$1/g;
-   $bsmtp_file_final =~ s{%(.)}
-@@ -6281,7 +6281,7 @@
-     'sender-quarantine' =>
-       sub { my($s) = $MSGINFO->sender;
-             $s = substr($s,0,100)."..."  if length($s) > 100+3;
--            $s =~ tr/a-zA-Z0-9@._+-]/=/c; $s =~ s/\@/_at_/g;
-+            $s =~ tr/a-zA-Z0-9@._+-/=/c; $s =~ s/\@/_at_/g;
-             $s = untaint($s)  if $s =~ /^(?:[a-zA-Z0-9%=._+-]+)\z/;  # untaint
-             ($QUARANTINEDIR, "sender-$s-%m.gz");   # suggested file name
-           },
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch
index da5cbef9c253..02b1e4e17549 100644
--- a/mail-filter/amavisd-new/files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch
@@ -1,5 +1,5 @@
---- amavisd.conf-sample.orig	2006-06-27 13:31:44.000000000 +0200
-+++ amavisd.conf-sample	2006-07-02 19:25:02.000000000 +0200
+--- amavisd.conf-sample.orig	2006-12-18 17:14:43.000000000 +0100
++++ amavisd.conf-sample	2006-12-18 17:19:46.000000000 +0100
 @@ -74,14 +74,14 @@
  
  # Set the user and group to which the daemon will change if started as root
@@ -17,27 +17,9 @@
 +#$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is), -T
 +$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
  
- #$db_home = "$MYHOME/db";	# DB databases directory, default "$MYHOME/db", -D
+ #$db_home = "$MYHOME/db";    # DB databases directory, default "$MYHOME/db", -D
  
-@@ -155,7 +155,7 @@
- # feeding amavisd, e.g. with Postfix the 'Max procs' field in the
- # master.cf file, like the '2' in the:  smtp-amavis unix - - n - 2 smtp
- #
--$max_servers  =  2;   # number of pre-forked children          (default 2), -m
-+$max_servers  =  4;   # number of pre-forked children          (default 2), -m
- $max_requests = 20;   # retire a child after that many accepts (default 10)
- 
- $child_timeout=5*60;  # abort child if it does not complete its processing in
-@@ -470,7 +470,7 @@
- 
- # Alternatives to consider for spam:
- # - use D_PASS if clients will do filtering based on inserted
--#   mail headers or added address extensions ('plus-addressing');
-+#   mail headers or added address extensions ('plus-addressing')2;
- # - use D_DISCARD, if kill_level is set comfortably high;
- #
- # D_BOUNCE is preferred for viruses, but consider:
-@@ -487,22 +487,45 @@
+@@ -492,22 +492,43 @@
  # default setting of an associative array %final_destiny_by_ccat which is
  # backwards compatible and contains references to these traditional variables:
  #
@@ -70,8 +52,6 @@
 +# -Cory Visi <merlin@gentoo.org> 07/28/04
 +#
 +#######
-+
-+
  
  # to explicitly list all (or most) possible contents category (ccat) keys:
 -#%final_destiny_by_ccat = (
@@ -97,7 +77,7 @@
  
  # to rely on a catchall ccat key and only list exceptions (alternative 1):
  #%final_destiny_by_ccat = (
-@@ -684,7 +707,7 @@
+@@ -689,7 +710,7 @@
  #   or a directory (no trailing slash)
  #   (the default value is undef, meaning no quarantine)
  #
@@ -106,7 +86,7 @@
  
  #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
  
-@@ -1594,7 +1617,7 @@
+@@ -1658,7 +1679,7 @@
  # NOTE: if $daemon_chroot_dir is nonempty, the directories will be
  #       relative to the chroot directory specified;
  
@@ -115,7 +95,7 @@
  
  # For external programs specify one string or a search list of strings (first
  # match wins). The string (or: each string in a list) may be an absolute path,
-@@ -2025,7 +2048,7 @@
+@@ -2124,7 +2145,7 @@
  
    ### http://www.nai.com/
    ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
@@ -124,12 +104,12 @@
      qr/(?x) Found (?:
          \ the\ (.+)\ (?:virus|trojan)  |
          \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
-@@ -2143,7 +2166,7 @@
+@@ -2246,7 +2267,7 @@
  
    ### http://www.f-prot.com/   - backs up F-Prot Daemon
    ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
--    '-dumb -archive -packed {}', [0,8], [3,6],
-+    '-dumb -ai -archive -packed -server {}', [0,8], [3,6],
-     qr/Infection: (.+)|\s+contains\s+(.+)$/ ],
+-    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
++    '-dumb -ai -archive -packed -server {}', [0,8], [3,6],   # or: [0], [3,6,8],
+     qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/ ],
  
    ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch
deleted file mode 100644
index bfbeacf9aa99..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- amavisd	2007-01-30 01:13:27.000000000 +0100
-+++ amavisd.ticho	2007-01-30 01:13:12.000000000 +0100
-@@ -13224,13 +13224,13 @@
-         # we'll be calling Net::Cmd::datasend directly for speed
-         $smtp_data_fh->flush or die "Error flushing smtp_data_fh: $!";
- 
--        while (($nbytes=$msg->read($buff,65536)) > 0) {
-+				for ($! = 0; defined($buff=$msg->getline); $! = 0) {
-           do_log(-1,"WARN: Unicode string passed to Net::Cmd::datasend")
-             if $unicode_aware && Encode::is_utf8($buff);
-           $smtp_handle->datasend($buff)
-             or die "datasend timed out while sending body";
-         }
--        defined $nbytes or die "Error reading: $!";
-+				defined $buff || $!==0 or die "Error reading: $!";
-       }
-       $smtp_data_fh->close or die "Error closing smtp_data_fh: $!";
-       $smtp_data_fh = undef;
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3-r2 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3-r2
deleted file mode 100644
index 9eb2864ebae2..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b02df514c1a2bf8af346bc9c7e97111 amavisd-new-2.3.3.tar.gz 772280
-RMD160 c2213190582fe8fea9b8f1736e3b3e49b2906887 amavisd-new-2.3.3.tar.gz 772280
-SHA256 8c6d78cc0a703f0aa36d52fdf833e074c6adca2d21bd334ef381f9e9c92b8f0b amavisd-new-2.3.3.tar.gz 772280
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.2 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.2
deleted file mode 100644
index a99293888cd0..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d750176de7481498ebd1011e08a488da amavisd-new-2.4.2.tar.gz 854326
-RMD160 fd82a0f3a1166d7f70846651b7b91af147b3fb70 amavisd-new-2.4.2.tar.gz 854326
-SHA256 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a amavisd-new-2.4.2.tar.gz 854326
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.2-r1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.2-r1
deleted file mode 100644
index a99293888cd0..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d750176de7481498ebd1011e08a488da amavisd-new-2.4.2.tar.gz 854326
-RMD160 fd82a0f3a1166d7f70846651b7b91af147b3fb70 amavisd-new-2.4.2.tar.gz 854326
-SHA256 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a amavisd-new-2.4.2.tar.gz 854326
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.3 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.3
deleted file mode 100644
index eb9a2aacbbb0..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7c5f23b1cd523df31d10cf38150e8cea amavisd-new-2.4.3.tar.gz 876615
-RMD160 9301d2ea30bd6a620d827384facc5a1bbace86db amavisd-new-2.4.3.tar.gz 876615
-SHA256 ff71af590a0dc62bda558a037daceaea3b776d1ef7d0689ab0bfb582d436cf15 amavisd-new-2.4.3.tar.gz 876615
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4
deleted file mode 100644
index 7af62ef9a7db..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08b009ca24dc3676293fc6b80db250a3 amavisd-new-2.4.4.tar.gz 887625
-RMD160 3d6ac62f57b68440a7ca3766ff374f4763db6bbf amavisd-new-2.4.4.tar.gz 887625
-SHA256 b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889 amavisd-new-2.4.4.tar.gz 887625
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5-r1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5-r1
deleted file mode 100644
index fa3876ba3d69..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eef8c03855f9e3a4c6c53c06006d77ea amavisd-new-2.4.5.tar.gz 895870
-RMD160 3167b7660c84e33b59b87f8b437814c074c0e89c amavisd-new-2.4.5.tar.gz 895870
-SHA256 cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53 amavisd-new-2.4.5.tar.gz 895870
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.0 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.0
deleted file mode 100644
index 66cb5c929f91..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 990a8c78911e208afca8c43a1f7c018d amavisd-new-2.5.0.tar.gz 780990
-RMD160 b84a75b57489c6fc3ce4340b420e7fd1339e5f19 amavisd-new-2.5.0.tar.gz 780990
-SHA256 d5f5238a565868b5150c2591cd06780556d2aa093355475874e6b539e7eb1116 amavisd-new-2.5.0.tar.gz 780990
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.1
deleted file mode 100644
index 056c5e9fdb77..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0bed5db53dfce6e70047597989523e2 amavisd-new-2.5.1.tar.gz 786898
-RMD160 bd9e5dd9619abbacf4f1b0daf1c1fabda3b68b7c amavisd-new-2.5.1.tar.gz 786898
-SHA256 2ac5a933d62072b3ed9986252003fd3942179618c7ba76d3390570547fc981de amavisd-new-2.5.1.tar.gz 786898
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.3 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.3
new file mode 100644
index 000000000000..2815fd5be273
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.5.3
@@ -0,0 +1,3 @@
+MD5 5cf1a7a481855c6712378c0475058255 amavisd-new-2.5.3.tar.gz 789275
+RMD160 49b97ff3782b42f8aaba7beb73440398d83638d9 amavisd-new-2.5.3.tar.gz 789275
+SHA256 f724654e15eab3fabce22873a5f2a0fcf2db9374ca84979cf066a29360ee533d amavisd-new-2.5.3.tar.gz 789275