gentoo resync : 05.02.2020

31 files changed, 758 insertions, 30 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 41c6d43a1c57..808e837b56e9 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index a316063bfa8c..9c8b1d53aa76 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,5 +1,5 @@
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
-EBUILD bogofilter-1.2.4-r2.ebuild 3770 BLAKE2B 05d7455ed57edb32fe4e15826c9d576134492f916be02ee0c112942cd2a4e503719fa9dd0d1d8119eade16cd9430ecc3870cd1d32f95817a44eff009273597f9 SHA512 8c1f25341d43e0d2f3d1b7b80c4fe58ca4c7ef49e0a5a7a6e216fec0e5216c0f787b6f2ea2fc97af3c44fca16062a473030efba263d4f5ea52fc15356c490e90
+EBUILD bogofilter-1.2.4-r2.ebuild 3771 BLAKE2B 3f26616ae19b770eb075589a6fa244289ae46e892b0278d5628e76cb53102379382150ebfd96e97cf400fe3cc68fe961135ce5b955d4251403e2c0e37e402ce0 SHA512 f54ea09fb41355006f687b7c3b358cc3b5337ad248f377c629caa72e9572312585eee06f7a8fc3f78e78fbfe20744f89c7e90164f33c7a984e7ea066bd511e3b
 EBUILD bogofilter-1.2.4-r3.ebuild 3785 BLAKE2B 49c9456060768e144c295b389b5723254fc9a2f32a4e58a71d32133c8b72f9a83e8992c0e0e7d27a83092cd66b1978ba5c23f8c165f189674c60db65e8d290fc SHA512 5dbfb92c306b35e38681b8808926ed8ba364e7c09d3789cbf70e8d4c715e6a322885d29bf8788b4a8eda10947a44fbad5d13426a39ed94ff19391baa1c97fb3b
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
index f63e11eeafe7..dde626dbacf6 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
 IUSE="berkdb sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 3efd3fff5561..1a75c9272cac 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,5 +4,5 @@ AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc962
 DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.154.ebuild 4336 BLAKE2B 08645b6659dfe8026c186d420967c05a5689f3e7078beba6cee663b946af42d9ecaa3b0d337ee6306532d24562377258f8dc112c9910658de052fba8b8d49307 SHA512 2748020ff1954b8616f1e1546154a4b6dbd6866042276b97f340b6cf8df00e1d8f86a4db138824f70ef2cc2e70928eff61b11256bccb2318442428f8386e1d8b
-EBUILD dcc-1.3.158.ebuild 4329 BLAKE2B e361a9f332d1c88ebe889d239993c463deedc47c913baa994efd555333b18a5f7708b7a65712c9cd07f97cfc612db5fa402ea34355391ad2b0b52944f5ad94ee SHA512 6e12845d7d0afb842170e6c9da17c429640ee2670b5563078792eec2f6dcb09d155eaa1a472d644d9ae0cc332999a17f699f68314a1ddd133b1a31900847e3aa
+EBUILD dcc-1.3.158.ebuild 4330 BLAKE2B bbc6de66d91981e4e541dc4ea8983e93201b552994375f04e8cead179eeb15e7dbe576e615040988004edc002443372b5b4f1976506f26ae4bc48cc2450e57f6 SHA512 00e623f5ab899296d7db432348afa9b53fbfd135bf3bb71054b5ceef912fb1457c9ad0ab50ee00d3b6090fa4eef303f88a17aeb08e00477298fd78bcda1bcb15
 MISC metadata.xml 316 BLAKE2B 24478ea14c1a25332766f54d5d385ef2e5755880258c2307eb62f649e3ab06c299c4ef0534b44b9f97462313227da016ef89b55ddac493a0b6a9014d098d0b85 SHA512 deaa7ad3b9919c65113f97639885bf7da2281a21dff15a0cfa11315daae55550c95ff411c8448bfe03c6b94b4cc4b7a3475bd6f9cf6315d6aa75abb99f536952
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index e7acea790b2c..358bb37a598f 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" #
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" #
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 5fe7b3b1bb65..a6dc4ca53b64 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -5,6 +5,6 @@ AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adb
 AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD libmilter-1.0.2.ebuild 1901 BLAKE2B b1556f75ec034bcd30926dc8562a6fee3bb09295a8832123d9319fa5cbcc1048574c0935327b14618ca3f193b907f51d12b902cb40ca8c992f0d133d48948d4e SHA512 641ff4dadc693654e3b55490dcd019dde0dfd24956891f8c7d2cdc5971899313b14260aa5c53e2fb0509a71f4303991271625c5910937dd7dbd1dcfc06d573db
+EBUILD libmilter-1.0.2.ebuild 1902 BLAKE2B 14ebd1c779b88e60a1edd3c5d47179e8c1ee3fc9f40432383bc1ee0e55486cc833c334779f75d194368a84e58297993250fc5c3fa1d383c4a04e5bfe738cc9bb SHA512 bb7e122fbf753cd314b6198432ddd898f45368db1d1dd218ff0e0b86b3091be3a39c3993037ed48a600fddf12b7eb2ab91e017fa20289379f3b8924ee2d358ad
 EBUILD libmilter-1.0.2_p1.ebuild 2036 BLAKE2B b22e729c6c4726ccfe6997778d36884c67a4396c37ff7ef60741d8a49426577e6ba547ddf4e8c66f84b7bba318e1c9b3e06b30a94f6aaaa201f7b835cf70b5ac SHA512 ec94ac7c597a4c7cc6e4593169981f009bc47bce0eb9e86883c9fb257e734c7ceab3dc4b7a721e1b2e47d819bc45133cb78f77ff16726e382e47d970e2d4723e
 MISC metadata.xml 300 BLAKE2B 410778ccb51b94b32d34d1c9b70f2deff712ad96143c4bd4bbf027f6910e7dfa700dfd8ee07c774043a3d4b7ad6507e5457af71a44fda6b3a81b46cd976b9185 SHA512 07af4a01f72fbe8c5ccdbfa72ea3a869e07a9907f8e878d6df03d1fc3061304280fc9e813958061f00f101571343ada901ec2fd1917760c60c631804498089e5
diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild
index c18c20ad483c..a6e507a3dbad 100644
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="ipv6 poll"
 
 DEPEND="!mail-mta/sendmail
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index ad6e36870d33..35ea75efa9af 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,4 +1,4 @@
 AUX libspf2-1.2.10-gcc5.patch 1080 BLAKE2B ce085a71cba9f6a493c7b276dada02dceb8efdb75df9d0062b74acd9b0e9d5a9c56cdd970743cc9e4860a4714e24d0e4687d9a2c5d321e320a6888c06f88e6c3 SHA512 cd2af129e334e0e1efcd722680f8f7cb064e6f5581ce41c791cb4f5f34d1eb4ac0dc586114b3017b4fd2ba350f11972f78a4029a8fc03118cf74c4f1276cd12b
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-EBUILD libspf2-1.2.10.ebuild 1209 BLAKE2B 70b6d6cd07c1435d0477cbda24610577e7abbfd20fc1cf920cfb42f5ee00948145c04129756c85ddcdcc9d8c6ee60899386dcf9a4ed0387109f690a454b2626e SHA512 d14ac8a5781dcde8b3a9528c3e434672795d4a2829e88bcc6098bf2f928739e3c0852b0deadc8b18f322dcc183a65b689b2b024d889382dbbc50668cddef716d
+EBUILD libspf2-1.2.10.ebuild 1210 BLAKE2B 91c9505cca38c639848f5560670c09b4a1dca4fe28bebc23aab6eecce40d6743bdc8da12486828ab862e7e718d847278db836b5c821a0b9a297932366318bb1c SHA512 24708acc594fcf21eb6e02ee280148ff0a2af64378324468df753cd23495e71aef93261be191134b903544e6a0f5e790fffcf48793a8d3192c3e2fd5ada8da2d
 MISC metadata.xml 588 BLAKE2B f2a34d6c55b8678f9ef69824ccce32a51508fe251af758d4d4c3ae05b51498b543e5f60757764a4a47dbc98587bc2b57faced4965d8c401e35f8e36605313a4c SHA512 8328d959a8b69fa3e10108f21cf2c53a3daf4aacbd9646af8e5af95ec818eeb6aebc20185b991e4ce6a3a2d0101bf67ce47b7af85dec4b06c2748d5f4fafd18e
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 33a36356218c..a6cc32b7cc43 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static static-libs"
 
 DEPEND=""
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index 2b08da46baeb..69d91529ac02 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 1151 BLAKE2B 28c0ec00d1db87f8970baaa548fb2f771719944a194682e1bec933c788b34db6ad7de43a914eb7ae363177a42bb6b48f00d1aadea83afbb285814ebd561f26e8 SHA512 92c94c2d9e4fb1f7f4b0bfe8d8b3d5487738de762cf2f158d308166a0394b4ef8f4eb2d2b6ad316b27796fe7f80d66c55408477340e9c6a5cde73c078a5a1f9c
+EBUILD libsrs_alt-1.0-r1.ebuild 1152 BLAKE2B 6af2123fefb24d1445dbe35eb2d54dda9ee0ab79cb3625be0166ebfb51e1d32abfca195fb6cca33e23ac30e760f13794432cd63abf741b936cbbf544e6cb25f4 SHA512 d9bfd79c514ce2ad5fec6b245897894b7ec346a396eac4d6cfc44c8645d44d97c407b649adec9bf84a0c4efd3d8eacc8669f390bf87bdc653f7c7c8b71638734
 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 2d20c933b205..bb78212ace85 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 363be275f49f..e7255397155e 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 3649 BLAKE2B c74138052d56f41d023267c547a972691f937ac57dfdf6bde30bc3c74b47b5af9052f564e36925327441ddf69fd4fd5f4dc2376775d58fa48447b077bf0c1d3a SHA512 c74224a4f02dc7d88f5339fc0ecd4e3cd1d066e0ca4cbecc8acd5285f8df72192cfd90ebae068141d349333d07aa6743d48428f0c6dd7e33bb5f982ed5488f08
+EBUILD maildrop-3.0.0.ebuild 3650 BLAKE2B a80a6b02a8caee3fc496c4c7fd674a047713e7c45cb80c5aebad88ce0752319ee904270b4f2ce5b41c7d9f2e14659a6691382fbaf23a29d014ef5b1943bab77f SHA512 88f7dcca62bdd1e3fd83d1e083fd6571e2482c20dac7f5b4a9293642205ba25f301a919e917e2bef5d0eb36baf5d4772a596b96b8b29cb96f2b989e95afbcbf6
 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 efb1aa7dee43..b6d89e487253 100644
--- a/mail-filter/maildrop/maildrop-3.0.0.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.courier-mta.org/maildrop/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh 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/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 274e6390bf61..7896bd81b3d9 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,5 +1,7 @@
+AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad01a39e85a6f1e440e3754e497082f5f1098dfc8c31771b1f83ae59f1e53ef242af78093601b1348b62945deacf8afdc42fca0 SHA512 b9ee7e625d1a3f00dcda7e441a81749d773daa9cfad7f046dd03d775564f1c111648c883ef1dcc16a6b518239b6a66bee4ba59f59227d182fcf61b887594d1d7
 AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r17.ebuild 7370 BLAKE2B 5d651b5389f07920d307d9c9895d1bfb320edff2d4ce6cb339b9f2f75e9b2073ffeb528b3bfa409d5eab87d7c04b99c48f61793598c7d0b88cea84c8281f1c3c SHA512 cbc2f5869b49a0981ba874b26ff386adcaddcbc15d227d56ad3baf7b6b6b31c33691bfe5552daa8354cef1db3ded88f9576647347bc047835170bd5c31f9dff9
+EBUILD opendkim-2.10.3-r18.ebuild 7412 BLAKE2B f84da27ad0469bd5f194d2276d477fa639a58c777d0332a01d862ff0739b9d2fd448614b28e86aaa2d54440afd76c467877265f8a9bead4266f21feee896858b SHA512 e6950c55ae36dc38629a28a8c2f6db00dd36e10c959e735f409418792204ce44a8341657cdbcd6620347718004ba15709bcb9bb0aafc31a40b5ece1a0ba21de0
 MISC metadata.xml 2185 BLAKE2B 0cfb33303e8edf764700664863e2dbf90a288e71cf1a078c33ebaac20b11e398e34ae8ca289732b24401ec1f4b192e2c922a86297632af9a039736c52e0ac143 SHA512 56753bc62e8fa16ad3df9e49c2877bbfa5ca8f2f617455c8b9757e50cdd2afe6b27d2d185edb3620d447e42277d755373eafb448da08262723cfb0b5863c3399
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig.patch b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig.patch
new file mode 100644
index 000000000000..ee8d5769f76a
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig.patch
@@ -0,0 +1,174 @@
+From 1f1c947a983c49677544ab08dea3ea04869a8caf Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 26 Jan 2020 22:29:16 -0500
+Subject: [PATCH 1/1] configure.ac: check for "lua" with pkg-config in addition
+ to "lua5.1".
+
+The upstream Lua pkg-config file is named lua.pc, so unless some
+distribution renames it, OpenDKIM should be looking for "lua"
+and not "lua5.1" in its PKG_CHECK_MODULES call. In any case, we
+should definitely be checking for "lua", so this commit appends it
+to the list of modules we look for. The "lua5.1" module was left
+alone, because I don't know enough of the history to be sure that
+removing it is the right thing to do.
+
+When the call to PKG_CHECK_MODULES fails, OpenDKIM falls back to
+a manual search that looks in /usr/lib, and this can detect 32-bit
+libraries on a 64-bit system. Therefore it is preferable that the
+PKG_CHECK_MODULES call succeed.
+
+In the process of adding this fallback, I realized that some
+additional actions need to be performed in the success branch of
+the existing (and new) PKG_CHECK_MODULES call. The following
+three lines were added,
+
+  AC_SEARCH_LIBS([dlopen], [dl])
+  AC_SUBST([LUA_MANNOTICE], "")
+  AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
+
+to tell various parts of OpenDKIM that we do indeed have Lua support.
+Afterwards, it became clear that those three lines could be factored
+out of *every* lua check, so that has been done as well.
+
+Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/62
+Gentoo-bug: https://bugs.gentoo.org/704556
+---
+ configure.ac | 45 +++++++++++++++++----------------------------
+ 1 file changed, 17 insertions(+), 28 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a478bb83..1d0db41a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1495,12 +1495,20 @@ lua_found="no"
+ 
+ if test \(  x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
+ then
+-        PKG_CHECK_MODULES([LIBLUA], [lua5.1],
+-	                  [
+-				lua_found="yes"
+-				LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+-	                  ],
+-			  [AC_MSG_WARN([pkg-config for Lua not found, trying manual search...])])
++  PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
++      LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
++      lua_found="yes"
++    ],
++    [
++      AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
++      PKG_CHECK_MODULES([LIBLUA], [lua], [
++          LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
++          lua_found="yes"
++        ],
++	[AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
++      )
++    ]
++  )
+ fi
+ 
+ if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
+@@ -1515,10 +1523,6 @@ then
+ 			LIBLUA_INCDIRS="-I$d/include/lua51"
+ 			LIBLUA_LIBDIRS="-L$d/lib/lua51"
+ 			LIBLUA_LIBS="-llua -lm"
+-			AC_SEARCH_LIBS([dlopen], [dl])
+-			AC_DEFINE([USE_LUA], 1,
+-			          [support for Lua scripting])
+-			AC_SUBST([LUA_MANNOTICE], "")
+ 			lua_found="yes"
+ 			break
+ 		elif test -f $d/include/lua52/lua.h
+@@ -1527,10 +1531,6 @@ then
+ 			LIBLUA_INCDIRS="-I$d/include/lua52"
+ 			LIBLUA_LIBDIRS="-L$d/lib/lua52"
+ 			LIBLUA_LIBS="-llua -lm"
+-			AC_SEARCH_LIBS([dlopen], [dl])
+-			AC_DEFINE([USE_LUA], 1,
+-			          [support for Lua scripting])
+-			AC_SUBST([LUA_MANNOTICE], "")
+ 			lua_found="yes"
+ 			break
+ 		elif test -f $d/include/lua5.1/lua.h
+@@ -1539,10 +1539,6 @@ then
+ 			LIBLUA_INCDIRS="-I$d/include/lua5.1"
+ 			LIBLUA_LIBDIRS="-L$d/lib"
+ 			LIBLUA_LIBS="-llua5.1 -lm"
+-			AC_SEARCH_LIBS([dlopen], [dl])
+-			AC_DEFINE([USE_LUA], 1,
+-			          [support for Lua scripting])
+-			AC_SUBST([LUA_MANNOTICE], "")
+ 			lua_found="yes"
+ 			break
+ 		elif test -f $d/include/lua5.2/lua.h
+@@ -1551,10 +1547,6 @@ then
+ 			LIBLUA_INCDIRS="-I$d/include/lua5.2"
+ 			LIBLUA_LIBDIRS="-L$d/lib"
+ 			LIBLUA_LIBS="-llua5.2 -lm"
+-			AC_SEARCH_LIBS([dlopen], [dl])
+-			AC_DEFINE([USE_LUA], 1,
+-			          [support for Lua scripting])
+-			AC_SUBST([LUA_MANNOTICE], "")
+ 			lua_found="yes"
+ 			break
+ 		elif test -f $d/include/lua.h
+@@ -1563,7 +1555,6 @@ then
+ 			LIBLUA_INCDIRS="-I$d/include"
+ 			LIBLUA_LIBDIRS="-L$d/lib"
+ 			LIBLUA_LIBS="-llua -lm"
+-			AC_SEARCH_LIBS([dlopen], [dl])
+ 			lua_found="yes"
+ 			break
+ 		fi
+@@ -1588,7 +1579,6 @@ then
+ 		LIBLUA_INCDIRS="-I$luapath/include/lua51"
+ 		LIBLUA_LIBDIRS="-L$luapath/lib/lua51"
+ 		LIBLUA_LIBS="-llua -lm"
+-		AC_SEARCH_LIBS([dlopen], [dl])
+ 		lua_found="yes"
+ 	elif test -f $luapath/include/lua52/lua.h
+ 	then
+@@ -1596,7 +1586,6 @@ then
+ 		LIBLUA_INCDIRS="-I$luapath/include/lua52"
+ 		LIBLUA_LIBDIRS="-L$luapath/lib/lua52"
+ 		LIBLUA_LIBS="-llua -lm"
+-		AC_SEARCH_LIBS([dlopen], [dl])
+ 		lua_found="yes"
+ 	elif test -f $luapath/include/lua5.1/lua.h
+ 	then
+@@ -1604,7 +1593,6 @@ then
+ 		LIBLUA_INCDIRS="-I$luapath/include/lua5.1"
+ 		LIBLUA_LIBDIRS="-L$luapath/lib"
+ 		LIBLUA_LIBS="-llua5.1 -lm"
+-		AC_SEARCH_LIBS([dlopen], [dl])
+ 		lua_found="yes"
+ 	elif test -f $luapath/include/lua5.2/lua.h
+ 	then
+@@ -1612,7 +1600,6 @@ then
+ 		LIBLUA_INCDIRS="-I$luapath/include/lua5.2"
+ 		LIBLUA_LIBDIRS="-L$luapath/lib"
+ 		LIBLUA_LIBS="-llua5.2 -lm"
+-		AC_SEARCH_LIBS([dlopen], [dl])
+ 		lua_found="yes"
+ 	elif test -f $luapath/include/lua.h
+ 	then
+@@ -1620,7 +1607,6 @@ then
+ 		LIBLUA_INCDIRS="-I$luapath/include"
+ 		LIBLUA_LIBDIRS="-L$luapath/lib"
+ 		LIBLUA_LIBS="-llua -lm"
+-		AC_SEARCH_LIBS([dlopen], [dl])
+ 		lua_found="yes"
+ 	else
+ 		AC_MSG_ERROR(not found at $luapath)
+@@ -1629,6 +1615,9 @@ fi
+ 
+ if test x"$lua_found" = x"yes"
+ then
++	AC_SUBST([LUA_MANNOTICE], "")
++	AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
++	AC_SEARCH_LIBS([dlopen], [dl])
+ 	saved_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="$outer_CPPFLAGS $LIBLUA_INCDIRS"
+ 	AC_MSG_CHECKING([Lua version])
+-- 
+2.24.1
+
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
new file mode 100644
index 000000000000..260010392d11
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use eutils systemd tmpfiles
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
+
+# The GPL-2 is for the init script, bug 425960.
+LICENSE="BSD GPL-2 Sendmail-Open-Source"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+
+BDEPEND="acct-user/opendkim
+	test? ( dev-lang/lua:* )"
+
+COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	sys-apps/grep
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	berkdb? ( >=sys-libs/db-3.2:* )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( dev-lang/lua:* )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	memcached? ( dev-libs/libmemcached )
+	sasl? ( dev-libs/cyrus-sasl )
+	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
+	!unbound? ( net-libs/ldns )"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/opendkim
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	querycache? ( berkdb )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+)
+
+src_prepare() {
+	default
+	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
+		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		|| die
+	sed -e 's:dist_doc_DATA:dist_html_DATA:' \
+		-i libopendkim/docs/Makefile.am \
+		|| die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	if use berkdb ; then
+		myconf+=( --with-db-incdir=$(db_includedir) )
+	fi
+	if use unbound; then
+		myconf+=( --with-unbound )
+	else
+		myconf+=( --with-ldns )
+	fi
+	if use ldap; then
+		myconf+=( $(use_with sasl) )
+	fi
+
+	# We install the our configuration filed under e.g. /etc/opendkim,
+	# so the next line is necessary to point the daemon and all of its
+	# documentation to the right location by default.
+	myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
+
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_with lmdb) \
+		$(use_enable poll) \
+		$(use_enable querycache query_cache) \
+		$(use_enable static-libs static) \
+		$(use_enable stats) \
+		$(use_with memcached libmemcached) \
+		"${myconf[@]}" \
+		--enable-filter \
+		--enable-atps \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-live-testing \
+		--with-test-socket="${T}/opendkim.sock"
+}
+
+src_compile() {
+	emake runstatedir=/run
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
+	systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
+	systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
+
+	dodir /etc/opendkim
+	keepdir /var/lib/opendkim
+
+	# The OpenDKIM data (particularly, your keys) should be read-only to
+	# the UserID that the daemon runs as.
+	fowners root:opendkim /var/lib/opendkim
+	fperms 750 /var/lib/opendkim
+
+	# Tweak the "simple" example configuration a bit before installing
+	# it unconditionally.
+	local cf="${T}/opendkim.conf"
+	# Some MTAs are known to break DKIM signatures with "simple"
+	# canonicalization [1], so we choose the "relaxed" policy
+	# over OpenDKIM's current default settings.
+	# [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
+	sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
+		"${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
+	cat >>"${cf}" <<EOT || die
+
+# The UMask is really only used for the PID file (root:root) and the
+# local UNIX socket, if you're using one. It should be 0117 for the
+# socket.
+UMask			0117
+UserID			opendkim
+
+# For use with unbound
+#TrustAnchorFile	/etc/dnssec/root-anchors.txt
+EOT
+	insinto /etc/opendkim
+	doins "${cf}"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	if [[ -z ${REPLACING_VERSION} ]]; then
+		elog "If you want to sign your mail messages and need some help"
+		elog "please run:"
+		elog "	emerge --config ${CATEGORY}/${PN}"
+		elog "It will help you create your key and give you hints on how"
+		elog "to configure your DNS and MTA."
+
+		elog "If you are using a local (UNIX) socket, then you will"
+		elog "need to make sure that your MTA has read/write access"
+		elog "to the socket file. This is best accomplished by creating"
+		elog "a completely-new group with only your MTA user and the"
+		elog "\"opendkim\" user in it. Step-by-step instructions can be"
+		elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
+	else
+		ewarn "The user account for the OpenDKIM daemon has changed"
+		ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
+		ewarn "from being able to read your private keys. You should"
+		ewarn "adjust your existing configuration to use the \"opendkim\""
+		ewarn "user and group, and change the permissions on"
+		ewarn "${ROOT}/var/lib/opendkim to root:opendkim with mode 0750."
+		ewarn "The owner and group of the files within that directory"
+		ewarn "will likely need to be adjusted as well."
+	fi
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector="${HOSTNAME}"
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}/var/lib/opendkim/${selector}.private" ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		keysize=1024
+		# Generate the private and public keys. Note that opendkim-genkeys
+		# sets umask=077 on its own to keep these safe. However, we want
+		# them to be readable (only!) to the opendkim user, and we manage
+		# that by changing their groups and making everything group-readable.
+		opendkim-genkey -b ${keysize} -D "${ROOT}/var/lib/opendkim/" \
+			-s "${selector}" -d '(your domain)' && \
+			chgrp --no-dereference opendkim \
+				"${ROOT}/var/lib/opendkim/${selector}".{private,txt} || \
+				{ eerror "Failed to create private and public keys."; return 1; }
+		chmod g+r "${ROOT}/var/lib/opendkim/${selector}".{private,txt}
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+	einfo "  Keyfile /var/lib/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters	   = unix:/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}/var/lib/opendkim/${selector}.txt"
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+}
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index af028e45f461..aae73c11ef3d 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -4,8 +4,8 @@ AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
-EBUILD opendmarc-1.1.3.ebuild 758 BLAKE2B 19dbe9ce41807931e4e02c506275ba97472440647f07d2f368c651d2761016cd553c1bdea90d2036d218de0e00b8b6b37b3607bf24faf47ff2d7fcfdfce54ce8 SHA512 064609b575f3722909e89b763336ec8f891a3dd320b83012f966edb949ba8b35a84b3691f2cfbaccca9f53c76df73955cab37ef63c7fcbd555352c1569a3554a
+EBUILD opendmarc-1.1.3.ebuild 759 BLAKE2B ea835fecfdec60ffa9022b0a3cb8aeafee43caf29580f8e8765ba95e39140ce0fa62b7a3b256fe608cda58dc3a30ccdfd12143865203b6040f2a3ba7f864e41f SHA512 abc3abaa7cb15148c467c654e7decb717842c6513cc5e625eac468b0e3dd93777f2d2cf5ac27eb6ad706fe3e8f08696819df1e8ad930c265db96757d8ac5ce4e
 EBUILD opendmarc-1.3.2-r1.ebuild 1512 BLAKE2B 3ca0ef4573fa16a1f123d1f5e92c24587a75695dc898f2e242d7985c44796f0525940672f4274d4d83bcc1ebe2920dc1109f7d44c813659bf88e501e8e3da89f SHA512 4cb2626f8073a210356dd645c84e26bd7a2a6a8383cabdabdb0de5bb37baea0dd874171abfdf283d5371fd6799ebb95b2e60b45498969dff15020a487037d09b
-EBUILD opendmarc-1.3.2-r2.ebuild 1646 BLAKE2B 9acaeb738840d3bdde9b201d5d1a79ded7da70ef91e8d972a2ecab7b51fc61195443883a4cad1d83c826ae8013ae1d2c90ec3dfeab21b5b7de0a4b871a63e8ad SHA512 e17f098fdf6102b257a8eebdf30d7eb543c2ca608c6226f997093aabefb24ce7642f8fa96850365f54ab98a9d04bd7fc9f881887ccc7a43b5535049111ef9228
+EBUILD opendmarc-1.3.2-r2.ebuild 1647 BLAKE2B 4db7dfa4de214d93fbe0040eefde08fa06504abaf5d2f5450bca837de25bc64f6a9761f1ecbfa439d3d0b20471aba1f7b79fa486d92f0674a235f9a21fe745df SHA512 a549716bf53417286aea2fb16b2461872ae2ae4a3f474ed014125705a34b30f1ad78b25cd24eaa5553d20807da19a5e5d7c067b66a2f7b61734e84bc2f794665
 EBUILD opendmarc-1.3.2-r3.ebuild 1700 BLAKE2B b35ba56a6a2b5d3b225b4a3279f4ea87115e482802bcf31a011056d3f509a0c089f56cfa78237110cc29fa2aa2a9e9738b982dc20416b6b7c6ca8b0270134826 SHA512 c213e8454048eb5f85c71cacd875f3908b23c73598c00fe37e35d09bffd20c98f15ab735740ec468a83e81f71c064201fde0477cd87228344bfcd40622ac9e3b
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
index de20ec167141..a04bfa2d65c2 100644
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/DBI
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 7bf2976ccd89..779a226b5053 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/opensmtpd-filter-rspamd/Manifest b/mail-filter/opensmtpd-filter-rspamd/Manifest
new file mode 100644
index 000000000000..5b8c07576729
--- /dev/null
+++ b/mail-filter/opensmtpd-filter-rspamd/Manifest
@@ -0,0 +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
+MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/mail-filter/opensmtpd-filter-rspamd/metadata.xml b/mail-filter/opensmtpd-filter-rspamd/metadata.xml
new file mode 100644
index 000000000000..915f00227065
--- /dev/null
+++ b/mail-filter/opensmtpd-filter-rspamd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+</pkgmetadata>
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.5.ebuild
new file mode 100644
index 000000000000..e55019d353a2
--- /dev/null
+++ b/mail-filter/opensmtpd-filter-rspamd/opensmtpd-filter-rspamd-0.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND} mail-mta/opensmtpd"
+BDEPEND=""
+
+S=${WORKDIR}/${P#opensmtpd-}
+DOCS=( README.md )
+
+src_compile() {
+	go build -ldflags="-s -w" -buildmode=pie filter-rspamd.go || die
+}
+
+src_install() {
+	default
+	exeinto /usr/libexec/opensmtpd
+	doexe filter-rspamd
+}
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index ae92af5612c7..74c291216b79 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -9,5 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e
 AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc
 AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5
 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
-EBUILD procmail-3.22-r14.ebuild 3659 BLAKE2B e305c81f6ec23aef8c38088b5a3fb21560f257061e4a5e62abdaba81cdce3f74d63e06b0dc8bd0e6594e578b020e4c3886b27ebcc170d40306494fcadcc46c63 SHA512 82800866188e9d3d266926c165aba17c1e0e164457f6b51b73139fde6e758f121de92d29e8e2951128ed9a24605aaf393dbe65f9c9f534dfe89d4708c1784410
+EBUILD procmail-3.22-r14.ebuild 3660 BLAKE2B 866a3678d898065591db1afa6b2ed921bd46347a17d0a2eeb45614af60976b8e820a181e16c1a62ddfe18287d6d88a09c32f9fdcd6f0aecf52f7c8e389995212 SHA512 cc6a1983c7dfb6e3598ba2a069910007d5c2b7344f56d7ae76461e36cc084a3a1cd8394b15312060950e10f427be93e0c86676e2013c4a8e6d10d16efcedddd4
 MISC metadata.xml 265 BLAKE2B a79a9f0aec856d7f6890b8adf1dbb728c1218426404e815e308bef910ff6b80a97dc487084ea81f93823fcd3a909f3eca5bec488c252cb886c46c55544f370f2 SHA512 82df2df703946d60d4906f91f64fb4158cd88219b613221005996ff953451c0a659d761d1ced61971be2d6be6f968bc8471c26e001353f6dee6033a2012c265a
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 4d67def38fa9..83b712b01d98 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="mbox selinux"
 
 DEPEND="virtual/mta"
diff --git a/mail-filter/rblcheck/Manifest b/mail-filter/rblcheck/Manifest
index 38887af46805..a883d44bffbf 100644
--- a/mail-filter/rblcheck/Manifest
+++ b/mail-filter/rblcheck/Manifest
@@ -1,4 +1,4 @@
 AUX rblcheck-1.5-configure.patch 719 BLAKE2B 81c4bfbe0a85f58965755c32eeadd9796a97b48c7626f285fc462cd260a1ef8e46de716b5be1816d1928a1a4157e8ac2d4e43f54f17bdfe6f318c07f0100b48b SHA512 302eb1d56793d07cda5000ce480c8bc705c0fcd20d41fc514b47fbdfbf6d8ec48318c85a7ed8008376e2c09b6ff0891c5484e930589cbb078fcf4832f547cc36
 DIST rblcheck-1.5.tar.gz 150395 BLAKE2B 2d4232fea8e5b43d0b29c44d3413eb3a5b5222bac0a6f737c9e7a273c3810b7c729f8fc6222fae18801cf6e172d4ef165213b70d38f510621791e4f8a0f25a0e SHA512 f0122701b5f7b293cf97cfb6f04963fdf657774f97342ecd57bc4a049b08f3d5b94e5148a4cc1f24de62c852b003c7339c35e4ddc199ea6be6a13583ca58f311
-EBUILD rblcheck-1.5-r2.ebuild 601 BLAKE2B 08d673e7f8398e9588d3dbb77aa97ab5286cf6697d0034a248a9f81986559f1434eadb7713a77398c894d90c7493d84de0f34269b16abb2952ce66154f506d17 SHA512 2e7c4d077f08979e5c599e6abaa477abc087cb42c37c5647263673d09210dbc2caedb08bc566f34cdf87e04f6e88a5d3c6ccb8f08ab9fc753d3adf958c50bc5c
+EBUILD rblcheck-1.5-r2.ebuild 602 BLAKE2B b1dbef74c97a6c993e381984c2f5f9c283b868affe1c00408351244848c58de20ad62e317372227a7ba99f76d354630eb16b6c494a3f9b86c5e8ad8e54c45443 SHA512 c67e67391164f5a28715155110e78cb5bdabec43ff96c07d789ef5cbdb151ce15958364041415bc436271123ee7a578441eb0fc1940be65a6fba7ec383674eee
 MISC metadata.xml 246 BLAKE2B 4fb6f001359007060f557dd40adf003fcac81f91051966d26aef90d8fe07240e8b4b5f0ce6ff227b4562008cf69dd412e36cd84ed4067f47294f449c7f62fd50 SHA512 43570f81095c94f1accb8bd55483d62db011205920ffc4079cad84626da66f3daf0d8e24e9476f553485153233874b86c6232d17f059b6f25eb53f2fbc0d0c2b
diff --git a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
index 3d209c916ebb..23ae4d709f0b 100644
--- a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
+++ b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/logic/rblcheck"
 SRC_URI="https://github.com/logic/rblcheck/releases/download/${P}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 131096e76ce5..393816cc3283 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -11,7 +11,9 @@ AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
 DIST Mail-SpamAssassin-3.4.3.tar.bz2 2739618 BLAKE2B cd77fc99cbec17f10c04f211e773fe2df9dd9c2efb54c9cc169f1fbfed884e74b77c96d8eee333af4bcefb05dee4519408b2e53e0c519734d582f95bad6030d6 SHA512 4d50b30a42d318c3a4c868b4940d1f56c329cc501270df12e1a369dd7de670c30f328a5fbc37dbd3b0d06538b9500085e920939c62de80ad6d8740bc47162cb0
-EBUILD spamassassin-3.4.2-r2.ebuild 7630 BLAKE2B cf03c3a415a636ff6370cb17ebe7c23dba199ccc086e5f6135c68511ce0989f1015db8d9b9eb6da174eec56d65f8c0f8c3b21a230f6cc017e47b1def33e2fed9 SHA512 1ff9b5f891546d54ed65042b20cef3fab77812a7df6da4a94a9346b0565f8a043648265d9a0b4a0fb5231ab2fc85a57266490bc1f4b6198a113e34f00988686c
+DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
+EBUILD spamassassin-3.4.2-r2.ebuild 7631 BLAKE2B 98932d67183f81c5ca9d297f720e70cb0953366037162f4f92c709daeeb5c69d31ac321fa20ab1858ffa2563dc80ff19830d4b3cdf4a930193c155f15f4e98b2 SHA512 c8876ff55bca21c8d0292511e65c4382d0ef857be0219083a173b1d781002e75ac3792a248edc242b91ce4398882d1ed06694b37fc176b5f2dbccf69018c072b
 EBUILD spamassassin-3.4.2-r6.ebuild 8713 BLAKE2B e13be6c1028c5dbd95d642582ab3f08a5b61c9139cbd2aa82d948787ae36c8081fd39ec9d15844af44d0970857178c17adea45d0cab2cd509d241765212896dd SHA512 2f45421391ced81ddb47a973e059d62939c5be9e7e286449d93bc313949238c20f540fe112cfb97836e4e79d9f0438d2fc61324ac70202ca7baeabaccf948967
-EBUILD spamassassin-3.4.3.ebuild 8507 BLAKE2B 9cf8eed03d39ccfc5e8a9f97508afdd248dc71e24ddf3885bad24079add59786a7e958a6f6ab7fb74728f384e046e22edf8a01f15df34a9aad48f444520e65bf SHA512 be3d9bb98e034a37d8c3edd68d61e41d018422d651c1c18ee853c8cb1db34ddfdbd3bb972e6df0f182ea1306246af90f289223f35f840485c51e759ba6442266
-MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
+EBUILD spamassassin-3.4.3.ebuild 8505 BLAKE2B dadc2d74a0ba987b3861747463e75cd4ea78c5fd734be70ae13d96d38fc1703ae44b553f76f8120fb1b592ea4828d04bcea7727d428757179d9d4c183121ea34 SHA512 f183a7918bf27ecb45d55fda23b62d3bbc9912d69d09de0295acf442170e52475291fc1cfd3ecf3820b79e69cef414d52a6514526269d9c490d869c953c73c68
+EBUILD spamassassin-3.4.4.ebuild 8513 BLAKE2B 3ded41c7857bbb2367b567b90cfbcbc38a27552b5afcfc5f68b3320be6d43f227053cd28869cb59c596242efd74e9d40a9e6e2f9e6416234ac7224a22e90bb12 SHA512 facfa73482315e2c13fc581a4b89aa156846f6c3dc109459794ef26014723ef31f313aa99d6f7989a46fbeac5841541994b2ee5fdb1763b0a6501a11808137c9
+MISC metadata.xml 693 BLAKE2B 57b8a079ed95858b27fb567e1c3b77389e8141315fcf69e34e2b80dab13e5b0f88c9f50f2387f7537cedd5a3cd56adcb611932a641e31a7f875914bb847708d3 SHA512 991a54ec305b6b4c4e9fd27ba77abf2ad7e72647776e0acc0e29a058566d0045e31df8ceebee6e320f758f10fb12973239d1650e469e910ac77a887656fcff3e
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index 6e32082b5470..b9faf870933f 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -11,11 +11,6 @@
     <name>Marcin Mirosław</name>
   </maintainer>
 
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-    <name>Michael Orlitzky</name>
-  </maintainer>
-
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
index 85c97d9c4235..e3f07a85d5df 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
index 638c0c3090b5..ba94a7473b2a 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
new file mode 100644
index 000000000000..39c0972f5e9a
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-functions systemd toolchain-funcs user eapi7-ver
+
+MY_P="Mail-SpamAssassin-${PV//_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="https://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( test )"
+
+# The Makefile.PL script checks for dependencies, but only fails if a
+# required (i.e. not optional) dependency is missing. We therefore
+# require most of the optional modules only at runtime.
+REQDEPEND="dev-lang/perl:=
+	dev-perl/HTML-Parser
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	virtual/perl-Archive-Tar
+	virtual/perl-Digest-SHA
+	virtual/perl-IO-Zlib
+	virtual/perl-Time-HiRes
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+
+# SpamAssassin doesn't use libwww-perl except as a fallback for when
+# curl/wget are missing, so we depend on one of those instead. Some
+# mirrors use https, so we need those utilities to support SSL.
+#
+# re2c is needed to compile the rules (sa-compile).
+#
+# We still need the old Digest-SHA1 because razor2 has not been ported
+# to Digest-SHA.
+OPTDEPEND="app-crypt/gnupg
+	dev-perl/BSD-Resource
+	dev-perl/Digest-SHA1
+	dev-perl/Encode-Detect
+	dev-perl/Geo-IP
+	dev-perl/HTTP-Date
+	dev-perl/Mail-DKIM
+	dev-perl/Mail-SPF
+	dev-perl/Net-Patricia
+	dev-perl/Net-CIDR-Lite
+	dev-util/re2c
+	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
+	virtual/perl-MIME-Base64
+	virtual/perl-Pod-Parser
+	berkdb? ( virtual/perl-DB_File )
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+DEPEND="${REQDEPEND}
+	test? (
+		${OPTDEPEND}
+		virtual/perl-Test-Harness
+	)"
+RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+
+PATCHES=(
+)
+
+src_prepare() {
+	default
+
+	# The sa_compile test does some weird stuff like hopping around in
+	# the directory tree and calling "make" to create a dist tarball
+	# from ${S}. It fails, and is more trouble than it's worth...
+	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
+
+	# The spamc tests (which need the networked spamd daemon) fail for
+	# irrelevant reasons. It's too hard to disable them (unlike the
+	# spamd tests themselves -- see src_test), so use a crude
+	# workaround.
+	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
+
+	# Upstream bug 7622: this thing needs network access but doesn't
+	# respect the 'run_net_tests' setting.
+	perl_rm_files t/urilocalbl_geoip.t \
+		|| die 'failed to remove urilocalbl_geoip tests'
+}
+
+src_configure() {
+	# This is how and where the perl-module eclass disables the
+	# MakeMaker interactive prompt.
+	export PERL_MM_USE_DEFAULT=1
+
+	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	# (just to be sure, nobody knows how it could happen in the first place).
+	#
+	# We also set the path to the perl executable explictly. This will be
+	# used to create the initial shebang line in the scripts (bug 62276).
+	perl Makefile.PL \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRS=vendor \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		DATADIR="${EPREFIX}/usr/share/spamassassin" \
+		PERL_BIN="${EPREFIX}/usr/bin/perl" \
+		ENABLE_SSL="$(usex ssl)" \
+		DESTDIR="${D}" \
+		|| die 'failed to create a Makefile using Makefile.PL'
+
+	# Now configure spamc.
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	emake
+	use qmail && emake spamc/qmail-spamc
+}
+
+src_install () {
+	emake install
+	einstalldocs
+
+	# Create the stub dir used by sa-update and friends
+	keepdir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"${ED}/etc/mail/spamassassin/init.pre" \
+		|| die "failed to disable plugins by default"
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
+	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
+							 "${PN}.service"
+
+	use postgres && dodoc sql/*_pg.sql
+	use mysql && dodoc sql/*_mysql.sql
+
+	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
+		sql/README.awl procmailrc.example sample-nonspam.txt \
+		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
+		spamd-apache2/README.apache
+
+	# Rename some files so that they don't clash with others.
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	if use qmail; then
+		dodoc spamc/README.qmail
+	fi
+
+	insinto /etc/mail/spamassassin/
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+	# Create the directory where sa-update stores its GPG key (if you
+	# choose to import one). If this directory does not exist, the
+	# import will fail. This is bug 396307. We expect that the import
+	# will be performed as root, and making the directory accessible
+	# only to root prevents a warning on the command-line.
+	diropts -m0700
+	dodir /etc/mail/spamassassin/sa-update-keys
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod || die "failed to remove perllocal.pod"
+
+	# The perl-module eclass calls three other functions to clean
+	# up in src_install. The first fixes references to ${D} in the
+	# packlist, and is useful to us, too. The other two functions,
+	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
+	# to be needed: there are no empty directories, *.bs files, or
+	# ${D} paths remaining in our installed image.
+	perl_fix_packlist || die "failed to fix paths in packlist"
+}
+
+src_test() {
+	# Trick the test suite into skipping the spamd tests. Setting
+	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
+	# set in SATest.pm.
+	export SPAMD_HOST=disabled
+	default
+}
+
+pkg_preinst() {
+	# The spamd daemon runs as this user. Use a real home directory so
+	# that it can hold SA configuration.
+	enewuser spamd -1 -1 /home/spamd
+
+	if use mysql || use postgres ; then
+		local _awlwarn=0
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				_awlwarn=1
+				break
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+			ewarn 'You will need to manually ALTER your tables for them to'
+			ewarn 'continue working.  See the UPGRADE documentation for'
+			ewarn 'details.'
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog 'No rules are installed by default. You will need to run sa-update'
+	elog 'at least once, and most likely configure SpamAssassin before it'
+	elog 'will work.'
+
+	if ! use cron; then
+		elog
+		elog 'You should consider a cron job for sa-update. One is provided'
+		elog 'for daily updates if you enable the "cron" USE flag.'
+	fi
+	elog
+	elog 'Configuration and update help can be found on the wiki:'
+	elog
+	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
+	elog
+
+	if use mysql || use postgres ; then
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+				ewarn 'You will need to manually ALTER your tables for them to'
+				ewarn 'continue working.  See the UPGRADE documentation for'
+				ewarn 'details.'
+				ewarn
+
+				# show this only once
+				break
+			fi
+		done
+	fi
+
+	ewarn 'If this version of SpamAssassin causes permissions issues'
+	ewarn 'with your user configurations or bayes databases, then you'
+	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
+	ewarn 'configuration file, or remove the --username and --groupname'
+	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
+	ewarn 'configuration file.'
+}