gentoo resync : 30.05.2020

25 files changed, 437 insertions, 75 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b5cbc3b40256..f633d541c542 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index bb74c0947c1e..78dd10e8a0d4 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -7,6 +7,6 @@ AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca0
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
 EBUILD amavisd-new-2.11.1-r3.ebuild 5214 BLAKE2B 87ad69414234780a535697ce54b84669c1c28b51053c5c4e7e927742ec6387afe10573278e2825c71812f2f0dbdeec1af5efb7530a7863460b0cd974bed59146 SHA512 50f1fe496433a34a86d0e02fac8ae28655543ba25653b6066f9f6d1184632ddf78665e99218ecd191cbab80ec8115654ad3a0de39f2787a324ed1c19b776bb2f
-EBUILD amavisd-new-2.12.0-r3.ebuild 5337 BLAKE2B dceeff396a0ed8dba72363740b658d7dcce3225cee088b57d2199512fcac8d12b8411c0e6c72c26ebba1ed751a70df82534376924e2ca069c749b97d1a13f9c2 SHA512 7c05a03c57f67c804669aed736e123f0b2e3c685e9ee6ebd412f4516bf38698e77eec11afa8c3dd2a19cf02ea319f35536166ae528431c36a440268f1a79dae9
+EBUILD amavisd-new-2.12.0-r3.ebuild 5334 BLAKE2B 091a11961cf8513fcfccb349e8bfa37401c9470e9cfd12a0501d731f621aeacaa5efb387b3ea3cb287f98c9d97af6522be81cbc6d8fb4b9cf8c3eaef65b314f0 SHA512 616891a57b51e5f984343b12862284404cde54ec4c2144e0c9cf1ff6df02d31c5188f2cc25f04dcfb230c4fbb8957806fa143a5bfbd31d441671c6bc53fd0d06
 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.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index a46381630e27..0f4143d9a4d0 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 ~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/exim-geoip/Manifest b/mail-filter/exim-geoip/Manifest
index 635bff341e42..494a034d4872 100644
--- a/mail-filter/exim-geoip/Manifest
+++ b/mail-filter/exim-geoip/Manifest
@@ -1,3 +1,3 @@
 DIST exim-geoipv6-dlfunc-0.1.tar.gz 306380 BLAKE2B ce51841c988f41e5dff9c545852985e94ed4ddcad7d4575d0001d39a67266ad1083b4bed8c49fafa8ac742e2c8d1a12f78585b29f5887ceecdd37c862bef8c7f SHA512 ab10cf8ccd89772c1b925115d45cbd429f9ad577b4b951b120162516f0702331b8f8cca780d4aa1714435a907deed52f50acb06e9be888136a1745834d73215e
-EBUILD exim-geoip-0.1.ebuild 626 BLAKE2B 3f6839ca14c0adfadb9b522697baf7ecc5fea9f6653d32ed4ff61b7e75c15ed4230b22695253b59fcf1f189b9e314abacc93732b7275c98e19f2c423e3364833 SHA512 d747e18c3811f0abc183d5d24af3e1c363c2cf180b427076977521e73a08945e49a5734ae91aceb0d8981ea19fb7e6d4de0afdcdfc3b7eb689698bc639d3619d
+EBUILD exim-geoip-0.1-r1.ebuild 642 BLAKE2B 172fa9ed530ccaea7e1aede1ab900b063e6bbc004a916883d88578f5a3b1842b0c1213a49b0b2dc4bb8769f44fa287646fe9c50e19605c99066661dc00178945 SHA512 159e12fff213a1645904f47037740fe3761c29e7675a92880e46b6e6a39f41b121dc6687769483851780a8e40e91c31a22b46ae5a0df3a3d68ee0c14b0c7ad57
 MISC metadata.xml 563 BLAKE2B 04a42876b10c10bb1e4941b0371a9e361023d48e12df440ec20cfdf3d641d830e1cb86e9ecb5c1bf07d1c5ab8bc574c3ec6fac51c11184ee63393583b9c66ada SHA512 62706fd3f95ae73470d26133ff28fe53011d4aa8268822218a69203a95de8b7474da67d8875c4f47953ab614d036a884254f714157f6aa31bbedec167372514b
diff --git a/mail-filter/exim-geoip/exim-geoip-0.1.ebuild b/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
index a2f6fdee4d5b..9c12f98603f6 100644
--- a/mail-filter/exim-geoip/exim-geoip-0.1.ebuild
+++ b/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=4
 inherit eutils flag-o-matic ltprune
 
 DESCRIPTION="This is an IPv4 and IPv6 capable GeoIP dlfunc library for Exim"
-HOMEPAGE="http://dist.epipe.com/exim/"
-SRC_URI="http://dist.epipe.com/exim/exim-geoipv6-dlfunc-${PV}.tar.gz"
+HOMEPAGE="https://dist.epipe.com/exim/"
+SRC_URI="https://dist.epipe.com/exim/exim-geoipv6-dlfunc-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/exim-geoipv6-dlfunc-${PV}"
 
 src_configure() {
-	append-cppflags "-I/usr/include/exim"
+	append-cppflags "-I/usr/include/exim -DDLFUNC_IMPL"
 	econf
 }
 
diff --git a/mail-filter/exim-p0f/Manifest b/mail-filter/exim-p0f/Manifest
index 2b3dc6949711..e82f65eb31d5 100644
--- a/mail-filter/exim-p0f/Manifest
+++ b/mail-filter/exim-p0f/Manifest
@@ -1,3 +1,3 @@
 DIST exim-p0f3-dlfunc-0.1.tar.gz 307851 BLAKE2B 73bb80220ed65fadb17079b1e566664b51bea95ee12636296054b4bc8e3902d518ab1e63511d49c14f56e5ccb257ac10987fe8fd399c6e33c2f733a94f8f71df SHA512 9f913ba303bb42f6599ed044bb65954f993c2964d84ea0ff4e01e515c35ac7b58118fa6a304cba984499136438ad8f65bfe8c08e22c3be2d4c95f2950ab380b2
-EBUILD exim-p0f-0.1.ebuild 617 BLAKE2B 00c6b51a9fb865fb54992cd625b57af9c43af04330a27076c1d0964420e9694dc67e9cf3b4961e6955b167b14185df909fdf14eee5953fa75c1c4a7ae875083e SHA512 c3aa2fddeb8b99326ee6060e85b8b104e56d46fc7c0a546f1e58bf1cab5269747751ad46e5657f25bb352e17bc77761b7084f453feb6f4deea807ecbc8cefb5e
+EBUILD exim-p0f-0.1-r1.ebuild 633 BLAKE2B 0ac77a7dcac904fa4269e5d42c5aa5877e32599b2109ebd91fba2e044cf5703c7ad31ea3f794c23a561f9b8aa7a540d1e38fe0e532737257e897c2535e696081 SHA512 81c25a5b7352286a5d0ce4d4be868a113222d57a6124263d117193a64c577641abaf3f8bfabd9ef51bdcf6c833cd38711cd5b0a2adea64908d25680578e44cbf
 MISC metadata.xml 583 BLAKE2B c5fc0490ecbd798b0e15bdc44e80dd3f796bb1e5592fe0b1a2a18f59fff2937b4982cca45b8e3fefd88a97af7e446f2cc638e405bfb78e67142790578d2ad942 SHA512 bf47f55a81bc369964e41f01f0d70b966349c5c03100cd0f156c66d6fbf210c9ef93ef6b338b265e927eb6e1fa7a687064d099d6d85b7b1a17210c2466f75cc5
diff --git a/mail-filter/exim-p0f/exim-p0f-0.1.ebuild b/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
index 885ec0c74647..8c3b300d1dee 100644
--- a/mail-filter/exim-p0f/exim-p0f-0.1.ebuild
+++ b/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=4
 inherit eutils flag-o-matic ltprune
 
 DESCRIPTION="This is p0f version 3 dlfunc library for Exim"
-HOMEPAGE="http://dist.epipe.com/exim/"
-SRC_URI="http://dist.epipe.com/exim/exim-p0f3-dlfunc-${PV}.tar.gz"
+HOMEPAGE="https://dist.epipe.com/exim/"
+SRC_URI="https://dist.epipe.com/exim/exim-p0f3-dlfunc-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -19,7 +19,7 @@ RDEPEND=">=net-analyzer/p0f-3.05_beta
 S="${WORKDIR}/exim-p0f3-dlfunc-${PV}"
 
 src_configure() {
-	append-cppflags "-I/usr/include/exim"
+	append-cppflags "-I/usr/include/exim -DDLFUNC_IMPL"
 	econf
 }
 
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index 1270ce536f88..cba2c4d58a28 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 1160 BLAKE2B 7569ee3cc193f7e8db8759eb4c3740907e38a70040d4fe5d06839b75f420e25dca25c091506dca6cd0125af2eaaeab5900d3c8ea469c4545381549e481622667 SHA512 4a711e3171b3ded1031abff1a970deb22bc21d7313ccf626e40a47f78ab7300826f6f8749868eec974ed20e6a1829b2d601915035378a37b4eb81321946bd999
+EBUILD libsrs_alt-1.0-r1.ebuild 1161 BLAKE2B a46930a064932ca18d874408332fd9661e4ea5ec54c7082acef63cd78b4fc906e41b5f07ce9abcdd4da8cde638c33bf19ae0240cd8e35c6cf1cb92de40459aec SHA512 9cf9bdee482d84b55258b3b446542264326442473ba117a723127675261c38cd23a3834f138c83c60a9f3be2bf09ddce1527d63fb2bdd8158458f180af4eebae
 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 e0365e165990..4d0c263508ed 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_RC=${PV}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 DESCRIPTION="Sender Rewriting Scheme library for use with Exim"
-HOMEPAGE="http://opsec.eu/src/srs/"
+HOMEPAGE="https://opsec.eu/src/srs/"
 SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 108cafd04a03..08816790984b 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 3647 BLAKE2B d26c4175e2216d666c28b77ffcd7f4552c1671e9955110aef3f4e4509e43ced0ec0f2ead8f19ccd4227b58dfda9e07129554755cf63b0d1967c664ac78c3baa4 SHA512 36556fd4c0dbe4ca307267a12821b3691c92cce983d75a9fff8c01fb9a45cba1fa7795d5a9c306db12afc3fd076d728c45c35440b5cb01b385dbd47753e1f8c0
+EBUILD maildrop-3.0.0.ebuild 3648 BLAKE2B e8356785837fd6fccd1235400e8c9016cf35f3fa9fad2bf6cb0068fd98563b72b175e0b46cb3ca171ee28fcab6faa2720de77b6daa9d7c0ff91ef60c71ec729f SHA512 4b6aaa91a270eb80733dfb241677af2d973859cca4b63a4f40067e40df72fb5481170516fdfdaa31f2904ef45d0d2cd1536bad5e44145aa559028f749523185c
 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 300914d24e6d..77b882112208 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 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/opensmtpd-filter-rspamd/Manifest b/mail-filter/opensmtpd-filter-rspamd/Manifest
index 5b8c07576729..6909592861d7 100644
--- a/mail-filter/opensmtpd-filter-rspamd/Manifest
+++ b/mail-filter/opensmtpd-filter-rspamd/Manifest
@@ -1,3 +1,3 @@
-DIST opensmtpd-filter-rspamd-0.1.5.tar.gz 4829 BLAKE2B 1a08431b11501ce30631e9db812e5742180bee8b995d8b07eacd35efd385a5213bb735218143a78ae8e8a9f4c6f791653f7e8f19cdb174236949364d587741d2 SHA512 9f11f5fa319e8f0e13e7f6b2cefe1a3018715be494e9bef51e017320ba99f75f1f65833b2c03a283cbfade49e8dfcd6255ea89d9486cd266ea78614c8482ce63
-EBUILD opensmtpd-filter-rspamd-0.1.5.ebuild 696 BLAKE2B 3deb6f28f12b43cb1f00a52e2a858c2b296d5090f26b0d7f8a3dcf8c73a6dcb1882a978f04cf5a2d14225a025af6a6f2db52adfd23860e88bd85ec02124349df SHA512 33919ae13dba1ac6c14025d8ad2ce7358c05b56cc806d0c60937673232f5c72108db1710b0de6d86c85ef1dd79baaee1a979e521c1bea8f2974a68150e977f13
+DIST opensmtpd-filter-rspamd-0.1.6.tar.gz 5096 BLAKE2B 7287aa2da095e7bdaf4f258112dbcf1c99f6a664ba7932e8704b7f7fb3fd9c7d0a243f1be0b412dfaff2baf70aee64c297e4489fd9802a0060f5c6a18d77a354 SHA512 c09251d78e26e5e13772b2b9d627e73a1633a71f7e70c7128fdf04f68ec9cf6737e1e4b0d7d7f9867b39798736970de06788b58b7f72f8e601af9d128d1e6650
+EBUILD opensmtpd-filter-rspamd-0.1.6.ebuild 696 BLAKE2B 3aea583fd0b6382bfb3c9c89995776a503acfa148c178ca3e800bdef71b91e12ab8f85ce6d5654fb36e541defa9e62a807f0aafdf04129f0f7d81ef02a81352b SHA512 2bc50beced58bbf6c1a7572a6a1e7bccdab56e5fc4347df8405f5a25368c26445975cf115ff94b6702f602129258e82632fbd9a94b844bd73fa0c368cb41517e
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/mail-filter/opensmtpd-filter-rspamd/opensmtpd-filter-rspamd-0.1.5.ebuild b/mail-filter/opensmtpd-filter-rspamd/opensmtpd-filter-rspamd-0.1.6.ebuild
index e55019d353a2..bf92338219e2 100644
--- a/mail-filter/opensmtpd-filter-rspamd/opensmtpd-filter-rspamd-0.1.5.ebuild
+++ b/mail-filter/opensmtpd-filter-rspamd/opensmtpd-filter-rspamd-0.1.6.ebuild
@@ -7,7 +7,7 @@ inherit golang-base
 
 DESCRIPTION="OpenSMTPD filter for putting emails through rspamd"
 HOMEPAGE="https://github.com/poolpOrg/filter-rspamd"
-SRC_URI="https://github.com/poolpOrg/filter-rspamd/releases/download/0.1.5/filter-rspamd-0.1.5.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/poolpOrg/filter-rspamd/releases/download/${PV}/filter-rspamd-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P#opensmtpd-}
 DOCS=( README.md )
 
 src_compile() {
-	go build -ldflags="-s -w" -buildmode=pie filter-rspamd.go || die
+	go build -ldflags="-s -w" -buildmode=pie -o filter-rspamd || die
 }
 
 src_install() {
diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest
deleted file mode 100644
index 22c10e3bdb78..000000000000
--- a/mail-filter/pypolicyd-spf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673
-EBUILD pypolicyd-spf-2.0.2-r1.ebuild 1270 BLAKE2B 2b1303811bb5ce57b7dc5a13f9cafba334034612438f0923ac7cc0a404725a73b12355a9b10a94a466ab1aff37d5f761169776347775da469d008b35e85f7788 SHA512 c1cb2788c3bab4bc79e6b81a7e7b7efb64d63651632307093fbdba21e58529e73f59ae73e4ff12ebe0fdd7020adc3fdc4e22c8bc912fd27863e74ca56f99728e
-EBUILD pypolicyd-spf-2.0.2.ebuild 1220 BLAKE2B f1c90045fa5cc2d2390077f3c82aebe24c5a79fcaa055a361a12d556f25ac50bb7dfcafafa5574f3fbc6d3c09a0d6c22bb4ee4b2fd153c0071460b2f08a0e461 SHA512 52cd03de6764aa154f510f2d90ea5d67c339edcbcc2acc5c49ce18fd70796e686eed201832a4891d1280fbeeb45fd5cc1c74c69e3e501e8bdad463eb30796ab4
-MISC metadata.xml 356 BLAKE2B e28aba8830da5e0c372cc7090736a5a90c208af79c6fe338e8bf96ef79e17afa05cdabdb48ca172d57fd34203c66ff7e3be4ce4c043b14c0e9694639512a82f3 SHA512 67a8fd46090c3e558e7bf963277e99e11be4d2df97f4a4491a7fbc64a42f89e19af2131d13efec7370df1f27b2eb7385f59e732fae57b6ec67c47f18af8cfc72
diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
deleted file mode 100644
index 19a17d76236a..000000000000
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-# The built-in ipaddress module handles the parsing of IP addresses. If
-# python is built without ipv6 support, then ipaddress can't parse ipv6
-# addresses, and the daemon will crash if it sees an ipv6 SPF record. In
-# other words, it's completely broken.
-PYTHON_REQ_USE="ipv6"
-
-inherit distutils-r1
-
-DESCRIPTION="Python-based policy daemon for Postfix SPF verification"
-HOMEPAGE="https://launchpad.net/pypolicyd-spf"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/authres[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
-
-python_prepare_all() {
-	# The "real" config file mentions the commented one, so we point
-	# users in the right direction.
-	local oldconf="policyd-spf.conf.commented"
-	local newconf="/usr/share/doc/${PF}/${oldconf}"
-
-	sed -i "1 s~ ${oldconf}~,\n#  ${newconf}~" policyd-spf.conf \
-		|| die 'failed to update commented config file path'
-
-	distutils-r1_python_prepare_all
-}
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index 7c0683f4258e..cfa07b5e26c3 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -2,5 +2,5 @@ AUX razor-2.85-cosmetic-pv-fix.patch 616 BLAKE2B 58def0277c1142b664f65ae9f6e7f31
 AUX razor-2.85-makefile-quoting-fix.patch 574 BLAKE2B 03616893b3537e00f0a56b357a70956cb87e266feb72d588343427f248d73c2e61d8c9515572d7bc0f312420d5328dd6e0039a297be322f83dfd270615922289 SHA512 ee43993dbf4e1ed932a293636cfad98c8c4bb5b94a8df00262c39d34dd9c95143ba8dca1f088185123d352b940e0dd19d5b0a6f4afc04e63b36cc49a4963cbe4
 AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289
 DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db
-EBUILD razor-2.85-r3.ebuild 2595 BLAKE2B 743be10deb95e88192040b63e36f871ca557cd471f0ff34ccd93775c93d80e4a5d88a542176af94b57f889855bcbf27e3bdd410613a8fd91fdb37559dd089df6 SHA512 8d36ea73cce5c6a48cbd652f67f2e6e87bc547b9739eb1320b7be061fbcd9b6c11744659f47ebf4af7adc66b600b1a6a3249e72632f5edbd08e51cabf1ec5ea1
+EBUILD razor-2.85-r3.ebuild 2594 BLAKE2B bd09d4bd2a2367570c61da4955225d2864e284b7c6c27f74a67c4871029bc982fa2db6402dd81f7300a092b7a2357674dae3bb130bc84dc471cf12fa1a16aa08 SHA512 a9289bce20ffb2cdc3faeb6f76eb05c243b9b749d6927c2032d3db41a3b747855b58856d8bc72fb590f0be910521b75107f6cf21b63483b1f071320113d928e6
 MISC metadata.xml 581 BLAKE2B 7a4fa065ec593200d844a2c5cba9df1711608fb089b4c568bc4095e4feee3ebfbeb53aa866b6c6a3044ccc9e6d5fb5b71319ca1f12f7ad7b8693567a1eda4b1c SHA512 6de4a7f82c7b1bacda76f5bb13df29a130c7c7cc4612071178b78a252cc029deb6b596847db37d6b305b5776fa2ce5e0475856fd0e0ea71b56cae36f89d389c8
diff --git a/mail-filter/razor/razor-2.85-r3.ebuild b/mail-filter/razor/razor-2.85-r3.ebuild
index 965f5c3a51bd..f69dfd96977d 100644
--- a/mail-filter/razor/razor-2.85-r3.ebuild
+++ b/mail-filter/razor/razor-2.85-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	dev-perl/URI
diff --git a/mail-filter/scmail/Manifest b/mail-filter/scmail/Manifest
index d37195cce35e..22fc05376d17 100644
--- a/mail-filter/scmail/Manifest
+++ b/mail-filter/scmail/Manifest
@@ -2,5 +2,5 @@ AUX scmail-doc-encoding.patch 1271 BLAKE2B c554ebfed8350a10939364b9d4b50d446d839
 AUX scmail-gauche-0.9.patch 1295 BLAKE2B 2bf2ee2aa2c99ef72d6fbd25c65448a99d1c3a16be20373db867c3ec07604b94ea2fb7a6fac76f1bca4aa8be378140dc6eb6718ead1f61844cba9127a0bd2ea8 SHA512 4aee907271c20254a41035160418429fcd7e35890a0d7a6251d4adefcaafe8581dc5e3df4bc70b27b541eb6a888acc7811231a183d62f2c267b1d2ccf652dc69
 AUX scmail-undefined-reference.patch 1351 BLAKE2B b0758cf2a1de5be0bd32d16bbc44d28d7e3b4e3a65f9a9151e76245c4f5473e8c82a682324544018e7aecf53f2534cc5e2fa2d27451947ff285684221b091e55 SHA512 2b8acf57f55a3367157bf20da796f2529258e48877b049f2928ff06c3365c24c41c6a8824f32b0fbf14fb193f94a2f147afa97c9c03a13227b62b13bd0b550d0
 DIST scmail-1.3.tar.gz 52744 BLAKE2B 2e2848472bb6f9ce913fea381c905ec28a1cac5201fe3a8c89e25c96a0fd646e7f96ddcf6cdfd1e0d88f34b5d51ea754faa5c3574635715ed1dc92cfd9d2980c SHA512 ae94de7f34f9279e892533137d76f07642ade63f9d179bbc96202003f49cf8ae6dd6cc5b9d53fa1d2f8be2bebcbe071635910d48593c9e57fb6609cc7ec6e95d
-EBUILD scmail-1.3.ebuild 864 BLAKE2B c00af9ca1b45bed5d8ac8ab5146fd5eb233ac4c7c576a894ad2086852ca2fad8bea6980350c2604687c933a37c12d855db6485f2a421065cfdd6f1ed587d2b23 SHA512 1b47d5b876c09a24e2ca7ed2b8fa68725b206e60f2cc7e82f0582c06bd6ff234fab27375aba5668eb2b704fb81f47c8d1e91251a70767fd56bf0170d9cf22b18
+EBUILD scmail-1.3.ebuild 900 BLAKE2B 879eb1116e6e9b160395ae0b89ca011957d867c17ac412fe4337f3099a6ffb8d4eda7699ad725101978c71c8ff71498c335bf7c07277815d15d8cb1bd5bb3b5d SHA512 0c54c8b91f354888e76ef8ab723f6a8ee58053c8cc814cfe970fa9805dc06de7169ce3a8262eb71e041c0a74a3f9a4b45dec02a47da9fb3dd8d6db5fcb491d64
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild
index 34ce96c9044c..9e0798bddb6a 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -1,7 +1,7 @@
-# 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 fixheadtails
 
@@ -40,3 +40,7 @@ src_install() {
 		install
 	einstalldocs
 }
+
+src_test() {
+	emake -j1 -s check
+}
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 66c0e88f261f..417e0c9e37a2 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -6,5 +6,6 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 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 9768 BLAKE2B b7f7c59ff8f13b2702ae54dc97084a04ba971b317402a1916bc3edc06491feefe48d7dd06ad0f03d2680783ebd77bab62cf42195a36a5dca6b82955a9d72855f SHA512 cdcd621b39e9d7f53a3e3f3e5bf4e80fdcd1edbcc440cfe43d4c0b525f58489021433d0892f7e1c8405cf073768860c4d0605fbcd8c94a6e3d19905b736b003d
+EBUILD spamassassin-3.4.4-r2.ebuild 9643 BLAKE2B 2cd5f87c164d2c56be84e533196e0a1f99f3955135540bb9f47dbd34f51fa1897f2508a8230c7e5c2d3a2c24da263f67c9e78b7855e1c15887d91627a65c12ec SHA512 d9c93a7a071b3a16ad38fd1c6c879ee82b80b1c8bb25689d4abea30c640ac4a90d423378f52bb80df666586ce35575039337f69077dbf87b4a8de8127dc50e54
 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/spamassassin-3.4.4-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild
new file mode 100644
index 000000000000..5c74424f1d0d
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.4-r2.ebuild
@@ -0,0 +1,314 @@
+# 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 ~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="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/spf-engine/Manifest b/mail-filter/spf-engine/Manifest
new file mode 100644
index 000000000000..d1ef1385c146
--- /dev/null
+++ b/mail-filter/spf-engine/Manifest
@@ -0,0 +1,5 @@
+DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673
+DIST spf-engine-2.9.2.tar.gz 52737 BLAKE2B 39d6c9831ef3ea489f2910fcbcaec9b2bed627f02459e20826166f04a2fe895aecf83768a3446a037e4231cc317ee277f6ff8e9030c72d8819739f6af889d632 SHA512 fe1fe82411ed4d6fcfadccd6ccc9fbd36372b4676051aafa5984740cba862336b00567576b3e32451cd24b0cfcd992d7dfdee33f0cf65a35f4009837e99b8f98
+EBUILD spf-engine-2.0.2-r1.ebuild 1374 BLAKE2B e37ced457ffa2294aab2031bb847928cbadbfd342dbb48b0899482686e564bb5b1f3ef6d7deb915824f6a5f85b3512102cb011feb5552edd99be9cad5d47e0bc SHA512 5c56fea79f669e534554488f770ba84559ea91b1c1e69bd4112cd3c08330590140f5f4c4901fcf4852df33fbaf2c8af4dcdfe736e0d73c8d1ad70460e5095d0b
+EBUILD spf-engine-2.9.2.ebuild 2782 BLAKE2B 92d0e8a0ec35717b3d0c0835078f377a8980bbd1331651ca651293db994fe331aa856d1947e9a71301de3a76e5e5a0dfc3a8d63e6c2d13d513b2a98e0fe1ed6a SHA512 3839b93d2b7282151a193ab570bcf1211becc3e61f21ba3268e844d1c601366c70aff1e69c2e19a3ce59e9ca3c606f4d42ecbef890f22782ec749b202c834a55
+MISC metadata.xml 350 BLAKE2B 979a5608d2877fdfe350a7f58ca1d0da721f3d2742b89bab11b6eae5d7ebfcf1f0b8cbda8b81c904aefcbbb908b325d732a6928093dfed57a13d407e91a769ca SHA512 434b6b307bfb636ed69cb2fa9a95daa7c5208501054df048346973a16ebb14786fdf4eda749eea6006c529f9d5a9c78b6ff32d7e85f76644250944e5d8f7b3a8
diff --git a/mail-filter/pypolicyd-spf/metadata.xml b/mail-filter/spf-engine/metadata.xml
index 9b1409156b59..9d7516779a0b 100644
--- a/mail-filter/pypolicyd-spf/metadata.xml
+++ b/mail-filter/spf-engine/metadata.xml
@@ -5,7 +5,7 @@
     <email>mjo@gentoo.org</email>
   </maintainer>
   <upstream>
-    <remote-id type="launchpad">pypolicyd-spf</remote-id>
-    <remote-id type="pypi">pypolicyd-spf</remote-id>
+    <remote-id type="launchpad">spf-engine</remote-id>
+    <remote-id type="pypi">spf-engine</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild b/mail-filter/spf-engine/spf-engine-2.0.2-r1.ebuild
index bede125e92e7..da8cc8d6ff55 100644
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2-r1.ebuild
+++ b/mail-filter/spf-engine/spf-engine-2.0.2-r1.ebuild
@@ -14,13 +14,16 @@ PYTHON_REQ_USE="ipv6"
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
+OLD_PN="pypolicyd-spf"
+OLD_P="${OLD_PN}-${PV}"
+OLD_PF="${PN}-${PVR}"
 DESCRIPTION="Python-based policy daemon for Postfix SPF verification"
 HOMEPAGE="https://launchpad.net/pypolicyd-spf"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/p/${OLD_PN}/${OLD_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
@@ -28,13 +31,15 @@ DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/authres[${PYTHON_USEDEP}]"
 
+S="${WORKDIR}/${OLD_P}"
+
 DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
 
 python_prepare_all() {
 	# The "real" config file mentions the commented one, so we point
 	# users in the right direction.
 	local oldconf="policyd-spf.conf.commented"
-	local newconf="/usr/share/doc/${PF}/${oldconf}"
+	local newconf="/usr/share/doc/${OLD_PF}/${oldconf}"
 
 	sed -i "1 s~ ${oldconf}~,\n#  ${newconf}~" policyd-spf.conf \
 		|| die 'failed to update commented config file path'
diff --git a/mail-filter/spf-engine/spf-engine-2.9.2.ebuild b/mail-filter/spf-engine/spf-engine-2.9.2.ebuild
new file mode 100644
index 000000000000..eebe9b13725c
--- /dev/null
+++ b/mail-filter/spf-engine/spf-engine-2.9.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+# The built-in ipaddress module handles the parsing of IP addresses. If
+# python is built without ipv6 support, then ipaddress can't parse ipv6
+# addresses, and the daemon will crash if it sees an ipv6 SPF record. In
+# other words, it's completely broken.
+PYTHON_REQ_USE="ipv6"
+
+# setup.py defines entry_points
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Policy daemon and milter for Postfix SPF verification"
+HOMEPAGE="https://launchpad.net/spf-engine"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	dev-python/authres[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
+
+python_prepare_all() {
+	# The "real" config file mentions the commented one, so we point
+	# users in the right direction.
+	local oldconf="policyd-spf.conf.commented"
+	local newconf="/usr/share/doc/${PF}/${oldconf}"
+
+	sed -e "1 s~ ${oldconf}~,\n#  ${newconf}~" -i policyd-spf.conf \
+		|| die 'failed to update commented config file path'
+
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Remove the milter files that are installed by default. The milter
+	# isn't quite ready:
+	#
+	#   * The README says it's experimental not well-tested.
+	#   * There's no documentation for its configuration parameters
+	#     (expecially the UserID).
+	#   * The configuration file is hard-coded to /usr/local.
+	#   * The paths in the systemd service file are hard-coded to /usr/local.
+	#   * We need to write an OpenRC service script for it.
+	#
+	# These are all eventually doable, but I'm not willing to commit to
+	# making the milter work before upstream is.
+	#
+	rm "${ED}/usr/bin/pyspf-milter" \
+		|| die "failed to remove ${ED}/usr/bin/pyspf-milter"
+	rm -r "${ED}/usr/lib/systemd" \
+		|| die "failed to remove ${ED}/usr/lib/systemd"
+	rm -r "${ED}/usr/etc/init.d" \
+		|| die "failed to remove ${ED}/usr/etc/init.d"
+	einfo "The milter component of spf-engine is still deemed experimental"
+	einfo "and not well-tested by upstream. It's missing configuration"
+	einfo "files, service scripts, and documentation. In other words, it"
+	einfo "doesn't work yet."
+
+	# The setuptools installation routing always works relative to
+	# python's prefix, so that when installing locally you wind up
+	# with paths like /usr/local/etc. However for system installs
+	# that does the wrong thing and puts the sysconfdir at /usr/etc.
+	# Here we move it to the right place.
+	mv -v "${ED}/usr/etc" "${ED}/" || die 'failed to relocate sysconfdir'
+}