gentoo resync : 13.10.2019

41 files changed, 265 insertions, 477 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 4c035a544afa..fd7ed8e2544f 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/ask/Manifest b/mail-filter/ask/Manifest
deleted file mode 100644
index 3cd3dfaed5db..000000000000
--- a/mail-filter/ask/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ask-2.4.1.tar.gz 102631 BLAKE2B 7aa23cdc2f85c552cd28a43d79f15a19117e7912ba9b351ecd58cd63b9ba978576262e3a7b069b2a90b5d9d5b6efc5ad23861806dbbc9efbe77f9fd75727e080 SHA512 a6e84f6846019f5ac76f127abdcb27d74e3661aa396ab442fa0805679543cadd3de6c9e37d3e7e7aa778543893e6e5fa9067279c040f90d7b2053a9d03cb5a9c
-DIST ask-2.5.3.tar.gz 106339 BLAKE2B e9b01c6a779c92f0e2cd1127942aa81cda385d4abea5386eeb0b64e795919d206a6a5cbef0976305d4636da2ab879e03628e892795bd4043034f6352f9fec4d0 SHA512 cd3be1ecf989372d3127d7c54cee1a7c4ceea37bcd445a759f59df3569dc339fc93e20b073d2a75e8d8b99a8d2d422ad6a327c21155f86c2c4b1daf87cca09bf
-EBUILD ask-2.4.1.ebuild 1418 BLAKE2B a94630f78660452aa566354356cf5c6d5c38cf5143a330f3341a20d18e4a611b80ede54af106c416714ea9ab4d3ddaaccc3dc8b9c167bc4904aa489268d63ff8 SHA512 9d5bd0e63e7aed463d6327341e930dcb944c5ca10423a4b14b9181163d9f28e27af4d015c859249b53dc226531608d8650bb875a065a4b5a29189453ee5f85b9
-EBUILD ask-2.5.3.ebuild 1015 BLAKE2B f3e8771cb719875855d359a862f897af089b6981946460106167c8898c9efce8f55abe55e674fb089bb4d3dbd45011140849153392553b2b9601dc28049b3fd1 SHA512 391d2ea918c196ffb528993ccc6ea6e5e4596f216ce86d3e335ebbb42920f6f1df469e0a262f7ffd2f7bc0f5d275f997b74d6811022986b31aca77a02df432e4
-MISC metadata.xml 339 BLAKE2B 8082f7bd6e9ca5bdd95e8e5aa6ccac01a5d48e7bcea21a84da697b9a398a80d86a2e26dfa3731f2144080efc34b15772619d91824d0c303c5405f75db63497f9 SHA512 a3ef7ef8e3b31a7d8df8a664144ccdd6a6201a75912a830251185d36c072fe287e155f4b782ad5b942f68aa7660f1584c14d70b4cc24b352a0bcfccd42732091
diff --git a/mail-filter/ask/ask-2.4.1.ebuild b/mail-filter/ask/ask-2.4.1.ebuild
deleted file mode 100644
index bf734aa08f02..000000000000
--- a/mail-filter/ask/ask-2.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Active Spam Killer: A program to filter spam"
-HOMEPAGE="http://www.paganini.net/ask/index.html"
-SRC_URI="mirror://sourceforge/a-s-k/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-
-IUSE="procmail"
-RDEPEND=">=dev-lang/python-2.2
-		virtual/mta
-		procmail? ( >=mail-filter/procmail-3.22 )"
-
-src_install() {
-	into /
-	dobin ask.py asksetup.py askversion.py utils/asksenders.py
-
-	insinto /usr/lib/ask
-	doins askconfig.py asklock.py asklog.py askmail.py askmain.py \
-		 askmessage.py askremote.py
-
-	insinto /usr/share/ask/samples
-	doins samples/*
-
-	insinto /usr/share/ask/templates
-	doins templates/*
-
-	insinto /usr/share/ask/utils
-	doins utils/*
-
-	doman docs/*.1
-
-	dodoc ChangeLog TODO docs/ask_doc*
-}
-
-pkg_postinst() {
-	elog
-	elog "You MUST run the asksetup.py file to configure ASK!"
-	elog
-	if use procmail; then
-		elog "To use ASK's procmail support these should be your first two procmail rules:"
-		elog
-		elog ":0 fW"
-		elog "|/path_to_ask/ask.py --procmail --loglevel=5 --logfile=/your_home/ask.log"
-		elog
-		elog ":0 e"
-		elog "/dev/null"
-		elog
-		elog "The second rule above instructs procmail to deliver the message to /dev/null"
-		elog "if ASK returns a fail code. If you're truly paranoid, you can save those"
-		elog "messages to a file instead for later inspection."
-	fi
-}
diff --git a/mail-filter/ask/ask-2.5.3.ebuild b/mail-filter/ask/ask-2.5.3.ebuild
deleted file mode 100644
index 2e7c8d080acc..000000000000
--- a/mail-filter/ask/ask-2.5.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib
-
-DESCRIPTION="Active Spam Killer: A program to filter spam"
-HOMEPAGE="http://www.paganini.net/ask/index.html"
-SRC_URI="mirror://sourceforge/a-s-k/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="procmail"
-RDEPEND="dev-lang/python
-		virtual/mta
-		procmail? ( >=mail-filter/procmail-3.22 )"
-
-src_install() {
-	dobin askfilter asksetup askversion.py utils/asksenders
-
-	insinto /usr/$(get_libdir)/ask
-	doins askconfig.py asklock.py asklog.py askmail.py askmain.py \
-		 askmessage.py askremote.py
-
-	insinto /usr/share/ask/templates
-	doins templates/*
-
-	insinto /usr/share/ask/utils
-	doins utils/*
-
-	doman docs/*.1
-
-	dodoc ChangeLog docs/ask_doc*
-}
-
-pkg_postinst() {
-	elog "You MUST run the asksetup file to configure ASK!"
-	elog "WARNING: if you upgrade from ask-2.4.1, you must replace ask.py with askfilter"
-	elog "         in your procmail/maildrop recipe!"
-}
diff --git a/mail-filter/ask/metadata.xml b/mail-filter/ask/metadata.xml
deleted file mode 100644
index 30efab86d68a..000000000000
--- a/mail-filter/ask/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="procmail">Adds support for
-		<pkg>mail-filter/procmail</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">a-s-k</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index ad6c875dd14b..f18b0552291b 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,4 +1,4 @@
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
-EBUILD bogofilter-1.2.4-r2.ebuild 3780 BLAKE2B 819275c4a12113cc20b2f8058632cf0c910160a2bbbfa32f4416415997cf58e8b342c50c2cf2a8f7f71a791f8634d02bc8f5a8f923f0b245b119e284ebf11a91 SHA512 c8e55e332d6580086cd679d2aab776d873b814d14a310049afee9d990dcf9ca056f31f4c9ea7a96ab0137fc2b3dd0f7cc5818ec9977599891db53be15399b698
+EBUILD bogofilter-1.2.4-r2.ebuild 3770 BLAKE2B 05d7455ed57edb32fe4e15826c9d576134492f916be02ee0c112942cd2a4e503719fa9dd0d1d8119eade16cd9430ecc3870cd1d32f95817a44eff009273597f9 SHA512 8c1f25341d43e0d2f3d1b7b80c4fe58ca4c7ef49e0a5a7a6e216fec0e5216c0f787b6f2ea2fc97af3c44fca16062a473030efba263d4f5ea52fc15356c490e90
 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 0ee617558a51..f63e11eeafe7 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 ~x86-fbsd"
+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 c085dcbda4e9..3efd3fff5561 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -3,6 +3,6 @@ AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b7
 AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
 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 4358 BLAKE2B 0e3b69bf36dc2a6f8f58eac9638c76648b825a2d9deee643e1a4ae174b34ce150a885fc115284aad0dc817743355f07bb450a75e62b5942172fc6d812c943c37 SHA512 d22050cdf0e5ab84a524c62e3752faa5a2bd986a57ee3ac643f56bf8ff5c7501b396d9a81f3788652e4f0c3229ae9c5bb7a45646bc903fac7b636670a0748508
-EBUILD dcc-1.3.158.ebuild 4351 BLAKE2B e95eb22145d2e7af6a5cb8cccedce16ffd5965e3334dd7f90e829c504ceb54ffb89f373d16e4ae2cd78a3a8336b0d28e42508849e022a3bd333eb70794fb68ec SHA512 7934e9494707f325e8836d3be51b329590f4439ea72076a5589a2ffdccbd2128cdd14e19d7286eeb712d85cbd2d54681bf219922919483bca2de16de22ed853b
+EBUILD dcc-1.3.154.ebuild 4336 BLAKE2B 08645b6659dfe8026c186d420967c05a5689f3e7078beba6cee663b946af42d9ecaa3b0d337ee6306532d24562377258f8dc112c9910658de052fba8b8d49307 SHA512 2748020ff1954b8616f1e1546154a4b6dbd6866042276b97f340b6cf8df00e1d8f86a4db138824f70ef2cc2e70928eff61b11256bccb2318442428f8386e1d8b
+EBUILD dcc-1.3.158.ebuild 4329 BLAKE2B e361a9f332d1c88ebe889d239993c463deedc47c913baa994efd555333b18a5f7708b7a65712c9cd07f97cfc612db5fa402ea34355391ad2b0b52944f5ad94ee SHA512 6e12845d7d0afb842170e6c9da17c429640ee2670b5563078792eec2f6dcb09d155eaa1a472d644d9ae0cc332999a17f699f68314a1ddd133b1a31900847e3aa
 MISC metadata.xml 316 BLAKE2B 24478ea14c1a25332766f54d5d385ef2e5755880258c2307eb62f649e3ab06c299c4ef0534b44b9f97462313227da016ef89b55ddac493a0b6a9014d098d0b85 SHA512 deaa7ad3b9919c65113f97639885bf7da2281a21dff15a0cfa11315daae55550c95ff411c8448bfe03c6b94b4cc4b7a3475bd6f9cf6315d6aa75abb99f536952
diff --git a/mail-filter/dcc/dcc-1.3.154.ebuild b/mail-filter/dcc/dcc-1.3.154.ebuild
index 403e3e574893..b4bdaf7abd15 100644
--- a/mail-filter/dcc/dcc-1.3.154.ebuild
+++ b/mail-filter/dcc/dcc-1.3.154.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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" #
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index e007b2d85ba1..e7acea790b2c 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 ~x86-fbsd" # ~amd64-fbsd
+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 2f111e7c1ee8..2b23fbd9dea9 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -2,5 +2,5 @@ AUX gentoo.config.m4 168 BLAKE2B bbd9a011f6ca442aebb3f4e0177dfae6c1f8b246a493205
 AUX libmilter-build-system.patch 6855 BLAKE2B 987a71369b672d74835cb37a4ad5ceb58aa8b0fd451ffbcfbcba8ff89dafae58d0c9d412fec8c2a0f0621cce4b8bfce3ee618aa399feb6d7523bd22e3a210fe3 SHA512 d36adc49d5fec792139a921b5292ad0a6d71c11a31093cb1249f4e19b8255bb5a287beb3537b2ec0316d97505233cdd708bac27c0d4e1f54464918d4730be43b
 AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
-EBUILD libmilter-1.0.2.ebuild 1911 BLAKE2B fdcba10c83c1404a8ee0c3d677251980f50672d6475adcf9b9dea463f96564211d870ffb61ffb05427e4ad2df6b9eac9df545162ee3cf6b170b1c6af2ef4df23 SHA512 892afab1d982aa524bf4565ff36222ceb6e626660bc9d11a1c7e7cb0285628375273bd4b1158550e0eb1c9c0df419a02854d293fba586b16443087f73687b117
+EBUILD libmilter-1.0.2.ebuild 1901 BLAKE2B b1556f75ec034bcd30926dc8562a6fee3bb09295a8832123d9319fa5cbcc1048574c0935327b14618ca3f193b907f51d12b902cb40ca8c992f0d133d48948d4e SHA512 641ff4dadc693654e3b55490dcd019dde0dfd24956891f8c7d2cdc5971899313b14260aa5c53e2fb0509a71f4303991271625c5910937dd7dbd1dcfc06d573db
 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 5c22ef6e79df..c18c20ad483c 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 ~x86-fbsd"
+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 4bd776b45f44..ad6e36870d33 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 1219 BLAKE2B 85afd0c834ce4a81635a7535ad0f218cffe3bd445112c4add6e6a7864995daf44912ff57dab5a203209a30f1377d6054844b51c81050657aa501468e607ea14a SHA512 99e4467440c5ed53ecf255d0fcd95eaf6731b51dcd3e18b0e858a0de1a3ac2cc19cb7596950bd457b127521abe63c74bcc16d764bcc9be99280cb734377f6a38
+EBUILD libspf2-1.2.10.ebuild 1209 BLAKE2B 70b6d6cd07c1435d0477cbda24610577e7abbfd20fc1cf920cfb42f5ee00948145c04129756c85ddcdcc9d8c6ee60899386dcf9a4ed0387109f690a454b2626e SHA512 d14ac8a5781dcde8b3a9528c3e434672795d4a2829e88bcc6098bf2f928739e3c0852b0deadc8b18f322dcc183a65b689b2b024d889382dbbc50668cddef716d
 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 31818fc7e8cb..33a36356218c 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 ~x86-fbsd"
+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 d2825150b636..afc9bad78df3 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.gz 337225 BLAKE2B 1fb10130eb44c8edfc3757b9ba6d8a77659d1ba53fa620da2f7c5fe6cb01fe3f9c1ac0aac5a49db7d9f1b8308ac4c07778e03e4aa6ad9c0204a0871dff40047f SHA512 c202b2cbd28ce0b1296a8000b9f2ae19f4fff259a2d9ea43674cab11b947d0f85a0fdbb13e5fef2a52b1ae675a8fa35b492b233f97f5e365a9c076a337010629
-EBUILD libsrs_alt-1.0.ebuild 1047 BLAKE2B 83fa19ff750dfed2dce7b5fb2e22a2cfea92bd21e36f5be17a6b66dfcc68a0ecfe1525ec0ef2f773ae442a3aa9bedf9a67ada37289423921f40bde587eff6912 SHA512 483b670eb681e3c8fe98862b008529aebd5ca07ce3e6b230cef945482f7182281f2cefd8342ec10d07c6c16c7603799e0ab8c678d881be3d0b7299653d56d70d
+EBUILD libsrs_alt-1.0.ebuild 1037 BLAKE2B 7696b03d8cedcf177dc30e74fc2e679e79cc38b46538f5abb75e9682e9a8afed22098a582fab47350a2268efbf27469ec8f3def1bb0f2364a6fb250b9c5dcd82 SHA512 b28e0a756a5de946899196ed737523a27b6daf49bcdec185b2854b0e0d418c03a3d9c2e29a15f8df39dfcafb48251261abda1556fd87f687ae77a63f103b49da
 MISC metadata.xml 444 BLAKE2B 0e453a9b03bb2471127bf22592dc3532700d48684aff29d158ae757b4456e7012312223e980d7bbcbaa320c23f5e5ddfcc641075f66a020fcc109d839ffd5b4a SHA512 893b89842051781f1147f679884ef46d1701f4abc13ccc9b825103ce794a23c539cad6d142e94aadb672cff41e0403d2c5c480d996082c18dcfdd5ddde5c900f
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
index 272b35e945f5..110faf04c054 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://srs.mirtol.com/libsrs_alt-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 6760677d7c34..4295ef169533 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -2,5 +2,5 @@ AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d6
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
-EBUILD mailfilter-0.8.4.ebuild 692 BLAKE2B fb757a9720845de24cace35bcd73c0091ec91bfe849231ca4267941f3e12576da8547f9758acc017b50fe8958fac9c9573af13acfe555128da0d86b5bad348dd SHA512 00e959c7887b7895c9c257ac9c7933b6d20bee71b48ec8072768137f8517ba50c709bbd044ecfa0bbf980027866d0b37edd086dedb1af2dec5fafbbea49d9c1c
+EBUILD mailfilter-0.8.4.ebuild 682 BLAKE2B 9850eedda9e8df78ea8f98c4d629781d23ba1d6f12e806380a0e4ca389032a4002ef049c6b3eb89ad13fb6772d338bceef09b3f3681367ac48c6366ac70ba109 SHA512 98dd725f1d6281caece3c27b152c53f55c43bf0ed5d8c124da43496a182332f9ee61f3feef60faba06d8fb493f65605ca1a95ba10368717d01b51dba0d07e2a2
 MISC metadata.xml 247 BLAKE2B 7d481b0cede6e8bdaa87e4e460a2e9c022147ff75e58fa9f0c3881cd10a0feb7210be0f15ad4359c284db38388f74fe7308e9a415b8c85537adb0afbd867ef5d SHA512 75a4c0de2951d0542c787fc15e0b22ae7af87f391bcbb5416b0bd984a9ea6f1d384de28227dae6718a75b0f3826d24adec3192d0d8aec2b9e27b92defc1b4423
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index 5a6a30d45f7d..a5a9171da42b 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="libressl +ssl"
 
 DEPEND="sys-devel/flex
diff --git a/mail-filter/normalizemime/Manifest b/mail-filter/normalizemime/Manifest
index 7f9c935ee1d0..551d4f3782db 100644
--- a/mail-filter/normalizemime/Manifest
+++ b/mail-filter/normalizemime/Manifest
@@ -1,3 +1,3 @@
 DIST normalizemime-1.19.tar.bz2 12192 BLAKE2B 663d2b67c597003c8b8f8d098bbb0538abcb2a68109ede900d9f6aca9b5af8d0a2822c86738dc8763b2693a4b1a642518c1d46cd8525fc2d94c1a8d2cf93f5e6 SHA512 670d2508dd6d79e09a9187d2161d4fd81168b34705d620d1ad3547d298404b3964ddb5ae1921e9e570c7132df1cd65e27f4da6e532bec39a9177085da84eb46c
-EBUILD normalizemime-1.19.ebuild 468 BLAKE2B 4e155c719be71fa0bcc80904030d149dd0b31bd9e7c906658acc15810b4f8e9a9f714d4579752208289d8a37553506002a649d215c5cde224d0047f7347bf886 SHA512 3d763393e6321e1f6f54723caa35e36c9deff83ebfd2fe2e98b40900dd2e44d45f6c2f58f9953493d7b2e927f197410a454431437846a48a42e00d8b318c5873
+EBUILD normalizemime-1.19.ebuild 458 BLAKE2B 9512031b4b1090f60c815a9168e62a8b512616cdebc2ca1276102b743f63640518a74a3c627493fd906062773762be6bd8cd1ac7eb5b2ef841336f1fb26eda6c SHA512 eeac0794f9edd933bfb001b3a8147e04d7e962ca302f545f5c25867ff5d6c6201b697f595e74fb7617a297088bfdb36f87cb1704f9df0b4411e9f5b9f450dfcb
 MISC metadata.xml 170 BLAKE2B 596d3ac9dabce24bba0cde2371d477e82ca5f9200bfeda69429558c79d4b59db07d8cb368f7eac09605bd132564778c12a20934e61cfede0197b9ebf69a3b5ca SHA512 ad26626abac376b8d9cb5b3125c4361c443524ef85ec99212acd972ca75190b15fe2f701c00c5110c74efc2171db92e41d580786ae2356bf1248e7808b6c67b8
diff --git a/mail-filter/normalizemime/normalizemime-1.19.ebuild b/mail-filter/normalizemime/normalizemime-1.19.ebuild
index 27de9266f7c6..d5077b3a88e4 100644
--- a/mail-filter/normalizemime/normalizemime-1.19.ebuild
+++ b/mail-filter/normalizemime/normalizemime-1.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 src_compile() {
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 0b9faf454ed6..3946231bff4f 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -2,4 +2,5 @@ AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc324690
 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-r16.ebuild 7437 BLAKE2B 7c66326a577d9dd2a883346fdd5f8258b5f80b2c1bd2d288c38dc3b18f3be7013bf0e7ba20719680ba009eb2581371dcb34f4d05a00e4ed66f27ac58fd0cf9d6 SHA512 575e04109efd12e8c90d8f410bcfa041a0f748b1001d21829fd45fcb42e75f814baa95faa606eb5259defe3d95a7802c3efde77e3bd99df9e1bdd0f6e663eda3
-MISC metadata.xml 2186 BLAKE2B 849f52c2a72b9891732476203f9368204e0323a21306ef11a5b114ab66d9946b5028ad6b424f659dfa5cecf88b90e1a2fe3a55b8868f02a3f999151b19f85f82 SHA512 57caed2ca4c63ddb76ef643c1dcc76662efc767c37d2c0c084abfea0af864e8fbdf6d7b041114aad2478f4b0ebbace4dde0a427a4464e5d785ec9eac78f4fda3
+EBUILD opendkim-2.10.3-r17.ebuild 7372 BLAKE2B 158317c73d7714a034b772eeda3c1e63e2583400f9887001f39c0bb9561a10f7e019713d0a857a7b7dc7fd0e17aa14a0a59849fbc5c373db56f9a2f27ba7d133 SHA512 4d6221b6e46c07b5626c7af614da38708a8c825f929f43252f459a87089dce484c10507a529fb805aec3f85430c5fc95a059a80dc24ee9f200a6a98d2893ef9f
+MISC metadata.xml 2316 BLAKE2B 5bda2db8ef7a54711366213e84b3edb8a93e5327737a433a445d28a482e92e4c5e29e9dc22d318ba4c294d273f048a63f1e10999e132df9cdcbbc05c12c29d4b SHA512 4720d75af10968bfdcf4a53c2571724ad164ea081dd30b39568467b5eee25f6df25c8caf8b4551ddb2f2e97889b8ddff1fb10a7e24e1eaaf340c8d7bab542837
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index e70d2e70d706..70cf6ebedb92 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -60,6 +60,9 @@
       Add support for using <pkg>dev-db/lmdb</pkg>
     </flag>
     <flag name="query_cache">
+      Obsolete, use "querycache" instead. Flag will be removed after next stabilization.
+    </flag>
+    <flag name="querycache">
       Add support for query caching (requires 'berkdb' flag)
     </flag>
     <flag name="stats">
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
new file mode 100644
index 000000000000..d9b8c07b0c5e
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 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"
+)
+
+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 32bdbd401a2f..d0c411e4aefe 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 768 BLAKE2B f9fcb819281ac3eadbfc22875fdfa0d663cd5c73c9e4221ade6af260ae0f3bfdbb5b396de53b297a7346120cbc36b06a698d6ae1cb3df0b916a1842944751d2e SHA512 d2f7ae5dd159315b6f96bea798796cd6ee9ff7a3fd07329c80e7764fc1e9d9cc35fab481dccb369dea0f1682590ecc17ec45448be514602626bd565dab527257
-EBUILD opendmarc-1.3.2-r1.ebuild 1522 BLAKE2B d75259d5ce9c44e3f8ba59bba674d520d886d150843298dbef587843f842d7ca8c9b368140ab4daffba1c4222245254d818bc868d5e33c6c4e18b4618c280093 SHA512 27d9c2f088c7a5789837e49e8357a3f7100852e752786060d5eb00854cbf552bf3803364ecb181aae7c13b2e5e2abfeb21f8b11ca08e98259618e77eca170250
-EBUILD opendmarc-1.3.2-r2.ebuild 1656 BLAKE2B ef0130e15886f9fdb8ee8fb5fedc85b7aa98b1660870ed597c453df7771e74a3eb1b2b59fc02235f37218260af5365e0fafa044c1a60dfe017a7d3f6f138496e SHA512 8a21ac243cdf5e2a37ae1716c62c23f94d2b8bd3c3ac68713831ab3ed02448f1a456985c16465940b410e264534a5acecdc9b1d54a17f9328973ac7ce319ebe8
-EBUILD opendmarc-1.3.2-r3.ebuild 1718 BLAKE2B d27b7e5625226546de9be5a81e2d7d69f50c88556c2127899336cb5bbb990a29b1808f487fbf5e3c773861cae824274ed1062ea723b324bef6a004f3f983c0df SHA512 58b97c608a4f3e6cdf5103ac25ed693362389001ce042569071b1ec2c504ef9db9192d31c1c9e107ca5e4d10b9f19bb8af276f28f779731ff7d5b367c3040004
+EBUILD opendmarc-1.1.3.ebuild 758 BLAKE2B 19dbe9ce41807931e4e02c506275ba97472440647f07d2f368c651d2761016cd553c1bdea90d2036d218de0e00b8b6b37b3607bf24faf47ff2d7fcfdfce54ce8 SHA512 064609b575f3722909e89b763336ec8f891a3dd320b83012f966edb949ba8b35a84b3691f2cfbaccca9f53c76df73955cab37ef63c7fcbd555352c1569a3554a
+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-r3.ebuild 1708 BLAKE2B 88ce826ce14e970bcd832ece2ff96b867f7b8133da62767408008daff9cdb06f98af4318551b810b6e30283e15c71f8a9939ebdc28ce54ccfd8cd24994b20fc7 SHA512 4116e544c6bb87c1cb49e264a6831487d54a4214cb8900b1457a381f61153ff16615f87288927b24ba8e7b65b75018d4f17b40bd479ba6bb178b85f3da4405db
 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 d57dcbb45999..de20ec167141 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/DBI
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
index 2cc6694ba6fd..cd314a38aa75 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~x86"
 IUSE="spf +reports"
 
 DEPEND="reports? ( 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 37e83e7c0f37..7bf2976ccd89 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
index 2482aed4e1f8..5b30342c8b05 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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-extras/Manifest b/mail-filter/opensmtpd-extras/Manifest
deleted file mode 100644
index d7f1d5aa05f6..000000000000
--- a/mail-filter/opensmtpd-extras/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST opensmtpd-extras-201606062304.tar.gz 631098 BLAKE2B 2e6de8b4a24e6ca9120c907b48ac77bc3cc12e352dfb081c1ed61c291eb146f19b714b5ca04077a91ee063cf32db8330e4ba9c8c344e5c130855940c4bc8e366 SHA512 7af916ed71fb81518bccbc7a82946a2a8252d2b70663238d7eea21841c82926221f03ab7afebd79d49f41e970e62c2dd70234ebaa0d27be5a9c5bbb4ae4ef7d8
-DIST opensmtpd-extras-201609141255.tar.gz 561289 BLAKE2B 55aa0f2fe2eeaae9d2f2ebefc20da83041a0a09c1e8b508813df3535c6563edc10bd311f8544b359a984327bf9e7ac8e2ea3618cc53b570678ab65b7dd64db90 SHA512 df9caf235095edd1f8535e41a3aedc51a5674a62d66d0749d5bb0d4433f3ea54e0b31a8b3a4d619b7ca79b64bcb1576b97f220c60cb3f48080d1972b7a46cc0b
-EBUILD opensmtpd-extras-5.9.2.201606062304.ebuild 2180 BLAKE2B 8a6e4d8adcb28bc749a5218b2c843ed144ac1fcf38a8c938bbcd99190643183bf4ade856fc548e35a2b05cdfb209b695f34f0ee0e0e8e87599e5857316a19233 SHA512 4e8fe5ef227ce92b446bb0d882457f3766b489c0ff7e68f10918e2d5b13fb7cc8c471e7eb1644c189249ccf709950df1a3903c68dd692eb9a24f5dc1f5b42698
-EBUILD opensmtpd-extras-5.9.2.201609141255.ebuild 2028 BLAKE2B 319e132a27d05db0929643be4ff9f32ea8af7c4048f3d243c948acf13bd47725d4f386d99a459379523f6f8fd093b7175c7ad90afac784f36d966a98b9e39a63 SHA512 561406e0005c66bbab19bcdfa8f6e7fff792c6da9367645423bcb2df3d7d64cbd621f8b951ef72672d7e72b3c2dc1a8c596cf26f0fbd8bcbbefeda7665b0e00a
-MISC metadata.xml 2332 BLAKE2B 8bf79bb4a7dd0e8ae8f6e0a9d06e199cf859045a24afdc431a8dc1536739e3163235c0228ba60bf768b4679c4e3f2fbfdcdaa1c30643a42cecd7addf44120053 SHA512 5f103f63090b859599f9224c5c9c8afe570b3ecee690f489d53a8fc76b6174e601235ad6cba13ba0a73be0e1a787e75e56eacd4009cd8faa32e19e90728db316
diff --git a/mail-filter/opensmtpd-extras/metadata.xml b/mail-filter/opensmtpd-extras/metadata.xml
deleted file mode 100644
index 7794758e2a4a..000000000000
--- a/mail-filter/opensmtpd-extras/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-	<use>
-		<flag name="filter-clamav">filter for scanning with app-antivirus/clamav</flag>
-		<flag name="filter-dkim-signer">filter for adding DKIM signatures to outgoing messages</flag>
-		<flag name="filter-dnsbl">filter for checking hosts against the DNS black lists</flag>
-		<flag name="filter-lua">filter for interfacing with dev-lang/lua</flag>
-		<flag name="filter-monkey">filter for arbitrarily rejecting random emails</flag>
-		<flag name="filter-pause">filter to pause on new connections</flag>
-		<flag name="filter-perl">filter for interfacing with dev-lang/perl</flag>
-		<flag name="filter-python">filter for interfacing with dev-lang/python</flag>
-		<flag name="filter-regex">filter for regular expression matching</flag>
-		<flag name="filter-spamassassin">filter for scanning with mail-filter/spamassassin</flag>
-		<flag name="filter-stub">stub filter</flag>
-		<flag name="filter-trace">trace filter</flag>
-		<flag name="filter-void">void filter</flag>
-		<flag name="queue-null">null queue</flag>
-		<flag name="queue-python">queue for interfacing with dev-lang/python</flag>
-		<flag name="queue-ram">ram queue</flag>
-		<flag name="queue-stub">stub queue</flag>
-		<flag name="table-ldap">table for lookups with net-nds/openldap</flag>
-		<flag name="table-mysql">table for lookups with virtual/mysql</flag>
-		<flag name="table-postgres">table for lookups with dev-db/postgresql</flag>
-		<flag name="table-redis">table for lookups with dev-db/redis</flag>
-		<flag name="table-socketmap">table for lookups using a socket map</flag>
-		<flag name="table-passwd">table for lookups using /etc/passwd</flag>
-		<flag name="table-python">table for interfacing with dev-lang/python</flag>
-		<flag name="table-sqlite">table for lookups with dev-db/sqlite3</flag>
-		<flag name="table-stub">stub table</flag>
-		<flag name="scheduler-ram">ram scheduler</flag>
-		<flag name="scheduler-stub">stub scheduler</flag>
-		<flag name="scheduler-python">schedulre for interfacing with python</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">OpenSMTPD/OpenSMTPD-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild
deleted file mode 100644
index 989e81fd986c..000000000000
--- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201606062304.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools versionator
-
-DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD"
-HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras"
-SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_COMPONENTS="
-	filter-clamav
-	filter-dkim-signer
-	filter-dnsbl
-	filter-lua
-	filter-monkey
-	filter-pause
-	filter-perl
-	filter-python
-	filter-regex
-	filter-spamassassin
-	filter-stub
-	filter-trace
-	filter-void
-
-	queue-null
-	queue-python
-	queue-ram
-	queue-stub
-
-	scheduler-python
-	scheduler-ram
-	scheduler-stub
-
-	table-ldap
-	table-mysql
-	table-passwd
-	table-postgres
-	table-python
-	table-redis
-	table-socketmap
-	table-sqlite
-	table-stub
-"
-IUSE="${MY_COMPONENTS} libressl luajit"
-
-# Deps:
-# mysql needs -lmysqlclient
-# sqlite needs -lsqlite3
-# redis needs -lhiredis
-# postgres requires -lpq
-# ldap uses internal library and requires no deps
-# spamassassin uses internal library and requires no deps
-# clamav uses internal library and requires no deps
-# dnsbl needs -lasr
-# python requires python, currently pegged at 2.7
-# lua requires any lua version
-
-DEPEND="mail-mta/opensmtpd
-	dev-libs/libevent
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	filter-python? ( dev-lang/python:2.7 )
-	filter-perl? ( dev-lang/perl )
-	filter-lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:* ) )
-	filter-dnsbl? ( net-libs/libasr )
-	table-sqlite? ( dev-db/sqlite:3 )
-	table-mysql? ( dev-db/mysql-connector-c:0= )
-	table-postgres? ( dev-db/postgresql:* )
-	table-redis? ( dev-libs/hiredis )
-	table-python? ( dev-lang/python:2.7 )
-	scheduler-python? ( dev-lang/python:2.7 )
-	queue-python? ( dev-lang/python:2.7 )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 4-)
-
-src_prepare() {
-	eautoreconf
-}
-src_configure() {
-	econf \
-		--with-user-smtpd=smtpd \
-		--sysconfdir=/etc/opensmtpd \
-		--with-lua-type=$(usex luajit luajit lua) \
-		$(for use in $MY_COMPONENTS; do use_with $use; done)
-}
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild
deleted file mode 100644
index 6229e20cb006..000000000000
--- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.9.2.201609141255.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools versionator
-
-DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD"
-HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras"
-SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS=""
-MY_COMPONENTS="
-	filter-monkey
-	filter-stub
-	filter-trace
-	filter-void
-
-	queue-null
-	queue-python
-	queue-ram
-	queue-stub
-
-	scheduler-python
-	scheduler-ram
-	scheduler-stub
-
-	table-ldap
-	table-mysql
-	table-passwd
-	table-postgres
-	table-python
-	table-redis
-	table-socketmap
-	table-sqlite
-	table-stub
-"
-IUSE="${MY_COMPONENTS} libressl luajit"
-
-# Deps:
-# mysql needs -lmysqlclient
-# sqlite needs -lsqlite3
-# redis needs -lhiredis
-# postgres requires -lpq
-# ldap uses internal library and requires no deps
-# spamassassin uses internal library and requires no deps
-# clamav uses internal library and requires no deps
-# dnsbl needs -lasr
-# python requires python, currently pegged at 2.7
-# lua requires any lua version
-
-#filter-python? ( dev-lang/python:2.7 )
-#filter-perl? ( dev-lang/perl )
-#filter-dnsbl? ( net-libs/libasr )
-#filter-lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:* ) )
-DEPEND="mail-mta/opensmtpd
-	dev-libs/libevent
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	table-sqlite? ( dev-db/sqlite:3 )
-	table-mysql? ( dev-db/mysql-connector-c:0= )
-	table-postgres? ( dev-db/postgresql:* )
-	table-redis? ( dev-libs/hiredis )
-	table-python? ( dev-lang/python:2.7 )
-	scheduler-python? ( dev-lang/python:2.7 )
-	queue-python? ( dev-lang/python:2.7 )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 4-)
-
-src_prepare() {
-	eautoreconf
-}
-src_configure() {
-	econf $(for use in $MY_COMPONENTS; do use_with $use; done) \
-		--with-user-smtpd=smtpd \
-		--sysconfdir=/etc/opensmtpd
-		#--with-lua-type=$(usex luajit luajit lua) \
-}
diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 70f35bd8aa4c..4fd146456214 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -4,6 +4,5 @@ AUX policyd-post182.patch 1567 BLAKE2B 7019004993501396bada4754b40dbbf09e507220d
 AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e6f57ed531fc8aa5c22ea05ce63767e011754d1fc4aeed03b1d0cb1ef07705bf734c4e1f3b5f53 SHA512 6fbac91a71bd556e864b70534a57fcc60bf4a838ff780ee878b257313e12205ae95402c591cc62604dad8d1ee349ecea74c1646429c39587dc0ba13a697ca68f
 AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
 DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
-EBUILD policyd-1.82-r1.ebuild 1974 BLAKE2B 9467c9cb11441d4e528717b1c01abb878b18f02e0321c3195c4ae359ca413ed16d4abb28c54834494661ee92124f7ccb9da8439048c2ee0f75e48b7bbf3b44e9 SHA512 17c253ac9d1f3c0b8e2eccb320e1fc3df627014828fbc4c95f3438b67a27075fb703eb42c806644dd6e9741450b897aaca11e1799255a257269513fd228caf2b
-EBUILD policyd-1.82-r3.ebuild 2032 BLAKE2B f2e98fb86aa068c899f1900224806cfc71d8858c195f6c15ee8276a9b571b029f0de075fc469e0f513936281e08d6907197616371a5ca78114be60f6ee762f5f SHA512 705f158545acf90e1d2dcffddcb3b5f9f7c6f562c7f98116771f558f2486139a9189d34f94417ea39a5636295d12b8b54ca7b189658980ea38f61ad1684871d7
+EBUILD policyd-1.82-r3.ebuild 2030 BLAKE2B 30bf9e509d433fa619d5f603bb3a5cafbcc916ff6e133be6af8b8f20b780c8f9d9337f27065592a23b9b92d164ee8c7d64860be19b29d67183beb5259e9bc81f SHA512 346e21f8ca413c058e2a22a6a3efd17869379145c640a54fc4f5b00d64e9379aea8e765484884f528b6c834321b1ae13d792fffb3266a1b3c385f2822222c82f
 MISC metadata.xml 249 BLAKE2B cea7fd2e21aaa481df4b19103927fcdd71b9e296720387e01aed419f8f27ef74ed751add3132fd2f811f55265315453ca1b6de218a4b4b78c06b6ec3bcb6d312 SHA512 d9f2d22053f3ff8e8dd64e0a1695fa371612f1f57d62bf1a914ce28443cc910dfb5b4f53b61742668da15ae3f8b9dfd3004c7fe980a71922d0fcf7bc8952ca9b
diff --git a/mail-filter/policyd/policyd-1.82-r1.ebuild b/mail-filter/policyd/policyd-1.82-r1.ebuild
deleted file mode 100644
index ab88aeb093eb..000000000000
--- a/mail-filter/policyd/policyd-1.82-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Policy daemon for postfix and other MTAs"
-HOMEPAGE="http://policyd.sf.net/"
-
-# This is not available through SF mirrors
-SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-DEPEND="virtual/mysql
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-post182.patch"
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-	sed -i -e "s/gcc/$(tc-getCC)/" Makefile
-
-	ebegin "Applying config patches"
-	sed -i -e s:UID=0:UID=65534:g \
-	    -e s:GID=0:GID=65534:g \
-	    -e s:DAEMON=0:DAEMON=1:g \
-	    -e s:DEBUG=3:DEBUG=0:g \
-	    -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
-	    policyd.conf || die "sed failed"
-	eend
-}
-
-src_compile() {
-	emake build || die "emake build failed"
-}
-
-src_install() {
-	insopts -o root -g nobody -m 0750
-	mv cleanup policyd_cleanup
-	mv stats policyd_stats
-
-	dosbin policyd policyd_cleanup policyd_stats
-
-	insopts -o root -g nobody -m 0640
-	insinto /etc
-	doins policyd.conf
-
-	insopts -o root -g nobody -m 0700
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
-
-	dodoc ChangeLog DATABASE.mysql README doc/support.txt
-
-	newinitd "${FILESDIR}/${PN}.rc" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
-
-pkg_postinst() {
-	elog "You will need to create the database using the script DATABASE.mysql"
-	elog "in /usr/share/doc/${PF}/"
-	elog "Read the mysql section of the README.txt for details."
-	elog
-	elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
-	elog "  check_policy_service inet:127.0.0.1:10031"
-	elog "to your smtpd_recipient_restrictions line, or similar."
-	elog
-	elog "Also remember to start the daemon at boot:"
-	elog "  rc-update add policyd default"
-	elog
-	elog "Read the documentation for more info."
-}
diff --git a/mail-filter/policyd/policyd-1.82-r3.ebuild b/mail-filter/policyd/policyd-1.82-r3.ebuild
index 0d1be22af1b6..1fc4a90aaeda 100644
--- a/mail-filter/policyd/policyd-1.82-r3.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://policyd.sf.net/"
 SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="libressl"
 DEPEND="dev-db/mysql-connector-c:0=
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 1a82e72d5c3b..b912ad78aca3 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,6 +10,6 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
-EBUILD spamassassin-3.4.2-r2.ebuild 7613 BLAKE2B 690cd70de2f99c3270d8bc2b7a07e9ea7631a8bd6954fd988c34c96058a39b1c95daa0421d63e1604b036258fab95601b3b72d158c2397320f7709e85e959a2c SHA512 1a6cefc7cd60ebe36463abf434dcba826b7758764c246e8b147e159c627241e90987a72e8de3a08b50a53d7ddf1e6df6f663e4269efdcf1defe11888d5a97264
-EBUILD spamassassin-3.4.2-r6.ebuild 8696 BLAKE2B 15119b4bea3d9df6d94274f9f977535abb032222eeb08cbc1bf33c6ac45baa931dd1bf13315469ffdf397bf567f56546039323409be321f86f3675bfb5ff3a85 SHA512 6dddf4ebdef75a6d1b19464c53d750d5060ad6d0a1e40f80dd13fac495fccc7a006b632a47a32993281c2be021bb343ed0e17b5928818c0e01307ac893a91f66
+EBUILD spamassassin-3.4.2-r2.ebuild 7603 BLAKE2B 906e4a749fa313cf6cb12ad916294ddef33089a718deb7c22c30dda2dda6ca0df374a01e2be2bb18a328bbef7b92483fb15eeaa4b8c57407714a4bc969245cb0 SHA512 d1459251e1157046effdd7b97a63bd43f210f9967bcd09f9bf03d867438789057dd8313b823faebd2d1463c5910a887252fb0a5845b4ec40ba5389b175f923a8
+EBUILD spamassassin-3.4.2-r6.ebuild 8686 BLAKE2B 94a8e2f0d0f23a94e5755847fb228adf10d23d982286d69b156a164b3a1e4ef8b94597fceba04c78bf6060ee07a9c8cb1e29c1b9ce53d03476546b10196a142e SHA512 b901cdfd36912b8272083b0052297eed951f153cbfd17cb514a2ca7521738c3a5694540fdb6d888913a8ebbd5fcb7c96bec132bf19232dfd121ce26f616c02cf
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
index ee3aa7e8f19a..71ac354ea39a 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 ~x86-fbsd ~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"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
index 8ea2c2e6acee..3baf1b738bc0 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r6.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 ~x86-fbsd ~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"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index bac04d83c57b..52c280f35ac4 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -1,8 +1,6 @@
 AUX conf 665 BLAKE2B 21638b47bcd8f90b5521c131aae983ec7ceb51fc470eb991f5fe1b670d267efc0314b787e8e6f094b793a08239717d0d183766a676b127320a59037ccd718c7b SHA512 f184a784261923b8e36279c5cca24783812617220d266f5f16f15e83e2e2f3b0f9c1b9a82b9b3ac7d297b28a15af78d858f9f250757171187e6ff2c885a3b741
 AUX init 526 BLAKE2B 9b78b45417c996f9e533d151a5c7f7677857715c0f05ed586088fd4a9796a4442fad06ae1b8ed53deb3adc880fc985519a22fe513abbea1f57b581d6d1dc92f5 SHA512 bae9152a51e07f702649b64f0d44b12d115242dd9b44bc12b2695647eaedd635180d6cff31c26a203df7ce0ae7623db274c64d2c3eb80258aa0c6a92f31cb55f
 AUX init-r1 521 BLAKE2B 42b31324c1b9a3226429aaa58af1d19f280b09ab40c21769de401f533b7436df21bdada171de43b0888ebd83fbfbbb29227523ed2f608d696c0c0d8335dccd07 SHA512 fc32a28811b9d7f0d6f6d3d53b10df1b49b8ec68aaa058f5309809aa4c1e4ac17b5823b3b0f46b0823297b00548c45acff54acdb9c5f8e612260462fde2f8d72
-DIST spampd-2.30.tar.gz 25001 BLAKE2B 039e68a214e20f2b2410a213cc7c99ef40fe6c491e02784f7f00e105380f99f7dd00d70866c9ac73212d740615b96b60a4c7f53399219425b5a5d77c10a003b1 SHA512 6f45016ef449e914bd23ddc1b9de508e7d068f198e587038de5b54dddb6ce4de451eca7f7e63a91e6a51423765fd971107a39a39c4f64e0ad1a37d5a885775f9
 DIST spampd-2.42.tar.gz 202504 BLAKE2B 9ad74d3199345ba54c613fa928cfd177fded551ca304dd22c802b996b95e2905d40d92bfa25d7c64b823b2357c657f283c9550b635f3188fbbb42fb793cd2b8d SHA512 5c44b5902efd6c628fb62887b755012b137940d7d687f5d9489e5f96623d6eeca5f3641a76fe3b2ce8585040c3661e19df981c612cdb1a767b4a46fec982fa4e
-EBUILD spampd-2.30.ebuild 664 BLAKE2B 422ca8828cdfbcb67646f910e4aaa12341fcfaa11be84e08f3412040e54621216d0eaed37cd8fb0d6784d2cad4426f28eb4429de4e4ba73350276ae57e9165ae SHA512 6b3b213b3e8187a6737a05fceb5696db22df48e659ed4e9be68fd188d1f83c5c393dc57a9ff891c6176df6b9df6aa86a08236de8dcdbf2bdb9c46c8c5bf8d7ae
-EBUILD spampd-2.42.ebuild 709 BLAKE2B 44fd3eb5c3d3d39c6bc31cd3debd8f8d6cb753be0fcb346f7fa81fed58861ca4edf466d1803238ee21c7e935029669073c2e1d3def3b3faede53d255b457ed6a SHA512 ddd3a1bf88c13c1acea7b03ab6ce235a687e7e7c290c1048c971cc14628796da9eb122e92b23f8d9fae81b8625b77fd33b83330388d84256cb71573233c08595
+EBUILD spampd-2.42.ebuild 705 BLAKE2B fcf41d55115965a29547438c7f05d8dc6e86a086fb09c84bafe7f2a07496a7ecd312222548ae98a9839a443fa842013bf677216c80ef3868e6d38e2c244b9562 SHA512 1f5e4b9370233a5c1b405a46bd4d97a17a20421cc18a2cfd9b977d78807e5514e42651942de7aa12222156ce79dc58acfd9d5988fc30c450448759b4f6071287
 MISC metadata.xml 247 BLAKE2B 6e99b6d8d84d2165e1d927d94eddb3d8827ffa0b8c9baf1ff2e571167b997737d4a1bffb3da540b7d8237db37ef0ba15d2698c7c5275dfbff97a168bd64bb917 SHA512 2c3209cbb0b1c88fd242e69ec40e06a8aa16b4980203c20f9ce61fd5925cdefbed5b9ad9c19cc3baba68ca72565d6cae2cb404e291461ce9e607f0230ec99f3c
diff --git a/mail-filter/spampd/spampd-2.30.ebuild b/mail-filter/spampd/spampd-2.30.ebuild
deleted file mode 100644
index 4c88f07d498f..000000000000
--- a/mail-filter/spampd/spampd-2.30.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="spampd is a program to scan messages for Unsolicited Commercial E-mail content"
-HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
-SRC_URI="http://www.worlddesign.com/Content/rd/mta/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-Server
-	mail-filter/spamassassin"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dosbin spampd
-	dodoc changelog.txt spampd-rh-rc-script
-	dohtml spampd.html
-	newinitd "${FILESDIR}"/init spampd
-	newconfd "${FILESDIR}"/conf spampd
-}
diff --git a/mail-filter/spampd/spampd-2.42.ebuild b/mail-filter/spampd/spampd-2.42.ebuild
index d45e51557bf9..357e81734992 100644
--- a/mail-filter/spampd/spampd-2.42.ebuild
+++ b/mail-filter/spampd/spampd-2.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
 SRC_URI="https://github.com/mpaperno/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl