commit:     34ddfef24e1740025854af215d7b04809fb7e65f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 14:53:30 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 23:23:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ddfef2

mail-filter/amavisd-new: remove old "unused" versions.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-filter/amavisd-new/Manifest                   |   4 -
 .../amavisd-new/amavisd-new-2.10.1-r4.ebuild       | 181 --------------------
 mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild  | 180 --------------------
 .../amavisd-new/amavisd-new-2.11.0-r2.ebuild       | 177 -------------------
 mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild   | 167 ------------------
 .../amavisd-new/amavisd-new-2.8.1-r1.ebuild        | 188 ---------------------
 .../amavisd-new/amavisd-new-2.9.1-r2.ebuild        | 180 --------------------
 7 files changed, 1077 deletions(-)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index ebee6ac630e..44fb609486f 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,5 +1 @@
-DIST amavisd-new-2.10.1.tar.xz 767716 BLAKE2B 
603dabc34e2304084f725633bb772fc78316bbccbd5635940cf257bf19d38ffcfc44087832d5d8db270b943c27b5074f32fb76804e2f19a721e7bc9aae09d9c6
 SHA512 
1939cc60136fe37a078ebd6117a774bcc7ee34b68807472eb08ab15414749300925f74898131299fb051c539cc59d264003439a6307c9d0fa16971d02dab1ff9
 DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 
59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654
 SHA512 
a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
-DIST amavisd-new-2.7.2.tar.gz 945448 BLAKE2B 
b6315f080b246a8715761fbc9516631b6737fa6b7995a52b0e013ed8704546d741d678e09ed5f21d590527bcfb9fa27d051167cd673828b85539d9e495b8dafc
 SHA512 
f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756
-DIST amavisd-new-2.8.1.tar.xz 731816 BLAKE2B 
6becb5a9d2029605030f04fc8876570aedd2c8d925a9a202aff22969d0e0001d9ed56e25e00ad7f1181671c16482a90b139f8327abf8478a3c56e5e132e5f662
 SHA512 
a840b57513b8a7b18e15085016c273ba2fba5cceb76ef52c52aa2ca34e9257be78f8bb8ea350dbdac3b26d2aba8f5aae821c1c45f2d37bc6be04ff2efb9f3ade
-DIST amavisd-new-2.9.1.tar.xz 753076 BLAKE2B 
835ce09dcaa98b44447d48522b3dfddb8066add0e2fe10767118c5979aeaee37c0db439e17721d9e5c6b40977b5db3ff0213261ea0fc88a2d6566249c1d57888
 SHA512 
6829a769f50498aaec4fd5c198059f828e9ba90223083e439caa9d2bd19006e0cff8ae7b1e2416009bd2514aae4428598142e86a63260b5292c15b515792a7af

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
deleted file mode 100644
index f9e7a0683a5..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/";
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz";
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~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
-       virtual/perl-IO-Socket-IP
-       >=virtual/perl-Time-HiRes-1.49
-       dev-perl/Unix-Syslog
-       dev-perl/Net-LibIDN
-       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-LibZMQ3 )"
-
-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
-               newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
-       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}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
deleted file mode 100644
index 0a0c01a71b0..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/";
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz";
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~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
-       virtual/perl-IO-Socket-IP
-       >=virtual/perl-Time-HiRes-1.49
-       dev-perl/Unix-Syslog
-       dev-perl/Net-LibIDN
-       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}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
deleted file mode 100644
index 37446c48476..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/";
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz";
-PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin 
zmq"
-
-DEPEND=">=sys-apps/sed-4
-       >=dev-lang/perl-5.10.0"
-
-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
-       virtual/perl-IO-Socket-IP
-       >=virtual/perl-Time-HiRes-1.49
-       dev-perl/Unix-Syslog
-       dev-perl/Net-LibIDN
-       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-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       if use courier ; then
-               eapply -p0 amavisd-new-courier.patch
-       fi
-
-       if use qmail ; then
-               eapply -p0 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
-       eapply_user
-}
-
-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
-               newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
-       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*
-       dodoc -r 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
-}
-
-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.2.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
deleted file mode 100644
index b2bce29bb34..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/";
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="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.8.1-r1.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
deleted file mode 100644
index fac90db569b..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/";
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc 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
-       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-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
-
-       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
-
-       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
-
-       #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.1-r2.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
deleted file mode 100644
index 72d7bbcee46..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/";
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz";
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~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
-       virtual/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
-               newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
-       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}"
-}

Reply via email to