gentoo Easter resync : 12.04.2020

64 files changed, 840 insertions, 1249 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index db43e9e284b9..ce1c370b0293 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 9b251037fbd6..9fc1b70888a6 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,9 @@
 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
-MISC metadata.xml 883 BLAKE2B 64c438e53564d21a25684eb8b8bcf6b5a9e53a79202a27eb43a7621669c716f5af96cec95ee616c5ef3d1be91433c523badb16cb1c6363ebb9574066b2d65833 SHA512 5f799a3db42139165f32075a9f753cdc2f11072c067e5602bc37f557b6edfc8c631a8ea9c512e492587224b287f2d996e38a4e690fe294e508f7b9568b6f15e7
+EBUILD afew-2.0.0.ebuild 1166 BLAKE2B 460e123ac14cbb91eeb5173e006379052e8175b55e216738b450a41fc9902d1c32daa247c913fdfad2e30e4e5d8f077f9fa350232731abb0ad9e86084cb62d04 SHA512 dc1a65b85308cc7daea5dc770301515d0a7221abfe0ca84ba281f158705bc41ce4defc2095bced5831ee1b6211bce5cfbda35a4154cbc7717d940084069916d5
+EBUILD afew-3.0.0.ebuild 1166 BLAKE2B 460e123ac14cbb91eeb5173e006379052e8175b55e216738b450a41fc9902d1c32daa247c913fdfad2e30e4e5d8f077f9fa350232731abb0ad9e86084cb62d04 SHA512 dc1a65b85308cc7daea5dc770301515d0a7221abfe0ca84ba281f158705bc41ce4defc2095bced5831ee1b6211bce5cfbda35a4154cbc7717d940084069916d5
+MISC metadata.xml 999 BLAKE2B 83acdc32e7730809e9d351a24f23a148b307b5f932b12e72c0672913f6d7b6329c16b262c5ffcbd89ea75ac27bcf2b31b92e5f71178a8e4e7f18190f4d15fd8c SHA512 b6d06de35ec7a61a7ae27dc56021dba8de1ec04e6769e832e716ab9c6d0112a254db3594b41d635066d2f231c7f2f2afa1ecdb779165c45a89a05f0327cc9530
diff --git a/mail-filter/afew/afew-2.0.0.ebuild b/mail-filter/afew/afew-2.0.0.ebuild
new file mode 100644
index 000000000000..b9e74273e201
--- /dev/null
+++ b/mail-filter/afew/afew-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="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}]
+	')"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS=( "README.rst" )
+
+python_prepare_all() {
+	sed -r \
+		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
+		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	esetup.py build_sphinx -b man --build-dir=docs/build
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	doman docs/build/man/*
+	dodoc afew/defaults/afew.config
+	use doc && local HTML_DOCS=( docs/build/html/. )
+}
diff --git a/mail-filter/afew/afew-3.0.0.ebuild b/mail-filter/afew/afew-3.0.0.ebuild
new file mode 100644
index 000000000000..b9e74273e201
--- /dev/null
+++ b/mail-filter/afew/afew-3.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="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}]
+	')"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS=( "README.rst" )
+
+python_prepare_all() {
+	sed -r \
+		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
+		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	esetup.py build_sphinx -b man --build-dir=docs/build
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	doman docs/build/man/*
+	dodoc afew/defaults/afew.config
+	use doc && local HTML_DOCS=( docs/build/html/. )
+}
diff --git a/mail-filter/afew/metadata.xml b/mail-filter/afew/metadata.xml
index cf80ebdd8a77..1e0a6251fcea 100644
--- a/mail-filter/afew/metadata.xml
+++ b/mail-filter/afew/metadata.xml
@@ -5,6 +5,10 @@
 		<email>aidecoe@gentoo.org</email>
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
 	<longdescription lang="en">
 		afew is an initial tagging script for Notmuch.  Its basic task is to
 		provide automatic tagging each time new mail is registered with Notmuch.
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 28f26ff3adaa..ca93c700b2ab 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -2,8 +2,11 @@ AUX amavisd-milter-1.6.0-policybank.patch 937 BLAKE2B 54cd7ffbbdc0396874a3fb8672
 AUX amavisd-milter.confd 357 BLAKE2B 4c584ef42c9c1f135160d574dabed9882978930ddf1051161ca7a8ac64a926390ce3aa693957b786cf0f8e83a41b325574c4a19e82b638c2f96726e335ae654d SHA512 354c7e1a0224bd0f8bd40e35dca99fc5c489f9b7ecc2292d992e5594ac969800ab19e99a784957bcc76e3b06788b0623fc5019d8965f002a67c3e01681c541de
 AUX amavisd-milter.initd 678 BLAKE2B 75c31115806da7e9f7fd2746e26cd2ebff55edec6611349f2321e99eba7588a69f005ce810595aad2e70bc54576ff870184974bd6bb91af6e3924fb955387499 SHA512 017cc4e2461b524768f2c7f69a1d16b99c08ebf39d024913e79e5ffb2033a2dbd5eb64cedb3b9e370a0143256fdb17652492385f996f0dbe4baaaa96557a16c6
 AUX amavisd-milter.initd-r1 679 BLAKE2B c6d8d8a8b23c01923e2909f5b58cc8228ac693d210a6bd65d9048aa9ac40dadcfb74bb67eded81315fb4c8545bbc652c90e3db1d61f733d1687deb58795f152d SHA512 c043d41da85b206705c5e58204904b30d2076d9563ca52cac60b31eb9638f4574e5b0b771e43e74e83af1f417944ed737f10699a82933cfbee07e9d69a529695
+AUX amavisd-milter.initd-r2 399 BLAKE2B bf842ef6bca77bebe76fe6969676669c97454eee977e67ccf455b09c2ddc2e290739dbb8dbc525625c82eec690826ce39224f188d3e9819fdd8d55169290dc12 SHA512 2021255da427782854b5b0de670359a7f955491bb4de5e6ec0a961cd571183c81c07468559a7f9c9289b069ada3b8c05dab1e07c8d3beb0e4b01199f24794052
 DIST amavisd-milter-1.5.0.tar.gz 175759 BLAKE2B c9de40eadbfca71a3a35c340372163ed7b685ff7150cdb85ab073cc78abcbc5dfb5fcaccc0b1518fa3a354d6ddcf19b6690d5a125e0f2ccb3ea190be57348b88 SHA512 ef206cd2c64cf48edb8a679b92a960451e0edbec11e0c207942bf6f435f7d14538a409d8197774ea4bbf63f27ed73d52a7c51531155be6d8724981b5dd9e0037
 DIST amavisd-milter-1.6.0.tar.gz 187994 BLAKE2B 87d3d870236b50e9c8c7bf3876fc476fb28ff6ee208c8da77c2f9ab2f1ccc0b883cc551718f4f9639125484965180100088d94557f065c7bf904fc912dd2794a SHA512 2e0b39b733f88742fcb2f4e884e528b70731ad5950bd56d3af1391d666dc018d2f6c1ad4212e787872a503bccbc65c52d55ae195c384e9333e4f39d25b1d1a34
+DIST amavisd-milter-1.7.0.tar.gz 192688 BLAKE2B 882ecdc1f4b1b3fba2f7f82ffb3e7f4ecf27ce42fc14df926a508b852dd142161af9ce65bc367a5968f64a29a40cb362a0783bdbaf4dff2559715bfd53170f73 SHA512 52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af
 EBUILD amavisd-milter-1.5.0-r1.ebuild 681 BLAKE2B fd6a954e839da2eb92d023615cdc8d65358e6ee22a7c29aed0f4adfaaa6f04cc70024818fa1005cc71c7d0e16e9841c57c62672cb73d0870f5138cf28bc0cf55 SHA512 0f9c5b732a70a3e9a9206e62c6d92115f9c998c642bdbfa7f6813b4b29865dc793d41de0c27c95a48febbf1e312ef2960efa34f79aa84c2b7a3ad9ba28a2cc92
 EBUILD amavisd-milter-1.6.0-r1.ebuild 730 BLAKE2B 1a451372ba7008105209790587ee1560346a694e4752b7db09fd6b920e8e8a78c633a087baeb57f7c629b4a5e55a4827002ba1f653560877f14a04d6858b0769 SHA512 43e7ce94bea93f1b4b08966f43669715ee7545c5ab176421aa19fd1dff3741c82bcd4725fd64884fa83b25a074ccdd75be3af2dcf736a011e44b1cc8b59776b5
-MISC metadata.xml 251 BLAKE2B e1367be44411f535beb8cbf57139e7b0fb032a7ddd9cc49ff85de4b4b884822b0b0b61f0bbd3663fd5af8aa2ab14bf0aba2eeff35cf68322549ca27c82ef703c SHA512 b3b1e3c58e9c9f9774ced1b8358ecba8fd4c8f69f8feafbadec5d6e58c820cbbd4971472dd61039fa75279c5f4f33ccc3de950cb2aeac14c2fe0b307ee80697b
+EBUILD amavisd-milter-1.7.0-r1.ebuild 683 BLAKE2B fec5ac2a2ee5628af601666da5b8f9a0344d3c117e5df7221ccd194282602b67509713998ede1c26a16dc7558750a7c809b4a040d63290934d43ee49a0d99413 SHA512 c48343bed9a8faa06d0214ca7e9aa1d8ad3426e5b10d4939d3773c6d1c5b5aafbf3a7ba17c69caf88b9642cd8053f8bf7ce94eda2465db93a6132e2d63188174
+MISC metadata.xml 332 BLAKE2B 5bc31a7148c73721bd5563f2c951ea025db1387cf6dcee67fecc9dbde770199b8d3e1659b34ae8f07dc039880cf2b9484f20afe799983b2837c28bd2b03c1733 SHA512 ae325c6633d2d141416bf0953de89fe177c0afb04e2396ff22e2d1afd258d2a1ac756a868fd3b00466cd9ac80de858a1730d34d4d8e9930d67296ed0e3986101
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..3e8aa64faa2e
--- /dev/null
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="sendmail milter for amavisd-new"
+HOMEPAGE="https://github.com/prehor/amavisd-milter/"
+SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	elibc_uclibc? ( net-libs/libnsl:0= )"
+RDEPEND="${DEPEND}
+	mail-filter/amavisd-new"
+
+DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
+	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
+}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2
new file mode 100644
index 000000000000..4acd7992258f
--- /dev/null
+++ b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="amavisd-milter"
+command="/usr/sbin/${name}"
+command_args="${DOPTIONS}"
+command_user="amavis"
+pidfile="${PIDFILE}"
+
+depend() {
+        use logger dns amavisd sendmail
+}
+
+start_pre() {
+	# needed to avoid potential mi_stop errors
+	[ "${RC_CMD}" = "restart" ] && sleep 4
+}
diff --git a/mail-filter/amavisd-milter/metadata.xml b/mail-filter/amavisd-milter/metadata.xml
index 22b1528aa1fd..ec6b90fcfa96 100644
--- a/mail-filter/amavisd-milter/metadata.xml
+++ b/mail-filter/amavisd-milter/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">amavisd-milter</remote-id>
+		<remote-id type="github">prehor/amavisd-milter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 79fd88bbdf9a..bb74c0947c1e 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -6,7 +6,7 @@ AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a8650
 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 5219 BLAKE2B aa9f9c6844ffd09cee44d36602487aa17e86c2fee3aabd65e4df299d2830f6a8826ee04596abbf58d2d5a7ce1ded70156d960c407e8ca7c92fbf3e8d8cdfe2fb SHA512 89a12c54c47c1857f2cba6480240b984ef8e65098e704b86a9c785aae466d01fd9f1dc1602494df710523960074ec868075fe70ec1b83bd1de69c7440fe84d2d
-EBUILD amavisd-new-2.12.0-r3.ebuild 5343 BLAKE2B 31b53a6b2668c42cef061b2c26d837198cc00c3ef9a6cceee88f0cf0b487d9d68076a88b843ef284fbecdb97fdf93c52ed6afe5b068d469537a28aef6ea10270 SHA512 254627898ad35c2f0353f862889744f754c17fa0fed20ae408df9a44c5ff6f30552416294077b78fba777f3a576602227b777661eb388390b1dde9a7e44efafd
-EBUILD amavisd-new-2.12.0.ebuild 5270 BLAKE2B 9937d06a8d7775df99072363f87fbcc5b1b4c770cfbd62285f3aa6446f45327b9b1dd4d540388df6c030f3da9755e2af0f327b4858f4259df936ab576dd2b83c SHA512 b9722c2e63747f68d28c419f1edfe89842f47580bbd393ed13cad7c2a5c1c8132dc21d6e4e0d8726e8bd3a1bfebff42cd9ef01386d8d3ef642fe74cf76066a82
+EBUILD amavisd-new-2.11.1-r3.ebuild 5214 BLAKE2B 87ad69414234780a535697ce54b84669c1c28b51053c5c4e7e927742ec6387afe10573278e2825c71812f2f0dbdeec1af5efb7530a7863460b0cd974bed59146 SHA512 50f1fe496433a34a86d0e02fac8ae28655543ba25653b6066f9f6d1184632ddf78665e99218ecd191cbab80ec8115654ad3a0de39f2787a324ed1c19b776bb2f
+EBUILD amavisd-new-2.12.0-r3.ebuild 5337 BLAKE2B dceeff396a0ed8dba72363740b658d7dcce3225cee088b57d2199512fcac8d12b8411c0e6c72c26ebba1ed751a70df82534376924e2ca069c749b97d1a13f9c2 SHA512 7c05a03c57f67c804669aed736e123f0b2e3c685e9ee6ebd412f4516bf38698e77eec11afa8c3dd2a19cf02ea319f35536166ae528431c36a440268f1a79dae9
+EBUILD amavisd-new-2.12.0.ebuild 5264 BLAKE2B 7cf639a83ebf1b384b07d32276224781d3b22ed056d98e22c357686b3afb2a09f5997b71bd75fe204e3f951344d06c06a339900cdc3520601b2d9a90fe2f33e4 SHA512 c77aa8a8a652d18f37c9a9702eba93bcbeda4c613e143f8088e7c495f8269d7f41e59105aad2b014319f2e7c1e98b5cbba2110b29c934914df4ff5652c28b78f
 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
index aed561d90ced..ba4e5ba01f52 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index 12e9e6ba1f1f..a46381630e27 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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/HTTP-Message
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
index 5494757a110f..e38d6d4fe4f3 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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 )"
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index a512e61ba6f2..5135673448ef 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,5 +1,4 @@
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
-EBUILD bogofilter-1.2.4-r2.ebuild 3771 BLAKE2B 0c7e1f6a519225d5d7b28e91b853031e045c61b97bf6257d774b22cef7cb1b121eca0da6fc95806e538406bf1dcd38b162358ad749fddee8a97877ebc58d4add SHA512 fdea152b7d3aa4873f26a8ba630e634039ef2824c82019d35e4c89df275e7b67f84e16ac96f032d36f1825997d25ffe636d9564cac52df6ea43b6691a9f8806c
-EBUILD bogofilter-1.2.4-r3.ebuild 3779 BLAKE2B 3a8f43929a8ad6459cea07837cf551169ae0d66cd3e45100c7c7b8188dfb97f3cf2f4d0b680dbc989e774d981a6f86151450b736a7a92d991460e6e9ff76dc72 SHA512 dfc20ea0b6ffcbca1a93d57233589636ca22696d0e2e47a3c436dccfca3f6c293be2d7eea49d95e8bfe8993b09c7296dab29505bbaf3d4fd2e92ec77a7cba92e
+EBUILD bogofilter-1.2.4-r3.ebuild 3775 BLAKE2B ef688072e111d237d6052dd0cd1c0b313c8c646a97224e8f5a0c7775f94006828a46e15f66af446ac71da4a6d0ee90926a4dac33d647b102b598e40905fee1ac SHA512 caed65cf0d86b6bc299a57534fee24f8134678f3080a72ce996e6b3676e7d15772a6392275cdb153bdf6926345643df1e6ced6ed335446895fa77c84bba70bb0
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
deleted file mode 100644
index 195141b45036..000000000000
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
-IUSE="berkdb sqlite tokyocabinet"
-
-# pax needed for bf_tar
-DEPEND="
-	app-arch/pax
-	sci-libs/gsl:=
-	virtual/libiconv
-	berkdb?  ( >=sys-libs/db-3.2:* )
-	!berkdb? (
-		sqlite?  ( >=dev-db/sqlite-3.6.22 )
-		!sqlite? (
-			tokyocabinet? ( dev-db/tokyocabinet )
-			!tokyocabinet? ( >=sys-libs/db-3.2:* )
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-test-env.patch" )
-
-pkg_setup() {
-	has_version mail-filter/bogofilter || return 0
-	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
-			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
-			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
-		) ; then
-		ewarn
-		ewarn "If you want to switch the database backend, you must dump the wordlist"
-		ewarn "with the current version (old use flags) and load it with the new version!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 445918
-	sed -i -e 's/ -ggdb//' configure.ac || die
-
-	# bug 421747
-	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id}
-
-	# bug 654990
-	sed -i -e 's/t.bulkmode//' \
-		-e 's/t.dump.load//' \
-		-e 's/t.nonascii.replace//' \
-		src/tests/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="" berkdb=true
-	myconf="--without-included-gsl"
-
-	# determine backend: berkdb *is* default
-	if use berkdb && use sqlite ; then
-		elog "Both useflags berkdb and sqlite are in USE:"
-		elog "Using berkdb as database backend."
-	elif use berkdb && use tokyocabinet ; then
-		elog "Both useflags berkdb and tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	elif use sqlite && use tokyocabinet ; then
-		elog "Both useflags sqlite and tokyocabinet are in USE:"
-		elog "Using sqlite as database backend."
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use tokyocabinet ; then
-		myconf="${myconf} --with-database=tokyocabinet"
-		berkdb=false
-	elif ! use berkdb ; then
-		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	fi
-
-	# Include the right berkdb headers for FreeBSD
-	if ${berkdb} ; then
-		append-cppflags "-I$(db_includedir)"
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	emake -C src/ check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
-		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
-		contrib/{spamitarium,stripsearch}.pl
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,dot-qmail-bogofilter-default} \
-		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
-		contrib/vm-bogofilter.el \
-		contrib/{trainbogo,scramble}.sh
-
-	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
-		doc/integrating-with-* doc/README.{db,sqlite}
-
-	dodoc -r doc/*.html
-
-	dodir /usr/share/doc/${PF}/samples
-	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
-	rmdir "${D}"/etc || die
-}
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
index 7bb589b17c14..833ba677f9bf 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="berkdb sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index ae6413095754..8493d9b2eaae 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,5 +4,5 @@ AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc962
 DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.154.ebuild 4336 BLAKE2B 08645b6659dfe8026c186d420967c05a5689f3e7078beba6cee663b946af42d9ecaa3b0d337ee6306532d24562377258f8dc112c9910658de052fba8b8d49307 SHA512 2748020ff1954b8616f1e1546154a4b6dbd6866042276b97f340b6cf8df00e1d8f86a4db138824f70ef2cc2e70928eff61b11256bccb2318442428f8386e1d8b
-EBUILD dcc-1.3.158.ebuild 4330 BLAKE2B b2c89564b7a2c6b3e609f3df4e7b483569f576ac46636f09071ab323792838ba78b1aa249522f9b21c5451eae4ef96400e76e8012ef895f403c04e051e4690da SHA512 07511a9121bf552d317f6180a09141a52421155355f6612e6388d8bbfbd7d0e4921baf84ddefa65f7dbc3a8521159c5c3a161a51831f51d155e4616168d8b316
+EBUILD dcc-1.3.158.ebuild 4331 BLAKE2B 3c75d133653a43d0c3790804f27d03cbee63a4ae927072f4ee29a44036e3553eab893a13c0a4520642f6a1bfa5784214d5436dae2d9938822345f1266370fc9a SHA512 0276729806370c6d8f7fc297c77c84ca63aa29f1c3d853d59902c4e0f43091de8ba6559cccbf56359e9939ded88a00b93a0b979260c26b9cab7983835156a616
 MISC metadata.xml 316 BLAKE2B 24478ea14c1a25332766f54d5d385ef2e5755880258c2307eb62f649e3ab06c299c4ef0534b44b9f97462313227da016ef89b55ddac493a0b6a9014d098d0b85 SHA512 deaa7ad3b9919c65113f97639885bf7da2281a21dff15a0cfa11315daae55550c95ff411c8448bfe03c6b94b4cc4b7a3475bd6f9cf6315d6aa75abb99f536952
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 195f8d7d4f8d..fe4fdb53a691 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" #
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" #
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index f55347596ffa..ae5439d59729 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,5 +1,4 @@
-DIST imapfilter-2.5.6.tar.gz 53579 BLAKE2B a62900f29d6a1056985e41e4ba4d36c193ef2cbe44c870f2e6b5d2fe012320c5d872605f579149b1e5b4ba2f96ebc823f8a5e7df795b29415fe76ca8388a381e SHA512 98bca5cea00cdbbd0bcb3b98c381ae75ec43a3b6651a171cce47df38948d6d7f043f5bd6f42c8f9e30297db17f5d542bb0174dfbd46fc83d25cb5ea6e60d962c
-DIST imapfilter-2.6.12.tar.gz 59249 BLAKE2B 5d828bfb7680feee0787741e48a5e61fde33b41dd0e0034f7d91b3b8865704f5acd3766e00c277c37b1276204ebb356c459ac5ea626dbee58af0e2b07777f918 SHA512 1425041c288ac46833af6119fd0169cf783a1fec61bf07dfad6f732ec74834ec3beb4e81c3b19f7436310324d9a4369c4ec61aa3a83eef203d7897ea0fc26528
-EBUILD imapfilter-2.5.6.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
-EBUILD imapfilter-2.6.12.ebuild 898 BLAKE2B ccf32725cf7a31769523eadf3da76700e7e7df38bfc932babe1bc67566c7b1d13d72dfa521333a5c489166ae0b49e0fdc5e477d8e7f823d5b955ac9fe906ca88 SHA512 75ea1168731120ebbcb315d9af068afb54137fcf0056aadff3725500cb8a42e76e6a8b0e6cf275bb12a2147eab0f2a6f8bfb0aa10ada2581f6a0e282b44f05d6
+AUX imapfilter-2.6.16-libressl.patch 920 BLAKE2B 6c0bc84885354f2f95430f9e827c391063acc8bc12113a775a24b6af58679c43eea500bb57405ddf89cf09a0a97c5255e49257cb76b87f3481a3b65b62f8e884 SHA512 81ff9036b77d763c57287b4852ae6e3c746478c1b1a98ee62d5021a8580c0245231078b806eed5e6857e71ed2935788552f6fc2565506c21ae336dd89b8b70a2
+DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
+EBUILD imapfilter-2.6.16.ebuild 942 BLAKE2B 2cf741a6835c2b7bfe1754289b9f6fca4f4cfec8d08a3e6c03c1624e7a98bc44a859ee4b6d9e4502ad81a4f45aa789d4cd353afffddb26b7dbda67a59dd0a126 SHA512 5ffb60643302cee65e8c5ee39f5d0c33031b7fd96548c97add5272fdb48a13f992c298d8e5578f2944640d96b6a7a210a3912a6c9ce186e89390816b98d66cd6
 MISC metadata.xml 249 BLAKE2B 8f4404564610b1fc4705b073c963909d882aa72717e386d0ddaa11f4a58ea4fedb0505711baf498cb59107d8486b890eb337d56fad641a0c656d4553fc0139fd SHA512 8fb3a6309758c23abad3fd09a007212a6f5c0beb6d03d3c7d94f5fc8b8818d5cbddd55ef8fbe25700eb11dce04486295ddcc413a3fe568b5ba620b0b5fe0b0a6
diff --git a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
new file mode 100644
index 000000000000..2454fc3ffb98
--- /dev/null
+++ b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
@@ -0,0 +1,29 @@
+From bf69bdbf674269e84b22461c50ce1016182b56d3 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sat, 28 Mar 2020 06:56:07 +0200
+Subject: [PATCH] Fix build with LibreSSL
+
+Bug: https://bugs.gentoo.org/714882
+Upstream-Status: Submitted
+[https://github.com/lefcha/imapfilter/pull/204]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/socket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/socket.c b/src/socket.c
+index 0a1874f..03e0d21 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
+ 		goto fail;
+ 
+ 	if (get_option_boolean("certificates")) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 		SSL_set_hostflags(ssn->sslconn,
+ 		    X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ 		if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
+-- 
+2.26.0
+
diff --git a/mail-filter/imapfilter/imapfilter-2.5.6.ebuild b/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
deleted file mode 100644
index 78c29f258103..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="http://imapfilter.hellug.gr"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="dev-libs/openssl:0=
-	dev-libs/libpcre
-	>=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
-	sed -i -e "/^PREFIX/s:/local::" \
-		-e "/^MANDIR/s:man:share/man:" \
-		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
-		-e "/^CFLAGS/s/-O//" \
-		src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.6.12.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
index 396bcc311fe9..2717687e7e40 100644
--- a/mail-filter/imapfilter/imapfilter-2.6.12.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="libressl"
 
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS NEWS README samples/*"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 src_prepare() {
 	default
 	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 16587fbc4031..6ea8a6cd9a11 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -5,6 +5,6 @@ AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adb
 AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD libmilter-1.0.2.ebuild 1901 BLAKE2B e324dc0842f55f7bcf7634473396cd0828d559500e2d4f43177711a3470eb4731cfdd8784d107d36912711ace6258f1d4ff917cd89511714de14505f32276840 SHA512 c6d71910cd8f7469b5b204c86b6d9fed5ea56e0d0ca6eb57153446d3e76a12a5ded001c3134109d80492cf9bd6b69f751a6268a900526ac365694f821e9414a5
-EBUILD libmilter-1.0.2_p1.ebuild 2035 BLAKE2B 560f20780de715cc6a740c25dab44d3d81aca58350504916e30d52730ff20f7ef4a433b10a276a0681157c110a9b675b594ca1fa576a57370c3e4f5630538271 SHA512 a3575852b0a9d8ce5c00f699911b26e951612380358a071c0c5b28b723cdeda8b66b0cfc8d12c1d9b5143a823a6a50f25a88676f32475ee6289dc3dad5f17607
+EBUILD libmilter-1.0.2.ebuild 1902 BLAKE2B ca8b7252baddcc96ce6660356a29a8f1006a7d9ae737f7dff3306d3a80cda8ce553d4e7d53a5b2ad646e5cb12b987e0c6052b6eca9fcf65c60eb87d8f67bc8be SHA512 a02c5bd778ac79e6bdb66c6dd76687517a28f105622988330860257790d79b65edb514749a44df548480cbf27701f29db4117732e1cededfec8dff23350d4bde
+EBUILD libmilter-1.0.2_p1.ebuild 2028 BLAKE2B e995eefcaac442b1128fe4429353846f32dfc495d63798367de85b2c27b1f3a401c294e2ca9de38b114200bb28a4ea01e4d57999c193415b80045b1c5630b3b5 SHA512 200847443f1d65314a58c490341563deadaedb7bfb1186b76d7e6cbfc2050a7fe0e8d1d8591abb86585cb867e919fa7eaf5983d71c43ef57b182fdad3486683b
 MISC metadata.xml 300 BLAKE2B 410778ccb51b94b32d34d1c9b70f2deff712ad96143c4bd4bbf027f6910e7dfa700dfd8ee07c774043a3d4b7ad6507e5457af71a44fda6b3a81b46cd976b9185 SHA512 07af4a01f72fbe8c5ccdbfa72ea3a869e07a9907f8e878d6df03d1fc3061304280fc9e813958061f00f101571343ada901ec2fd1917760c60c631804498089e5
diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild
index cd3921b5f7e1..e9c4a3b0d423 100644
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="ipv6 poll"
 
 DEPEND="!mail-mta/sendmail
@@ -36,7 +36,7 @@ src_prepare() {
 	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
 	use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
 
-	sed -e "s:@@CFLAGS@@:${CFLAGS}:" \
+	sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
 		-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
 		-e "s:@@CC@@:${CC}:" \
 		-e "s:@@ENVDEF@@:${ENVDEF}:" \
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
index f24ea5bf5d30..f2d436b1e73d 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="ipv6 poll"
 
 DEPEND="!mail-mta/sendmail
@@ -42,7 +42,7 @@ src_prepare() {
 	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
 	use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
 
-	sed -e "s:@@CFLAGS@@:${CFLAGS}:" \
+	sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
 		-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
 		-e "s:@@CC@@:${CC}:" \
 		-e "s:@@ENVDEF@@:${ENVDEF}:" \
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index 0da0767018c1..8d5072661313 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,4 +1,4 @@
 AUX libspf2-1.2.10-gcc5.patch 1080 BLAKE2B ce085a71cba9f6a493c7b276dada02dceb8efdb75df9d0062b74acd9b0e9d5a9c56cdd970743cc9e4860a4714e24d0e4687d9a2c5d321e320a6888c06f88e6c3 SHA512 cd2af129e334e0e1efcd722680f8f7cb064e6f5581ce41c791cb4f5f34d1eb4ac0dc586114b3017b4fd2ba350f11972f78a4029a8fc03118cf74c4f1276cd12b
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-EBUILD libspf2-1.2.10.ebuild 1207 BLAKE2B 86e2b5e334ef694693bc02a3beb1fbc3229a943c92ca795b99b098ffe45073820b4e64d96ce69601e17c9f25f9666a7815aefebcf60f8c4263654977ee7bd5b0 SHA512 b879a8bf8e48c280fcefb9b1e0e20c54c479f69e755b93d0cea9e47cc7872d8c0a9d618cf0ffcbac7c3d9810fac484fdd7b4ef639fca7ab6f56ddeb0a583290d
+EBUILD libspf2-1.2.10.ebuild 1208 BLAKE2B a8121b3b781ae84f3752fcf8cd443908b1106b35e155d85d57f625be44b8fd7f95d7c7c6081ea9ed86fee840f96fa19a5e2f2612b5cd5d014e71139c1c69b66a SHA512 5d814eea972f656ab260313457bf3c51e4f7652e97b9ad9134e752cfc6d4a3ce9e19bbb5f22ce57d38d7e6ff02371f0d152cb5f11ea554fcc2fcc093f9418821
 MISC metadata.xml 588 BLAKE2B f2a34d6c55b8678f9ef69824ccce32a51508fe251af758d4d4c3ae05b51498b543e5f60757764a4a47dbc98587bc2b57faced4965d8c401e35f8e36605313a4c SHA512 8328d959a8b69fa3e10108f21cf2c53a3daf4aacbd9646af8e5af95ec818eeb6aebc20185b991e4ce6a3a2d0101bf67ce47b7af85dec4b06c2748d5f4fafd18e
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 115110c5e018..f6f0d8580258 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static static-libs"
 
 DEPEND=""
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index 2ff9f9e72ad9..58a4ccaef7b5 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,4 +1,4 @@
 AUX libsrs_alt-1.0-ftime.patch 313 BLAKE2B f634abd1e527a199374fc55bf84927c5e38730f79d1b13f7cb0199ce338f825902df662248fa99bb3baf4c4c07117031b52e3e986a7ad0b2816ca28cfe7601b2 SHA512 2566c9b7e9187a243f5eb6b4b67d649bc081538350f647f1afa69812892a8ff8ef889068ccb73f019cf287e9e6ae3999bc62b2003d197963606a4c30ebecd214
 DIST libsrs_alt-1.0.tar.bz2 237984 BLAKE2B e55b01f28fdf240ccf2fea8b43e930bc02a78bfb82a2b9fe573c1c09e0839f89a0bdb51844dae237ed66e4bda925b5b3b93842462987e7f300f6f5d763adf382 SHA512 1e15f8b12c2174c8ee085fc5adae4cb267f69dd5656066d33af106ad4940769552e04cfc67af4ad9650eece2519c03ef383290f36a22df7d9e03fa2186262404
-EBUILD libsrs_alt-1.0-r1.ebuild 1152 BLAKE2B 4c26c1698c552505c4bf4ddf4a00f0c726a24feed0b293818db7be834d0c85d0bb02988d215b2605e2288280c54e43e9d14ae3c50428f1354729937de0c91603 SHA512 a5e74d3af835dac3e2ba34b22d23334bf828d8a88210c9639964a8ba319c3474264a38a7ee04a3005fa0387ad1c7b565921a2db59e86b3c8850822f092968cc2
+EBUILD libsrs_alt-1.0-r1.ebuild 1153 BLAKE2B c30c04dace1d3a3cf6af3a54cb32217c5b39a8a2e6a680f3aff60e1b88e1ee0b1ebd672800ca9b7ef0e31ae9d4c77cebf3a6d8c1a4caa94a47e15e480fd359e0 SHA512 845715bff66b0959c68688c09702ca010f99a8583f3ee756f6e0927d831f1cef23dc6b2726eb3ac9145cbdb4342dfadbe70057232144157728141d5d0c957e43
 MISC metadata.xml 506 BLAKE2B 85745c6fffc19e1064f5d2bde90dbe56f5bdd674d4189630ccbe3d012e505dec487878097ed83d031e79e46478e7f0281f5edda1a94057671bcc051ca202025a SHA512 6a6096ee6f1895de958b8167e1a9632dc6901b16908d94af86932aead64fbc1690ffd300d8cc97792d46201e64cb20d6696e232e9d796e33fe4484e808e111ee
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
index 06ff78fda6f6..b0e133766445 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index ecc9183aca6a..108cafd04a03 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -2,5 +2,5 @@ AUX maildrop-3.0.0-testsuite.patch 1948 BLAKE2B fcfdfd488873fa4f14c7087ee54bbc2e
 AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd4454920e60d8d2799f105fd98f51b5a0faa4ecc9d8a688aa4cc9022a6b62b434389d5516bd06abd273e02bf32926b57 SHA512 547f78a9e5dce501ac61584912a2e74b43e36b2189bab27d1811af7718def5e07d3683fb2ef0937ae026bd53cffc68b735319322c089bcfff0a17a6edebed1fb
 AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e
 DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff
-EBUILD maildrop-3.0.0.ebuild 3650 BLAKE2B 3d6705a1146532445ad1201cea984a1398c740e0a2366a189dacdc1a0423bcd1351ace967786488c192c5b5da00e19bcc0d2c9298138ce6145a163c491f221d9 SHA512 f1c243f5d07be2d1fd681f0f4ba7e7dc949fae7271b07f4219e214eb2ab7e351fe440dde622dc5afd27b3d91e71eab24dd6219a556a831ca594f597f6ed80eb6
+EBUILD maildrop-3.0.0.ebuild 3647 BLAKE2B d26c4175e2216d666c28b77ffcd7f4552c1671e9955110aef3f4e4509e43ced0ec0f2ead8f19ccd4227b58dfda9e07129554755cf63b0d1967c664ac78c3baa4 SHA512 36556fd4c0dbe4ca307267a12821b3691c92cce983d75a9fff8c01fb9a45cba1fa7795d5a9c306db12afc3fd076d728c45c35440b5cb01b385dbd47753e1f8c0
 MISC metadata.xml 553 BLAKE2B 259c46533fe17a5fa0cb8a8f66e0934f048debde8aa2d3e8c231461ad9cd0840854ad5cd25170c8945c8c92fb6281b751db44180be6087c198a4057306487af6 SHA512 42f25a0370d0c41dedfd0ec15e244527ed97ac6d577b170794e9c10930a0a0603e9edba090b004c8fa648ff6bf164a05d7aa2b4cbe2576bd8d9dda6dc54e6e42
diff --git a/mail-filter/maildrop/maildrop-3.0.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild
index bbbe3b641222..300914d24e6d 100644
--- a/mail-filter/maildrop/maildrop-3.0.0.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
 
 CDEPEND="!mail-mta/courier
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 3e7d560eacb6..7cfd4db1bc02 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -4,8 +4,8 @@ AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
-EBUILD opendmarc-1.1.3.ebuild 756 BLAKE2B ae8b1292a30509d3a8c4dab5f7b2f46b4504ba3bc6d9e322f825a1eb265aa414e559f9d12b14358759f982c22dbe871714f39a0a46faaa84013e872bb5f58ac3 SHA512 6a3f85774f40eb47080432f7ea4102368d4d3e35df8f38e8ade4428b9b8c1e0ae04a95cabcddbf52e23ec243e6d1ba191a3b6be804811f6637486524de28e4c3
+EBUILD opendmarc-1.1.3.ebuild 757 BLAKE2B 1dc78305bb746405185e6b3e2a435a976475bf881ad3e2702c1e99cb38ae9c3ddca5bd6e51ea506ab0a84f40629ac1b7de24c5d44739b2fb54d301a2ce3cfac6 SHA512 4bdd251638b2ff2dd90ed985da7ae04152b7f41028585149e31f463f82203b11e972845821084f355e7481a5fd9275278b057a24abd5002559571b196b4ba3a1
 EBUILD opendmarc-1.3.2-r1.ebuild 1411 BLAKE2B 09744240801d95ffab1ddea96509c1e1796aab9b5787ad264984a9e94e943e07b52af49ec05670acad01a14685b1f38a099b387b1249a91f5a97305f2cb3b86e SHA512 b5a927769b5635124d815311daa6ff8057b4e735895e10726687c835fb19cf663e43d6e8c085a5e13e07d35c07d2ab22ff65f464f4de2ee26c05404bdda8def5
-EBUILD opendmarc-1.3.2-r2.ebuild 1549 BLAKE2B 8c975b7dff125f797a7f6f22fd9e60b2e072234c05a6697439d93ac52637da2e45f9e9d79a6592ae22d07ecb8815a126d1300bdbdb65653b91b600b11425a85a SHA512 65b8b9ca479fe98884dfe112c051ca8bf127fd66b49958a15ca9d8273566c3a7e93b62805cb557d46f298397baf2401d45a5ddb1445d5f1cbf5ca91873e247e9
-EBUILD opendmarc-1.3.2-r3.ebuild 1602 BLAKE2B 689bd025c502c9ca317ad8c0b32429d1b7be6bcad47b781c720379160f1b25b1465cf2ab1687f663b5b2257e6451d6f946cb0d898ecb0b48ebaaf81abc4f4618 SHA512 c5f1916754edfc07758f13cca0f8e87f34a213e5af46f0b50067752df9a8b19cbfe94abfd44eb99132ae80f8ba93e1313f1e75ef938c25c2b8b3a9faf7da098a
+EBUILD opendmarc-1.3.2-r2.ebuild 1550 BLAKE2B b5ba54570b5d5fde5df574e13e2d82ffed5de6a2293a094ab7e8a2aff95843d49cd3266baf4cedb86ade0a35189aa37a159cb12bec9d7d37132921f5978af62d SHA512 0d187edb2a3fe745f4f9b9ebc5c13a4a26c38308a18ea0a7966297a6d2a4835f611a90e0baa4a0794f886edc6df429202bea25f2a6a87e4a0ec3ff5dcffe063f
+EBUILD opendmarc-1.3.2-r3.ebuild 1603 BLAKE2B 9183cfae9e768b485e5c469208660ec02c8d7fe8cecc8bd5916ab87d0579d9d4699a07a86ce9915eefea5e4ba549b71aeaf52f8be01c9b53e68d4f6f7c0ac1a3 SHA512 1c13bcdb86bacf192c0f1be61781757054bfdfa9db6a96b46de103eeebb28e35cee88051b580ebbe8be13708826c32e2169d3cf518b0e2c381b22990757d61e8
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
index 1a1b1054671d..63923f17a6d8 100644
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/DBI
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 98462ace5613..031cb5289f55 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
index 54d0eaccc931..b3c31185020a 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index 4f06959a559a..17f1fa39513b 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -1,6 +1,8 @@
 AUX postsrsd.init 737 BLAKE2B 76342c7707e86c8d111e550393ce2e624c2ed192e16a4521cf6b14deb81a21d2bc8be9ca1027890dd0dc883cadf6659fedd17b417d0712e55e38781f5ec8cffe SHA512 9550e26ddee4eec5b324bc6364b52ea8ebf755c1463498ab7380aac87e79d1a84e2048ef0bfdd250d029674d5050bab1bb5d1cec455ec5d4863e08d320e06111
 AUX postsrsd.init-r1 787 BLAKE2B 6d5431bb32974dc88ace86d2781681fdc9058475569080d057cb0336f337b8ccb3bd63f12344829085e5ba7399569dc951a820e6bdb8c5e0cecba718bfa19774 SHA512 dd80b6be1e2c28ddd7ff48ac761ce15b46d01db58aa91ddaa29db63acec5c071a52c055b9ecf8839f04696765a937dfcd2532be4a99fe2cf04bd881a7bd5acc2
 DIST postsrsd-1.4.tar.gz 26555 BLAKE2B acdfb3c8a1ca5172ac7727913ad6c1f9cf0450996aaf3cbc4905b89e02de5917de2d6e7674819299bd456232547fdc0496be06c5cd0531fd703622edfaf9a9df SHA512 e5b9d2091d562030dd8d35117a3c5fb7d99c0613120fc90f74be57af5e88a3fe0ce73a5ce702708047ae37f70c6aedb4a0df018dccbe480048ccb6ed4debbcef
+DIST postsrsd-1.6.tar.gz 32111 BLAKE2B 5b4e562aa9c9b5faf0e45c035a71d76dc2b6e9b3d4399108f06e6d0ad3e4f7abfcb8c18c818f3b4787bab155bf7895caaf127a97b861b26525ad5a27f2ee4dc7 SHA512 b2df4cdec41361e15cd8c9207fb16564d607559bcb36dd73c9347b90e4f3c2414b88434ef1ffe6a18783f38c5960383516e40e4ffa28802a03539e52ca723aa1
 EBUILD postsrsd-1.4-r1.ebuild 550 BLAKE2B fe9d47ec65943344ceaa1000fbda08367aa3f17febdca670f7ce8d4f768ac9469f4e7bbed9b71fe5bb02a555ff7bff6a00a2b0bc7c467050c4b828708a3fb91d SHA512 9e395c93a416b5cc81cd5295d287f871c225ec3bb49445b94e34ddfe9bd768bccacfe8189015e3e9d53092c615b90f8287e9afae69dd9f516cf16197570437d6
 EBUILD postsrsd-1.4.ebuild 547 BLAKE2B c74dc06204c8e865fbda696ec43c14adc5f57e0a942435b0a1bafc0f5836ea51e70eb0b51a87bd7f98e3239b816069ba015ccf1fd5493b41333e81e75f8499b3 SHA512 3e3c21cc922a540d5bc4af336678588f463afaca5109e4ba977d042e7ac6010f8f4b1f9fe10cbabbbc81ce9b3f28dc5f368887186315c6e343e5d4846501ea4c
+EBUILD postsrsd-1.6.ebuild 773 BLAKE2B d6c819693865f82e2282552a6adf7e6c5a8f41f34d217ff2d64b795a18893f63f8034536eeb110504e5c9016e9f2d06259f18969159c656e542d44190a3473e0 SHA512 e03de005aa024efd034ecf9cf80934d9a3522826fb769e119c6618871c8b82fc6fd1ac4d91a825888d3ad620c016f7301561d8e8fbb755b463d03afc06de1513
 MISC metadata.xml 337 BLAKE2B caac016ab1be7bad01670321e5aae7cf8c3699a394f4911350b4104d313e5b921071cb3406a47f976f16d1fc6879a16b2d6be03e0765a02f0e1e65de5703df0f SHA512 9093270e1a174ca6c5e1316015b3e9605f247bcd4fccf1e1c9595f5b94e3e182e532dced5c483a0be24c053fd453a5b9ba272c1004fbc54fe95cc3069dfe7d59
diff --git a/mail-filter/postsrsd/postsrsd-1.6.ebuild b/mail-filter/postsrsd/postsrsd-1.6.ebuild
new file mode 100644
index 000000000000..ec90ac1a91ad
--- /dev/null
+++ b/mail-filter/postsrsd/postsrsd-1.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Postfix Sender Rewriting Scheme daemon"
+SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/roehling/postsrsd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-util/cmake-2.4"
+RDEPEND=""
+
+CHROOT_DIR="${EPREFIX}/var/lib/postsrsd"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCHROOT_DIR=${CHROOT_DIR}
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/postsrsd.init-r1" postsrsd
+	newconfd "${BUILD_DIR}/postsrsd.default" postsrsd
+	keepdir ${CHROOT_DIR}
+}
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index 139b5fc44b8e..6c167833a7e1 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -9,5 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e
 AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc
 AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5
 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
-EBUILD procmail-3.22-r14.ebuild 3660 BLAKE2B 96fecafbace3b7da0938ea76c75e5b1a40fb64ea6554e63e30f9530dece7b248423a2eedc4d29c6173efe58bca51f5e8ba604d4c344ffbcd1a161859284d3cb6 SHA512 43583656939473a6e32d2e47827270de1dfdfa1867779bdbaf2e396e78d9c430c5e4d5113e2a30ed8b527ce23507bdd96a4f3f085485852c81bf4cbcdace8793
+EBUILD procmail-3.22-r14.ebuild 3658 BLAKE2B 7c9d55eebe8b370c75681a5ebebde5ee948cf746a14a975bc9b562a9c579466a26ffb3b7dd57251dfb9ba4f9c539880d5f43bcf308291257a84444b37776d395 SHA512 405c299d545b2b6c1aa2542d106954a2cd9352a6a249dee78094c4124bdfae5f1c7cd2fe0a0ab65756484de912ba504513d8bf5d20b6073693168934f5ed121c
 MISC metadata.xml 265 BLAKE2B a79a9f0aec856d7f6890b8adf1dbb728c1218426404e815e308bef910ff6b80a97dc487084ea81f93823fcd3a909f3eca5bec488c252cb886c46c55544f370f2 SHA512 82df2df703946d60d4906f91f64fb4158cd88219b613221005996ff953451c0a659d761d1ced61971be2d6be6f968bc8471c26e001353f6dee6033a2012c265a
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild b/mail-filter/procmail/procmail-3.22-r14.ebuild
index ca949f0929cb..3abc7cf7a8aa 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="mbox selinux"
 
 DEPEND="virtual/mta"
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
new file mode 100644
index 000000000000..bef5b63ee8dd
--- /dev/null
+++ b/mail-filter/pyzor/Manifest
@@ -0,0 +1,5 @@
+AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
+AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
+DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
+EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
+MISC metadata.xml 887 BLAKE2B 5a399af14ad9aa5eefe9f37da9b43addf24e6c5416827721f110a5cceb44eb9f03c78ac0b149f31468e5206a10c93c98d3940783c39ffa8f04b840a94c3fa850 SHA512 c3967f9f0e2c64f510f04e7ce01f89a2c03a7e1f260ca25a3d29b6c7821dbcded3ffa4b16f640693b08f3763793c733689c30ef8710305a4bf0b706605eda138
diff --git a/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch b/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
new file mode 100644
index 000000000000..03031a976690
--- /dev/null
+++ b/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
@@ -0,0 +1,85 @@
+From 66225b32d2774cf37fa7f702f7eb26cd94094482 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 4 Mar 2018 17:27:01 -0500
+Subject: [PATCH 1/1] scripts/pyzor: replace the client with the git (+ issue
+ 64 fix) version.
+
+---
+ scripts/pyzor | 33 +++++++++++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/pyzor b/scripts/pyzor
+index 19b1d21..86c6f7d 100755
+--- a/scripts/pyzor
++++ b/scripts/pyzor
+@@ -17,9 +17,9 @@ import tempfile
+ import threading
+ 
+ try:
+-    import ConfigParser
+-except ImportError:
+     import configparser as ConfigParser
++except ImportError:
++    import ConfigParser
+ 
+ import pyzor.digest
+ import pyzor.client
+@@ -110,7 +110,7 @@ def load_configuration():
+     config = ConfigParser.ConfigParser()
+     # Set the defaults.
+     config.add_section("client")
+-    for key, value in defaults.iteritems():
++    for key, value in defaults.items():
+         config.set("client", key, value)
+     # Override with the configuration.
+     config.read(os.path.join(options.homedir, "config"))
+@@ -171,14 +171,35 @@ def _get_input_digests(dummy):
+ 
+ 
+ def _get_input_msg(digester):
+-    msg = email.message_from_file(sys.stdin)
++    msg = email.message_from_bytes(get_binary_stdin().read())
+     digested = digester(msg).value
+     yield digested
+ 
+ 
++def _is_binary_reader(stream, default=False):
++    try:
++        return isinstance(stream.read(0), bytes)
++    except Exception:
++        return default
++
++
++def get_binary_stdin():
++    # sys.stdin might or might not be binary in some extra cases.  By
++    # default it's obviously non binary which is the core of the
++    # problem but the docs recommend changing it to binary for such
++    # cases so we need to deal with it.
++    is_binary = _is_binary_reader(sys.stdin, False)
++    if is_binary:
++        return sys.stdin
++    buf = getattr(sys.stdin, 'buffer', None)
++    if buf is not None and _is_binary_reader(buf, True):
++        return buf
++    raise RuntimeError('Did not manage to get binary stdin')
++
++
+ def _get_input_mbox(digester):
+     tfile = tempfile.NamedTemporaryFile()
+-    tfile.write(sys.stdin.read().encode("utf8"))
++    tfile.write(get_binary_stdin().read())
+     tfile.seek(0)
+     mbox = mailbox.mbox(tfile.name)
+     for msg in mbox:
+@@ -372,7 +393,7 @@ def genkey(client, servers, config, hash_func=hashlib.sha1):
+         return False
+     # pylint: disable-msg=W0612
+     salt = "".join([chr(random.randint(0, 255))
+-                    for unused in xrange(hash_func(b"").digest_size)])
++                    for unused in range(hash_func(b"").digest_size)])
+     if sys.version_info >= (3, 0):
+         salt = salt.encode("utf8")
+     salt_digest = hash_func(salt)
+-- 
+2.13.6
+
diff --git a/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch b/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch
new file mode 100644
index 000000000000..93d0f07a2579
--- /dev/null
+++ b/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch
@@ -0,0 +1,41 @@
+From e4f06e21f697b863fa45a50e535ff0c6e3621a60 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 25 Mar 2018 10:14:21 -0400
+Subject: [PATCH 1/1] scripts/pyzor: undo ConfigParser python-3.x
+ compatibility.
+
+The build system for pyzor-1.0.0 still runs the 2to3 utility on the
+scripts to be installed. As an unintended side-effect, the python-3.x
+"try... import... except" compatibility block for the ConfigParser <->
+configparser module gets modified (the module name gets mistakenly
+lowercased).
+
+This commit puts back the python-2.x "import ConfigParser" line
+unconditionally, and we'll have to rely on 2to3 to fix it when run
+under python-3.x. In newer versions of pyzor, the automatic 2to3 will
+not happen.
+
+Bug: https://bugs.gentoo.org/643692
+---
+ scripts/pyzor | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/scripts/pyzor b/scripts/pyzor
+index 86c6f7d..2750d92 100755
+--- a/scripts/pyzor
++++ b/scripts/pyzor
+@@ -16,10 +16,7 @@ import optparse
+ import tempfile
+ import threading
+ 
+-try:
+-    import configparser as ConfigParser
+-except ImportError:
+-    import ConfigParser
++import ConfigParser
+ 
+ import pyzor.digest
+ import pyzor.client
+-- 
+2.16.1
+
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
new file mode 100644
index 000000000000..77b1c62d6729
--- /dev/null
+++ b/mail-filter/pyzor/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="pyzord">Enable the pyzord server daemon</flag>
+    <flag name="gdbm">
+      Enables the Gdbm back-end database engine for pyzord
+    </flag>
+    <flag name="redis">
+      Enables the redis back-end database engine for pyzord through
+      <pkg>dev-python/redis-py</pkg>
+    </flag>
+    <flag name="gevent">
+      Use <pkg>dev-python/gevent</pkg> to enable asynchronous operation
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">SpamExperts/pyzor</remote-id>
+    <remote-id type="sourceforge">pyzor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..1cf021784362
--- /dev/null
+++ b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+MY_PV="1-0-0"
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor"
+SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gdbm gevent pyzord redis test"
+# The test suite is py2-only
+RESTRICT="test"
+
+# The mysql-python library is always required for the MySQL engine. We
+# depend on it conditionally here because otherwise repoman will balk at
+# the potential conflict between PYTHON_TARGETS and USE=mysql. But as a
+# result, if you try to use the MySQL engine with python-3.x, it just
+# won't work because you'll be missing the library.
+RDEPEND="
+	pyzord? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
+	)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+# TODO: maybe upstream would support skipping tests for which the
+# dependencies are missing?
+REQUIRED_USE="pyzord? ( || ( gdbm redis ) )
+	test? ( gdbm redis )"
+S="${WORKDIR}/${PN}-release-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch"
+	"${FILESDIR}/unfix-configparser-compat-for-2to3.patch"
+)
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${D}"usr/bin/pyzord* "${ED}usr/sbin" \
+		   || die "failed to relocate pyzord"
+	else
+		rm "${D}"usr/bin/pyzord* || die "failed to remove pyzord"
+	fi
+}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index ecbe503b95c2..4e23c0584dcd 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,13 +1,15 @@
-AUX rspamd-2.2-i386-hyperscan.patch 698 BLAKE2B 429b91b8d1984d601696e85d8be8b520d6ffa16c98d9c4365d619e25761c13ccd8850e051ed565eac91ab56cba10003c13c25e58fecfbd7eee546e80a0560bee SHA512 224a4aee34a25223e4f6f74957d19b45227d072e3042c8d2e3b699eb4fea2636817820f3cd91f3a5db0e3eff4bb17d9222a384cf27374bfd01704598be10591d
+AUX rspamd-2.5-unbundle-lua.patch 3169 BLAKE2B 77ff33b618a824008da0d4d71a79c252bacbfc48a7fa8f288cfdf901883498a6bcdb2acc21959c9c49aabf4e2b2f6445eb7f9b906a008f31e54a9deb730946d0 SHA512 02b59ade0a715c9d7875fb154129724a9e4f392f31928e1c460bd720de0ffb649883c8d29480f8ac09d8cb69281a8395547cb0f6a082a9b422de7adb81469bb0
+AUX rspamd-2.5-unbundle-snowball.patch 758 BLAKE2B 4e419c4e70d5726309c17ca759b8917feb2d52842cde06453821a8b1964ed8165a5f3536ab917a8362b44b40858d1660ae7c7887fee513e9e6fb681d24589255 SHA512 5257921bdeb5febef99feebd03d291aad009a6b8a44c325305532bae7aec35456042b4813338f175c4a59aa80cce3178118d9e1e4bc5a500f42e5364c06a4dda
+AUX rspamd-2.5-unbundle-zstd.patch 4191 BLAKE2B 3d053efdfbf66dfd793b20d00a534bf5d46f5a85c48f432a45d17781be960db916bb28decd92c089d5bca734edb18559f552590ad804f27c494a2342a52b8606 SHA512 afdbfb264243bdc27c8010c9a2b89a855d16054d445c82a13656f505550670f7ab978008c0900c9d04144677b043976101d882e6deb9a32215110e0d96e74179
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
-DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
-DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
 DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
-EBUILD rspamd-2.1.ebuild 2246 BLAKE2B 17bed4c0f2e236e9759b3b7fb179d1206f855a78609066876b3fbe011bdce111bc65179d8ee7839869f82cb1128d93a8e496c7fa095f9b7178847b92b3f0cc45 SHA512 2ecd0cd86a822dba3308dfc4c3cb3bdf6519d94da2c39e03cf7cd45dc33de959f11990a7cbe87d0d7ec265662782378a1136916177dec121dcd1f10ceb4134d7
-EBUILD rspamd-2.2.ebuild 2301 BLAKE2B be0806ccb14916cb81a8e3603a43514e4937ea794b3582156ca32b99032656f67379d170abda4aafc7cfcc88021fd157bacfeb2b1720258aac2a94434a69daeb SHA512 c5f704b9b293379eeb4917e8fa758ac44374c6bc06ec46d395fb3687418e37f01fe7c5fef4cb2a01097eb7f96e804a2ac0ce0fac20c95d7f259d4709c19eafb9
-EBUILD rspamd-2.3.ebuild 2133 BLAKE2B 190371b0c53e43bdd45c49a311ffca5d95f08252483cebd365b15e0bb3dd0f7e999194e43ff66ade199d503073452dfeefe114e9f51a904d5b5741692ec494da SHA512 c33edd128f5be1d8c91b01740fdab899049d721b395fd198020e235aee1c1db9cdb6002c28d0e5adb66267eef10a8a32c5532239046a3ffa859de85f0c2d8f1e
-EBUILD rspamd-9999.ebuild 2133 BLAKE2B 190371b0c53e43bdd45c49a311ffca5d95f08252483cebd365b15e0bb3dd0f7e999194e43ff66ade199d503073452dfeefe114e9f51a904d5b5741692ec494da SHA512 c33edd128f5be1d8c91b01740fdab899049d721b395fd198020e235aee1c1db9cdb6002c28d0e5adb66267eef10a8a32c5532239046a3ffa859de85f0c2d8f1e
-MISC metadata.xml 641 BLAKE2B cf34ec72d9a23ca2a1b7325e9cf35f0f7f5ddd2a7f7ed257614b8d74dac32ba22067ab008513b80a4edb8ac4f4be574967f1d4659f92f269cfeb647b4ad0abfe SHA512 0615158d243771302c5dbe70e80ddbba668286286a45a8c098b944baf75adbf87ff143ee7b07193c5b557fa44ef615b46fa5f7a5e4aa0d3b95118996b2e95328
+DIST rspamd-2.4.tar.gz 4462119 BLAKE2B 073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca SHA512 47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08
+DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
+EBUILD rspamd-2.3.ebuild 2219 BLAKE2B 22b8e199e27f7771ea5a4216b648da72b14f76c31845565fabb76a331e16366dbcc40eee13915db234a77fed03dabb4869cefa6aaf55387c6eeacbaa476dc6da SHA512 88f17ad1f33841d5ac80447ad935a8bf2e108fc7fc89ba70922312979721eaa38cc74bfbde09145f055885a62b7306e664325eee2e434bc1483aacb083e23230
+EBUILD rspamd-2.4.ebuild 2219 BLAKE2B 22b8e199e27f7771ea5a4216b648da72b14f76c31845565fabb76a331e16366dbcc40eee13915db234a77fed03dabb4869cefa6aaf55387c6eeacbaa476dc6da SHA512 88f17ad1f33841d5ac80447ad935a8bf2e108fc7fc89ba70922312979721eaa38cc74bfbde09145f055885a62b7306e664325eee2e434bc1483aacb083e23230
+EBUILD rspamd-2.5.ebuild 2573 BLAKE2B 634e38870b37b9d3d41d38e0101df39ec19fbab7b36d5b3b6db4dd7e321f23260aef04b9c289a1bed77536cd539d824d53820e107a327ac8e673b099f530a9fa SHA512 f2a0934d81ce4ed7ff6383c5017e48bd8b71c07d31eea5fb2e9078639ca4e36fa4526c6c7cfed2a96ccd527a9ac4ffa7e7cbc825d7b1149f21589f40435925d6
+EBUILD rspamd-9999.ebuild 2573 BLAKE2B 634e38870b37b9d3d41d38e0101df39ec19fbab7b36d5b3b6db4dd7e321f23260aef04b9c289a1bed77536cd539d824d53820e107a327ac8e673b099f530a9fa SHA512 f2a0934d81ce4ed7ff6383c5017e48bd8b71c07d31eea5fb2e9078639ca4e36fa4526c6c7cfed2a96ccd527a9ac4ffa7e7cbc825d7b1149f21589f40435925d6
+MISC metadata.xml 751 BLAKE2B 612a7de6326aba8b0319fb58cb7dd8669bc8d2d59e0e606afbe6b202c287e6953023e5a026750866dc015b9a2aa0249be3ccd46b48cf950a78b2cf497bc86147 SHA512 d958864849fa7a74e578046d1d2a7599b0a3e3d8b1d7f9d520833ce1037aff77f39dff49ad1996eb600f3293f23ba84919ab046abddc75490816799ea6865494
diff --git a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
deleted file mode 100644
index 578d3da7fa31..000000000000
--- a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/Hyperscan.cmake b/cmake/Hyperscan.cmake
-index 3dd774511..b8f83a3bb 100644
---- a/cmake/Hyperscan.cmake
-+++ b/cmake/Hyperscan.cmake
-@@ -1,8 +1,8 @@
- option (ENABLE_HYPERSCAN    "Enable hyperscan for fast regexp processing [default: OFF]" OFF)
- 
- if (ENABLE_HYPERSCAN MATCHES "ON")
--    if (NOT "${ARCH}" STREQUAL "x86_64")
--        MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64 architecture")
-+    if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386"))
-+        MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386 architectures")
-     endif ()
-     ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES
-             hs include/hs
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
new file mode 100644
index 000000000000..b8deb2d6903b
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-lua.patch
@@ -0,0 +1,99 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bbc141170..8e3665c18 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+ 		"${CMAKE_SOURCE_DIR}/contrib/librdns"
+ 		"${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
+ 		"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+-		"${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
+ 		"${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
+ 		"${CMAKE_BINARY_DIR}/src/libcryptobox")
+ 
+@@ -592,16 +591,11 @@ ENDIF()
+ ADD_SUBDIRECTORY(contrib/libucl)
+ ADD_SUBDIRECTORY(contrib/librdns)
+ ADD_SUBDIRECTORY(contrib/aho-corasick)
+-ADD_SUBDIRECTORY(contrib/lua-lpeg)
+ ADD_SUBDIRECTORY(contrib/t1ha)
+ ADD_SUBDIRECTORY(contrib/libev)
+ ADD_SUBDIRECTORY(contrib/kann)
+ ADD_SUBDIRECTORY(contrib/fastutf8)
+ 
+-IF (NOT WITH_LUAJIT)
+-	ADD_SUBDIRECTORY(contrib/lua-bit)
+-ENDIF()
+-
+ IF (ENABLE_LUA_REPL MATCHES "ON")
+ 	ADD_SUBDIRECTORY(contrib/replxx)
+ 	SET(WITH_LUA_REPL 1)
+@@ -700,7 +694,6 @@ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
+-INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
+ 
+ # systemd unit
+ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND WANT_SYSTEMD_UNITS MATCHES "ON")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a34d2ac4..54b2e4083 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -180,7 +180,6 @@ ENDIF()
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
+@@ -189,10 +188,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
+ 
+-IF (NOT WITH_LUAJIT)
+-	TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
+-ENDIF()
+-
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ 	TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index ce5fff6c5..509ceeb44 100644
+--- a/src/lua/lua_common.c
++++ b/src/lua/lua_common.c
+@@ -14,7 +14,6 @@
+  * limitations under the License.
+  */
+ #include "lua_common.h"
+-#include "lptree.h"
+ #include "utlist.h"
+ #include "unix-std.h"
+ #include "ottery.h"
+@@ -903,10 +902,6 @@ rspamd_lua_wipe_realloc (void *ud,
+ 	return NULL;
+ }
+ 
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ lua_State *
+ rspamd_lua_init (bool wipe_mem)
+ {
+@@ -961,7 +956,6 @@ rspamd_lua_init (bool wipe_mem)
+ 	luaopen_kann (L);
+ 	luaopen_spf (L);
+ #ifndef WITH_LUAJIT
+-	rspamd_lua_add_preload (L, "bit", luaopen_bit);
+ 	lua_settop (L, 0);
+ #endif
+ 
+@@ -971,7 +965,6 @@ rspamd_lua_init (bool wipe_mem)
+ 	rspamd_lua_new_class (L, "rspamd{session}", NULL);
+ 	lua_pop (L, 1);
+ 
+-	rspamd_lua_add_preload (L, "lpeg", luaopen_lpeg);
+ 	luaopen_ucl (L);
+ 	rspamd_lua_add_preload (L, "ucl", luaopen_ucl);
+ 
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
new file mode 100644
index 000000000000..10b56fa977ad
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad989f7f2..d08496998 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
+ 		"${CMAKE_SOURCE_DIR}/contrib/libottery"
+ 		"${CMAKE_SOURCE_DIR}/contrib/xxhash"
+ 		"${CMAKE_SOURCE_DIR}/contrib/cdb"
+-		"${CMAKE_SOURCE_DIR}/contrib/snowball/include"
+ 		"${CMAKE_SOURCE_DIR}/contrib/librdns"
+ 		"${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
+ 		"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+@@ -586,7 +585,6 @@ ADD_SUBDIRECTORY(contrib/fpconv)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+ ADD_SUBDIRECTORY(contrib/libottery)
+ IF(ENABLE_SNOWBALL MATCHES "ON")
+-	ADD_SUBDIRECTORY(contrib/snowball)
+ 	SET(WITH_SNOWBALL 1)
+ ENDIF()
+ ADD_SUBDIRECTORY(contrib/libucl)
+-- 
+2.24.1
+
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch
new file mode 100644
index 000000000000..e86d70173c64
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.5-unbundle-zstd.patch
@@ -0,0 +1,132 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8e3665c18..ad989f7f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -171,6 +171,8 @@ ELSE()
+ 		ROOT ${PCRE_ROOT_DIR} MODULES pcre libpcre pcre3 libpcre3)
+ ENDIF()
+ 
++ProcessPackage(ZSTD LIBRARY zstd INCLUDE zstd.h
++	ROOT ${ZSTD_ROOT_DIR} MODULES libzstd)
+ ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite
+ 	ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
+ ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
+@@ -583,7 +585,6 @@ ADD_SUBDIRECTORY(contrib/http-parser)
+ ADD_SUBDIRECTORY(contrib/fpconv)
+ ADD_SUBDIRECTORY(contrib/lc-btrie)
+ ADD_SUBDIRECTORY(contrib/libottery)
+-ADD_SUBDIRECTORY(contrib/zstd)
+ IF(ENABLE_SNOWBALL MATCHES "ON")
+ 	ADD_SUBDIRECTORY(contrib/snowball)
+ 	SET(WITH_SNOWBALL 1)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 54b2e4083..e0e2edd58 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -181,7 +181,6 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
+ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
+ 
+ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c
+index 98b51506b..b4ed1cb5e 100644
+--- a/src/client/rspamdclient.c
++++ b/src/client/rspamdclient.c
+@@ -19,8 +19,8 @@
+ #include "libserver/http/http_private.h"
+ #include "libserver/protocol_internal.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
+-#include "contrib/zstd/zdict.h"
++#include <zstd.h>
++#include <zdict.h>
+ 
+ #ifdef HAVE_FETCH_H
+ #include <fetch.h>
+diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
+index d3ad9e210..c7e09c2f9 100644
+--- a/src/libserver/cfg_utils.c
++++ b/src/libserver/cfg_utils.c
+@@ -36,9 +36,8 @@
+ #include "contrib/libottery/ottery.h"
+ #include "contrib/fastutf8/fastutf8.h"
+ 
+-#define ZSTD_STATIC_LINKING_ONLY
+-#include "contrib/zstd/zstd.h"
+-#include "contrib/zstd/zdict.h"
++#include <zstd.h>
++#include <zdict.h>
+ 
+ #ifdef HAVE_OPENSSL
+ #include <openssl/rand.h>
+diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
+index a832adc4f..bdc1f8ba0 100644
+--- a/src/libserver/maps/map.c
++++ b/src/libserver/maps/map.c
+@@ -23,7 +23,7 @@
+ #include "libserver/http/http_connection.h"
+ #include "libserver/http/http_private.h"
+ #include "rspamd.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "contrib/libev/ev.h"
+ #include "contrib/uthash/utlist.h"
+ 
+diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
+index 35d50b909..53c23ed51 100644
+--- a/src/libserver/protocol.c
++++ b/src/libserver/protocol.c
+@@ -21,7 +21,7 @@
+ #include "worker_private.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/scan_result_private.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "lua/lua_common.h"
+ #include "unix-std.h"
+ #include "protocol_internal.h"
+diff --git a/src/libserver/task.c b/src/libserver/task.c
+index 3e8dd381f..150b5d54c 100644
+--- a/src/libserver/task.c
++++ b/src/libserver/task.c
+@@ -25,7 +25,7 @@
+ #include "stat_api.h"
+ #include "unix-std.h"
+ #include "utlist.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "libserver/mempool_vars_internal.h"
+ #include "libserver/cfg_file_private.h"
+ #include "libmime/lang_detection.h"
+diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
+index 91cc18800..d29f8aeaa 100644
+--- a/src/lua/lua_util.c
++++ b/src/lua/lua_util.c
+@@ -17,7 +17,7 @@
+ #include "html.h"
+ #include "tokenizers/tokenizers.h"
+ #include "unix-std.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ #include "contrib/uthash/utlist.h"
+ #include "libmime/email_addr.h"
+ #include "libmime/content_type.h"
+diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
+index e9ce9ef5e..a9f3159db 100644
+--- a/src/rspamd_proxy.c
++++ b/src/rspamd_proxy.c
+@@ -36,7 +36,7 @@
+ #include "libserver/milter.h"
+ #include "libserver/milter_internal.h"
+ #include "libmime/lang_detection.h"
+-#include "contrib/zstd/zstd.h"
++#include <zstd.h>
+ 
+ #include <math.h>
+ 
+-- 
+2.24.1
+
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 140755872e01..c14373f9b6eb 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -9,6 +9,10 @@
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer type="person">
+    <email>arkamar@atlas.cz</email>
+    <name>Petr Vaněk</name>
+  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild b/mail-filter/rspamd/rspamd-2.3.ebuild
index 6fc83c0865fa..38a8793ea037 100644
--- a/mail-filter/rspamd/rspamd-2.3.ebuild
+++ b/mail-filter/rspamd/rspamd-2.3.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
+HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.4.ebuild
index 3b7e31293814..38a8793ea037 100644
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.4.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
+HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 
@@ -41,13 +41,9 @@ RDEPEND="
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-i386-hyperscan.patch" )
-
 src_prepare() {
 	cmake_src_prepare
 
-	sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
 		|| die
diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild b/mail-filter/rspamd/rspamd-2.5.ebuild
index bdfa150670b4..b5d45580a5de 100644
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ b/mail-filter/rspamd/rspamd-2.5.ebuild
@@ -1,51 +1,69 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils pax-utils systemd tmpfiles
+inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 
 RDEPEND="
 	acct-group/rspamd
 	acct-user/rspamd
+	app-arch/zstd
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/libev
+	dev-libs/libsodium
+	dev-libs/snowball-stemmer
 	net-libs/libnsl
 	sys-apps/file
-	dev-util/ragel
-	dev-libs/libsodium
 	blas? ( sci-libs/openblas )
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
-	jit? ( dev-lang/luajit:2 )
-	!jit? ( dev-lang/lua:* )
+	jit? (
+		dev-lang/luajit:2
+		dev-lua/lpeg[luajit]
+	)
+	!jit? (
+		dev-lang/lua:*
+		dev-lua/lpeg[-luajit]
+		dev-lua/LuaBitOp
+	)
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 	pcre2? ( dev-libs/libpcre2[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/rspamd-2.5-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
+
+	rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
 
-	sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
 		|| die
@@ -57,20 +75,21 @@ src_configure() {
 		-DRUNDIR=/var/run/rspamd
 		-DDBDIR=/var/lib/rspamd
 		-DLOGDIR=/var/log/rspamd
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newconfd "${FILESDIR}"/rspamd.conf rspamd
 	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
@@ -80,7 +99,7 @@ src_install() {
 
 	# Remove mprotect for JIT support
 	if use jit; then
-		pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
 	fi
 
 	insinto /etc/logrotate.d
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 6fc83c0865fa..b5d45580a5de 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -6,44 +6,64 @@ EAPI=7
 inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 
 RDEPEND="
 	acct-group/rspamd
 	acct-user/rspamd
+	app-arch/zstd
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/libev
 	dev-libs/libsodium
-	dev-util/ragel
+	dev-libs/snowball-stemmer
 	net-libs/libnsl
 	sys-apps/file
 	blas? ( sci-libs/openblas )
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
-	jit? ( dev-lang/luajit:2 )
-	!jit? ( dev-lang/lua:* )
+	jit? (
+		dev-lang/luajit:2
+		dev-lua/lpeg[luajit]
+	)
+	!jit? (
+		dev-lang/lua:*
+		dev-lua/lpeg[-luajit]
+		dev-lua/LuaBitOp
+	)
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 	pcre2? ( dev-libs/libpcre2[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/rspamd-2.5-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
 
+	rm -vrf contrib/{lua-{bit,lpeg},snowball,zstd} || die
+
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
 		|| die
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 960793614a0f..367ffa1b849e 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,19 +1,9 @@
 AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e0110994dac66bfccb4ee1d84c9c50e6c2fd6649b09b7206e16120ed7e55b387ba76afdf0fe7e629bc767d87a80c SHA512 b2233d9330fa06d13dc8d222fa16198a1f81dcb9c87ca93961db54d9f2514cdabd824d0f25c0cca678495f271f48f601ee14363c2a2f833100facae307226beb
 AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02
 AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72def5b3e168f235afc16a1dc34afa0e839ffa9da6c0c360c9a93a126d9dd711b4473e0a19ebcc SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb
-AUX spamassassin-3.4.2-bug_7623_p1.patch 599 BLAKE2B 620cd321761d0c87aa4e064b4576f2e1909c3cc9835861e351f35997f0fc0543ecbb0d8509ab5d61ff4901a5ec0f3068d7089dec8800dfa6d25e54be4b81bc9e SHA512 4bf3d4fcfe50ee5a4c1b7357bc6f014cfe46c419a30a5c3ebe26415b700260f5f82f89ce39044b32f799c7b8614a5baaf5db54de5599e14fcc64e45c5c75d2a8
-AUX spamassassin-3.4.2-bug_7623_p2.patch 742 BLAKE2B c3011fc1edd2b399b4cc9a4cfb518b197aa96ee0e58a6605934a88aa5e56c669791d591db365673ecf820e943e6728abab9734492f6fb3abb6cff194786c6fe9 SHA512 b17df1f5b332895976ab00553d6b1c85b8576fb688f20fd3485531ab897263e31d4adcb47afa5f1f2bf5b7aca91d70de6097bac740ddd8c56b2b0d6777c3d0f4
-AUX spamassassin-3.4.2-bug_7631.patch 2022 BLAKE2B 33b67b585fdb2ce82b6e64856463714e014f8e6ae69671a70f0a8c0952450c888e9e42cd4cebe0d57cf6552d30ae50214757c0192f61601294b4e11c39537832 SHA512 f23c7f9d821ef9d24f716f56016ce3bb1b29fabd177ad7ce3f8b6728601fcfb22d2c8aad82f36b978f3343bc18a514e1e85ce7c5b207ffd732c2921cf4909353
-AUX spamassassin-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
-AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
-DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
-DIST Mail-SpamAssassin-3.4.3.tar.bz2 2739618 BLAKE2B cd77fc99cbec17f10c04f211e773fe2df9dd9c2efb54c9cc169f1fbfed884e74b77c96d8eee333af4bcefb05dee4519408b2e53e0c519734d582f95bad6030d6 SHA512 4d50b30a42d318c3a4c868b4940d1f56c329cc501270df12e1a369dd7de670c30f328a5fbc37dbd3b0d06538b9500085e920939c62de80ad6d8740bc47162cb0
 DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
-EBUILD spamassassin-3.4.2-r2.ebuild 7630 BLAKE2B 709d3a9791377bbfefd971b8ddbe34b4c17a74444ebf28ed92db795239b05537db81cd58b02aa7f7a2deb284955d2368eaca1ee02cd4cdda4b83334e66afb5ce SHA512 b897fd165baffde6bebc6b17865c7f1df394bcb4523e60f95c4b6b1477ad7ed10f69e3b0812cea9f2851b6adadc1dc7a2c55f9c3ad96a2bb344e51aa35daf102
-EBUILD spamassassin-3.4.2-r6.ebuild 8712 BLAKE2B 9b427dcec7df513b30a06466f35e4f1c423766e441e0c52fd73058ddbedc6613b144334117a15c167b4a0775ca1f58dd18681f62d5820fef00f4dc336ec3f794 SHA512 63177d560a6d25782978a9ac0134641f58b0fd9d26a2697f719afac44f44e70bc8662b92b2534698f0b8e1a81b7f39ed3f86046263f803e9958c56d8a4a248c1
-EBUILD spamassassin-3.4.3.ebuild 8504 BLAKE2B 7bce952a83a094ad9749637fcf2d5f2b9838b4da66a5f8c73d7a1676d46d3cbe8bdb71f847ef7746a497fda1a916aed30a0b89d2be554105bb0d3b3cae27756e SHA512 129c4056efb704db05bcd43a8790e1e9e830e6be7cad392b50e8419602aaf73a7bffec8c430914837e592ddcfa4e5b4cd6d6c1ded064c9376289b3319b05a108
-EBUILD spamassassin-3.4.4.ebuild 8503 BLAKE2B 565a07f4276cbecc51356b2e502381802a5810c8b1db92c7f801d0d8bd31098e33966c47739d90972a9c65cdf7c03986f883b29bf3b122c155ce0d5913a1538c SHA512 f4052269362234cd002895e70fa1347d04288fef9fab774e0822a3b1fc8f9db9e3e0d849398acadb7bc529cd9f06d99c36d195a1ebdac817e8bf1790875cfde3
+EBUILD spamassassin-3.4.4.ebuild 8499 BLAKE2B 592546b060b152316a579e6f6d201590d4081c7eb1bea2ba8957f954fbda514051f14fc51bba7ffa2a6359a4551d806634b0219daba7ce98356b080192b20027 SHA512 ac9c0eb2934a33df010046706267ad58c4e12a3c8c07d6d43e51aa013f9c8031ccf9160e82f6bde5fef895430dec22016eb61daa8ce2c149ad426e3d3e6bc9e3
 MISC metadata.xml 693 BLAKE2B 57b8a079ed95858b27fb567e1c3b77389e8141315fcf69e34e2b80dab13e5b0f88c9f50f2387f7537cedd5a3cd56adcb611932a641e31a7f875914bb847708d3 SHA512 991a54ec305b6b4c4e9fd27ba77abf2ad7e72647776e0acc0e29a058566d0045e31df8ceebee6e320f758f10fb12973239d1650e469e910ac77a887656fcff3e
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch
deleted file mode 100644
index d0fe21bf9ef9..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/677250
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623
-
---- a/sa-update.raw	2018/09/29 09:33:52	1842302
-+++ b/sa-update.raw	2018/09/29 09:41:24	1842303
-@@ -1659,6 +1659,7 @@
-     my($a_rr, $aaaa_rr);
-       # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-     $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
-+    $mirror =~ s{[:/].*}{}s;  # strip all starting from :port or /path
-     return 1 if $have_inet4 && do_dns_query($mirror, "A");
-     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
-     return 0;
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch
deleted file mode 100644
index 26d921a6e676..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://bugs.gentoo.org/677250
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623
-
---- a/sa-update.raw	2018/09/29 10:16:29	1842320
-+++ b/sa-update.raw	2018/09/29 10:20:26	1842321
-@@ -1659,6 +1659,9 @@
-     my($a_rr, $aaaa_rr);
-       # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-     $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
-+    # No DNS check needed for IPv4 or IPv6 address literal
-+    return 1 if $mirror =~ m{^\d+\.\d+\.\d+\.\d+(?:[:/]|$)};
-+    return 1 if $mirror =~ m{^\[};
-     $mirror =~ s{[:/].*}{}s;  # strip all starting from :port or /path
-     return 1 if $have_inet4 && do_dns_query($mirror, "A");
-     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch
deleted file mode 100644
index 3c4bf403dc2c..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-This upstream doc changes addresses 3.4.2 adding new rows to awl SQL
-tables.
-
-Upstream's UPGRADE diff is slightly different.  Their version is 
-applied to the 3.4.3 release notes (not yet released), ours applies
-to 3.4.2.
-
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7631
-Bug: https://bugs.gentoo.org/666576
-
---- a/UPGRADE	2018-10-28 15:43:45.744850026 -0400
-+++ b/UPGRADE	2018-10-28 15:47:52.805028626 -0400
-@@ -8,6 +8,13 @@
- 
- See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7614
- 
-+- Added last_hit timestamp to Awl SQL schema.
-+  You should upgrade your sql database running the following command:
-+  MySQL:
-+  "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"
-+  PostgreSQL:
-+  "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;"
-+
- New plugins
- -----------
- 
---- a/sql/awl_mysql.sql	2018/10/21 12:10:09	1844484
-+++ b/sql/awl_mysql.sql	2018/10/21 12:10:40	1844485
-@@ -5,5 +5,6 @@
-   msgcount int(11) NOT NULL default '0',
-   totscore float NOT NULL default '0',
-   signedby varchar(255) NOT NULL default '',
-+  last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-   PRIMARY KEY (username,email,signedby,ip)
- ) ENGINE=InnoDB;
---- a/sql/awl_pg.sql	2018/10/21 12:10:09	1844484
-+++ b/sql/awl_pg.sql	2018/10/21 12:10:40	1844485
-@@ -5,8 +5,22 @@
-   msgcount bigint NOT NULL default '0',
-   totscore float NOT NULL default '0',
-   signedby varchar(255) NOT NULL default '',
-+  last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
-   PRIMARY KEY (username,email,signedby,ip)
- );
- 
--ALTER TABLE awl SET (fillfactor=95);
-+create index awl_last_hit on awl (last_hit);
-+
-+create OR REPLACE function update_awl_last_hit()
-+RETURNS TRIGGER AS $$
-+BEGIN
-+  NEW.last_hit = CURRENT_TIMESTAMP;
-+  RETURN NEW;
-+END;
-+$$ language 'plpgsql';
- 
-+create TRIGGER update_awl_update_last_hit BEFORE UPDATE
-+ON awl FOR EACH ROW EXECUTE PROCEDURE
-+update_awl_last_hit();
-+
-+ALTER TABLE awl SET (fillfactor=95);
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
deleted file mode 100644
index a9a065abd817..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This upstream fix changes the informational message,
-
-  dns: new_dns_packet: domain is utf8 flagged...
-
-to a debug one. This should prevent it from being spammed in your logs
-a million times a day.
-
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7632
-
---- a/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:14:11	1843622
-+++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:38:56	1843623
-@@ -547,7 +547,7 @@
-   eval {
- 
-     if (utf8::is_utf8($domain)) {  # since Perl 5.8.1
--      info("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
-+      dbg("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
-     }
- 
-     $domain =~ s/\.*\z/./s;
diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules.cron b/mail-filter/spamassassin/files/update-spamassassin-rules.cron
deleted file mode 100644
index 1b36af0548db..000000000000
--- a/mail-filter/spamassassin/files/update-spamassassin-rules.cron
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Update SpamAssassin rules and reload daemons that use them.
-#
-
-# First, redirect stdout to /dev/null.
-exec 1>/dev/null
-
-# Try to update the rules.
-sa-update
-
-# Exit code 0: all new updates were installed.
-# Exit code 1: we were already up-to-date.
-# Exit code 3: some updates were installed, but some weren't.
-# Any other exit code indicates failure.
-if (( $? == 0 || $? == 3 )); then
-    # Compilation spits out its progress onto stderr.
-    sa-compile 2>/dev/null
-
-    # Do you run spamd or amavisd? Both daemons need to be reloaded
-    # in order to pick up the newly-updated rules.
-    if command -v rc-service 2>/dev/null; then
-        # OpenRC is installed. These "status" checks should succeed
-        # only when the daemon is running under OpenRC. We redirect
-        # stderr to hide the lecture that OpenRC gives you if you
-        # try this on a system running systemd.
-        rc-service spamd status 2>/dev/null && rc-service spamd reload
-        rc-service amavisd status 2>/dev/null && rc-service amavisd reload
-    fi
-
-    if command -v systemctl 2>/dev/null; then
-        # The systemctl (systemd) executable is installed, so try to
-        # use it to restart spamd and amavisd. These are safe to run
-        # if systemd is installed but not in use.
-        systemctl try-restart spamassassin
-        systemctl try-restart amavisd
-    fi
-fi
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
deleted file mode 100644
index a68f39a6a865..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-RESTRICT="!test? ( test )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=( "${FILESDIR}/spamassassin-3.4.2-bug_7632.patch" )
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t \
-		|| die 'failed to remove urilocalbl_geoip tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install() {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
deleted file mode 100644
index 07de81c0dbe3..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user eapi7-ver
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-RESTRICT="!test? ( test )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/BSD-Resource
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/spamassassin-3.4.2-bug_7631.patch"
-	"${FILESDIR}/spamassassin-3.4.2-bug_7632.patch"
-	"${FILESDIR}/spamassassin-3.4.2-bug_7623_p1.patch"
-	"${FILESDIR}/spamassassin-3.4.2-bug_7623_p2.patch"
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t \
-		|| die 'failed to remove urilocalbl_geoip tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install() {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-
-	if use mysql || use postgres ; then
-		local _awlwarn=0
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${_v}" -gt "3.4.2-r3"; then
-				_awlwarn=1
-			fi
-		done
-		if [[ ${_awlwarn} == 1 ]] ; then
-			ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
-			ewarn 'You will need to manually ALTER your tables for them to'
-			ewarn 'continue working.  See the UPGRADE documentation for'
-			ewarn 'details.'
-			ewarn
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	if use mysql || use postgres ; then
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.2-r3"; then
-				ewarn
-				ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
-				ewarn 'You will need to manually ALTER your tables for them to'
-				ewarn 'continue working.  See the UPGRADE documentation for'
-				ewarn 'details.'
-				ewarn
-
-				# show this only once
-				break
-			fi
-		done
-	fi
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
deleted file mode 100644
index da1c0754b715..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user eapi7-ver
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-RESTRICT="!test? ( test )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/BSD-Resource
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t \
-		|| die 'failed to remove urilocalbl_geoip tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install() {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-
-	if use mysql || use postgres ; then
-		local _awlwarn=0
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.3"; then
-				_awlwarn=1
-				break
-			fi
-		done
-		if [[ ${_awlwarn} == 1 ]] ; then
-			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
-			ewarn 'You will need to manually ALTER your tables for them to'
-			ewarn 'continue working.  See the UPGRADE documentation for'
-			ewarn 'details.'
-			ewarn
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	if use mysql || use postgres ; then
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.3"; then
-				ewarn
-				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
-				ewarn 'You will need to manually ALTER your tables for them to'
-				ewarn 'continue working.  See the UPGRADE documentation for'
-				ewarn 'details.'
-				ewarn
-
-				# show this only once
-				break
-			fi
-		done
-	fi
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
index 55de18339926..7e04843441b6 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.4.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"