gentoo (leap year) resync : 29.02.2020

32 files changed, 270 insertions, 54 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 82979e744563..db43e9e284b9 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 3d0e639c08d1..79fd88bbdf9a 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -7,5 +7,6 @@ AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca0
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
 EBUILD amavisd-new-2.11.1-r3.ebuild 5219 BLAKE2B aa9f9c6844ffd09cee44d36602487aa17e86c2fee3aabd65e4df299d2830f6a8826ee04596abbf58d2d5a7ce1ded70156d960c407e8ca7c92fbf3e8d8cdfe2fb SHA512 89a12c54c47c1857f2cba6480240b984ef8e65098e704b86a9c785aae466d01fd9f1dc1602494df710523960074ec868075fe70ec1b83bd1de69c7440fe84d2d
+EBUILD amavisd-new-2.12.0-r3.ebuild 5343 BLAKE2B 31b53a6b2668c42cef061b2c26d837198cc00c3ef9a6cceee88f0cf0b487d9d68076a88b843ef284fbecdb97fdf93c52ed6afe5b068d469537a28aef6ea10270 SHA512 254627898ad35c2f0353f862889744f754c17fa0fed20ae408df9a44c5ff6f30552416294077b78fba777f3a576602227b777661eb388390b1dde9a7e44efafd
 EBUILD amavisd-new-2.12.0.ebuild 5270 BLAKE2B 9937d06a8d7775df99072363f87fbcc5b1b4c770cfbd62285f3aa6446f45327b9b1dd4d540388df6c030f3da9755e2af0f327b4858f4259df936ab576dd2b83c SHA512 b9722c2e63747f68d28c419f1edfe89842f47580bbd393ed13cad7c2a5c1c8132dc21d6e4e0d8726e8bd3a1bfebff42cd9ef01386d8d3ef642fe74cf76066a82
-MISC metadata.xml 930 BLAKE2B 83024c982d4af5cb86fcc1322fd2018ac9f1756fe64ace76abf8e4bcba94ba96241e834494978fd9dc296cc3264146afd6a8ac9df945addac38e0723ea2484de SHA512 83e086908a3945a6d29fa9a02d41931e3a8fb39454fdfdfe77bd72e2019d02679bf270f64433f981a9d9c1bf3532f49031ecbdae931e3d0433147283f934fa3e
+MISC metadata.xml 925 BLAKE2B b75aca7f3afff0d320516d293b6c88b34be4599a0233675f3bdeb3881a857a1b6316dba66cff118667d0c455650c0b23da3f471dbab9f9710cdc3dcf23b55aae SHA512 27cbf8cebfe1e2611193a954edad5fce81cf27f2a4f7d1746d975529317ee45b94b250c47c013856e18f339c3ea234b59fc3990aac5176bffec67786e67f8d1f
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
new file mode 100644
index 000000000000..12e9e6ba1f1f
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+
+MY_RSPAMD_DEPEND="dev-perl/HTTP-Message
+	dev-perl/JSON
+	dev-perl/LWP-UserAgent-Determined"
+DEPEND="acct-user/amavis"
+RDEPEND="${DEPEND}
+	app-arch/arc
+	app-arch/bzip2
+	app-arch/cabextract
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	dev-lang/perl:*
+	dev-perl/Archive-Zip
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	dev-perl/File-LibMagic
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-stringy
+	>=dev-perl/Mail-DKIM-0.31
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/MIME-tools-5.415
+	dev-perl/Net-LibIDN
+	>=dev-perl/Net-Server-0.91
+	dev-perl/Net-SSLeay
+	dev-perl/Unix-Syslog
+	net-mail/ripole
+	net-mail/tnef
+	>=sys-apps/coreutils-5.0-r3
+	>=sys-libs/db-4.4.20
+	virtual/mta
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Temp
+	virtual/perl-IO-Compress
+	virtual/perl-IO-Socket-IP
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-HiRes
+	clamav? ( app-antivirus/clamav )
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	razor? ( mail-filter/razor )
+	rspamd? ( ${MY_RSPAMD_DEPEND} )
+	rspamd-https? ( ${MY_RSPAMD_DEPEND}
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-SSLeay )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/lib/amavishome"
+S="${WORKDIR}/amavis-v${PV}"
+
+src_prepare() {
+	if use courier ; then
+		eapply -p0 amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		eapply -p0 amavisd-new-qmqpqq.patch
+	fi
+
+	# We need to fix the daemon_user and daemon_group in amavis-mc even
+	# though we're going to run it in the foreground, because it calls
+	# "drop_priv" unconditionally and will crash if its user/group
+	# doesn't exist.
+	sed -i	\
+		-e '/daemon/s/vscan/amavis/' \
+		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+		"${S}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file - dkim"
+	fi
+
+	if use zmq ; then
+		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+			|| die "missing conf file - zmq"
+	fi
+
+	if ! use spamassassin ; then
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+			"${S}/amavisd.conf" || die "missing conf file - sa"
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	dosbin amavisd{,-agent,-nanny,-release,-signer,-status}
+	dobin p0f-analyzer.pl amavisd-submit
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent
+		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
+				 amavisd-snmp-subagent
+		dodoc AMAVIS-MIB.txt
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		newins LDAP.schema "${PN}.schema"
+	fi
+
+	# The config file should be root:amavis so that the amavis user can
+	# read (only) it after dropping privileges. And of course he should
+	# own everything in his home directory.
+	insinto /etc
+	insopts -m0640 -g amavis
+	doins amavisd.conf
+
+	# Implementation detail? Keepdir calls dodir under the hood.
+	diropts -o amavis -g amavis
+	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
+
+	# BEWARE:
+	#
+	# Anything below this line is using the mangled insopts/diropts from
+	# above!
+	#
+
+	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
+
+	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
+
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+		amavisd.conf-default amavisd-custom.conf
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dodoc -r README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+}
+
+pkg_preinst() {
+	# TODO: the following is done as root, but should probably be done
+	# as the amavis user.
+	if use razor ; then
+		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+			elog "Setting up initial razor config files..."
+
+			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local d="/var/amavis"
+	if [ -d ${d} ]; then
+		elog "Existing data found. Please make sure to manually copy it to amavis' new"
+		elog "home directory by executing the following command as root from a shell:"
+		elog
+		elog "  cp -a ${d}/* ${d}/.??* ${AMAVIS_ROOT}/ && rm -r ${d}"
+		elog
+	fi
+}
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index a3ae4f141113..358d0af9a716 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>antivirus@gentoo.org</email>
-		<name>Gentoo Antivirus Project</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="courier">Add courier support</flag>
 		<flag name="dkim">Add DomainKeys Identified Mail support</flag>
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 7d9bcfe793d3..a512e61ba6f2 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 3771 BLAKE2B 0c7e1f6a519225d5d7b28e91b853031e045c61b97bf6257d774b22cef7cb1b121eca0da6fc95806e538406bf1dcd38b162358ad749fddee8a97877ebc58d4add SHA512 fdea152b7d3aa4873f26a8ba630e634039ef2824c82019d35e4c89df275e7b67f84e16ac96f032d36f1825997d25ffe636d9564cac52df6ea43b6691a9f8806c
-EBUILD bogofilter-1.2.4-r3.ebuild 3784 BLAKE2B 563774aae6bf7ee3e09e8ddbec2b3a30f79f632ced67c951db12494b77625bec036dd2a89b1b523b22852a11efae3938b48371a5798919bb2ce98cd76ad68f96 SHA512 2e055560e7c24d222012d462226bf0648643449b3fef18310dce77e898f3544a9d947d36d92f030f74c63d865977a75613f70ad59a3a1e360a842d2d0108c94a
+EBUILD bogofilter-1.2.4-r3.ebuild 3779 BLAKE2B 3a8f43929a8ad6459cea07837cf551169ae0d66cd3e45100c7c7b8188dfb97f3cf2f4d0b680dbc989e774d981a6f86151450b736a7a92d991460e6e9ff76dc72 SHA512 dfc20ea0b6ffcbca1a93d57233589636ca22696d0e2e47a3c436dccfca3f6c293be2d7eea49d95e8bfe8993b09c7296dab29505bbaf3d4fd2e92ec77a7cba92e
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
index 0c05b327f47c..7bb589b17c14 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
 IUSE="berkdb sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-filter/exim-geoip/Manifest b/mail-filter/exim-geoip/Manifest
index 5df711a0b3b2..635bff341e42 100644
--- a/mail-filter/exim-geoip/Manifest
+++ b/mail-filter/exim-geoip/Manifest
@@ -1,3 +1,3 @@
 DIST exim-geoipv6-dlfunc-0.1.tar.gz 306380 BLAKE2B ce51841c988f41e5dff9c545852985e94ed4ddcad7d4575d0001d39a67266ad1083b4bed8c49fafa8ac742e2c8d1a12f78585b29f5887ceecdd37c862bef8c7f SHA512 ab10cf8ccd89772c1b925115d45cbd429f9ad577b4b951b120162516f0702331b8f8cca780d4aa1714435a907deed52f50acb06e9be888136a1745834d73215e
-EBUILD exim-geoip-0.1.ebuild 626 BLAKE2B f0331c565d9335a63b3979e317b034c6dbc96b7d542766fd0632cc2847dbb046f65e035ce2c5fcf3eff3c7b5d724153afe08a5e34d9aa3b5474b7f27aa20d4fd SHA512 51dc0c3bf1ca2145b31b847cc35b697268c8a6a1d4cdf4bdac14bcae6445c435a32db626de63e4b6312191ded289fb3a58aaac0bb4633795775fafeba10c4453
+EBUILD exim-geoip-0.1.ebuild 626 BLAKE2B 3f6839ca14c0adfadb9b522697baf7ecc5fea9f6653d32ed4ff61b7e75c15ed4230b22695253b59fcf1f189b9e314abacc93732b7275c98e19f2c423e3364833 SHA512 d747e18c3811f0abc183d5d24af3e1c363c2cf180b427076977521e73a08945e49a5734ae91aceb0d8981ea19fb7e6d4de0afdcdfc3b7eb689698bc639d3619d
 MISC metadata.xml 563 BLAKE2B 04a42876b10c10bb1e4941b0371a9e361023d48e12df440ec20cfdf3d641d830e1cb86e9ecb5c1bf07d1c5ab8bc574c3ec6fac51c11184ee63393583b9c66ada SHA512 62706fd3f95ae73470d26133ff28fe53011d4aa8268822218a69203a95de8b7474da67d8875c4f47953ab614d036a884254f714157f6aa31bbedec167372514b
diff --git a/mail-filter/exim-geoip/exim-geoip-0.1.ebuild b/mail-filter/exim-geoip/exim-geoip-0.1.ebuild
index 1d9023b2a756..a2f6fdee4d5b 100644
--- a/mail-filter/exim-geoip/exim-geoip-0.1.ebuild
+++ b/mail-filter/exim-geoip/exim-geoip-0.1.ebuild
@@ -18,12 +18,12 @@ DEPEND="dev-libs/geoip
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/exim-geoipv6-dlfunc-${PV}"
 
-src_configure()	{
+src_configure() {
 	append-cppflags "-I/usr/include/exim"
 	econf
 }
 
-src_install()	{
+src_install() {
 	default
 	prune_libtool_files --all
 }
diff --git a/mail-filter/exim-p0f/Manifest b/mail-filter/exim-p0f/Manifest
index 342a7eeaa9b2..2b3dc6949711 100644
--- a/mail-filter/exim-p0f/Manifest
+++ b/mail-filter/exim-p0f/Manifest
@@ -1,3 +1,3 @@
 DIST exim-p0f3-dlfunc-0.1.tar.gz 307851 BLAKE2B 73bb80220ed65fadb17079b1e566664b51bea95ee12636296054b4bc8e3902d518ab1e63511d49c14f56e5ccb257ac10987fe8fd399c6e33c2f733a94f8f71df SHA512 9f913ba303bb42f6599ed044bb65954f993c2964d84ea0ff4e01e515c35ac7b58118fa6a304cba984499136438ad8f65bfe8c08e22c3be2d4c95f2950ab380b2
-EBUILD exim-p0f-0.1.ebuild 617 BLAKE2B 9982afe070659177285f3e44a052a68f074277a330b69e836ec36f358a5d7e3607c5a71e798bce5c3fb79bd2108b4d2af1795dc6bd8de63b17989f6225079642 SHA512 21f018c9eb46164d7915d0ada5cf8e0235d1ba842a429e5e51d5918567150a7997f10ac5dceab660c8670f0a32c1ad82b93ff5fba34634079eb4baa049bdfe8c
+EBUILD exim-p0f-0.1.ebuild 617 BLAKE2B 00c6b51a9fb865fb54992cd625b57af9c43af04330a27076c1d0964420e9694dc67e9cf3b4961e6955b167b14185df909fdf14eee5953fa75c1c4a7ae875083e SHA512 c3aa2fddeb8b99326ee6060e85b8b104e56d46fc7c0a546f1e58bf1cab5269747751ad46e5657f25bb352e17bc77761b7084f453feb6f4deea807ecbc8cefb5e
 MISC metadata.xml 583 BLAKE2B c5fc0490ecbd798b0e15bdc44e80dd3f796bb1e5592fe0b1a2a18f59fff2937b4982cca45b8e3fefd88a97af7e446f2cc638e405bfb78e67142790578d2ad942 SHA512 bf47f55a81bc369964e41f01f0d70b966349c5c03100cd0f156c66d6fbf210c9ef93ef6b338b265e927eb6e1fa7a687064d099d6d85b7b1a17210c2466f75cc5
diff --git a/mail-filter/exim-p0f/exim-p0f-0.1.ebuild b/mail-filter/exim-p0f/exim-p0f-0.1.ebuild
index 4357da030244..885ec0c74647 100644
--- a/mail-filter/exim-p0f/exim-p0f-0.1.ebuild
+++ b/mail-filter/exim-p0f/exim-p0f-0.1.ebuild
@@ -18,12 +18,12 @@ RDEPEND=">=net-analyzer/p0f-3.05_beta
 	${DEPEND}"
 S="${WORKDIR}/exim-p0f3-dlfunc-${PV}"
 
-src_configure()	{
+src_configure() {
 	append-cppflags "-I/usr/include/exim"
 	econf
 }
 
-src_install()	{
+src_install() {
 	default
 	prune_libtool_files --all
 }
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 21890a0bb725..16587fbc4031 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 1902 BLAKE2B de3d0019b827b59b3425f82bfac6bcf2581b7aa5db4f3062ed0febf263f82ba7562a204f9c8793441e268f19fc8a16df3e70192f3c6b0a923efb687255498b38 SHA512 47c4914ee441cabd72d963d0052b884ae8a484ca38df42e4da2326d8f9d1186ddd5993b96a8e4afea05a9c4102e84263f31f665c0027e142aa4ada00c72ae7db
-EBUILD libmilter-1.0.2_p1.ebuild 2036 BLAKE2B b22e729c6c4726ccfe6997778d36884c67a4396c37ff7ef60741d8a49426577e6ba547ddf4e8c66f84b7bba318e1c9b3e06b30a94f6aaaa201f7b835cf70b5ac SHA512 ec94ac7c597a4c7cc6e4593169981f009bc47bce0eb9e86883c9fb257e734c7ceab3dc4b7a721e1b2e47d819bc45133cb78f77ff16726e382e47d970e2d4723e
+EBUILD libmilter-1.0.2.ebuild 1901 BLAKE2B e324dc0842f55f7bcf7634473396cd0828d559500e2d4f43177711a3470eb4731cfdd8784d107d36912711ace6258f1d4ff917cd89511714de14505f32276840 SHA512 c6d71910cd8f7469b5b204c86b6d9fed5ea56e0d0ca6eb57153446d3e76a12a5ded001c3134109d80492cf9bd6b69f751a6268a900526ac365694f821e9414a5
+EBUILD libmilter-1.0.2_p1.ebuild 2035 BLAKE2B 560f20780de715cc6a740c25dab44d3d81aca58350504916e30d52730ff20f7ef4a433b10a276a0681157c110a9b675b594ca1fa576a57370c3e4f5630538271 SHA512 a3575852b0a9d8ce5c00f699911b26e951612380358a071c0c5b28b723cdeda8b66b0cfc8d12c1d9b5143a823a6a50f25a88676f32475ee6289dc3dad5f17607
 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 f2c3e1d172fe..cd3921b5f7e1 100644
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild
@@ -50,7 +50,7 @@ src_compile() {
 	popd
 }
 
-src_install () {
+src_install() {
 	local MY_LIBDIR=/usr/$(get_libdir)
 	dodir "${MY_LIBDIR}"
 	emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
index b7d5242cfdd5..f24ea5bf5d30 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,7 +56,7 @@ src_compile() {
 	popd
 }
 
-src_install () {
+src_install() {
 	local MY_LIBDIR=/usr/$(get_libdir)
 	dodir "${MY_LIBDIR}"
 	emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index e1e1705f066d..3e7d560eacb6 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -5,7 +5,7 @@ AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8
 DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
 EBUILD opendmarc-1.1.3.ebuild 756 BLAKE2B ae8b1292a30509d3a8c4dab5f7b2f46b4504ba3bc6d9e322f825a1eb265aa414e559f9d12b14358759f982c22dbe871714f39a0a46faaa84013e872bb5f58ac3 SHA512 6a3f85774f40eb47080432f7ea4102368d4d3e35df8f38e8ade4428b9b8c1e0ae04a95cabcddbf52e23ec243e6d1ba191a3b6be804811f6637486524de28e4c3
-EBUILD opendmarc-1.3.2-r1.ebuild 1512 BLAKE2B 3ca0ef4573fa16a1f123d1f5e92c24587a75695dc898f2e242d7985c44796f0525940672f4274d4d83bcc1ebe2920dc1109f7d44c813659bf88e501e8e3da89f SHA512 4cb2626f8073a210356dd645c84e26bd7a2a6a8383cabdabdb0de5bb37baea0dd874171abfdf283d5371fd6799ebb95b2e60b45498969dff15020a487037d09b
-EBUILD opendmarc-1.3.2-r2.ebuild 1647 BLAKE2B b1611ffb2147ff53b03113f703aafba1436703982ec081af88544a6698c34e738a05bb379fbe1b2ce876b078e496cb879d43f41bf22695cd3812a236206cc64e SHA512 f3b1581ac5e4773f626d00bdb177dbe4b2ec40eabf22f6b7f4e2237ebb6fcf12a52022c9464cf2fb5e1c000c11baa834b7f615e3633346a91988d2c8f1c9788e
-EBUILD opendmarc-1.3.2-r3.ebuild 1700 BLAKE2B b35ba56a6a2b5d3b225b4a3279f4ea87115e482802bcf31a011056d3f509a0c089f56cfa78237110cc29fa2aa2a9e9738b982dc20416b6b7c6ca8b0270134826 SHA512 c213e8454048eb5f85c71cacd875f3908b23c73598c00fe37e35d09bffd20c98f15ab735740ec468a83e81f71c064201fde0477cd87228344bfcd40622ac9e3b
+EBUILD opendmarc-1.3.2-r1.ebuild 1411 BLAKE2B 09744240801d95ffab1ddea96509c1e1796aab9b5787ad264984a9e94e943e07b52af49ec05670acad01a14685b1f38a099b387b1249a91f5a97305f2cb3b86e SHA512 b5a927769b5635124d815311daa6ff8057b4e735895e10726687c835fb19cf663e43d6e8c085a5e13e07d35c07d2ab22ff65f464f4de2ee26c05404bdda8def5
+EBUILD opendmarc-1.3.2-r2.ebuild 1549 BLAKE2B 8c975b7dff125f797a7f6f22fd9e60b2e072234c05a6697439d93ac52637da2e45f9e9d79a6592ae22d07ecb8815a126d1300bdbdb65653b91b600b11425a85a SHA512 65b8b9ca479fe98884dfe112c051ca8bf127fd66b49958a15ca9d8273566c3a7e93b62805cb557d46f298397baf2401d45a5ddb1445d5f1cbf5ca91873e247e9
+EBUILD opendmarc-1.3.2-r3.ebuild 1602 BLAKE2B 689bd025c502c9ca317ad8c0b32429d1b7be6bcad47b781c720379160f1b25b1465cf2ab1687f663b5b2257e6451d6f946cb0d898ecb0b48ebaaf81abc4f4618 SHA512 c5f1916754edfc07758f13cca0f8e87f34a213e5af46f0b50067752df9a8b19cbfe94abfd44eb99132ae80f8ba93e1313f1e75ef938c25c2b8b3a9faf7da098a
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
index cd314a38aa75..35988944a840 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,8 +38,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
 		$(use_with spf spf2-lib "${EPREFIX}"/usr/lib)
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 2e8161266b97..98462ace5613 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -38,8 +38,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
 		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
index b796ba773357..54d0eaccc931 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,8 +42,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
 		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index a5457c83083d..139b5fc44b8e 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -9,5 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e
 AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc
 AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5
 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
-EBUILD procmail-3.22-r14.ebuild 3660 BLAKE2B 007783fce92da6af610a8aff66ba28432f8b003c0b64218cdf5858e261e38fafc19423e898399c4ce84c629b0cb3551d95efeb415c02d3ad331cfcbe26dc7084 SHA512 137cb75e715ae1879c2872387a932ef72ab100d21e3267feb430a797341f10396e595e025fe39c93f28ac5ba21ca86b6947e3b35722aa7232a27bfc6cf0547d3
+EBUILD procmail-3.22-r14.ebuild 3660 BLAKE2B 96fecafbace3b7da0938ea76c75e5b1a40fb64ea6554e63e30f9530dece7b248423a2eedc4d29c6173efe58bca51f5e8ba604d4c344ffbcd1a161859284d3cb6 SHA512 43583656939473a6e32d2e47827270de1dfdfa1867779bdbaf2e396e78d9c430c5e4d5113e2a30ed8b527ce23507bdd96a4f3f085485852c81bf4cbcdace8793
 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 f8caa1c551b6..ca949f0929cb 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -21,7 +21,7 @@ src_prepare() {
 	# disable flock, using both fcntl and flock style locking
 	# doesn't work with NFS with 2.6.17+ kernels, bug #156493
 
-	sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
+	sed -e "s|/\*#define NO_flock_LOCK|#define NO_flock_LOCK|" \
 		-i config.h || die "sed failed"
 
 	if ! use mbox ; then
@@ -74,10 +74,10 @@ src_compile() {
 		"gcc"|*) append-flags -fno-inline-functions -fno-ipa-cp-clone ;;
 	esac
 
-	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
-		-e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
-		-e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
-		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
+	sed -e "s|CFLAGS0 = -O|CFLAGS0 = ${CFLAGS}|" \
+		-e "s|LDFLAGS0= -s|LDFLAGS0 = ${LDFLAGS}|" \
+		-e "s|LOCKINGTEST=__defaults__|#LOCKINGTEST=__defaults__|" \
+		-e "s|#LOCKINGTEST=/tmp|LOCKINGTEST=/tmp|" \
 		-i Makefile || die "sed failed"
 
 	emake CC="$(tc-getCC)"
diff --git a/mail-filter/rblcheck/Manifest b/mail-filter/rblcheck/Manifest
index fd746249c7fa..8c39c006a86e 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 599 BLAKE2B ceb97d7841615e21888af9e5c0cc6125a568c7abd8ac387479b03d57c0fe88a3b8a6474f6f01938c396b797ec5aaebae1a1de1e9b3a1638a7a3329c62c51f4f4 SHA512 7deb9263fc30f04920c476ea89c6ef50d699085a649490eb1debe5df3bb8afdddcd59167db872683c3d876fd7b57554e30e3e860a7ba9898b9833396c5db83b0
+EBUILD rblcheck-1.5-r2.ebuild 598 BLAKE2B 318189cc98cd6c141df90342bea181eb3a1464e47c8a231ad1898818d5111b777901d30620984b71d7e40e0e7f9c33772313603c4ef70a21fbea10fe8d5bfa71 SHA512 8ca4aac95d840a9e6761e52b1b4787211db0267ef697c799cc99c30a6b3f7552aea65fae7578ab2aa3e9b66561d7809e1e709af3f8de6c3a864469cac732e016
 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 8f2df0e0ff6f..f9305dbb4bf4 100644
--- a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
+++ b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
@@ -21,7 +21,7 @@ src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_install () {
+src_install() {
 	dobin rbl rblcheck
 
 	dodoc README docs/rblcheck.ps docs/rblcheck.rtf
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index d70d2546d173..ecbe503b95c2 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
+AUX rspamd-2.2-i386-hyperscan.patch 698 BLAKE2B 429b91b8d1984d601696e85d8be8b520d6ffa16c98d9c4365d619e25761c13ccd8850e051ed565eac91ab56cba10003c13c25e58fecfbd7eee546e80a0560bee SHA512 224a4aee34a25223e4f6f74957d19b45227d072e3042c8d2e3b699eb4fea2636817820f3cd91f3a5db0e3eff4bb17d9222a384cf27374bfd01704598be10591d
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
@@ -6,7 +7,7 @@ DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464
 DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
 DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
 EBUILD rspamd-2.1.ebuild 2246 BLAKE2B 17bed4c0f2e236e9759b3b7fb179d1206f855a78609066876b3fbe011bdce111bc65179d8ee7839869f82cb1128d93a8e496c7fa095f9b7178847b92b3f0cc45 SHA512 2ecd0cd86a822dba3308dfc4c3cb3bdf6519d94da2c39e03cf7cd45dc33de959f11990a7cbe87d0d7ec265662782378a1136916177dec121dcd1f10ceb4134d7
-EBUILD rspamd-2.2.ebuild 2248 BLAKE2B 9335bd7f27029bc4f3f80d3459dd3671568b855f5b74c56a8036e6d26dbd75b5cc078523677fef3e70a8b14f0016fa73ed20bbc26a783db058ca3f369391d86c SHA512 7a16ea2696fe1b4d8d228eaec8a358851a60493a2c32778997eabba3b31c639c88a7a2626eb33026068c3fc27497a0f30ae2e245f5b2d8e4604e47ec92fb5ede
+EBUILD rspamd-2.2.ebuild 2301 BLAKE2B be0806ccb14916cb81a8e3603a43514e4937ea794b3582156ca32b99032656f67379d170abda4aafc7cfcc88021fd157bacfeb2b1720258aac2a94434a69daeb SHA512 c5f704b9b293379eeb4917e8fa758ac44374c6bc06ec46d395fb3687418e37f01fe7c5fef4cb2a01097eb7f96e804a2ac0ce0fac20c95d7f259d4709c19eafb9
 EBUILD rspamd-2.3.ebuild 2133 BLAKE2B 190371b0c53e43bdd45c49a311ffca5d95f08252483cebd365b15e0bb3dd0f7e999194e43ff66ade199d503073452dfeefe114e9f51a904d5b5741692ec494da SHA512 c33edd128f5be1d8c91b01740fdab899049d721b395fd198020e235aee1c1db9cdb6002c28d0e5adb66267eef10a8a32c5532239046a3ffa859de85f0c2d8f1e
 EBUILD rspamd-9999.ebuild 2133 BLAKE2B 190371b0c53e43bdd45c49a311ffca5d95f08252483cebd365b15e0bb3dd0f7e999194e43ff66ade199d503073452dfeefe114e9f51a904d5b5741692ec494da SHA512 c33edd128f5be1d8c91b01740fdab899049d721b395fd198020e235aee1c1db9cdb6002c28d0e5adb66267eef10a8a32c5532239046a3ffa859de85f0c2d8f1e
 MISC metadata.xml 641 BLAKE2B cf34ec72d9a23ca2a1b7325e9cf35f0f7f5ddd2a7f7ed257614b8d74dac32ba22067ab008513b80a4edb8ac4f4be574967f1d4659f92f269cfeb647b4ad0abfe SHA512 0615158d243771302c5dbe70e80ddbba668286286a45a8c098b944baf75adbf87ff143ee7b07193c5b557fa44ef615b46fa5f7a5e4aa0d3b95118996b2e95328
diff --git a/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
new file mode 100644
index 000000000000..578d3da7fa31
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-2.2-i386-hyperscan.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/Hyperscan.cmake b/cmake/Hyperscan.cmake
+index 3dd774511..b8f83a3bb 100644
+--- a/cmake/Hyperscan.cmake
++++ b/cmake/Hyperscan.cmake
+@@ -1,8 +1,8 @@
+ option (ENABLE_HYPERSCAN    "Enable hyperscan for fast regexp processing [default: OFF]" OFF)
+ 
+ if (ENABLE_HYPERSCAN MATCHES "ON")
+-    if (NOT "${ARCH}" STREQUAL "x86_64")
+-        MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64 architecture")
++    if (NOT ("${ARCH}" STREQUAL "x86_64" OR "${ARCH}" STREQUAL "i386"))
++        MESSAGE(FATAL_ERROR "Hyperscan is supported only on x86_64/i386 architectures")
+     endif ()
+     ProcessPackage (HYPERSCAN LIBRARY hs INCLUDE hs.h INCLUDE_SUFFIXES
+             hs include/hs
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild
index 3f29e90b90ed..3b7e31293814 100644
--- a/mail-filter/rspamd/rspamd-2.2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -41,6 +41,8 @@ RDEPEND="
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-i386-hyperscan.patch" )
+
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 929267c0bdd0..960793614a0f 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -12,8 +12,8 @@ AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc0
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
 DIST Mail-SpamAssassin-3.4.3.tar.bz2 2739618 BLAKE2B cd77fc99cbec17f10c04f211e773fe2df9dd9c2efb54c9cc169f1fbfed884e74b77c96d8eee333af4bcefb05dee4519408b2e53e0c519734d582f95bad6030d6 SHA512 4d50b30a42d318c3a4c868b4940d1f56c329cc501270df12e1a369dd7de670c30f328a5fbc37dbd3b0d06538b9500085e920939c62de80ad6d8740bc47162cb0
 DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
-EBUILD spamassassin-3.4.2-r2.ebuild 7631 BLAKE2B 4e5e57ca5c06f342c17ad444b3838975f5e54694be391049c6d048710099039e961bc5c937454ac97e96d2e14d64d7450dace19f7e53e42b55099de17eb41028 SHA512 aeee49e746bd417ee14f15dec7b48f7413106e80289852b513289c4b6dcc1f3b2b51559905d2d3743534935f0938af8807d877e00fc69928d8de530d0e5d7150
-EBUILD spamassassin-3.4.2-r6.ebuild 8713 BLAKE2B e13be6c1028c5dbd95d642582ab3f08a5b61c9139cbd2aa82d948787ae36c8081fd39ec9d15844af44d0970857178c17adea45d0cab2cd509d241765212896dd SHA512 2f45421391ced81ddb47a973e059d62939c5be9e7e286449d93bc313949238c20f540fe112cfb97836e4e79d9f0438d2fc61324ac70202ca7baeabaccf948967
-EBUILD spamassassin-3.4.3.ebuild 8505 BLAKE2B dadc2d74a0ba987b3861747463e75cd4ea78c5fd734be70ae13d96d38fc1703ae44b553f76f8120fb1b592ea4828d04bcea7727d428757179d9d4c183121ea34 SHA512 f183a7918bf27ecb45d55fda23b62d3bbc9912d69d09de0295acf442170e52475291fc1cfd3ecf3820b79e69cef414d52a6514526269d9c490d869c953c73c68
-EBUILD spamassassin-3.4.4.ebuild 8513 BLAKE2B 3ded41c7857bbb2367b567b90cfbcbc38a27552b5afcfc5f68b3320be6d43f227053cd28869cb59c596242efd74e9d40a9e6e2f9e6416234ac7224a22e90bb12 SHA512 facfa73482315e2c13fc581a4b89aa156846f6c3dc109459794ef26014723ef31f313aa99d6f7989a46fbeac5841541994b2ee5fdb1763b0a6501a11808137c9
+EBUILD spamassassin-3.4.2-r2.ebuild 7630 BLAKE2B 709d3a9791377bbfefd971b8ddbe34b4c17a74444ebf28ed92db795239b05537db81cd58b02aa7f7a2deb284955d2368eaca1ee02cd4cdda4b83334e66afb5ce SHA512 b897fd165baffde6bebc6b17865c7f1df394bcb4523e60f95c4b6b1477ad7ed10f69e3b0812cea9f2851b6adadc1dc7a2c55f9c3ad96a2bb344e51aa35daf102
+EBUILD spamassassin-3.4.2-r6.ebuild 8712 BLAKE2B 9b427dcec7df513b30a06466f35e4f1c423766e441e0c52fd73058ddbedc6613b144334117a15c167b4a0775ca1f58dd18681f62d5820fef00f4dc336ec3f794 SHA512 63177d560a6d25782978a9ac0134641f58b0fd9d26a2697f719afac44f44e70bc8662b92b2534698f0b8e1a81b7f39ed3f86046263f803e9958c56d8a4a248c1
+EBUILD spamassassin-3.4.3.ebuild 8504 BLAKE2B 7bce952a83a094ad9749637fcf2d5f2b9838b4da66a5f8c73d7a1676d46d3cbe8bdb71f847ef7746a497fda1a916aed30a0b89d2be554105bb0d3b3cae27756e SHA512 129c4056efb704db05bcd43a8790e1e9e830e6be7cad392b50e8419602aaf73a7bffec8c430914837e592ddcfa4e5b4cd6d6c1ded064c9376289b3319b05a108
+EBUILD spamassassin-3.4.4.ebuild 8503 BLAKE2B 565a07f4276cbecc51356b2e502381802a5810c8b1db92c7f801d0d8bd31098e33966c47739d90972a9c65cdf7c03986f883b29bf3b122c155ce0d5913a1538c SHA512 f4052269362234cd002895e70fa1347d04288fef9fab774e0822a3b1fc8f9db9e3e0d849398acadb7bc529cd9f06d99c36d195a1ebdac817e8bf1790875cfde3
 MISC metadata.xml 693 BLAKE2B 57b8a079ed95858b27fb567e1c3b77389e8141315fcf69e34e2b80dab13e5b0f88c9f50f2387f7537cedd5a3cd56adcb611932a641e31a7f875914bb847708d3 SHA512 991a54ec305b6b4c4e9fd27ba77abf2ad7e72647776e0acc0e29a058566d0045e31df8ceebee6e320f758f10fb12973239d1650e469e910ac77a887656fcff3e
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
index 358cb1f455f4..a68f39a6a865 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
@@ -129,7 +129,7 @@ src_compile() {
 	use qmail && emake spamc/qmail-spamc
 }
 
-src_install () {
+src_install() {
 	emake install
 	einstalldocs
 
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
index 4fef01f91cee..07de81c0dbe3 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -135,7 +135,7 @@ src_compile() {
 	use qmail && emake spamc/qmail-spamc
 }
 
-src_install () {
+src_install() {
 	emake install
 	einstalldocs
 
diff --git a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
index ba94a7473b2a..da1c0754b715 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
@@ -131,7 +131,7 @@ src_compile() {
 	use qmail && emake spamc/qmail-spamc
 }
 
-src_install () {
+src_install() {
 	emake install
 	einstalldocs
 
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
index 39c0972f5e9a..55de18339926 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
@@ -131,7 +131,7 @@ src_compile() {
 	use qmail && emake spamc/qmail-spamc
 }
 
-src_install () {
+src_install() {
 	emake install
 	einstalldocs
 
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index c96b35e95393..6bb049129585 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -3,6 +3,6 @@ AUX sqlgrey-1.8.0-init-openrc.patch 284 BLAKE2B 33384a04eeca7d22a8cd7c6e95d99742
 AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa5fe82f99cf2f5e46eb5900c4a0ee0731c27184a60568af14bb78baed3b0053134b121fea0f00a070 SHA512 7e41344e3820537d73a413d728d455de58c5358922a354904cba5a870f61fecbf96f84f91dadad283d406cad05010bc3fd57644f18ba319083af92a1810d9a27
 DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
 DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044
-EBUILD sqlgrey-1.7.6-r2.ebuild 8427 BLAKE2B 4cb1fecc4b2817edd41f11459c86afa1e2c3c2572aef7fc50d8668778a2a5d3df3f1d0f06b5b462aad1386c405eb14cd7753c35daf2d8b891cac6e2c0e579b75 SHA512 9a9f5f42e247df21a609afae682ff631c1e60ceba2a508513f4e7d6b34bf187ee8eb6fbb9d915a88ce862ef43b69ae7487ce664fbb3b4cacb6f449e14b0c2447
-EBUILD sqlgrey-1.8.0.ebuild 1649 BLAKE2B 01da4f42ea6aae1f2681059515dc892a8d3dc3249d647a27474a9a1dbccd51bf11da302fa6f3a93302048cb828ac8c0b7f43812ea8db6d7afb94a1840a777644 SHA512 26a7bc1d66494a01b799e904eaec98cd551b4041fb37ee8177506fc3649e9290cae368c8db79a5c2d25c686420f277477c0dbd347681f38f31c26f0f05d0b43a
+EBUILD sqlgrey-1.7.6-r2.ebuild 8425 BLAKE2B 80f5698cc229439f5ae8f04ca118ef55b5b38536f28f8526c4e26f21a27993c085bed14c74ec96b8255992d68dbe2688ba35ead05d52321888a1e59219360513 SHA512 e1852b976f89d8721398dcf66224e70bac48a6bd97dd6629fc4a9b911a8c380a3c563dc1f633aafde8163b58c1e4e1cb0a8f0b29207e1016b74d1f8b73347e98
+EBUILD sqlgrey-1.8.0.ebuild 1648 BLAKE2B a4c694e130b6e9cceac7e8d96013f3272a770e75b53714c929fd713b278c6f227c7860cdb6f464d07f8b802b252d0da310199297d15cee1a0b7e2be89b048388 SHA512 09529b366a5b984d9f0d3879447d37d6320363d0fe603dcf1c2b470138e1e0300db37eff8f3635c24566928e2c96c9594e38b744f5cdbe92c61112c7ac83d151
 MISC metadata.xml 352 BLAKE2B 22d2cabf23b745a432e22edee82b9184fad33a5fe579cdd2b0efe584c9a34d422d16a7552dad88fe9ba93b11bd496920450d7510e627576d08ac9ed4c0df541b SHA512 4681c824087ebac9bd919143cc665481311fd503d58655323bef2d8e8f204a502daf7d0d05ba5aedfb32a67b97d2b942dc1f39eab35df92677a43d77fb1f04cb
diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
index 4b26a8203a60..1e7d2013e063 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ pkg_setup() {
 	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
 }
 
-src_install () {
+src_install() {
 	emake gentoo-install ROOTDIR="${D}"
 	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
 
@@ -69,7 +69,7 @@ pkg_postinst() {
 	ewarn "the SQLgrey db"
 }
 
-pkg_config () {
+pkg_config() {
 	# SQLgrey configuration file
 	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
 	local SQLgrey_DB_USER_NAME="sqlgrey"
diff --git a/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild b/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
index f55872a59c38..21a0450a89f1 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 	"${FILESDIR}/sqlgrey-1.8.0-init-openrc.patch"
 )
 
-src_install () {
+src_install() {
 	emake gentoo-install ROOTDIR="${D}"
 	einstalldocs