gentoo resync : 16.09.2020

42 files changed, 198 insertions, 1479 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 703002097c39..11456a81378c 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 75b869f43abb..94e693c0374b 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,9 +1,5 @@
-DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
-DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
-DIST afew-2.0.0.tar.gz 33116 BLAKE2B 59f2686a6495ee9e4a0afaf3180a83667bc65aaee453fe73cb2813401778d63fbb67adb45ed5f98c5c593d07d53411042096d44d85e652157d6705eb2e236152 SHA512 09eaca6fd387b76f310879f6e04c21f3247e703300d9995d40c420a06a5884cb08ebd51e5d1caee6d8c5be29844f6d562838104445e7b7efd372690c1856f97d
 DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e4a768f2a1118b72893517fc3a8122a7a63d2e26659bf1afc2467bc7503f279b8037c65da9c250c18b152b SHA512 8d1947d547bde7fdc9ec2fc8fb212165fecc1cd4bc37c2dda60133e5ffe31dee1393ad0a92e4f0e2c85863a01f7ae252555e88868fa8ba5dece8380080f0e36c
-EBUILD afew-1.2.0.ebuild 815 BLAKE2B 4073b92aa56297b14c39ed1d954dc69cb2284526a08dca2ef9f1809c63a5b1ec03e4e110fc097e4fa5bccc49a21751379f9a9c2d0a0d9fa7bea967031deb8137 SHA512 bc0a703814c7813d217fecd568ee71ba04bbbefe348733bee0e8b0d9f7b83149fd6d8cc3710b79885cabbc64af4c865b6d96be4b2cdef1a5eccb37d7d108aafd
-EBUILD afew-1.3.0-r1.ebuild 865 BLAKE2B 9b17cdb5481927f3d5dcaa3b19b0305238331e47fc84337bc47edf041021c82c4229a8a9d65b516f81ce92706d991a2cd057dfc53efa313520e76cd361e2dc35 SHA512 03de0950dd23a2fc7d5424d1b17ac1472576cbcc8764fc98ae1bba5cd75c0758b44bccbacca9ceb0b38a15f515a7860d1cc77c124690ab4c96ece5061f2aae99
-EBUILD afew-2.0.0.ebuild 1166 BLAKE2B 460e123ac14cbb91eeb5173e006379052e8175b55e216738b450a41fc9902d1c32daa247c913fdfad2e30e4e5d8f077f9fa350232731abb0ad9e86084cb62d04 SHA512 dc1a65b85308cc7daea5dc770301515d0a7221abfe0ca84ba281f158705bc41ce4defc2095bced5831ee1b6211bce5cfbda35a4154cbc7717d940084069916d5
-EBUILD afew-3.0.0.ebuild 1165 BLAKE2B b0ace2eebed48bf98c09b5ee1cc6ccffd4e10fd23cced0a59376d35c34bf6f421d4038521e8383c9e697e1d1c7526d912b425178e786be5d9e788e22bc93e778 SHA512 c8f2561321ea850e6de1005291ef5073a47d1bc6687691524624bbb6a673ffbf0ccf18222b6ef12290682418a93537844dc58535c278e0fa86fdb87d68c24a9b
+DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
+EBUILD afew-3.0.0.ebuild 1164 BLAKE2B 233267562dfa67077beebe764f976ade4629b35ed0dade646447ed3b5d2621fa37643a37704a2e9dc4a5229559d1189872d05bcc40ff84657c2051ffb59305c3 SHA512 7912869b7b7fa2bda7b3389af1f9a5ed85deb0a386ee2079a004f6c0a9d328b3b65e89d2502e827e2da74955189b24899910c4d399fb9ebe9afa94dcd66e1135
+EBUILD afew-3.0.1.ebuild 1184 BLAKE2B cd13530f831fcb95c619c33c970a9a6d0b8f7712d0f1b28a439f082ce0934831c471c43edd6499e90ac4ee93a1deedfb4dcb8a6b379324d258781a33b11ddb18 SHA512 b5661f088706ff3b0ee80f6a323d647601dc567714fec3be251030ff25cf90920f6efafde4eaf469f1c26f54a5708c1da7aec9d052ba45e9d2d9160f70936a80
 MISC metadata.xml 1001 BLAKE2B 33e569aa1f5f64926dfb7a74743d1cd40d16177ef814cb25e16904c20b8ba7b1ef1b12562bd437353254af73abf0759ab90da818a0aaf5acc4cae089bd21451a SHA512 44016d8a87273ede7b9fd52871095894725584202b17c69feb7b599859cbdd6202c2e41296744e63fcc918b95daf1962f64af9ea87b627bd4bf8d318b2703feb
diff --git a/mail-filter/afew/afew-1.2.0.ebuild b/mail-filter/afew/afew-1.2.0.ebuild
deleted file mode 100644
index 839aa0f2d51e..000000000000
--- a/mail-filter/afew/afew-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-1.3.0-r1.ebuild b/mail-filter/afew/afew-1.3.0-r1.ebuild
deleted file mode 100644
index 3f9be50612f1..000000000000
--- a/mail-filter/afew/afew-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-3.0.0.ebuild b/mail-filter/afew/afew-3.0.0.ebuild
index 799d25c1b5ff..8f216a8027dd 100644
--- a/mail-filter/afew/afew-3.0.0.ebuild
+++ b/mail-filter/afew/afew-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/mail-filter/afew/afew-2.0.0.ebuild b/mail-filter/afew/afew-3.0.1.ebuild
index b9e74273e201..a2ee5e08bf39 100644
--- a/mail-filter/afew/afew-2.0.0.ebuild
+++ b/mail-filter/afew/afew-3.0.1.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -19,13 +20,13 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/dkimpy[${PYTHON_USEDEP}]
+		net-mail/notmuch[python,${PYTHON_USEDEP}]
 	')"
-DEPEND="
+BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	')"
 
 DOCS=( "README.rst" )
@@ -46,5 +47,6 @@ python_compile_all() {
 python_install_all() {
 	doman docs/build/man/*
 	dodoc afew/defaults/afew.config
-	use doc && local HTML_DOCS=( docs/build/html/. )
+	use doc && HTML_DOCS=( docs/build/html/. )
+	einstalldocs
 }
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 0c94e87b6cfe..91c797b2b918 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,12 +1,8 @@
 AUX amavis-mc.initd-r1 492 BLAKE2B b2bafdecd2d57ca52216154def014596f31670300510b0d2d049a4790ee3cc5a29c339ca8b7bb27503d0671b028d9da7d1ddadc662cabae18cac2a659ce2b676 SHA512 66d6364e12a0e71184682bfd35bdd1004c0cd6ee634936da8888b49f21d6c506e0645eabf8ae53ca08dccd9081f9753d63951258ccee8abd9fabf7d28233c533
-AUX amavisd-2.11.0-dkim.patch 428 BLAKE2B f9c1bcab637febaf0546f204db0260cb7dc6bc35e27092545f99fb13cb2de27638a3cb04177de6dcb406c216a1168f44141e477f460eced830ba4376581005af SHA512 85628ad2b9c1cde478b579865d414fb941798aafe8968d26af5ef9dddf0f9ec4a3ed1e2077a46ee0632a9ce9be159ad9696badad35a1117cb7437c2ab0c4a973
 AUX amavisd-snmp-subagent-zmq.initd 911 BLAKE2B 7cb247978f70d1b7468919b1df3f2e147b4ca48c6748401c6621d1db7b326981b513b0f02fce582052fdf6a0d5e8b6d55cab52198e262a673802626769050edd SHA512 846ed4622417657f7bc3dc5fa5d9b361dddfe7a13753dab7e8b2328a09dc9c21800c4cd990bc5dc466945ef857861413b8e5a8e726a40f0fa1831c509755e60b
 AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e
 AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
-DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
-EBUILD amavisd-new-2.11.1-r3.ebuild 5214 BLAKE2B 87ad69414234780a535697ce54b84669c1c28b51053c5c4e7e927742ec6387afe10573278e2825c71812f2f0dbdeec1af5efb7530a7863460b0cd974bed59146 SHA512 50f1fe496433a34a86d0e02fac8ae28655543ba25653b6066f9f6d1184632ddf78665e99218ecd191cbab80ec8115654ad3a0de39f2787a324ed1c19b776bb2f
-EBUILD amavisd-new-2.12.0-r3.ebuild 5332 BLAKE2B 3e377d15053535aa113909c3ede2b9fa489bb74ae0a7e76bfc580e67a978e1b76de62d7e54f5b710c47270a44c30b2975bd8e39fa3583ed21fce703a7222f2f7 SHA512 9e5eab2e8dee9cb3fc5150cfd0856f387e9534213fe880bcd55a9c7057fb194ec94898866e223402a7ce77db5f3e8f901c5e3262c1f42be46e12b8aa5b8783a5
-EBUILD amavisd-new-2.12.0.ebuild 5264 BLAKE2B 7cf639a83ebf1b384b07d32276224781d3b22ed056d98e22c357686b3afb2a09f5997b71bd75fe204e3f951344d06c06a339900cdc3520601b2d9a90fe2f33e4 SHA512 c77aa8a8a652d18f37c9a9702eba93bcbeda4c613e143f8088e7c495f8269d7f41e59105aad2b014319f2e7c1e98b5cbba2110b29c934914df4ff5652c28b78f
+EBUILD amavisd-new-2.12.0-r4.ebuild 5330 BLAKE2B 010299bc8a5f580f715fef7834d488f250817597204234554734dec0975ead2b96dca2e6b7586a8732964eb277d62320895b62cb647a6b77e3357830fc51f51a SHA512 9e1887e9fe1e18edb08a04bc8948fa2406114586d6e9862e6d0274ce0769b28bea7e98988629100e0592d75e73e880aa44ecca60a6969027d2cc3cebd2f9a793
 MISC metadata.xml 925 BLAKE2B b75aca7f3afff0d320516d293b6c88b34be4599a0233675f3bdeb3881a857a1b6316dba66cff118667d0c455650c0b23da3f471dbab9f9710cdc3dcf23b55aae SHA512 27cbf8cebfe1e2611193a954edad5fce81cf27f2a4f7d1746d975529317ee45b94b250c47c013856e18f339c3ea234b59fc3990aac5176bffec67786e67f8d1f
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
deleted file mode 100644
index ba4e5ba01f52..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="https://gitlab.com/amavis/amavis/-/archive/${P}/amavis-${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~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.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/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
-	dev-perl/File-LibMagic
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/perl-File-Temp
-	dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	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 dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/amavis-${P}"
-
-pkg_setup() {
-	# Create the user beforehand so that we can install the config file
-	# (and some directories) with group "amavis" in src_install().
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-}
-
-src_prepare() {
-	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
-	# see https://bugs.gentoo.org/603582
-	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
-
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	# We need to fix the daemon_user and daemon_group in amavis-mc even
-	# though we're going to run it in the foreground, because it calls
-	# "drop_priv" unconditionally and will crash if its user/group
-	# doesn't exist.
-	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{,-agent,-nanny,-release,-signer,-status}
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
-				 amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema "${PN}.schema"
-	fi
-
-	# The config file should be root:amavis so that the amavis user can
-	# read (only) it after dropping privileges. And of course he should
-	# own everything in his home directory.
-	insinto /etc
-	insopts -m0640 -g amavis
-	doins amavisd.conf
-
-	# Implementation detail? Keepdir calls dodir under the hood.
-	diropts -o amavis -g amavis
-	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
-
-	# BEWARE:
-	#
-	# Anything below this line is using the mangled insopts/diropts from
-	# above!
-	#
-
-	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
-
-	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
-
-	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
-}
-
-pkg_preinst() {
-	# TODO: the following is done as root, but should probably be done
-	# as the amavis user.
-	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
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
index 04e130e5d3e9..3054b84528d7 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}
 	app-arch/ncompress
 	app-arch/p7zip
 	app-arch/pax
-	app-arch/unarj
+	app-arch/arj
 	app-arch/unrar
 	app-arch/xz-utils
 	app-arch/zoo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
deleted file mode 100644
index e38d6d4fe4f3..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
-
-MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"
-RDEPEND=">=dev-lang/perl-5.10.0
-	app-arch/arc
-	app-arch/bzip2
-	app-arch/cabextract
-	app-arch/cpio
-	app-arch/gzip
-	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
-	clamav? ( app-antivirus/clamav )
-	>=dev-perl/Archive-Zip-1.14
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	dev-perl/File-LibMagic
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-stringy
-	>=dev-perl/Mail-DKIM-0.31
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/MIME-tools-5.415
-	dev-perl/Net-LibIDN
-	>=dev-perl/Net-Server-0.91
-	dev-perl/Net-SSLeay
-	dev-perl/Unix-Syslog
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	net-mail/ripole
-	net-mail/tnef
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	rspamd? ( ${MY_RSPAMD_DEPEND} )
-	rspamd-https? ( ${MY_RSPAMD_DEPEND} dev-perl/LWP-Protocol-https dev-perl/Net-SSLeay )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	>=sys-apps/coreutils-5.0-r3
-	>=sys-libs/db-4.4.20
-	virtual/mta
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Temp
-	>=virtual/perl-IO-Compress-1.35
-	virtual/perl-IO-Socket-IP
-	virtual/perl-MIME-Base64
-	>=virtual/perl-Time-HiRes-1.49
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/amavis-v${PV}"
-
-pkg_setup() {
-	# Create the user beforehand so that we can install the config file
-	# (and some directories) with group "amavis" in src_install().
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-}
-
-src_prepare() {
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	# We need to fix the daemon_user and daemon_group in amavis-mc even
-	# though we're going to run it in the foreground, because it calls
-	# "drop_priv" unconditionally and will crash if its user/group
-	# doesn't exist.
-	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{,-agent,-nanny,-release,-signer,-status}
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
-				 amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema "${PN}.schema"
-	fi
-
-	# The config file should be root:amavis so that the amavis user can
-	# read (only) it after dropping privileges. And of course he should
-	# own everything in his home directory.
-	insinto /etc
-	insopts -m0640 -g amavis
-	doins amavisd.conf
-
-	# Implementation detail? Keepdir calls dodir under the hood.
-	diropts -o amavis -g amavis
-	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
-
-	# BEWARE:
-	#
-	# Anything below this line is using the mangled insopts/diropts from
-	# above!
-	#
-
-	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
-
-	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
-
-	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
-}
-
-pkg_preinst() {
-	# TODO: the following is done as root, but should probably be done
-	# as the amavis user.
-	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
-}
diff --git a/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch
deleted file mode 100644
index d9aa07d732ba..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html
-
---- a/amavisd
-+++ b/amavisd
-@@ -34338,6 +34338,7 @@
-     $sig_ind++;
-   }
-   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
-+  $msginfo->originating(c('originating'));
-   $msginfo->dkim_signatures_valid(\@signatures_valid)  if @signatures_valid;
- # if (ll(5) && $sig_ind > 0) {
- #   # show which header fields are covered by which signature
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
index cecdd75f8481..0127e84b7dbd 100644
--- a/mail-filter/courier-pythonfilter/Manifest
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -1,3 +1,4 @@
 DIST courier-pythonfilter-3.0.2.tar.gz 59121 BLAKE2B 6223ddd62c1c1af980720451e3446cd3b2296a243c5c8d3b5e60fd8640e3391ba2e561ea251bbacbb4a1c6cdbe7eccf6f7ff8221d952cf5703d389b0267a1a2f SHA512 62985a3fefc2d324b3ba7035117e88e4e246815e63fe1b681af11a38a20ea55e649a233c1979b918b166f5c2abbcc22037f215b73be298763f777648249cd652
+EBUILD courier-pythonfilter-3.0.2-r1.ebuild 485 BLAKE2B b138d3528c6ad24c171ea68e323a3c51e73632ef4b651a2010778ee5ceccd7b3e46c710aa68fa58aa53911adf773833ec9ab98de7670d8f850461daad268d457 SHA512 77d3df1e48b6131b51a2c8720ad242fe7235a7cc9e418871275d85aacaba1a650749a59456d9bed0fa198e781f824b2c2f31c4bd2eb7747aca39ef54c425e5ee
 EBUILD courier-pythonfilter-3.0.2.ebuild 481 BLAKE2B 28cca6afd5fcc5298cafa3bfb7236bd61d48ef4387e7a85d544d4d983433c0ce48d2e4f501cc42ae93009b4291ddb92ae7a6d7230daa5a9a71eb43703319583d SHA512 b588c761d3f2b79d5866e5c5604ae85c3457bfe8f5899150f2122cec88119480b84df2e89ef981951c7276d0c45334bf40e462da102c0caba46f25a9249d16ab
 MISC metadata.xml 299 BLAKE2B 495df9e20b847c1760adbd30a80d131f07be4a51f1bb4727835bcfaa37c804bf0cbfa9a2697e8907507445ad4785129c97902d88aa4890122d2c4100d9233db1 SHA512 3658867ae9276068ed78a26bf218dbe5125025336119678d699c77f643884c55dbb4b8b19eb304447b0efcacf4b8eda437217e9ba8cacb7dffccc0d4464bc6e6
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..c7253148ccae
--- /dev/null
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python filtering architecture for the Courier MTA"
+HOMEPAGE="https://pypi.org/project/courier-pythonfilter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="mail-mta/courier"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
deleted file mode 100644
index eb26dc68648b..000000000000
--- a/mail-filter/dspam/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX dspam-3.10.2-mysql8-my_bool-typedef.patch 395 BLAKE2B 36c85ea2f2b2c9a4bd207b34194baffd9cc923dfeedd0441fb9b950a0ad0a80a453d4e9ddb774de82397402e75bc0b89a22aa09569df051f31af97b623cce7ef SHA512 d562bc266ff751b8b4dcd6ac198a237f73c75731868224ab558b8207809302b61491c86ad72cefa4199d31e127339c3dd2830fb013025a0e3b015beb8c075027
-AUX dspam.confd 299 BLAKE2B aab266bbf21ec63e668ee0ec88f3d8b1c7d2bf34f5dac43c063869ad2d2151767ae9c58e58bfc3709161322730f9590553d1b264bf0b1d875aa27b7c81d634af SHA512 fed17bf8b053924b42d7eaf11508ce3a75ca065c495c68a41016d82456cc8055bbd19c67135ab3d0d8cffe9717487c7000c8600a8dc1e077d18052919d98b433
-AUX dspam.cron-r4 160 BLAKE2B 55a8bc86a1ea34ea8a17a8dd41cb21625682e94d02086060a58c26e9a553579fbb344b8fe364ed717591be9af7cda7e2270b86fce0428d72fd30e48fe576af5c SHA512 b00260fb3017c34d6c37ac97139dda82a609740ee751f8e97487e9bbdb27582715adab418fcf4650c34a0b0d04ebad9c2aac14580e29a5cfca78b783b3e8c14c
-AUX dspam.initd 867 BLAKE2B c0dd2e67cb57b646b95b2b5cdf12aeea647166fde24036497e5e528e2bb6b66312e12c9895397f3dafb525dd12d528cb0550250e25d320ea133098be50adba88 SHA512 19d9abe29187612e358f4d7c428cf7313254e06e378f8ab5b6996871e80b6ceaf7c63763a6f6a4c3e4c0ff5d0d303a341c8995d87927f8f5b38580583af9a8f8
-AUX dspam.logrotate 180 BLAKE2B 157570caf3ce9885ded6aaf99f189985a730306e7a15cdb77dfc050134e75722ac0d82b27f69ed9478b252e458a39b3705801d9829d4759cf439a892aaf66275 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389
-DIST dspam-3.10.2.tar.gz 1035054 BLAKE2B 9200e6a3449feea3cec80572d7856597e487e553a69b52e7ecee1cd17c0792faf48fbda9e253d1fe52be40b8f0d4dcab4006b898abdcc62289550f17d7d876d3 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856
-EBUILD dspam-3.10.2-r2.ebuild 5933 BLAKE2B 124d4a8e3bcc45c75df78a47a895f97717662c8026e889dbaa7b70ffba4277fc2a126e8e2f46903299567f886295823083d037726c345974d5403dff910b1b64 SHA512 b140a514d4257d9aa40206879563e27b30d8287810a41fbd1a78d656618d7e68b1bcfe429c8a666069c8cac3e5f6d979303757bedd38f40418435921702d4db7
-EBUILD dspam-3.10.2-r3.ebuild 5996 BLAKE2B efbe8799c7b1d1083856647cd138600d4a1a8a889965d56430faad46c7c27f6ce6b0a7d97e4267b46b41ba1337741f36e8a05bab983cf283bceefe5dbd03547e SHA512 11bd8f1eb385ae8696836a188b091752a6d2b5fac196ce365cbd6f24bf99c5221ea86c0ad2f669f76c452e70285f779645204ae3222f7f97acaaa3d518961ccf
-MISC metadata.xml 1080 BLAKE2B 99fe9506bc845c43f298230a531ea6e463dae9ffa353b7e55c1133f0ee37d10e2b0846f6edc726fd690e1ec637809e4e2fdb5a04456b80b7382fd767b39b44e3 SHA512 963fd0fc0c898ad12877e5905917d0b733cf8e52c62d254955455b60e60eacd1b909c998e3e88c030cfd9024786da80920222369939a189d8e142500a13a636f
diff --git a/mail-filter/dspam/dspam-3.10.2-r2.ebuild b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
deleted file mode 100644
index 0144efda5694..000000000000
--- a/mail-filter/dspam/dspam-3.10.2-r2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="small-scale +domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-	net-mail/mailbase
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
-	${DEPEND}
-	clamav? ( app-antivirus/clamav )
-	syslog?	( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: select exactly one
-# - user-homedirs does not work with virtual-users
-REQUIRED_USE="
-	|| ( ${DRIVERS_IUSE//+} )
-	static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-	^^ ( ${SCALES_IUSE//+} )
-	virtual-users? ( !user-homedirs )
-"
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-	# setup storage, this sets DSPAM_DRIVERS
-	dspam_setup_storage_drivers
-
-	# create dspam user and group
-	dspam_setup_user
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=${DSPAM_CONF} \
-		--with-dspam-home=${DSPAM_HOME} \
-		--with-dspam-home-group=dspam \
-		--with-dspam-mode=${DSPAM_MODE} \
-		--with-dspam-group=dspam \
-		--with-logdir=${DSPAM_LOG} \
-		--enable-external-lookup \
-		--enable-long-usernames \
-		--enable-split-configuration \
-		$(use_enable clamav) \
-		$(use_enable daemon) \
-		$(use_enable debug) \
-		$(use_enable debug bnr-debug) \
-		$(use_enable debug verbose-debug) \
-		$(use_enable domain-scale) \
-		$(use_enable large-scale) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable user-homedirs homedir) \
-		$(use_enable virtual-users) \
-		--with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-		$(use mysql || use postgres && echo "--enable-preferences-extension") \
-		$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
-}
-
-dspam_setup_user() {
-	# DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-	# under suexec in apache, so DSPAM user/group need to be regular users too
-
-	local euid egid
-	for euid in {1000..5000} ; do
-		[ -z "$(egetent passwd ${euid})" ] && break
-	done
-	for egid in {1000..5000} ; do
-		[ -z "$(egetent group ${egid})" ] && break
-	done
-	enewgroup dspam ${egid}
-	enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-	# Find out which storage drivers need to be enabled, and set some
-	# variables so that src_configure can pick them up
-
-	if use hash; then
-		DSPAM_DRIVERS+=",hash_drv"
-	fi
-
-	if use mysql; then
-		DSPAM_DRIVERS+=",mysql_drv"
-		DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-	fi
-
-	if use postgres; then
-		DSPAM_DRIVERS+=",pgsql_drv"
-	fi
-
-	if use sqlite; then
-		DSPAM_DRIVERS+=",sqlite3_drv"
-	fi
-
-	if ! use static-libs; then
-		# set the driver name twice to avoid a static build
-		DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-	fi
-
-	# remove first comma separator
-	DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-	einfo "Building with drivers: ${DSPAM_DRIVERS}"
-	#echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-	default
-
-	if use daemon; then
-		newinitd "${FILESDIR}/dspam.initd" dspam
-		newconfd "${FILESDIR}/dspam.confd" dspam
-	fi
-
-	if use mysql; then
-		insinto "/usr/share/${PN}/mysql"
-
-		local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_user_aliases.sql virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.mysql_drv/${file}
-		done
-	fi
-
-	if use postgres; then
-		insinto "/usr/share/${PN}/pgsql"
-
-		local files="pgsql_objects.sql purge-pe.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.pgsql_drv/${file}
-		done
-	fi
-
-	if use sqlite; then
-		insinto "/usr/share/${PN}/sqlite"
-		newins src/tools.sqlite_drv/purge-3.sql purge.sql
-	fi
-
-	insinto "${DSPAM_HOME}/txt"
-	doins txt/*.txt
-	local i
-	for i in spam nonspam; do
-		echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-		doins "${T}/msgtag.${i}"
-	done
-
-	newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dspam.logrotate" dspam
-
-	dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-
-	# stop logrotate-3.8 from complaining
-	dodir /var/log/dspam
-	fowners dspam:dspam /var/log/dspam
-	fperms 0750 /var/log/dspam
-
-	# Install dspamc setgid
-	fowners root:dspam /usr/bin/dspamc
-	fperms g+s /usr/bin/dspamc
-}
-
-pkg_preinst() {
-	# dspam-3.10.0: config dir change, should be removed at some later point
-	if [ -d "${ROOT}/etc/mail/dspam" ]; then
-		ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-		if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-			# symlink, this is the setup in older ebuilds
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-
-		elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-			# directory and no symlink, do it manually since we cannot decide.
-			ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-		else
-			# nothing interesting in /etc/dspam
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-		fi
-	fi
-}
diff --git a/mail-filter/dspam/dspam-3.10.2-r3.ebuild b/mail-filter/dspam/dspam-3.10.2-r3.ebuild
deleted file mode 100644
index 5343bc91d6d3..000000000000
--- a/mail-filter/dspam/dspam-3.10.2-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="small-scale +domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-	net-mail/mailbase
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
-	${DEPEND}
-	clamav? ( app-antivirus/clamav )
-	syslog?	( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: select exactly one
-# - user-homedirs does not work with virtual-users
-REQUIRED_USE="
-	|| ( ${DRIVERS_IUSE//+} )
-	static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-	^^ ( ${SCALES_IUSE//+} )
-	virtual-users? ( !user-homedirs )
-"
-
-PATCHES=( "${FILESDIR}/${P}-mysql8-my_bool-typedef.patch" )
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-	# setup storage, this sets DSPAM_DRIVERS
-	dspam_setup_storage_drivers
-
-	# create dspam user and group
-	dspam_setup_user
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=${DSPAM_CONF} \
-		--with-dspam-home=${DSPAM_HOME} \
-		--with-dspam-home-group=dspam \
-		--with-dspam-mode=${DSPAM_MODE} \
-		--with-dspam-group=dspam \
-		--with-logdir=${DSPAM_LOG} \
-		--enable-external-lookup \
-		--enable-long-usernames \
-		--enable-split-configuration \
-		$(use_enable clamav) \
-		$(use_enable daemon) \
-		$(use_enable debug) \
-		$(use_enable debug bnr-debug) \
-		$(use_enable debug verbose-debug) \
-		$(use_enable domain-scale) \
-		$(use_enable large-scale) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable user-homedirs homedir) \
-		$(use_enable virtual-users) \
-		--with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-		$(use mysql || use postgres && echo "--enable-preferences-extension") \
-		$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
-}
-
-dspam_setup_user() {
-	# DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-	# under suexec in apache, so DSPAM user/group need to be regular users too
-
-	local euid egid
-	for euid in {1000..5000} ; do
-		[ -z "$(egetent passwd ${euid})" ] && break
-	done
-	for egid in {1000..5000} ; do
-		[ -z "$(egetent group ${egid})" ] && break
-	done
-	enewgroup dspam ${egid}
-	enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-	# Find out which storage drivers need to be enabled, and set some
-	# variables so that src_configure can pick them up
-
-	if use hash; then
-		DSPAM_DRIVERS+=",hash_drv"
-	fi
-
-	if use mysql; then
-		DSPAM_DRIVERS+=",mysql_drv"
-		DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-	fi
-
-	if use postgres; then
-		DSPAM_DRIVERS+=",pgsql_drv"
-	fi
-
-	if use sqlite; then
-		DSPAM_DRIVERS+=",sqlite3_drv"
-	fi
-
-	if ! use static-libs; then
-		# set the driver name twice to avoid a static build
-		DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-	fi
-
-	# remove first comma separator
-	DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-	einfo "Building with drivers: ${DSPAM_DRIVERS}"
-	#echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-	default
-
-	if use daemon; then
-		newinitd "${FILESDIR}/dspam.initd" dspam
-		newconfd "${FILESDIR}/dspam.confd" dspam
-	fi
-
-	if use mysql; then
-		insinto "/usr/share/${PN}/mysql"
-
-		local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_user_aliases.sql virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.mysql_drv/${file}
-		done
-	fi
-
-	if use postgres; then
-		insinto "/usr/share/${PN}/pgsql"
-
-		local files="pgsql_objects.sql purge-pe.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.pgsql_drv/${file}
-		done
-	fi
-
-	if use sqlite; then
-		insinto "/usr/share/${PN}/sqlite"
-		newins src/tools.sqlite_drv/purge-3.sql purge.sql
-	fi
-
-	insinto "${DSPAM_HOME}/txt"
-	doins txt/*.txt
-	local i
-	for i in spam nonspam; do
-		echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-		doins "${T}/msgtag.${i}"
-	done
-
-	newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dspam.logrotate" dspam
-
-	dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-
-	# stop logrotate-3.8 from complaining
-	dodir /var/log/dspam
-	fowners dspam:dspam /var/log/dspam
-	fperms 0750 /var/log/dspam
-
-	# Install dspamc setgid
-	fowners root:dspam /usr/bin/dspamc
-	fperms g+s /usr/bin/dspamc
-}
-
-pkg_preinst() {
-	# dspam-3.10.0: config dir change, should be removed at some later point
-	if [ -d "${ROOT}/etc/mail/dspam" ]; then
-		ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-		if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-			# symlink, this is the setup in older ebuilds
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-
-		elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-			# directory and no symlink, do it manually since we cannot decide.
-			ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-		else
-			# nothing interesting in /etc/dspam
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-		fi
-	fi
-}
diff --git a/mail-filter/dspam/files/dspam-3.10.2-mysql8-my_bool-typedef.patch b/mail-filter/dspam/files/dspam-3.10.2-mysql8-my_bool-typedef.patch
deleted file mode 100644
index 8edafbdf0dab..000000000000
--- a/mail-filter/dspam/files/dspam-3.10.2-mysql8-my_bool-typedef.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/mysql_drv.c	2020-07-07 10:40:33.871152228 -0400
-+++ b/src/mysql_drv.c	2020-07-07 10:43:16.187818893 -0400
-@@ -35,6 +35,10 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <mysql.h>
-+#if defined(LIBMYSQL_VERSION_ID) && (LIBMYSQL_VERSION_ID >= 80000)
-+  typedef bool my_bool;
-+#endif
-+
- #include <limits.h>
- 
- /* Work around broken limits.h on debian etch (and possibly others?) */
diff --git a/mail-filter/dspam/files/dspam.confd b/mail-filter/dspam/files/dspam.confd
deleted file mode 100644
index 75e0d4bda7d3..000000000000
--- a/mail-filter/dspam/files/dspam.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Change this to the user:group you want to run the dspam daemon as.
-# If you need dspam to switch uids, this is root:root.
-# If you use virtual users and deliver via LMTP, this can be nonprivileged such as dspam:dspam. 
-DAEMON_USER_GROUP="root:root"
-
-# Pid file
-PID_FILE="/var/run/dspam/dspam.pid"
diff --git a/mail-filter/dspam/files/dspam.cron-r4 b/mail-filter/dspam/files/dspam.cron-r4
deleted file mode 100644
index edf97dce541a..000000000000
--- a/mail-filter/dspam/files/dspam.cron-r4
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# See dspam_maintenance --help for a list additional parameters
-
-/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1> /dev/null
diff --git a/mail-filter/dspam/files/dspam.initd b/mail-filter/dspam/files/dspam.initd
deleted file mode 100644
index e452630ab946..000000000000
--- a/mail-filter/dspam/files/dspam.initd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-PIDFILE=${PID_FILE:-/var/run/dspam/dspam.pid}
-
-depend() {
-	use logger
-	before mta
-	after postgresql mysql ldap
-}
-
-checkconfig() {
-	local PIDDIR
-	PIDDIR=${PIDFILE%/*}
-	if [ ! -d "${PIDDIR:-/var/run/dspam}" ]; then
-		checkpath -q -d -o dspam:dspam -m 0755 "${PIDDIR}" || return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting dspam"
-	start-stop-daemon --start --quiet \
-		--user ${DAEMON_USER_GROUP} \
-		--pidfile ${PIDFILE} \
-		--exec /usr/bin/dspam -- --daemon
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dspam"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE} \
-		--exec /usr/bin/dspam
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading dspam"
-	start-stop-daemon --signal SIGHUP /usr/bin/dspam
-	eend $?
-}
diff --git a/mail-filter/dspam/files/dspam.logrotate b/mail-filter/dspam/files/dspam.logrotate
deleted file mode 100644
index f5e13067cfc7..000000000000
--- a/mail-filter/dspam/files/dspam.logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/dspam/bnr.log
-/var/log/dspam/dspam.debug 
-/var/log/dspam/dspam.log 
-/var/log/dspam/dspam.messages
-/var/log/dspam/sql.errors {
-	weekly
-	compress
-	missingok
-	copytruncate
-}
diff --git a/mail-filter/dspam/metadata.xml b/mail-filter/dspam/metadata.xml
deleted file mode 100644
index 63838d86ccbf..000000000000
--- a/mail-filter/dspam/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>A statistical-algorithmic hybrid anti-spam filter</longdescription>
-	<use>
-		<flag name="daemon">
-		Enable support for DSPAM to run in --daemon mode
-	</flag>
-		<flag name="debug">
-		Enable debugging support (don't enable this unless something needs testing!)
-	</flag>
-		<flag name="user-homedirs">
-		Build with user homedir support
-	</flag>
-		<flag name="virtual-users">
-		Build with virtual-users support
-	</flag>
-		<flag name="small-scale">
-		Build for small scale setups - puts data to $HOME/data/user
-	</flag>
-		<flag name="domain-scale">
-		Build for domain scale setups - puts data to $HOME/data/domain.com/user
-	</flag>
-		<flag name="large-scale">
-		Build for large scale setups - puts data to $HOME/data/u/s/user
-	</flag>
-		<flag name="hash">
-		Enable support for the file-orientated hash driver
-	</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">dspam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 5e66506560be..c6138ef6b426 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,6 +1,5 @@
 AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502acd6b3cf052a2c578a12120ce515ac640346cfb19135f83082dd2ff748adb95bfb9c519 SHA512 08c2d5db9e607bf583f0f7d4cfb0a8bbef68d19ae068f4e899cc620b199e2cea742e84d98ea79d14d09fc1f4635834140b8ae4c9f71f90d63c6b2fc3debd5ee6
 AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
 DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
-EBUILD gld-1.7-r2.ebuild 1875 BLAKE2B 1f2f2dccb676953a92aa4933fdd8a4ee580500c5118327d1c2ea950cbe6a92879a133d7a742d96409253e73df5a0a5409270ad9c9fba1e8a54269d3c982e618f SHA512 16e11bd850678ef303a81fab386870bc54d9a6341f66ac55e8a84b3d0d86cf9f0fccb3aec9cd39c0eff906eac976e554c055e91c197af8f91eadb35414b931ab
-EBUILD gld-1.7-r4.ebuild 2051 BLAKE2B 9edab9b96caaa40877df42f5169abd072113bdcc03a7b5b1d0fe707fa552f024eb9c259f46dc6f30979f0bcf98885088b259bb235512a006feebf237b3d289db SHA512 ebd7d1de7212ee06688941ec068c57cf6f1764cc7361e035e0de1c7e70a001fcd9f161424eb47a0b32dff4a0a34164cba35980c796a5759dfbf23889694a81a9
+EBUILD gld-1.7-r4.ebuild 2049 BLAKE2B 8373f96ee3953781ad8df8c750bb7b38a1cef373a92fc468a7189537174e04be56126cb3ff6a847a2d571b080147fe90166b752997ff30766e41ba905742f729 SHA512 5f99a5bf91bd034e11b4b2c3b4dcb685441fa21dc0d835dac7d58724562c34dbcd9a7aced48d24c4b4f86499846934c7b3136f6283a2dc5cdf512023e923bc35
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/gld/gld-1.7-r2.ebuild b/mail-filter/gld/gld-1.7-r2.ebuild
deleted file mode 100644
index 55c7f21f081d..000000000000
--- a/mail-filter/gld/gld-1.7-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
-HOMEPAGE="http://www.gasmi.net/gld.html"
-SRC_URI="http://www.gasmi.net/down/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="postgres"
-# Not adding a mysql USE flag. The package defaults to it, so we will too.
-DEPEND="sys-libs/zlib
-	>=dev-libs/openssl-0.9.6
-	postgres? ( dev-db/postgresql[server] )
-	!postgres? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i gld.conf \
-		-e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
-		-e 's:^#USER=.*:USER=nobody:' \
-		-e 's:^#GROUP=.*:GROUP=nobody:' \
-		|| die "sed gld.conf failed"
-
-	sed -i Makefile.in \
-		-e '/ -c /{s|-O2|$(CFLAGS)|g}' \
-		-e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
-		-e '/strip/d' \
-		|| die "sed Makefile.in failed"
-
-	sed -i tables.{my,pg}sql \
-		-e '/ip char/s/16/39/' \
-		|| die "sed sql tables failed"
-}
-
-src_configure() {
-	tc-export CC
-	# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
-	# use it...
-	if use postgres ; then
-		myconf="${myconf} --with-pgsql"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	dobin gld
-
-	insinto /etc
-	newins gld.conf gld.conf.example
-
-	dodoc HISTORY README*
-
-	insinto /usr/share/${PN}/sql
-	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
-
-	newinitd "${FILESDIR}"/gld.rc gld
-}
-
-pkg_preinst() {
-	elog "Please read the README file in /usr/share/doc/${PF} for"
-	elog "details on how to setup gld."
-	elog
-	elog "The sql files have been installed to /usr/share/${PN}/sql."
-	if [[ $REPLACING_VERSIONS == "1.7-r1" ]]; then
-		elog "You might want to use the ALTER_TABLE command to change the"
-		elog "ip field width to 39 chars to accomodate ipv6 addresses."
-		elog "Please see your sql server documentation."
-	fi
-}
diff --git a/mail-filter/gld/gld-1.7-r4.ebuild b/mail-filter/gld/gld-1.7-r4.ebuild
index 0bcd3923f278..fb79d9897fc6 100644
--- a/mail-filter/gld/gld-1.7-r4.ebuild
+++ b/mail-filter/gld/gld-1.7-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.gasmi.net/down/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
 DEPEND="sys-libs/zlib
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 2f2677ec6c81..51e5a21de2dc 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,7 +1,10 @@
 AUX opendmarc-1.3.2-multiple-From.patch 1394 BLAKE2B 91b36a131ca9dca5e33f3a9610ab5c3ba17bf7f44f891d278f4c070629987a4177166c176692edd36dee184948811f727a9752e3c6adcbaf1822cfe9aa6d0c8e SHA512 068f58f25133fc6216c437ba9df5a44d5e7139c471f85d63bea81d7c930a56a2900239bc051cf2a3ed7f60fac939a0090bbef4a690c78457911e267293019d66
+AUX opendmarc-1.3.3-CVE-2020-12460.patch 1302 BLAKE2B 8bd4a1f6aaf44e9931fb97553d2e072aa5efa3114e75f5240107a5c126fe432829cc515d29e5c0e082a013b4e2dd90b5eed8b4b07ec8110c63c3fe00248a8955 SHA512 98582c2b0a08d77b27856331f28214b7b5fa3972c572189ed21963030e98858285a5a69851f173d08380bf409d985980e7c61de5d571af11062f0d394fc8b5f5
 AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c
 AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
+DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
 EBUILD opendmarc-1.3.2-r3.ebuild 1610 BLAKE2B 78304b8b07399155f72cbbac51e47cecad9459e862425c5d0beb01a1ce5ec02791abaaaf87d674200c3dacb7069f1443959811a7ac6dd1a113f121b087f9dfeb SHA512 6a6e5125d8447a73c28478764f793af9a0052a4142e51773904275857f77384e8f4c4f07e04045b94e704d397ddd6d8d787fea9d1415c28d0110efb9052e6486
+EBUILD opendmarc-1.3.3.ebuild 1893 BLAKE2B db1915b074793c7973ff39eaef0f198e21f91077c5d58a190d9135938973eaf94b9684051f31c25d048b5ba1a6ea511b4f5ca41845a1dd59001b96737270b82b SHA512 2c6913cf6f83da9dc84d86f83510bb166f05a7aa4b1989e36a0365b1683420845d8eb99bd75092fc83471c28da41b43aa4f2dfbb8da570c80fa1b4bcbee2c9c6
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch b/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
new file mode 100644
index 000000000000..334c11d5302f
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
@@ -0,0 +1,41 @@
+From 50d28af25d8735504b6103537228ce7f76ad765f Mon Sep 17 00:00:00 2001
+From: "Murray S. Kucherawy" <msk@blackops.org>
+Date: Wed, 5 Aug 2020 21:56:01 +0000
+Subject: [PATCH] In opendmarc_xml_parse(), ensure NULL-termination of the
+ buffer passed to opendmarc_xml().
+
+---
+ libopendmarc/opendmarc_xml.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libopendmarc/opendmarc_xml.c b/libopendmarc/opendmarc_xml.c
+index 26bb9dc..b3ac55a 100644
+--- a/libopendmarc/opendmarc_xml.c
++++ b/libopendmarc/opendmarc_xml.c
+@@ -158,7 +158,7 @@ opendmarc_xml(char *b, size_t blen, char *e, size_t elen)
+ 			if (*cp != '<')
+ 				continue;
+ 			++cp;
+-			for(sp = cp; *sp != '\0'; ++sp)
++			for (sp = cp; *sp != '\0'; ++sp)
+ 			{
+ 				if (*sp == '?')
+ 					break;
+@@ -546,7 +546,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
+ 	if (fname == NULL)
+ 	{
+ 		xerror = errno;
+-		(void) snprintf(err_buf, err_len, "%s: %s", fname, "File name was NULL");
++		(void) snprintf(err_buf, err_len, "%s", "File name was NULL");
+ 		errno = EINVAL;
+ 		return NULL;
+ 	}
+@@ -572,7 +572,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
+ 		return NULL;
+ 	}
+ 
+-	bufp = calloc(statb.st_size, 1);
++	bufp = calloc(statb.st_size + 1, 1);
+ 	if (bufp == NULL)
+ 	{
+ 		xerror = errno;
diff --git a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
new file mode 100644
index 000000000000..c572a891d2eb
--- /dev/null
+++ b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools user multilib systemd
+
+DESCRIPTION="Open source DMARC implementation "
+HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
+SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="spf +reports static-libs"
+
+DEPEND="reports? ( dev-perl/DBI )
+	|| ( mail-filter/libmilter mail-mta/sendmail )"
+RDEPEND="${DEPEND}
+	reports? (
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/Switch
+	)
+	spf? ( mail-filter/libspf2 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2-multiple-From.patch
+	"${FILESDIR}"/${PN}-1.3.3-CVE-2020-12460.patch
+)
+
+S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
+
+pkg_setup() {
+	enewgroup milter
+	enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+	default
+
+	# fix issue after they removed docs
+	sed -i -e '/^\s\+docs\/Makefile/d' configure.ac || die
+
+	eautoreconf
+	if use !reports ; then
+		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with spf) \
+		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+
+	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
+	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	dodir /etc/opendmarc
+
+	# create config file
+	sed \
+		-e 's:^# UserID .*$:UserID milter:' \
+		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+		-e '/^# Socket /s:^# ::' \
+		"${S}"/opendmarc/opendmarc.conf.sample \
+		> "${ED}"/etc/opendmarc/opendmarc.conf \
+		|| die
+}
diff --git a/mail-filter/rmilter/Manifest b/mail-filter/rmilter/Manifest
deleted file mode 100644
index 70735c184e0d..000000000000
--- a/mail-filter/rmilter/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX rmilter.initd 588 BLAKE2B f6726d666d4345c7551c4a4487fec7bffc615181dea17b1f5057e0fed45146734cd14f425b32eee308dcff3f6beb9ea4c138f9c7f95e4da73445b6d401cadc05 SHA512 5640728313affedd46516cd89f33414a1bcbd3827a65e64e1ec98be6a214a98e275d4a1b1ad77b628f04c018267be4f31ffb5d96c573443550b5358d3d71a1bf
-AUX rmilter.initd-r1 566 BLAKE2B 488647c538328f174f5fcc213c02f6e1400d23be0070edcf3a8b18a3fd7563f5ee3d5a4dcf68b14c3f22eab9c1605975ded85947f018273411c0fbca7c0696fa SHA512 09e82fa4baaeaa6d2f68baf76eb97c00a88f537a794563e98cdb5309f2362b3c98c3b664f89ab373015c3da3ede61b77ac54ba7703aacef82e87edfe36733fcc
-AUX rmilter.initd-r2 578 BLAKE2B bf7365b3c62c906079131b050ce6873d337de24cd53eca685b00655f500df1674575ff04577eb023811128c4c8541f963787071aaf17fd548013e74eccf66168 SHA512 de683ee2914fffbd5ec302ce120aa1c15fcdbb4a2e086389ac47075ffdc260cf8ecbdef2fce8f247180ef6599dec6f54bee74954915f9de9745ce07ce1775c0d
-DIST rmilter-1.10.0.tar.gz 390583 BLAKE2B 82a854b9985ac1319c0bd4555ac33b3a4b96baee1954622276e7c37160ecd609f4e6f9ff7e04ce4648ac20ba4423c9474bddde14fb526ae47a0aabe5ca7ca930 SHA512 bef62d6dd4190b9a28e751cc598d201f0f994a08def46ae68587d1cc956e7e209ae540d91241545dc4efd055b4bf2b95039f0e9649448e5506f17ec37240adf8
-DIST rmilter-1.9.2.tar.gz 264637 BLAKE2B 04966cebcb2b399f89058da11cef427df4ec2957bfc597b2b8fda736a02e8aad25e56a5ff2c9d4942feeeacb05fe8a0d408df5af640e82fb1b9e908176fcd9d4 SHA512 4938515d18d4cff363266348cbd00b85690f889cb479a0e2fb61fa74e1e0deb3e78ec06132537ae001ccec375d0bab10af77c4a4c6fb248dc7f9f929c5a57eb9
-EBUILD rmilter-1.10.0-r1.ebuild 1095 BLAKE2B 7adac8adda8aaa61bd02dbd976f0b5b5fe60f8b5043e6411074715692be077849afe1496a12057959e71dcd0df9bbea4db5fcfb3300a8b2d0b656b09465aa111 SHA512 a9d183dfd3cab9c16f53ff5b3b21cb7b9372bf3c6367f16a3a9acb600056de88b1a811ce8531d0f501be05411c8a43d98c1e5f3c9a43ec31feb6c9098e3eecfd
-EBUILD rmilter-1.10.0-r2.ebuild 1095 BLAKE2B e9a78e45788e76569512f91e67b3bdbf05f7fd67d07fbc718f19cfb50834f7c83f32344d7ff0378e8b571b4b0e05a9e92d66e17061a174f1474637f4dfa4df7b SHA512 fced97d4ae81c410fe0ed64fd4654c255bfecfa6e49cea8a9a74c4441efd74397988e139f677740f3001c2b3b9ef17792b2754524700d25c9b8fa43bfc9adfea
-EBUILD rmilter-1.10.0.ebuild 1092 BLAKE2B ee937973e5266fa7d780789bbca594f435a367c5e4d5a575e6d5c48ba0fc3902cc16a61113b321c2f727de9e1250cc81e1aaa369fd6496f14c49c3fd0ffd6574 SHA512 b0c39933149971a7ebb2a5aa1294fb5b17df8a2c6dcdb1f203a0db94afbfc161d72ce24cffd68184327a5889dc198bd7b4a1f0b2eb0a4863050f9351d7241ee7
-EBUILD rmilter-1.9.2.ebuild 1092 BLAKE2B ee937973e5266fa7d780789bbca594f435a367c5e4d5a575e6d5c48ba0fc3902cc16a61113b321c2f727de9e1250cc81e1aaa369fd6496f14c49c3fd0ffd6574 SHA512 b0c39933149971a7ebb2a5aa1294fb5b17df8a2c6dcdb1f203a0db94afbfc161d72ce24cffd68184327a5889dc198bd7b4a1f0b2eb0a4863050f9351d7241ee7
-EBUILD rmilter-9999.ebuild 1062 BLAKE2B 94dbe81116ecd3ba655b503bc43e7048c9038a3e54b50dc75d71372b2856af369c9211c41a1f80b20f1e9f96ef7e3ad33fcd0607de8dfbc5098cb941e466dd13 SHA512 437216cd9f1df303792513b5a5f26d80e9e2fceda53adb722fe3a60d9a503cd4fa9def80eee3aeaa85b21b87d949a1d652d3bc82c5f5a56f73a079d8692cc16b
-MISC metadata.xml 491 BLAKE2B bcf821bd7a2877dd21187d216608a3aecab205509d61681d1c9f3334628e1f2c7a611840dcef393e0497cf6ab96f4ccd863b80bd756b58256bbbf98ff1b159f4 SHA512 83cd56e53d6a85524c3e8a9ce2a096d7820fa51b1cc80fcf4e667ddeccaacf8dbb1aeafe1590e9553fb432a3ad61f8d5446372201a02cdea474f00c5fba0b2d3
diff --git a/mail-filter/rmilter/files/rmilter.initd b/mail-filter/rmilter/files/rmilter.initd
deleted file mode 100644
index d155a4a43b4e..000000000000
--- a/mail-filter/rmilter/files/rmilter.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-RUNDIR=/var/run/rmilter
-PIDFILE=$RUNDIR/rmilter.pid
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	mkdir -m0750 -p $RUNDIR
-	chown rmilter:rmilter $RUNDIR
-	chmod g+s $RUNDIR
-	rm -f $RUNDIR/$SVCNAME.sock
-	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rmilter \
-						--exec /usr/sbin/rmilter -- -c /etc/rmilter/rmilter.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE
-	eend $?
-}
diff --git a/mail-filter/rmilter/files/rmilter.initd-r1 b/mail-filter/rmilter/files/rmilter.initd-r1
deleted file mode 100644
index 03eaa2512f8e..000000000000
--- a/mail-filter/rmilter/files/rmilter.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-RUNDIR=/var/run/rmilter
-PIDFILE=$RUNDIR/rmilter.pid
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	checkpath -d $RUNDIR -m2750 -o rmilter:rmilter
-	rm -f $RUNDIR/$SVCNAME.sock
-	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rmilter \
-						--exec /usr/sbin/rmilter -- -c /etc/rmilter/rmilter.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE
-	eend $?
-}
diff --git a/mail-filter/rmilter/files/rmilter.initd-r2 b/mail-filter/rmilter/files/rmilter.initd-r2
deleted file mode 100644
index 08b4c642d7ad..000000000000
--- a/mail-filter/rmilter/files/rmilter.initd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-RUNDIR=/var/run/rmilter
-PIDFILE=$RUNDIR/rmilter.pid
-
-depend() {
-	need net
-	before mta
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	checkpath -d $RUNDIR -m2750 -o rmilter:rmilter
-	rm -f $RUNDIR/$SVCNAME.sock
-	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rmilter \
-						--exec /usr/sbin/rmilter -- -c /etc/rmilter/rmilter.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE
-	eend $?
-}
diff --git a/mail-filter/rmilter/metadata.xml b/mail-filter/rmilter/metadata.xml
deleted file mode 100644
index 35ab47210bd9..000000000000
--- a/mail-filter/rmilter/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
-  <use>
-    <flag name="dkim">Enable support for DomainKeys Identified Mail</flag>
-    <flag name="memcached">Enable support for memcached</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">vstakhov/rmilter</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/mail-filter/rmilter/rmilter-1.10.0-r1.ebuild b/mail-filter/rmilter/rmilter-1.10.0-r1.ebuild
deleted file mode 100644
index f664f9f9849b..000000000000
--- a/mail-filter/rmilter/rmilter-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dkim libressl +memcached"
-
-RDEPEND="dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	mail-filter/libmilter
-	>=dev-libs/glib-2.28
-	dkim? ( mail-filter/opendkim )
-	memcached? ( dev-libs/libmemcached )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DKIM=$(usex dkim ON OFF)
-		-DENABLE_MEMCACHED=$(usex memcached ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd-r1" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/rmilter/rmilter-1.10.0-r2.ebuild b/mail-filter/rmilter/rmilter-1.10.0-r2.ebuild
deleted file mode 100644
index 82a8a61e1c0a..000000000000
--- a/mail-filter/rmilter/rmilter-1.10.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dkim libressl +memcached"
-
-RDEPEND="dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	mail-filter/libmilter
-	>=dev-libs/glib-2.28
-	dkim? ( mail-filter/opendkim )
-	memcached? ( dev-libs/libmemcached )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DKIM=$(usex dkim ON OFF)
-		-DENABLE_MEMCACHED=$(usex memcached ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd-r2" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/rmilter/rmilter-1.10.0.ebuild b/mail-filter/rmilter/rmilter-1.10.0.ebuild
deleted file mode 100644
index b0a6942c1809..000000000000
--- a/mail-filter/rmilter/rmilter-1.10.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dkim libressl +memcached"
-
-RDEPEND="dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	mail-filter/libmilter
-	>=dev-libs/glib-2.28
-	dkim? ( mail-filter/opendkim )
-	memcached? ( dev-libs/libmemcached )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DKIM=$(usex dkim ON OFF)
-		-DENABLE_MEMCACHED=$(usex memcached ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/rmilter/rmilter-1.9.2.ebuild b/mail-filter/rmilter/rmilter-1.9.2.ebuild
deleted file mode 100644
index b0a6942c1809..000000000000
--- a/mail-filter/rmilter/rmilter-1.9.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dkim libressl +memcached"
-
-RDEPEND="dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	mail-filter/libmilter
-	>=dev-libs/glib-2.28
-	dkim? ( mail-filter/opendkim )
-	memcached? ( dev-libs/libmemcached )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DKIM=$(usex dkim ON OFF)
-		-DENABLE_MEMCACHED=$(usex memcached ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/rmilter/rmilter-9999.ebuild b/mail-filter/rmilter/rmilter-9999.ebuild
deleted file mode 100644
index cb4d833def65..000000000000
--- a/mail-filter/rmilter/rmilter-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user git-r3
-
-DESCRIPTION="Another sendmail milter for different mail checks"
-HOMEPAGE="https://github.com/vstakhov/rmilter"
-EGIT_REPO_URI="https://github.com/vstakhov/rmilter.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="dkim libressl +memcached"
-
-RDEPEND="dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	mail-filter/libmilter
-	>=dev-libs/glib-2.28
-	dkim? ( mail-filter/opendkim )
-	memcached? ( dev-libs/libmemcached )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rmilter
-	enewuser rmilter -1 -1 /var/run/rmilter rmilter
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DKIM=$(usex dkim ON OFF)
-		-DENABLE_MEMCACHED=$(usex memcached ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/rmilter.initd" rmilter
-	insinto /etc/rmilter
-	newins rmilter.conf.sample rmilter.conf.sample
-	newins rmilter-grey.conf rmilter-grey.conf
-}
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 360fbf5183e2..7c6b6276da45 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,6 +10,6 @@ DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32f
 EBUILD spamassassin-3.4.4-r1.ebuild 9757 BLAKE2B da5bf1a73d699e1ef3542c98b2eef0ebdee1e8e51b50e69464ddf67772b05a76a669420cbe6be829ba4fe7f2fea7401e1c3a98af26ae73cfe6478085079feb9e SHA512 18f4c03126fae90068b57a302a309a00a9cf4ca55783bfc9a890c9107bfe5a578eb8b9dff184ff98ad86434fe084609fbdaa8f44914ecef2fe9d124e9364f820
 EBUILD spamassassin-3.4.4-r2.ebuild 9632 BLAKE2B 6b7816eeb6eaad6ecc1734e3b67b9b05df800ec0d8087cc3465fd451808216e06c497fdcaa66449ac4016869295dd6c8087054be9deded9e8f0bd28def29a5fe SHA512 9a3c46f95e944de3500e0adbbbff093d2f4fd20568907901c381bee0941c8f4ebc04f8609da26c7582e8c6b732710a20e09b0e081745246a9974843e042c9d27
 EBUILD spamassassin-3.4.4-r3.ebuild 9512 BLAKE2B bd5116a376a3bbf87ad962453e32bc60ccd3868c767a96b71fdad39d7753eb1d27a7f3eba8ba0b62ebed31c9e3f27711d04a8135bf3a3e276023478200c69c56 SHA512 20b012f637533a50cda2c921a6345595eaf6f6354577f976b875b31b2f5832cd329b6c775e915e9f2bf3f35c6dcdeb41f51640b8276e7a23b277c0c3452a09ca
-EBUILD spamassassin-3.4.4-r4.ebuild 9605 BLAKE2B a51cd8edf4104b8a5c61e7093ce5ba739d5a64971577e5cd77e79995f452721c748ec8eb4e2da9e7299c1b633f796e1ef1897e40683096ed93548cf9f342c6ff SHA512 21865ff9434b6575ab35e840607fc9a90088bf9f3f6c19182ce1d5eda364be316593d33629bc79b0d7223ee2be36337f1fb45ccbd2d0a2466ed1c1f0e3669688
+EBUILD spamassassin-3.4.4-r4.ebuild 9598 BLAKE2B 7a0a34f0201448f50b8ca83ba95b06509e96013fa2e786b923ea66aaff5ff49fd5368ff0f244fc7d8b7b72938eb7772393ef42446b315d368d212e67850c6e78 SHA512 c8e4e388d7daaa8939891910af4ceb4e255decfc3d5f107c3482769f8573b61bb64fad8c400042d5fca70f671986f76b29be802d5d545efedd0ea4704fd4766d
 EBUILD spamassassin-3.4.4.ebuild 8488 BLAKE2B b6d4f0dfd63739daaf7b48352caf580130dad0aa765c5f3347d790eaae6410703d8f66dc2b1b365e056c7b18bf1df3e2110b2f8cc3b4f2c6f67095142553dbad SHA512 12d0b6ae6e886d42448329f8bee89ab015a391dbe7497888a5b35a7e41463a52d2c51ca13e567f1cd2f4f6cfd9686a8425947fc956a5523438e710e20b90ca16
 MISC metadata.xml 579 BLAKE2B 98c1b526193c33a3f6d7aac34f9e93dcf81dfbd5b288da9a9a196d94e03fe7cb17d3b06de41042941a70f70215a6104a048fe67ff97b225490139bfb06fd8186 SHA512 f02b525fb0daf5a90edb2cfff536c51240bcc4c040f6ee6126b95865d0c61b1ded0d72d89b114ba58389963b033df1d8df97df6c39e49ac1ffbb69fee96acc7f
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
index 68d82abd9bb2..8dba40c9fdaf 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/zdkimfilter/Manifest b/mail-filter/zdkimfilter/Manifest
index 773ab7cee067..fa4006b9eec7 100644
--- a/mail-filter/zdkimfilter/Manifest
+++ b/mail-filter/zdkimfilter/Manifest
@@ -1,5 +1,7 @@
 DIST zdkimfilter-1.8.tar.gz 717481 BLAKE2B ec662a02c4a248085a42548d892084eb23c592c0511026039d18e8cc7a1a46dcf37411f8fc7395be507065ddb9cda8c5a1226e5e379852b4ef7ee84c2936b439 SHA512 e4b32c5d636db8a76ecfc2e4c8b1bda2053dc6c5baba13ed66120458f012a9d22d9ec269ae88100f1cc048b9c7d6c67a887ed1a48435a6353ab68bc13054c42c
 DIST zdkimfilter-2.1.tar.gz 737474 BLAKE2B a36155eef3bc31ede1446244f920040f1885109deae5646379f66a1a41315ad7f90552b64f138a61c4d88c0f616e2524fd8911302fd301503e70443948a68a34 SHA512 493a53d0879c7516196df32e364bf94d4f7f5265095637417ca9e569145dea68e528debe93f0835ffac493f05ab38d2b4cbd2bcd7da8029f5a9ef98a488d058d
+DIST zdkimfilter-2.2.tar.gz 742580 BLAKE2B b0d7c4ead1e6f3d3588c0b197b9615dd9cddde62230937a1d91ad38799e90e9ec18d29a14c14def9e1f88207afaebe3de496a57a78c049871d875391abce9574 SHA512 3a258f67ace9542dbc150ad1e89791fd50885c9e2599fffeb84b85460a56b3b3541f62779d374366b405274f92d5fa518d8e4c758e82a8a7dfac8a94fb0c6d91
 EBUILD zdkimfilter-1.8.ebuild 788 BLAKE2B 2a1865ec07d605b99d8f345c4fbbda23d368888413480071cda53f413badaa65ab346b0e63fa14210708f67e698b839d708e224d128ab19613e9d6bca90c7dfe SHA512 5c543aab75d484ee9441723b8b098564ee5d9ecc1be40d026c2180b9a0e0a9e4bea0368cfd5295bd2d2061c013f37ef1f2c44a9e20a7909daf530199df4e1b54
 EBUILD zdkimfilter-2.1.ebuild 788 BLAKE2B 39b13e0c665b71107bc9f58f86f8fd0fd43a3d77919bf77778e32a362c44e81d2be6eb459807966c32fc2883400ccf2fccbc8491c12942e65898554ad8fbeded SHA512 22afab073ea73116412e81b3fd30c0c8f5e73943ecbe369552a94e42e135f23730855fb98566b4719a63fbb94b83dee7a1bb0d9476fb03c8f497056b01d5e351
+EBUILD zdkimfilter-2.2.ebuild 788 BLAKE2B 39b13e0c665b71107bc9f58f86f8fd0fd43a3d77919bf77778e32a362c44e81d2be6eb459807966c32fc2883400ccf2fccbc8491c12942e65898554ad8fbeded SHA512 22afab073ea73116412e81b3fd30c0c8f5e73943ecbe369552a94e42e135f23730855fb98566b4719a63fbb94b83dee7a1bb0d9476fb03c8f497056b01d5e351
 MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
diff --git a/mail-filter/zdkimfilter/zdkimfilter-2.2.ebuild b/mail-filter/zdkimfilter/zdkimfilter-2.2.ebuild
new file mode 100644
index 000000000000..870512573928
--- /dev/null
+++ b/mail-filter/zdkimfilter/zdkimfilter-2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="DKIM filter for Courier-MTA"
+HOMEPAGE="https://www.tana.it/sw/zdkimfilter"
+SRC_URI="https://www.tana.it/sw/zdkimfilter/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="mail-filter/opendkim
+	mail-mta/courier
+	dev-db/opendbx
+	dev-libs/nettle
+	net-dns/libidn2
+	dev-libs/libunistring"
+RDEPEND="${DEPEND}"
+
+# For working tests we need a fix for opendkim,
+# see https://bugs.gentoo.org/700174
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	diropts -o mail -g mail
+	dodir /etc/courier/filters/keys
+	dodoc release-notes-*.txt README ChangeLog
+	dodoc odbx_example.{conf,sql}
+}