gentoo resync : 03.03.2021

15 files changed, 16 insertions, 1283 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 18cce35cf7ed..cb48fa3b3ed6 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 6e721c6fb1a0..5f82204c0ab3 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,5 @@
 DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e4a768f2a1118b72893517fc3a8122a7a63d2e26659bf1afc2467bc7503f279b8037c65da9c250c18b152b SHA512 8d1947d547bde7fdc9ec2fc8fb212165fecc1cd4bc37c2dda60133e5ffe31dee1393ad0a92e4f0e2c85863a01f7ae252555e88868fa8ba5dece8380080f0e36c
 DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
 EBUILD afew-3.0.0.ebuild 1158 BLAKE2B b04a876512c1687108e83a5c95eb2b3640195dcb300e206e00706cbe95731a114619dc58228f30bf53aa179a51431a7a2b863542c39cf8de37777201072a9da0 SHA512 ecf235b1e467a267b4dd259bfc8a9966a4bb36eca4330a126acbdc7020dfdcc7c48248c3e6645527c7e69dd809903309b030158813841b83ee990962d2ac1d06
-EBUILD afew-3.0.1.ebuild 1180 BLAKE2B ffbf334e965f66d4acc9f7e823fb7d194e5303d404185b4b42de40f4ff96aa1baa16b44fb366768e4f61481facc6f405f994b3461c4ab97678980e207d631894 SHA512 0b78edfc303d5cfedb149c9c4b13710cf5a823e18984751a8e2cff0261317a29171188822c6dd96563bb3c6e6478ba3306ea150bf9685b25813f12c5f4c2a723
+EBUILD afew-3.0.1.ebuild 1298 BLAKE2B 057eb66dde33f333a6c5cdcf29b152ca4a9142509a10586155a2dd8ea6a6d86b3562f37f4e44c8ebe1864c7e83cf88460779b45734d2974ccd07c68f9f3dd232 SHA512 17a881ed9f3ac448f631c18870fadbba54ef52e7b9b163559b4e20692dc198590e2707b7cc8057cb080f4b6a26d7f552562553cf156e7163c0befef12e70e3ee
 MISC metadata.xml 1001 BLAKE2B 33e569aa1f5f64926dfb7a74743d1cd40d16177ef814cb25e16904c20b8ba7b1ef1b12562bd437353254af73abf0759ab90da818a0aaf5acc4cae089bd21451a SHA512 44016d8a87273ede7b9fd52871095894725584202b17c69feb7b599859cbdd6202c2e41296744e63fcc918b95daf1962f64af9ea87b627bd4bf8d318b2703feb
diff --git a/mail-filter/afew/afew-3.0.1.ebuild b/mail-filter/afew/afew-3.0.1.ebuild
index ab45cdc1782f..96767c744cd6 100644
--- a/mail-filter/afew/afew-3.0.1.ebuild
+++ b/mail-filter/afew/afew-3.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -27,10 +27,17 @@ RDEPEND="
 BDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/sphinx[${PYTHON_USEDEP}]
-	')"
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/freezegun[${PYTHON_USEDEP}]
+		')
+	)"
 
 DOCS=( "README.rst" )
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	sed -r \
 		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 41ae34c8076e..c8a18ae157dc 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,5 +1,3 @@
-AUX amavis-mc.initd-r1 492 BLAKE2B b2bafdecd2d57ca52216154def014596f31670300510b0d2d049a4790ee3cc5a29c339ca8b7bb27503d0671b028d9da7d1ddadc662cabae18cac2a659ce2b676 SHA512 66d6364e12a0e71184682bfd35bdd1004c0cd6ee634936da8888b49f21d6c506e0645eabf8ae53ca08dccd9081f9753d63951258ccee8abd9fabf7d28233c533
-AUX amavisd-snmp-subagent-zmq.initd 911 BLAKE2B 7cb247978f70d1b7468919b1df3f2e147b4ca48c6748401c6621d1db7b326981b513b0f02fce582052fdf6a0d5e8b6d55cab52198e262a673802626769050edd SHA512 846ed4622417657f7bc3dc5fa5d9b361dddfe7a13753dab7e8b2328a09dc9c21800c4cd990bc5dc466945ef857861413b8e5a8e726a40f0fa1831c509755e60b
 AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e
 AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd-r1 b/mail-filter/amavisd-new/files/amavis-mc.initd-r1
deleted file mode 100644
index 6343d4255c4c..000000000000
--- a/mail-filter/amavisd-new/files/amavis-mc.initd-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/amavis-mc"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-# Let OpenRC background this, because otherwise it will write its PID
-# file after dropping privileges which presents a security issue when
-# we go to `kill` the thing as root.
-command_args="-f"
-command_background="true"
-command_user="amavis:amavis"
-
-depend() {
-  use logger
-  before amavisd-new snmpd
-}
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd b/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd
deleted file mode 100644
index 7482a3f1d20b..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/amavisd-snmp-subagent-zmq"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-# The RELEASE_NOTES say "it is safe to run it as root, although
-# perhaps not necessary." I'm not in a position to test, but I bet
-# it's safe to run this as amavis:amavis. Since the program itself
-# doesn't have the ability to drop privileges, we'd have to let OpenRC
-# do that; and in that case, the easiest way to deal with the PID file
-# is to let OpenRC handle that, too.
-#
-# Thus as a means of future-proofing, we run $command in the
-# foreground, and let OpenRC background it and write a PID file. So
-# if somebody wants to try command_user="amavis:amavis" here, it might
-# just work.
-command_args="-f"
-command_background="true"
-
-depend() {
-  use logger
-  before amavisd-new snmpd
-  need amavis-mc
-}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index e13094cf4547..bc196fd42b06 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,3 +1,3 @@
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
-EBUILD pyzor-1.0.0_p20200523.ebuild 1562 BLAKE2B 702a4f6aff6a446a4fd996d0950c9f1bac2e047ab819345dc4ef7cd9605e6c060eec7a478ced1235aeb2ebedc298e41e8fea724b69558ceac16e5ac6e0f6df42 SHA512 f381c5ffecf621612f39595ac517d98c9cd7932ef735e57454aa6f98376511fc879fd8758895280f115b25ecc4b247384bbe4beffb03c80c35217dd0eb95b691
+EBUILD pyzor-1.0.0_p20200523.ebuild 1564 BLAKE2B 05a588ce4132d8d14ec26f1b82a39d57a223aabc45cd064537f6ef113f9f49ebde5cce9ae71898566d9efe504c9cb8ba6d43a2f09c8ee223f2b1c0c1c2ed3395 SHA512 dcc69b16fc3faf31829df819b77ded9949abcbd4d518e58318ecc8eab54a5a0f1cef3f1a728ad9b44b63d832b3e6fa180ebf63483e8841657e4d37e245f2a87c
 MISC metadata.xml 953 BLAKE2B fe7e5e35caa89645a565b81176783dd56302b60be89423f4dd882f14ec6b437daaacdeb1c253440eb67dc7f9dbc5daa9c838bb39ccea2e38b2eb48817c28a559 SHA512 ab71adbb406760237a26728a512f32a10e3e55d17bed7c09d37e7da32abe21dcce9d4506630c7a59e681e4096ee4c436e8edcf220e22038d45a6b755e123acea
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
index 47276b95f2b4..237407e0fd9b 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 COMMIT="f46159bd6519cebcebf59e9334a7920371111d75"
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 41493e45b24d..beb178f9eff7 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -11,6 +11,6 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab
 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
 EBUILD rspamd-2.6-r100.ebuild 2744 BLAKE2B 2b7b8757bafa478ee1e024585b1b9865753bde923144a39fca8d5bda996891db1e9e141a9d6cb6ee5c9d2e905f83fdd0905b75b692750797cb1789cedf47ae2e SHA512 8bf9154733f4e394530447dba1bbd3c67b6ede15d400c36ec0657b851f074274bcbbf8e564ca506567579ce9ec3c061139c3eafd9157d3235da7e717c2251ccf
-EBUILD rspamd-2.7-r100.ebuild 2746 BLAKE2B 882abc5ea6b55c70fde959e3d2f130ee4292dafa410002211cc614c9df12e04b7a163eb3205ca51afdc72d5ce139d557d7c4952be4edf3801e91369ce720d6c2 SHA512 91f4436ef16115741acdaf17484408fedb28039f5915c156de4d96831d87a270137bc4532a98e0585a2bd7551b6aa5973ba7c0c48142549d5f7db453919198f3
+EBUILD rspamd-2.7-r100.ebuild 2744 BLAKE2B aed01d2331baa44011232783865fcbe1c8871aa4dd3a3cec2532d6f6cb9157bc4b9a063824550ca066401bf1b22bd7e1c30be3fc18828847d5d4464fcf6da7c3 SHA512 1efd398b58dd60820cda605c4d43d18ebf5ff103d086fd901d8d189d9c310eb242599d74b12155b8f60318fe09cd65aff200ef833fb1d8406c2bd421a5dafe95
 EBUILD rspamd-9999.ebuild 2746 BLAKE2B 882abc5ea6b55c70fde959e3d2f130ee4292dafa410002211cc614c9df12e04b7a163eb3205ca51afdc72d5ce139d557d7c4952be4edf3801e91369ce720d6c2 SHA512 91f4436ef16115741acdaf17484408fedb28039f5915c156de4d96831d87a270137bc4532a98e0585a2bd7551b6aa5973ba7c0c48142549d5f7db453919198f3
 MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80
diff --git a/mail-filter/rspamd/rspamd-2.7-r100.ebuild b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
index 0ba250193310..f6efcf40a61a 100644
--- a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index b287bccc2ff5..65869498fc3b 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -7,10 +7,6 @@ AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a63
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
 DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
-EBUILD spamassassin-3.4.4-r1.ebuild 9757 BLAKE2B da5bf1a73d699e1ef3542c98b2eef0ebdee1e8e51b50e69464ddf67772b05a76a669420cbe6be829ba4fe7f2fea7401e1c3a98af26ae73cfe6478085079feb9e SHA512 18f4c03126fae90068b57a302a309a00a9cf4ca55783bfc9a890c9107bfe5a578eb8b9dff184ff98ad86434fe084609fbdaa8f44914ecef2fe9d124e9364f820
-EBUILD spamassassin-3.4.4-r2.ebuild 9632 BLAKE2B 6b7816eeb6eaad6ecc1734e3b67b9b05df800ec0d8087cc3465fd451808216e06c497fdcaa66449ac4016869295dd6c8087054be9deded9e8f0bd28def29a5fe SHA512 9a3c46f95e944de3500e0adbbbff093d2f4fd20568907901c381bee0941c8f4ebc04f8609da26c7582e8c6b732710a20e09b0e081745246a9974843e042c9d27
-EBUILD spamassassin-3.4.4-r3.ebuild 9512 BLAKE2B bd5116a376a3bbf87ad962453e32bc60ccd3868c767a96b71fdad39d7753eb1d27a7f3eba8ba0b62ebed31c9e3f27711d04a8135bf3a3e276023478200c69c56 SHA512 20b012f637533a50cda2c921a6345595eaf6f6354577f976b875b31b2f5832cd329b6c775e915e9f2bf3f35c6dcdeb41f51640b8276e7a23b277c0c3452a09ca
 EBUILD spamassassin-3.4.4-r4.ebuild 9597 BLAKE2B b6143545ad7d644a9b871beb76280cf91c4b7a1c4f027b86e732ee3b7e416c11723afa81cc59d850bbc20d00e7f2335b258e4e4b6cfc238b9a27998a829f492a SHA512 9dc6d93468aa16cbf118fe3c1871b7b112b65f8d5f6a53df4dbb273dcb8e50790f48ed60d5790f1bd55fb35b3d1b799ff1e011857826fb5a57953a3e2d9321b8
 EBUILD spamassassin-3.4.4-r5.ebuild 9639 BLAKE2B 64be74a95194f2d3bd33d182775fa3367ea0410744cf8786394de74b68ced727ca3f86914030864e3fd46e35c790253d0f1c78da1282f44ea3cb865b646acf69 SHA512 ec54561690656c8a7b7c5796e71945b8ca9693d56027a32021825924396ecbe7fb75454d77d84b720d640d8786a84d68760de7e1169c58329dab0f2173fc454f
-EBUILD spamassassin-3.4.4.ebuild 8489 BLAKE2B cd3f696609d30b48e0236c92d0be7aa5ec0ab42f6ef0e90c992a0b42899d9225794867dd984475b138efb4304e3bf23e5f21ae4710e30a4487a60adf1d32fb10 SHA512 26958f349da7f79fbe29a524acd415d1067fc9949c9bd049be457efa7bcb2c7514e4956082d45986bcf9da9f6061d740758796193a4a6453712fbc6cc0dd54ed
 MISC metadata.xml 579 BLAKE2B 98c1b526193c33a3f6d7aac34f9e93dcf81dfbd5b288da9a9a196d94e03fe7cb17d3b06de41042941a70f70215a6104a048fe67ff97b225490139bfb06fd8186 SHA512 f02b525fb0daf5a90edb2cfff536c51240bcc4c040f6ee6126b95865d0c61b1ded0d72d89b114ba58389963b033df1d8df97df6c39e49ac1ffbb69fee96acc7f
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r1.ebuild
deleted file mode 100644
index 74671a6f239c..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,316 +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 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-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="acct-user/spamd
-	acct-group/spamd
-	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}"
-
-# There are a few renames and use-dependent ones in src_istall as well.
-DOCS=(
-	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
-)
-
-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
-
-	# 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
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"rules/init.pre" \
-		|| die "failed to disable plugins by default"
-}
-
-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 () {
-	default
-
-	# 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
-
-	# 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
-	use qmail && dodoc spamc/README.qmail
-
-	# 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
-
-	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
-
-	# 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
-}
-
-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() {
-	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.'
-
-	# Reminder: When we go to EAPI=7, add slashes after ${ROOT}
-	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "The acct-user/spamd package should have relocated it for you,"
-		elog "but may have failed because your spamd daemon was running."
-		elog
-		elog "To fix this:"
-		elog " - Stop your spamd daemon"
-		elog " - emerge -1 acct-user/spamd"
-		elog " - Restart your spamd daemon"
-		elog " - Remove the old home folder if you want"
-		elog "     rm -rf \"${ROOT}home/spamd\""
-	fi
-	# Reminder: When we go to EAPI=7, add slashes after ${ROOT}
-	if [[ -e "${ROOT}home/spamd" ]] ; then
-		ewarn
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "  Old Home: ${ROOT}home/spamd"
-		elog "  New Home: ${ROOT}var/lib/spamd"
-		elog
-		elog "You may wish to migrate your data to the new location:"
-		elog " - Stop your spamd daemon"
-		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
-		elog "   updated to the new location, now that the daemon isn't running:"
-		elog "     # emerge -1 acct-user/spamd"
-		elog "     # echo ~spamd"
-		elog " - Migrate the contents from the old location to the new home"
-		elog "   For example:"
-		elog "     # cp -Rpi \"${ROOT}home/spamd/\" \"${ROOT}var/lib/\""
-		elog " - Remove the old home folder"
-		elog "     # rm -rf \"${ROOT}home/spamd\""
-		elog " - Restart your spamd daemon"
-		elog
-		elog "If you do not wish to migrate data, you should remove the old"
-		elog "home folder from your system as it is not used."
-	fi
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild
deleted file mode 100644
index 1ca1c7c15c24..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-functions systemd toolchain-funcs
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-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="acct-user/spamd
-	acct-group/spamd
-	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}"
-
-# There are a few renames and use-dependent ones in src_istall as well.
-DOCS=(
-	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
-)
-
-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
-
-	# 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
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"rules/init.pre" \
-		|| die "failed to disable plugins by default"
-}
-
-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 () {
-	default
-
-	# 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
-
-	# 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
-	use qmail && dodoc spamc/README.qmail
-
-	# 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
-
-	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
-
-	# 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
-}
-
-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() {
-	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.'
-
-	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "The acct-user/spamd package should have relocated it for you,"
-		elog "but may have failed because your spamd daemon was running."
-		elog
-		elog "To fix this:"
-		elog " - Stop your spamd daemon"
-		elog " - emerge -1 acct-user/spamd"
-		elog " - Restart your spamd daemon"
-		elog " - Remove the old home folder if you want"
-		elog "     rm -rf \"${ROOT}/home/spamd\""
-	fi
-	if [[ -e "${ROOT}/home/spamd" ]] ; then
-		ewarn
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "  Old Home: ${ROOT}/home/spamd"
-		elog "  New Home: ${ROOT}/var/lib/spamd"
-		elog
-		elog "You may wish to migrate your data to the new location:"
-		elog " - Stop your spamd daemon"
-		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
-		elog "   updated to the new location, now that the daemon isn't running:"
-		elog "     # emerge -1 acct-user/spamd"
-		elog "     # echo ~spamd"
-		elog " - Migrate the contents from the old location to the new home"
-		elog "   For example:"
-		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
-		elog " - Remove the old home folder"
-		elog "     # rm -rf \"${ROOT}/home/spamd\""
-		elog " - Restart your spamd daemon"
-		elog
-		elog "If you do not wish to migrate data, you should remove the old"
-		elog "home folder from your system as it is not used."
-	fi
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild
deleted file mode 100644
index 97059ad27634..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-functions systemd toolchain-funcs
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-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="acct-user/spamd
-	acct-group/spamd
-	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/GeoIP2 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}"
-
-# There are a few renames and use-dependent ones in src_istall as well.
-DOCS=(
-	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
-)
-
-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
-
-	# 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
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"rules/init.pre" \
-		|| die "failed to disable plugins by default"
-}
-
-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 () {
-	default
-
-	# 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
-
-	# 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
-	use qmail && dodoc spamc/README.qmail
-
-	# 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
-
-	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
-
-	# 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
-}
-
-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() {
-	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.'
-
-	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "The acct-user/spamd package should have relocated it for you,"
-		elog "but may have failed because your spamd daemon was running."
-		elog
-		elog "To fix this:"
-		elog " - Stop your spamd daemon"
-		elog " - emerge -1 acct-user/spamd"
-		elog " - Restart your spamd daemon"
-		elog " - Remove the old home folder if you want"
-		elog "     rm -rf \"${ROOT}/home/spamd\""
-	fi
-	if [[ -e "${ROOT}/home/spamd" ]] ; then
-		ewarn
-		ewarn "The spamd user's home folder has been moved to a new location."
-		elog
-		elog "  Old Home: ${ROOT}/home/spamd"
-		elog "  New Home: ${ROOT}/var/lib/spamd"
-		elog
-		elog "You may wish to migrate your data to the new location:"
-		elog " - Stop your spamd daemon"
-		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
-		elog "   updated to the new location, now that the daemon isn't running:"
-		elog "     # emerge -1 acct-user/spamd"
-		elog "     # echo ~spamd"
-		elog " - Migrate the contents from the old location to the new home"
-		elog "   For example:"
-		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
-		elog " - Remove the old home folder"
-		elog "     # rm -rf \"${ROOT}/home/spamd\""
-		elog " - Restart your spamd daemon"
-		elog
-		elog "If you do not wish to migrate data, you should remove the old"
-		elog "home folder from your system as it is not used."
-	fi
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
deleted file mode 100644
index 14997d22b436..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.4.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 sparc x86 ~amd64-linux ~x86-linux"
-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.'
-}