Remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

5 files changed, 19 insertions, 558 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index ba8a19a551d5..af8e56422a70 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.209 2014/07/20 09:20:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.210 2014/07/22 05:06:24 eras Exp $
+
+  22 Jul 2014; Eray Aslan <eras@gentoo.org> -amavisd-new-2.8.0.ebuild,
+  -amavisd-new-2.8.1.ebuild, -amavisd-new-2.9.0.ebuild:
+  Remove old
 
   20 Jul 2014; Pacho Ramos <pacho@gentoo.org> amavisd-new-2.8.1-r1.ebuild:
   x86 stable, bug #473794
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index be48856bfcc6..d7e4f0b8d4db 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -6,22 +6,27 @@ AUX amavisd.initd 832 SHA256 b1d40ea4a25cf6f03ccd1b5f02adbfd2203944944077e2906b9
 AUX amavisd.initd-r1 828 SHA256 0176e34bbc0261bd3c50ae99174af623fe1aa8e8413c3f6196958c02c37d9f1e SHA512 c9fa8c967026a29e486ffb79a10578efa28ba868985a0e83f88ab04987bc0a80a17613e9c92a3c7e03676ab2ee27f07e79cf7b21069161f73c6e517226b7e40f WHIRLPOOL 48958a935e3a79ab44315969b69ff7223241a60a52b14bbbc64daf2363dfb259da8a141c5617f13f7fca6bce2a0b636ac36a4f503f384bdbc5d2c5bc04332306
 AUX amavisd.service 290 SHA256 4e99da77c6d466d03e149470168f1674d3b81c6c0aceb1c22954c8acd5542502 SHA512 2b67bece7706d1f18892cfb142970c7068dfe9c81eee546038ef27561619ad9633f593a98f6afb5f070cd608d6f7c9e7130a5d7e815c050f00d2e6cee220c6d3 WHIRLPOOL d825144145b049575f47216b76e5b42458663a9f8db79c930d2014bb2c0162719cb4bc85f15863243c318e11bf40dd75a09334c774ba613016e53b8802d2ea27
 DIST amavisd-new-2.7.2.tar.gz 945448 SHA256 4665e0fb9a71f483f1123113a006291e37f744a5880f945ccf9fd34d51cb9275 SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 WHIRLPOOL c0422d80b9dc11a7a2e9cb10092b7c97c02536aa852f70c566ab6e2e6a865b901ad24caf626b8b02ee64979bced7c25f03888827fd47ffbc4e733bb733e08c9e
-DIST amavisd-new-2.8.0.tar.xz 716556 SHA256 c21df73b4ba12322b67779fa5f6f23f57757240568f57d81e94702f0f7c1ce8c SHA512 4c927a6956027d8c953b455d37c0c152950ad392c50de992ecbd1f3525d13c11bc29b845496a2a51713fafbf62b6d589435d385b3bccaa34829049890cf56635 WHIRLPOOL c82d58a4d4337b3b42dcdd2e8b80060bdf288db51bdb5e69a8a1351733b4661d79a52d257f18cd26cf9a334f1195db0d8d9a0e3bf28a1043a49e5946817fba62
 DIST amavisd-new-2.8.1.tar.xz 731816 SHA256 6e333a70adbd24ec52202700059fbf133e20b3c3bf5ec6f4bb10f9a2f25ea82e SHA512 a840b57513b8a7b18e15085016c273ba2fba5cceb76ef52c52aa2ca34e9257be78f8bb8ea350dbdac3b26d2aba8f5aae821c1c45f2d37bc6be04ff2efb9f3ade WHIRLPOOL 0d0ce9a1e8adae101d0aace45251c02118c8f4481e67ab1af7fb32843010ac9e0b9f8ab88f0769a27c1e74e297507efe53c3a6e8ce84c616e1beeaf281027044
-DIST amavisd-new-2.9.0.tar.xz 752344 SHA256 a33b1bbb9a4ae9d00340291081e22dc7be00e60cd2dac6a93c17785cbc517fdd SHA512 490f249b47638368c4e39b1e90a0654c965ed0c3102495c152c1f365a2fb962078a2bcfb57dccbf0fa8008494d85414734a6cde2aeded7aeda6bf4c1201de59d WHIRLPOOL 31a979bc573b051217101fa317894dabbe5ad75f0d636ae3c720f9c184c9295cddc3acc532950e524348103596113cefd2660cf12753f08837cc9ef931f44f16
 DIST amavisd-new-2.9.1.tar.xz 753076 SHA256 442d6c185c19fd1d3288ee7eb2ac102a7d541c4d6e1724cdaf369df6ca629ba0 SHA512 6829a769f50498aaec4fd5c198059f828e9ba90223083e439caa9d2bd19006e0cff8ae7b1e2416009bd2514aae4428598142e86a63260b5292c15b515792a7af WHIRLPOOL 82c8630323e718b5fe9eccf38d592f6539cc56616f2eb0bea590e4d0b8ad70f30cfb2a7c13afddd1f838a26cd82cc6338199c3f9e2a402f1c67e1fe240deaed1
 EBUILD amavisd-new-2.7.2.ebuild 4286 SHA256 24b423853175ccf57a2590cdbd914891360f149ae27abc93befb2178031b7b13 SHA512 e335f31e8620dbd770dc06c59380959da2cde0b4a197e2752a93ee711dce67beaf19b81ad7b7f5ba4aee659a43aaedc923ba3a9ccf45ee8b52f443bb8ea557b6 WHIRLPOOL ead181cc33f0629b5440786c1be3aacfbf17c269d1de0412dfbeba6c5bc4b1b14994ab4401cb5ce2097a972eacc20f14f834e8d6b1c12cd75753fbef16557781
-EBUILD amavisd-new-2.8.0.ebuild 4629 SHA256 91f887a7a36852d866838bd09470936eea12196b74250e019cb0e3d57faa3064 SHA512 f5a452ec287c61e82b17d545eea6bfee9c9e862de3cf6aae47a2115b23e2b70707bf9f2085e798ab88ec55283ce111b811c122437513a3ace8905b4b81926867 WHIRLPOOL 6e57103138d4c61996b6e9c13b4fba98989c061d03246611876378b789dac40b20d55a9058a01ee190087c7c74d087c97357e1c44cbdf8622413c7f233d4b801
 EBUILD amavisd-new-2.8.1-r1.ebuild 4918 SHA256 c1911c9f3653170c90f49052af3c5e800fd4b2ad9e06465f7ec241bd8bd3d0d7 SHA512 7bba4c81d8a48d23855629fab0b3190331581c23ef7796daccf1e9e1c1a330221970c1f8026a1d7574e2c19db6eaf5b219930484ec720fb059b5dc4c3736b1b3 WHIRLPOOL 3e2e873113d20ee179c02228bf2fe3c9527616c8aeebecc85812eaf1e4e45947376a45e00486800e04847a73f60ba7365e243d88f6f26c62983ad6d6dd248d5d
-EBUILD amavisd-new-2.8.1.ebuild 4630 SHA256 677ace999088447813b9ea475a7e2007cf1890250838f6e691520fee0976375b SHA512 cc14ba78ccb66e4c1e845ab97bdb1f8e247bb17fb12f36dd689ba904ea8efb2fdcf01961a804570a4c9f3a35b87d23de2f430dcfaa44308b521d1671c25b7792 WHIRLPOOL 554e629dc5eab9eca243ccd7fd4ff125eba786c3fe0684bca8dddb8ac7adb4ddd00cc2209bd3548be8e9cec62fc8371abc1e747ecaa9ca4392de4432423b6208
-EBUILD amavisd-new-2.9.0.ebuild 4735 SHA256 4f6554228212bab5236140b67baa18e394c6db023df934922a998a7a5362d8f9 SHA512 391872beb41cee69035e74fecb1d481d87f223c9bb024f729ed80a931bc20f2640f0df95dffdd1bfdb2f1d47954f9952b7785fa59e182e26a46b5171b4d7cf40 WHIRLPOOL dce392ae038a60845f93fa962cfbcede07bf0318a168b4335df76cdaac3f0f37c1b16fa42e25e6562bc850abb93eca8806f057c294e577d2df1366b56e87cb7e
 EBUILD amavisd-new-2.9.1.ebuild 4735 SHA256 f93635e9999cba481d728b71698171f52f9201077a80d57f95a525dc86ef390f SHA512 4cee113c243e61c89c8e7f8e83730ba42506bf956b8cdc8a9b7485629bc864371acdb7f8da985fe3fe93b81e45687413a6b1e284919d960d05611502692666e4 WHIRLPOOL d9f6bef9914fe1b662883231a2cad151142d3e9af94a9b04f3888af92867231e296c1d380da24424e06f4f80f2db81cea3cd456d23a1c1a3c6d5df090bf52b2e
-MISC ChangeLog 38151 SHA256 ebf71e35aac6d94bb175b5a16f58142d92ab4213b24c719b62ee415e169402df SHA512 17e95046f3ce2b0205218e1814449ce19a0beb764c4421d0f642dad4459a0f8262c3344232f65aa7861a454138b8f367651c8a9abc2376d809b5b41203a2017d WHIRLPOOL 02d949faa0142e7009a11980d4779409202a498ca24c4f88bd1e1fb0d4a4b58f4171f7e5455a5be7d4166c83e2f2c785f6e3f5672aa8df3b3c87aa7ed002c27d
+MISC ChangeLog 38291 SHA256 2296e2c092a2f67a89a49104d6143c0c1e05689dd7cae1a46e6bf45e9c7f241c SHA512 5f5b28e510f753b11740d8c917f310203b03962c7cd046532695f2565ca5a64eaa0cf750018c7602ce02986754f0e66c4a97b3a08eb76e65dbff4b85c98709f5 WHIRLPOOL 19ee417f639ca1cbcbc23d49095ee32e83c14997dc833e27d527d036174bbd990cc81f44b96efa9c11454ce1ff36852e014e9f7cfff736d19f11aaf9b1367fab
 MISC metadata.xml 558 SHA256 d35f31e5c8a6d678fedb999a042c59eaa48a806558cf4e18f0f359ee64f7167b SHA512 af4c3ab95878fd14ad870c4364b3e4c03b863b2501ab2d899c4d6a8bc58e3d3d488f4fcba685939242d3690f490b9113af3675fdd14159eed8d8c873dd6f516c WHIRLPOOL a1dc324646fe6226f635030f825c25ed6e39cdc0a2c51f1a729f9225ff5e234d6c3f0ea297427d00a9ce3e5bbb64b8cac64fc49db78306bb0e5c077b9f1a437c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPLicwACgkQCaWpQKGI+9QpoACggiHqRIdMLVwfdjQeaM+Y3ZU9
-z5EAniOltLYO7zu5MQdPsF3A5ocMmdq0
-=uuXs
+iQIcBAEBCAAGBQJTzfFbAAoJEHfx8XVYajsf7tcQAJrxqiHIPKbelR0IUPmROtjM
+ZdF+0y2JUC1axlhqIND+o14QNtsJLUXbL9ewK1rWpNlH5lDFZYa/XnRt38cr+2hS
+om1F9HCnfTvxhDd0P9ivpuykNvx5i5cP4AJ7AOFpr1fHVzapwywpaoIGMhsl1Znf
+cU/0Mjp7504BrywWAtybnjB68Hn5jaVVlLL2bQ1vAKOkIVm0wU2mVDU39tbTYtT/
+aUuVmKbJ6OVIhEfrNc5w74GTmRBTwSLCk7uGc9QhCsQjwWXoZz5HRMkOZM9Dw++o
+prLBvIDJ8ljxcwh+kDTLTcBils5TzoxGCyFeH81lTW0FHxfZwkJOwYj1rE0zctMa
+HvOmrKrI7nTLJkVvC/QNZ50vBDxf8rUZl81KHxxn3Xp5p/olIYi5OxLCztF0lgiw
+P34ci6dnR10jya5/rHqtrGB3YeAiwuC9kWdBqj0/g+RQuM+++TRPcBB/7tXbVtWx
++psE5uon64LjDfJsEusIE0CNN9rYESHlXLBtZsLlh5p1HFfNqB/EYBQa/OWuRf1u
+ikqUwWKhYEb7xcSz6F720/uAJP+90G0nMECJdSX6ounKsHBNJ1AAZvqqu4Z1qfmw
+oLnBQvj+RMdPtKdRpf0IJD9JmYxpSGk/IZ4v0TrQGiCMK2mhoms4Z/B188ApfDWd
+0Y8JwePpe6CQFd4pYRPG
+=pBvR
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
deleted file mode 100644
index eadc0c83bfaf..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
+++ /dev/null
@@ -1,184 +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.8.0.ebuild,v 1.4 2012/12/17 18:26:39 ago 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.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-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/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=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
-	dev-perl/IO-Socket-IP
-	>=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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-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" "${S}/amavis-mc"  || die
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" 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.8.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1.ebuild
deleted file mode 100644
index 209f07adfeb6..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2013 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.8.1.ebuild,v 1.1 2013/07/04 10:32:11 eras 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.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-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/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=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
-	dev-perl/IO-Socket-IP
-	>=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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-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" "${S}/amavis-mc"  || die
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" 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.9.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.0.ebuild
deleted file mode 100644
index 0972baf96ba4..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.9.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2014 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.9.0.ebuild,v 1.1 2014/05/16 19:07:41 eras Exp $
-
-EAPI=5
-inherit eutils systemd 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.xz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-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/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	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
-	dev-perl/IO-Socket-IP
-	>=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
-	clamav? ( app-antivirus/clamav )
-	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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-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" "${S}/amavis-mc"  || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	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
-
-	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" || die
-		fi
-	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}"
-}