Remove old

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

10 files changed, 23 insertions, 726 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 824b9d73cfb5..a23931a95ba3 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.192 2012/09/30 16:21:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.193 2012/10/01 19:01:35 eras Exp $
+
+  01 Oct 2012; Eray Aslan <eraya@gentoo.org> -amavisd-new-2.6.3-r2.ebuild,
+  -amavisd-new-2.7.0.ebuild, -amavisd-new-2.7.1.ebuild,
+  -files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch,
+  -files/amavisd-new-2.6.3-dkimconf.patch,
+  -files/amavisd-new-2.6.3-startup.patch, -files/amavisd-new-dkimconf.patch,
+  -files/amavisd.rc6:
+  Remove old
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> amavisd-new-2.7.2.ebuild:
   alpha/sparc stable wrt #429106
@@ -964,4 +972,3 @@
 
   12 Jun 2003; Max Kalika <max@gentoo.org> amavisd-new-20030314_p2.ebuild:
   Initial version.
-
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 3f983358c2b9..dcba9eb373b6 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,26 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX amavisd-new-2.6.3-amavisd.conf-gentoo.patch 4882 SHA256 f928336035c432e1358fef2a494ae3727b789f4eb8847ca8c7ac816c622a184e SHA512 be21600fc4b1f75f419c7bf8dacce82a0cd6ceebdf68d69b83ef3f206f74fb6c675574f61c81131d766a02769e102c234cd829b57abefc786f22020f482da3b1 WHIRLPOOL acaaa5c69a96f7778d943310262ac3fe0883d747a08355411c865e4962318d54559fe7756e6c197166a78347ea451c1fcf82ac97b01bc20562459fa13b358a1b
-AUX amavisd-new-2.6.3-dkimconf.patch 735 SHA256 1d0489bfd14d794617c12ec797404373a632b2c26e381d9e09c364cbfa2ae248 SHA512 111630148607d59bb1112dab829f87f4f53eb75c83030ebb2b80bdcce61329e417aa18c36180f354423f1fe11714094b658da4ef505019d770ced875df41185c WHIRLPOOL 8f2e06b4e42c81ead59f108413065a9c470bae27b6e85c16307f70ac93ce56ddc5294a19df260f2cc610087f26f412bb51ca0f8a841c39ce5b443bd4a8fd2168
-AUX amavisd-new-2.6.3-startup.patch 522 SHA256 ebc531320945ab009da3b59d829d7f6dd938647063ec495ed85d96833eee0647 SHA512 d18fd29eca8b827567963cd5c75a53b267ab9443a854e6d0ecd433b2418829404900b17d22200a55d59ce003720ae7836362edaf5b8c8791bd0dfc3dc13e5a69 WHIRLPOOL 8e21a602b916ed19507833c5be8322787622a9b9eca8029a3bf4daf9b59512590e4d9bcab9e3c81c57df548ddd51d2d855afb88a350502c68fa0e7afc3eba56d
-AUX amavisd-new-dkimconf.patch 735 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8 SHA512 bc02a2aff5eed7e3bf2ebff89fafd49a2b67a85722963662cc7c60d38a5915d149bc2adf9a5936d23fcf32dc82bee4f63473ca79f66fadde718d7df7892ee928 WHIRLPOOL 644c26e237cc9bd1b9b62441d61202d56ff43d3625c7f80496a7a237e653f5de1da8fc604ab9f7231189ece3b47d6390798ea7d7888981c54462180916249afb
 AUX amavisd.initd 832 SHA256 b1d40ea4a25cf6f03ccd1b5f02adbfd2203944944077e2906b978e48ff6fd80b SHA512 f6aeb51fff579f233a387b43f2bb1f9396ba7d2d3bb058d74cca5aa22b5b8914e30bd1f95a674bafdc81c191bbff5077d7a6682894e6f9f57c99d81006920138 WHIRLPOOL 8f4e863fe2eb4f5c44b202f2c500713273de6d43ec410d953e18f45b12956c2b67775daf79a0c6830405ab857feaa652722c63783e0b5a3a0adc9b67fd1b2578
-AUX amavisd.rc6 371 SHA256 f2010650d3ef408359f41e3a84173c2b27300e9d6d2e4f7558ef39858e01da9d SHA512 4d709775bbe4fd0671da21ee43d69d88332716140eeed5f5000ccaf6d08170feeb252b1ae7d6587771ee766be0fc77dff823c2f79a544998df97971978c15fce WHIRLPOOL 6ceaaf289fd7cc8c16fbc0c8314ed5d794a76a8fe81218e87469cc874fba18a96910ccf1d92b9b5f8298fd092e222b528953781030f87258e1a9b21b3af9aa54
-DIST amavisd-new-2.6.3.tar.gz 918888 SHA256 47e774579fdab1e1c10ef2295d49cb511b13e05431a7955c73f07e98025d788e SHA512 5c71cb53c198ab59a3e242d43b77a5889713ba6934a784b5256ab5bebd8afda75d833b5a20afeff6daf052f30f30eb650b3c3e4175102992e8e2c6ba4efb17ff WHIRLPOOL e3b11e9a9dd079939bcbc02abc2eee1ea1be30d359c58f4ecbe1f9275f8076e2eff4a4d4b2366f18f752aa6bc536e13264336f4165b00bbbdf687cb2447a1f72
-DIST amavisd-new-2.7.0.tar.gz 941811 SHA256 534b3d91c31e0e87a73602c84dfeb4b30b4ea64dee99fcceabd59b1bc0082b0b SHA512 04fac5f3829d1ea7b26bb058e07ca323ffd92b644da8d83ea8d8f400236ae5b603b272e9c690f01c2a80d06a32f7326001d7109e5a00125b1112f54c67f8e199 WHIRLPOOL ecc49a638b6f196638e11f5f8e53d80f87e654674bbe7abfd880422fdc8efdd7ef92c2bb10090d644acb7f88ff31bc5df1e2ea46f488ab4793f0e9428fda1058
-DIST amavisd-new-2.7.1.tar.gz 948909 SHA256 033d67fa3ebb8e865409a3b48c12bdddd227f66a1fcc7e987100a64a2658401c SHA512 bde3d2dd780747c08462bacd622ace55f4987a878bc68abe82bbc985e1449b497992754bce8c0892439e152ceecd713bd262cd9d5d4c10c6a4351a5e614cd1cc WHIRLPOOL 65e73310b462d8b1de59ab0b2e9342b1812663d94b959d55afe53fb76957a08d28117dcec015a6304732bfa698fa85e4322420649857743e7d04d582eacee415
 DIST amavisd-new-2.7.2.tar.gz 945448 SHA256 4665e0fb9a71f483f1123113a006291e37f744a5880f945ccf9fd34d51cb9275 SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 WHIRLPOOL c0422d80b9dc11a7a2e9cb10092b7c97c02536aa852f70c566ab6e2e6a865b901ad24caf626b8b02ee64979bced7c25f03888827fd47ffbc4e733bb733e08c9e
-EBUILD amavisd-new-2.6.3-r2.ebuild 5484 SHA256 7521feff6769511f2d19e3b041dab59fdaa436e8f73f335795a6d8669eecd3d6 SHA512 601e7d4c7eb2bf1057faf9abd2ee40f8a189a586309960143d959b6da144ed23c6d0a30dce190b3e3b37c942159e879d85675cb38249fd0d56681197ee5a24dc WHIRLPOOL 468de71c9e6f02ad14196fd9fe341e77107318ac7abc8bee81bcea8b8cab7ebfbc1ee1beb0ffb3ddb27ac28d3cd568744c46974f2df9ac9007f4288a003b9af3
-EBUILD amavisd-new-2.7.0.ebuild 4292 SHA256 21385f792e9088f227fda38ff8d4f51b23b6f277aab4a03d94f933f978e2c075 SHA512 20b1caa972d9f1946aad4bc7621c3a3c1c2a078dbc2fc25f2a03aa212b492e552e4cc0b32230a79a023cc63eb8822d0a11bb422e8b57c5d542fdef41a64f4d9c WHIRLPOOL 1744bb4b6a4521b2c513c9fec6d230acecf09428fb84dc50a1da0d47fc5f349c902bc2ed28186ebbbbf9c099344a7ce7faf72a508d5a5b554c7466063fb1adeb
-EBUILD amavisd-new-2.7.1.ebuild 4292 SHA256 a7290d473ad9faacd66161add119bba96e673b92f33822607c5bf33f969b1f38 SHA512 659e4935b711d6b3f1e491d30c7980e086f5c76378cf7c212708d005adccfc8998d50d5f8340b2e1e018e39d6226e6c0cc3bcdfc027ad469c107e4e88db21e30 WHIRLPOOL 71e2e30ca19cd1c41a87c273604d22cc747e6ca72527a2c66e936df540c2ab2b93cb69d215053d2ee5576575cb99892646193cbe9e42c8bf4425ac2fa1ea513f
 EBUILD amavisd-new-2.7.2.ebuild 4291 SHA256 3b9f9cae6315d49734d83299524da54af123d0f72f28ba97a34937a3e314eaaa SHA512 d9ab58dec4466f5a56f0c93a5c88e574f45cef76cc632ef5415ad9c378a6233c17f09750b2d704cb394c15872fcee5d9707e6fd343e082522eb28b5e81808ae7 WHIRLPOOL 8e76512b761b193af2010739907977de0a14ca3970f94609e2c0d3014ce741738144fd15973f95b2174963ac942419cde8b40134ffb1e6b29f095b8ea1bc2fb0
-MISC ChangeLog 36008 SHA256 310174d10f8cca2c650585481f59e5626b6d0a1d228c21b9df750aaa1dd7a7f8 SHA512 b817335c7775d23d38d33b44dfbb3b01bc3b0a2c720fbcedec27a45c6466210e6abb8af058fee8c14ce3eb835d87acf1dda3efc3626213a4cc02b2f0ffb8e979 WHIRLPOOL 6430e7cddbaef16c7755a689c02c84f0237981c16ecf80f6c5e68aef242732c5134e0719c24705cff0dcf6f2d6190930b8009402b7e786e688a567790ee0a8ee
+MISC ChangeLog 36345 SHA256 2720b7727d15f539053427c5b825d88b0d620578cbeb2894f76245b253c5ffb1 SHA512 e8afeb8c414c3b02a875c9d6be71c6ce2adb8b02602fba776e2efbf3a124b89a779335da5182afc705f5f863314622b8eff98bf17ee0d0ee31efb95b252b6f37 WHIRLPOOL bf02a29e5b06a4aad7a35762d064a51bb65c819f9e5d7e26f5b1a55d62343b70c995403ce5071979b82d41b817d937ac2f03e25a6f01699a27e4bbbfc141eb56
 MISC metadata.xml 501 SHA256 14170b3945a5234a816acf9195f4d91f81620b221f9dc646efba9d14d95196e2 SHA512 6d8fd3c225a8e04de3575958d7826f3a65cbebe4cef092036f3e5e8fb70de4a1543ec7b14e67a1611d0db93cda72640c3a55f676f189d45a707e7861b44fa024 WHIRLPOOL 5194ba20e69a966781b36dded6843c8bb61ada9b37907ce74e504272f4c50a0203b6c771cb9aa8882767498df6b9facc953f2f018b48da2528e1c1f38f56e7e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBocagACgkQuQc30/atMkBC0ACgwZzhOXPGHmjBZvgmaep2ujO3
-ueUAn2N8s4TGOyBiHaKXFdI98rSwJpex
-=3DdW
+iQIcBAEBCAAGBQJQaeiaAAoJEHfx8XVYajsf1U0P/2S0AZzZcGFMeR47/hLg73fS
+rft9pu3mzXEw92fGQ/Y9R0jnVIUH3vE17Rsj9aefqggrO1Zwh6ZyGvOyfrYwD2oS
+7Wfel9eHPCMpCi9CIywS1Cbj742U7eqewVD21DpYDjh1W3VKKkkV2AGOPrAnixw5
+VMzcmZptVPQWu+sPsTR/85Hu/hWbzUGIDmRUAtoUTNGvCy4qpcux0ExMMFsBB+HQ
+57sxWFTNb5pW8tOpXa3r0bRWH85Ot4wNj692B3+TKbI5X4e6NPQYK2Raa4ukK3fi
+r1h+dEQ+IsojvlMoHrvdo4e0lloDAN2GkroLijoo+D5C8Ukxh0bWAa7Zxb/cxsJV
+9skLTJ7TNkB5go0Fyrq7GTq5MXC6cywvgk4md8GSY2o//5NKpl/pgsKCQEleuWnU
+yFDbH27dS/JOIfzXJi9B2MjMYiX5QRrwyurPfIiG311v7/zkCEcJXVhQznEwOEKe
+W6uTmqYRIlTyFEkD0G8k7PqGPn+XpMt1dwbX13ySXQcZ2LXY1kZS5/u/gr8E9JZu
+wM/ok7CeTVns6l7OC5kC4cd858sQrO47tHGX7t4M0XX2Z77gMiVR+7dzdTAFSVTb
+8C+N4BfBqWyR+k8xK+jDV7fkoPjqCGiZC57I+sAWhcP4lj/mPDp9pJeB4hC5peZ7
+VOQ0WSFBpb6HtgODXhsn
+=/y7S
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild
deleted file mode 100644
index b0b6f045e86f..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2012 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.6.3-r2.ebuild,v 1.9 2012/06/04 21:00:17 zmedico Exp $
-
-inherit eutils user
-
-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 hppa ~ppc ~ppc64 sparc x86"
-IUSE="courier dkim ldap milter mysql postgres qmail razor spamassassin"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2
-	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
-
-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/rar )
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-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
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	spamassassin? ( mail-filter/spamassassin )"
-
-AMAVIS_ROOT="/var/amavis"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch"
-	epatch "${FILESDIR}/${P}-startup.patch"
-
-	if ! use dkim ; then
-		epatch "${FILESDIR}/${P}-dkimconf.patch"
-	fi
-}
-
-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 use 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
-
-	if ! use 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
-}
-
-pkg_postinst() {
-	if ! use 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.7.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild
deleted file mode 100644
index a8352a7c7035..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 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.7.0.ebuild,v 1.8 2012/06/04 21:00:17 zmedico Exp $
-
-EAPI=4
-
-inherit eutils user
-
-MY_P="${P/_/-}"
-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/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/ncompress
-	app-arch/pax
-	app-arch/unarj
-	app-arch/xz-utils
-	|| ( app-arch/unrar app-arch/rar )
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	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-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd" amavisd
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-
-	#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
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	if use razor ; then
-		if [ ! -d "${ROOT}${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
-
-	if ! use spamassassin ; then
-		elog "Disabling anti-spam code in amavisd.conf..."
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${D}/etc/amavisd.conf"
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild
deleted file mode 100644
index 0ecf1b643ce7..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 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.7.1.ebuild,v 1.6 2012/07/29 18:47:48 armin76 Exp $
-
-EAPI=4
-
-inherit eutils user
-
-MY_P="${P/_/-}"
-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/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/ncompress
-	app-arch/pax
-	app-arch/unarj
-	app-arch/xz-utils
-	|| ( app-arch/unrar app-arch/rar )
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	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-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd" amavisd
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-
-	#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
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	if use razor ; then
-		if [ ! -d "${ROOT}${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
-
-	if ! use spamassassin ; then
-		elog "Disabling anti-spam code in amavisd.conf..."
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${D}/etc/amavisd.conf"
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch
deleted file mode 100644
index 37ea8cad655f..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- amavisd.conf-sample.orig	2009-04-22 02:23:58.000000000 +0200
-+++ amavisd.conf-sample	2009-05-04 19:13:20.000000000 +0200
-@@ -74,14 +74,14 @@
- 
- # 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), -u
--$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis), -g
-+$daemon_user  = 'amavis';   # (no default;  customary: vscan or amavis), -u
-+$daemon_group = 'amavis';   # (no default;  customary: vscan or amavis), -g
- 
- # 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), -T
--#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
-+#$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
- 
-@@ -500,22 +500,43 @@
- # default setting of an associative array %final_destiny_by_ccat which is
- # backwards compatible and contains references to these traditional variables:
- #
--$final_virus_destiny      = D_DISCARD; # (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)
-+#$final_virus_destiny      = D_DISCARD; # (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)
-+
-+########
-+#
-+# 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, causing the bounces to go to innocent parties,
-+# whose addresses have been forged.
-+# 
-+# 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
-+#
-+#######
- 
- # to explicitly list all (or most) possible contents category (ccat) keys:
--#%final_destiny_by_ccat = (
--#  CC_VIRUS,      D_DISCARD,
--#  CC_BANNED,     D_BOUNCE,
--#  CC_UNCHECKED,  D_PASS,
--#  CC_SPAM,       D_BOUNCE,
--#  CC_BADH,       D_PASS,
--#  CC_OVERSIZED,  D_BOUNCE,
--#  CC_CLEAN,      D_PASS,
--#  CC_CATCHALL,   D_PASS,
--#);
-+%final_destiny_by_ccat = (
-+  CC_VIRUS,      D_DISCARD,
-+  CC_BANNED,     D_BOUNCE,
-+  CC_UNCHECKED,  D_PASS,
-+  CC_SPAM,       D_DISCARD,
-+  CC_BADH,       D_PASS,
-+  CC_OVERSIZED,  D_BOUNCE,
-+  CC_CLEAN,      D_PASS,
-+  CC_CATCHALL,   D_PASS,
-+);
- 
- # to rely on a catchall ccat key and only list exceptions (alternative 1):
- #%final_destiny_by_ccat = (
-@@ -694,7 +715,7 @@
- #   or a directory (no trailing slash)
- #   (the default value is undef, meaning no quarantine)
- #
--$QUARANTINEDIR = '/var/virusmails';  # -Q
-+$QUARANTINEDIR = "$MYHOME/quarantine";
- 
- #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
- 
-@@ -1674,7 +1695,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,
-@@ -2188,7 +2209,7 @@
- 
-   ### http://www.nai.com/
-   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
--    '--secure -rv --mime --summary --noboot - {}', [0], [13],
-+    '--secure -rv --mime --summary --noboot --mailbox --program --timeout 180 - {}', [0], [13],
-     qr/(?x) Found (?:
-         \ the\ (.+)\ (?:virus|trojan)  |
-         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
-@@ -2333,7 +2354,7 @@
- 
-   ### http://www.f-prot.com/   - backs up F-Prot Daemon (old)
-   ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
--    '-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+(.+)$/m ],
- 
-   ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-dkimconf.patch b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-dkimconf.patch
deleted file mode 100644
index da8664d03d9d..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-dkimconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- amavisd.conf-sample.orig	2009-05-04 19:14:20.000000000 +0200
-+++ amavisd.conf-sample	2009-05-04 19:14:57.000000000 +0200
-@@ -102,8 +102,8 @@
- $enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
- $enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
- 
--$enable_dkim_verification = 1;  # enable DKIM signatures verification
--$enable_dkim_signing = 1;    # load DKIM signing code, keys defined by dkim_key
-+$enable_dkim_verification = 0;  # enable DKIM signatures verification
-+$enable_dkim_signing = 0;    # load DKIM signing code, keys defined by dkim_key
- 
- # MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
- # both $forward_method and $notify_method default to 'smtp:[127.0.0.1]:10025'
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch
deleted file mode 100644
index 7d3aa1c3452e..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-startup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- amavisd.orig	2009-07-30 19:30:22.707549708 +0200
-+++ amavisd	2009-07-30 19:29:08.000000000 +0200
-@@ -13649,7 +13649,9 @@
- my(%spam_scanners_used);
- my($bpscm) = ca('bypass_spam_checks_maps');
- if (!@{ca('spam_scanners')}) {
-+  undef $extra_code_antispam;
- } elsif (@$bpscm && !ref($bpscm->[0]) && $bpscm->[0]) {  # simple-minded
-+  undef $extra_code_antispam;
- } else {
-   eval $extra_code_antispam or die "Problem in antispam code: $@";
-   $extra_code_antispam = 1;       # release memory occupied by the source code
diff --git a/mail-filter/amavisd-new/files/amavisd-new-dkimconf.patch b/mail-filter/amavisd-new/files/amavisd-new-dkimconf.patch
deleted file mode 100644
index 2140326c08ab..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-new-dkimconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- amavisd.conf-sample.orig	2008-06-14 20:05:49.487302075 +0200
-+++ amavisd.conf-sample	2008-06-14 20:06:02.649294131 +0200
-@@ -102,8 +102,8 @@
- $enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
- $enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
- 
--$enable_dkim_verification = 1;  # enable DKIM signatures verification
--$enable_dkim_signing = 1;    # load DKIM signing code, needs keys in dkim_key()
-+$enable_dkim_verification = 0;  # enable DKIM signatures verification
-+$enable_dkim_signing = 0;    # load DKIM signing code, needs keys in dkim_key()
- 
- # MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
- # both $forward_method and $notify_method default to 'smtp:[127.0.0.1]:10025'
diff --git a/mail-filter/amavisd-new/files/amavisd.rc6 b/mail-filter/amavisd-new/files/amavisd.rc6
deleted file mode 100644
index 55a46549942c..000000000000
--- a/mail-filter/amavisd-new/files/amavisd.rc6
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	use logger
-	use antivirus
-	before mta
-}
-
-start() {
-	ebegin "Starting amavisd-new"
-	start-stop-daemon --start --quiet --name amavisd --pidfile /var/amavis/amavisd.pid \
-	 --exec /usr/sbin/amavisd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping amavisd-new"
-	start-stop-daemon --stop --quiet --pidfile /var/run/amavis/amavisd.pid
-	eend $?
-}