Use epause instead of sleep. Bug #124323, by Ciaran McCreesh <ciaranm at gentoo.org>. Removed old ebuilds.

(Portage version: 2.1_pre5-r1)

16 files changed, 15 insertions, 1282 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 7553a5e00d88..e6133392cb3c 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.76 2006/02/20 22:43:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.77 2006/02/28 01:21:46 ticho Exp $
+
+  28 Feb 2006; Andrej Kacian <ticho@gentoo.org>
+  -files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch,
+  -amavisd-new-2.2.1-r2.ebuild, -amavisd-new-2.3.0.ebuild,
+  -amavisd-new-2.3.1.ebuild, -amavisd-new-2.3.2.ebuild,
+  -amavisd-new-2.3.3.ebuild, -amavisd-new-2.3.3-r1.ebuild,
+  amavisd-new-2.3.3-r2.ebuild:
+  Use epause instead of sleep. Bug #124323, by Ciaran McCreesh <ciaranm at
+  gentoo.org>. Removed old ebuilds.
 
   20 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
   amavisd-new-2.2.1-r2.ebuild, amavisd-new-2.3.0.ebuild,
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 6dae0f499aa0..8329535514e8 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,27 +1,9 @@
 MD5 7c23d699fc64f64afb2f68f2495777ab ChangeLog 16443
 RMD160 71d33078131af59bfed87131648bc265eb2ba98e ChangeLog 16443
 SHA256 d36dca70df6397b833f6db8f5b30c664b3ea912b5df6951f45d4cb381e4d415a ChangeLog 16443
-MD5 19036c97c0d0653760a7fe64d77d951c amavisd-new-2.2.1-r2.ebuild 5050
-RMD160 b3cf068c3db642b8d3c8bef57168e65a63777575 amavisd-new-2.2.1-r2.ebuild 5050
-SHA256 e2b3d25ac8fdbaece68a305ce189b33262d33c9e62e67b5b75d03950ec7abbee amavisd-new-2.2.1-r2.ebuild 5050
-MD5 22321423bbeb24813987b9992f71a295 amavisd-new-2.3.0.ebuild 5147
-RMD160 f5d17c418b1d2bf2a860da7662871bb86d0c3397 amavisd-new-2.3.0.ebuild 5147
-SHA256 27fef9f4305b6d5315f08e7d36bef5d2150b0bb76d2484d48892751de5113389 amavisd-new-2.3.0.ebuild 5147
-MD5 3efbe35376ca5eed8933048f62afa33c amavisd-new-2.3.1.ebuild 5129
-RMD160 42f0d93d7370617b2875e74a8dc8aba4bc9794d2 amavisd-new-2.3.1.ebuild 5129
-SHA256 05ea8ced1d5176e5d351160d0854518bbd477dc73dc8609f960f657fd77b0428 amavisd-new-2.3.1.ebuild 5129
-MD5 69daf35703f7431254f1347b583bea56 amavisd-new-2.3.2.ebuild 5358
-RMD160 1742a3db7364e1f708505fb845fdcb91e19ec339 amavisd-new-2.3.2.ebuild 5358
-SHA256 cbcde15cbe2420cd6f0f77a379d35b93c7dd08cc3aabe1e1285826d3d9c9c2b3 amavisd-new-2.3.2.ebuild 5358
-MD5 b5a616f72e2d4653ef82131f1ee5d036 amavisd-new-2.3.3-r1.ebuild 5402
-RMD160 68c751dc72f1f15d25707e82aeea3a1626ec74ea amavisd-new-2.3.3-r1.ebuild 5402
-SHA256 e9f2b77d057a95b1c69a1c0f112b17b754e708b8bad8116eaaf258ceb3099772 amavisd-new-2.3.3-r1.ebuild 5402
-MD5 67af5005e182b3e0178fc9e4a7f6e15a amavisd-new-2.3.3-r2.ebuild 5472
-RMD160 1bd4c732b46641b4debf991d23353ae95fdbd1de amavisd-new-2.3.3-r2.ebuild 5472
-SHA256 593c1d76e3700205c7d404cf19205d337fa7ee41d5d242d062ef314af3ecb618 amavisd-new-2.3.3-r2.ebuild 5472
-MD5 0aa5bb6e2ba99f44341354f7517849f0 amavisd-new-2.3.3.ebuild 5383
-RMD160 69f3ff19ef264929b615353da4e18eeeabc9d3f8 amavisd-new-2.3.3.ebuild 5383
-SHA256 6c8ab963f771bd39a4f3ef2da42016fadeaccfc2ef797cc0b89ac4576d710fa2 amavisd-new-2.3.3.ebuild 5383
+MD5 b09102767471131326ba64dd203e3e4f amavisd-new-2.3.3-r2.ebuild 5471
+RMD160 57c526b778d54c2bba94a634b748813fedf5ede0 amavisd-new-2.3.3-r2.ebuild 5471
+SHA256 9d9b6f14eda9ba962102d3be737a763723581dda59fad6b773cae0438dfc578b amavisd-new-2.3.3-r2.ebuild 5471
 MD5 ccd66b725ef1b2e2ed20d4a1057b03b8 files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch 6849
 RMD160 3d34925bf50c3f627cdd0502ef750f1427c18e30 files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch 6849
 SHA256 6b79a58a4fb27d7bc9caf422b85ab26b07ae86dbf1f4d69fbe74cd3ba1ed3ce0 files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch 6849
@@ -37,24 +19,6 @@ SHA256 2815958cca7bbccdf6b7aecb345cba9a25177f9158c1867880db69bef71f2036 files/am
 MD5 1da4ebb5c79b4892074a61f52aff3eff files/amavisd.rc6 310
 RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c files/amavisd.rc6 310
 SHA256 c136451b550176c6292554c60e0d41d91e6ad3538dedecbdb48925898623dbd8 files/amavisd.rc6 310
-MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r2 69
-RMD160 03a8d11d55a002685f5116c95261506f8e52a754 files/digest-amavisd-new-2.2.1-r2 69
-SHA256 dfb131679411886b38bf02f64d62c097ed26d903beae1e099f55605dbb52ddc2 files/digest-amavisd-new-2.2.1-r2 69
-MD5 20d1361125dc21db61b44dec3a13dea2 files/digest-amavisd-new-2.3.0 69
-RMD160 fcb540e9bea85d6a92d55b144ae0a9f18c88fa40 files/digest-amavisd-new-2.3.0 69
-SHA256 9572a2bf6f2e3f87ada927c7d28954ed447c807e5f15ac79c5546bbe3c7219bf files/digest-amavisd-new-2.3.0 69
-MD5 d7ee87336e865f363c430fc60f105d44 files/digest-amavisd-new-2.3.1 69
-RMD160 2ec96b5a81a6b71f345318f78d28bd4cc280b874 files/digest-amavisd-new-2.3.1 69
-SHA256 b8434b7fecab3811a470af30554054a0b45c00f6005910dad0e3412e6a4f728e files/digest-amavisd-new-2.3.1 69
-MD5 64e273484857758e614f8afa7aa14e09 files/digest-amavisd-new-2.3.2 69
-RMD160 3b2c6471f8057871692c06199cb4932150b209dc files/digest-amavisd-new-2.3.2 69
-SHA256 c75924454193e1694dea9a8190cd96bb3f9d4ac614e7dfbff298930e977f87a0 files/digest-amavisd-new-2.3.2 69
-MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3 69
-RMD160 9b929043bd1b91f477cd533d7c4a1cc16708cc19 files/digest-amavisd-new-2.3.3 69
-SHA256 84073b4f97577e56566685a30a8d65e91e0cd590bce94e80b7de942084fff22b files/digest-amavisd-new-2.3.3 69
-MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3-r1 69
-RMD160 9b929043bd1b91f477cd533d7c4a1cc16708cc19 files/digest-amavisd-new-2.3.3-r1 69
-SHA256 84073b4f97577e56566685a30a8d65e91e0cd590bce94e80b7de942084fff22b files/digest-amavisd-new-2.3.3-r1 69
 MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3-r2 69
 RMD160 9b929043bd1b91f477cd533d7c4a1cc16708cc19 files/digest-amavisd-new-2.3.3-r2 69
 SHA256 84073b4f97577e56566685a30a8d65e91e0cd590bce94e80b7de942084fff22b files/digest-amavisd-new-2.3.3-r2 69
diff --git a/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild
deleted file mode 100644
index 6eb36e75b7e5..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2006 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.2.1-r2.ebuild,v 1.13 2006/02/20 22:43:17 hansmi 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="x86 ~ppc amd64 ~sparc ~alpha ppc64"
-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
-	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
-	>=virtual/perl-libnet-1.16
-	virtual/perl-Digest-MD5
-	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 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	milter? ( >=mail-mta/sendmail-8.12 )"
-
-AMAVIS_ROOT=/var/amavis
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		einfo "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() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-
-	dosbin amavisd amavisd-agent amavisd-nanny
-
-	# install config file with proper permissons/owners
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	fowners root:amavis /etc/amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/etc/amavisd.conf
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/amavisd.rc6" amavisd
-	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
-		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 LICENSE MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample-* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-}
-
-pkg_postinst() {
-	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
-
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
-	fi
-	echo
-	ewarn "Adjusting permissions for /etc/amavisd.new (0 for world, owner root:amavis)"
-	chmod o-rwx /etc/amavisd.conf
-	chown root:amavis /etc/amavisd.conf
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild
deleted file mode 100644
index 5cd0c896e6ea..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2006 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.0.ebuild,v 1.17 2006/02/20 22:43:17 hansmi 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
-	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
-	>=virtual/perl-libnet-1.16
-	virtual/perl-Digest-MD5
-	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 )
-	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
-		sleep 5
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		einfo "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${PN}-2.2.1-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
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	fowners root:amavis /etc/amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/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
-		einfo "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 LICENSE MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample-* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-}
-
-pkg_postinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${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
-	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
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@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
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild
deleted file mode 100644
index 5d31781d08c2..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2006 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.1.ebuild,v 1.11 2006/02/20 22:43:17 hansmi 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
-	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
-	>=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 )
-	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
-		sleep 5
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		einfo "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"
-}
-
-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
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	fowners root:amavis /etc/amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/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
-		einfo "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 LICENSE MANIFEST RELEASE_NOTES \
-		README_FILES/* test-messages/sample-* amavisd.conf-default amavisd-agent
-
-	if use milter ; then
-		cd "${S}/helper-progs"
-		einstall
-	fi
-}
-
-pkg_postinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${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
-	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
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@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
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild
deleted file mode 100644
index d6fa50f80ebd..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2006 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.2.ebuild,v 1.13 2006/02/20 22:43:17 hansmi 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
-	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
-	>=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
-		sleep 5
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		einfo "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"
-}
-
-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
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	fowners root:amavis /etc/amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/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
-		einfo "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 LICENSE 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
-			einfo "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
-			einfo "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	chown -R amavis:amavis ${D}/${AMAVIS_ROOT}
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_postinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@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
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild
deleted file mode 100644
index c59d443484ee..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.7 2006/02/20 22:43:17 hansmi 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
-	>=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
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} 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
-		sleep 5
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		einfo "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"
-}
-
-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
-	fowners root:amavis /etc/amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/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
-		einfo "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 LICENSE 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
-			einfo "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
-			einfo "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	chown -R amavis:amavis ${D}/${AMAVIS_ROOT}
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@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
-}
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
index 195415372a2a..2fb551bcf5bb 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.8 2006/02/20 22:43:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.9 2006/02/28 01:21:46 ticho Exp $
 
 inherit eutils
 
@@ -62,7 +62,7 @@ src_unpack() {
 		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
 		ewarn "         Consider upgrading your SpamAssassin installation."
 		ebeep 3
-		sleep 5
+		epause
 	fi
 	unpack ${A}
 	cd ${S}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild
deleted file mode 100644
index fa07c3c9d5ad..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.7 2006/02/20 22:43:17 hansmi 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
-	>=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
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} 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
-		sleep 5
-	fi
-	unpack ${A}
-	cd ${S}
-	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
-		epatch "amavisd-new-courier.patch" || die "patch failed"
-	fi
-
-	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
-		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
-
-		einfo "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"
-}
-
-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
-
-	insinto /etc
-	insopts -m0640
-	newins amavisd.conf-sample amavisd.conf
-	fowners root:amavis /etc/amavisd.conf
-	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
-		/etc/amavisd.conf
-	if [ "$(domainname)" = "(none)" ] ; then
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
-			/etc/amavisd.conf
-	else
-		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
-			/etc/amavisd.conf
-	fi
-	if ! $(has_version mail-filter/spamassassin) ; then
-		einfo "Disabling anti-spam code in amavisd.conf..."
-
-		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
-			/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
-		einfo "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 LICENSE 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
-			einfo "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
-			einfo "Copying existing razor config files..."
-			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
-		fi
-	fi
-
-	chown -R amavis:amavis ${D}/${AMAVIS_ROOT}
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
-}
-
-pkg_postinst() {
-	if ! $(has_version mail-filter/spamassassin) ; then
-		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@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
-}
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch
deleted file mode 100644
index 25a84f78b1ce..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- amavisd-new-2.2.1/amavisd.conf-sample.chris	2005-01-09 19:24:25.000000000 +0100
-+++ amavisd-new-2.2.1/amavisd.conf-sample	2005-01-09 19:25:11.784562320 +0100
-@@ -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
-@@ -291,7 +291,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 '\')
-@@ -447,10 +447,29 @@
- #            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)
--$final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
-+########
-+#
-+# 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)
- 
- # Alternatives to consider for spam:
- # - use D_PASS if clients will do filtering based on inserted
-@@ -590,7 +609,7 @@
- #   or a directory (no trailing slash)
- #   (the default value is undef, meaning no quarantine)
- #
--$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = "$MYHOME/quarantine";
- 
- #$virus_quarantine_method        = 'local:virus-%i-%n';    # default
- #$spam_quarantine_method         = 'local:spam-%b-%i-%n';  # default
-@@ -725,7 +744,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
-@@ -1428,7 +1447,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';
- 
- # 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,
-@@ -1466,7 +1485,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)
- 
-@@ -1525,7 +1544,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:
-@@ -1798,7 +1817,7 @@
- 
-   ### http://www.nai.com/
-   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
--    '--secure -rv --mime --summary --noboot - {}', [0], [13],
-+    '--secure --mime --program --mailbox -rv --summary --noboot --timeout 180 - {}', [0], [13],
-     qr/(?x) Found (?:
-         \ the\ (.+)\ (?:virus|trojan)  |
-         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
-@@ -1909,7 +1928,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 -packed -server {}', [0,8], [3,6],
-     qr/Infection: (.+)/ ],
- 
-   ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1-r2 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1-r2
deleted file mode 100644
index ad1a1abda341..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 567b6df37a2f049fe23c176e6fd1472f amavisd-new-2.2.1.tar.gz 741461
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.0 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.0
deleted file mode 100644
index f8a69ae96e8f..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dfeed1587a6ff1f0327c1d46bb8f631 amavisd-new-2.3.0.tar.gz 777817
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.1
deleted file mode 100644
index 78eefbe3f954..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5260e01b6ec94b66dc9160ce7bbb8ebc amavisd-new-2.3.1.tar.gz 780829
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.2 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.2
deleted file mode 100644
index 9cfd4cd07ad5..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4af47f7e0b2aaf71bd5783dc26a576a8 amavisd-new-2.3.2.tar.gz 786156
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3
deleted file mode 100644
index 648612738a19..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b02df514c1a2bf8af346bc9c7e97111 amavisd-new-2.3.3.tar.gz 772280
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3-r1 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3-r1
deleted file mode 100644
index 648612738a19..000000000000
--- a/mail-filter/amavisd-new/files/digest-amavisd-new-2.3.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b02df514c1a2bf8af346bc9c7e97111 amavisd-new-2.3.3.tar.gz 772280