Remove old

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

9 files changed, 9 insertions, 711 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/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 $?
-}