gentoo resync : 22.12.2021

12 files changed, 8 insertions, 262 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 70fe5c94694c..eeeac502e283 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 755aee1e3280..4ee4d28de820 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,8 +1,6 @@
 AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e
 AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
-DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
 DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
-EBUILD amavisd-new-2.12.0-r5.ebuild 4913 BLAKE2B 89efd4ca3df89f9875e7952d58a2440e88448410ed629ec77dcaf775c2a15cd5b75ba6af7b425855970c187864a1691175476c6f6d9c16f48f2f27e5440708d6 SHA512 b20582782a78fe683e4b33e5982ed5d9d6e676b7bf3c3ec2c0f5235cefbe709aa9c51bb8a31c8c0e95fd568865b7bf87dfd41e2f5ef462a2b9b126b269d6f80d
-EBUILD amavisd-new-2.12.1.ebuild 4918 BLAKE2B af107963f6342e4168a36036283982ddeb45a2f368319bce6ca74ff009b884fba0bcf5ab22b52e12cbd9b009d00ae9f2039f6484bb32a18ee32140ab08315b08 SHA512 d3f28f1e33889a8dcfce5abcaf6340cdd699ff2ddb8ffc4639dc3304be67be339463f75a5d305d68e46182bc6dfa4860dcbbeaec4d6afe713d1f374a2ee58b6a
+EBUILD amavisd-new-2.12.1.ebuild 4913 BLAKE2B 41a71ebdc6b3da7cb98c9de7b6b7ea43b2df8c19f0cbc2e512cd85d793786c5e62624e141bd304e13a10c1fb9fc10643518f2c25e57371ebd0329a443c2b2627 SHA512 451478648cd555f4d00e03335493e28a85c99db67b28a94a22fd2c1add7156389c24cc6fabf3946e3239210e8014cbcb846acd45cff605213183378c34067bee
 MISC metadata.xml 899 BLAKE2B 9b7c10ad571817f071c99963ed9930d87115f81813190d5c8b8e5e29dca556032ba312940e13077132d26c33212f28c90581c8a6d760b7aeea7f67c368c410d4 SHA512 f841f4ad9b70db155d9dea40d20de994b2d89769b63347a547adf45a2ba0c2cdf9ff8c8ed39b557beb001f2cc6fcb30c1cfc51c38aef601bd602f07e607f2a23
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
deleted file mode 100644
index f2e542b6b7c8..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
-
-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/arj
-	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 )"
-
-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 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
-	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/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index 4245de32669f..30aa24ba326f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index c4b63ba742dd..5dec91c1135a 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,5 +2,5 @@ AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 DIST bogofilter-1.2.5.tar.xz 801240 BLAKE2B 90fc5f0ab258ada722ca2fb79d17279b621eb089f646eade2ab41b78c44deea7f3fd8f219053e09ce5b4c64f5fc81f43a17c20b84261b22d5529c06106e80b3c SHA512 3a7280485cfe5802dd3e9721c153f88ccf28bff7a6a24590e985e860d1f1e0ddea7bde8a8e5ad1ff643e94c9fd7b26b2a5ed5a9fb991cee3fd5b0ce67ce9abfe
 EBUILD bogofilter-1.2.4-r4.ebuild 3776 BLAKE2B ca33d99ba26303b43236143b6039f640e2fd2a85ef37c3e5efd8a06d92d941e201cb25d9e7b30e3c9dd876aeba69cafe9ac9bab20f14a17984a331f173d7c628 SHA512 57925f55342e5c6adcbd62d59523f5b9082f80843e66eef83e1f5e720dee7c20b5ed7bbff9d26185a27aa991a803ae2e25589dc35a5801f68c6fc375982cbab1
-EBUILD bogofilter-1.2.5-r1.ebuild 3742 BLAKE2B f180e7bba5d1359d35f14d91fe482f313ca769a2d1ac58b12bf5c20b9b7bd3f8cad20b8e0fa223546b3697968a4e96780b8882d0f8e3f1509a6db572d6d51ac0 SHA512 559b34acc549915019c20d8de142ffb87735cfb3c602afe502aafb93893e9c47655df7428cf3943295ff1d137b83238eca0550c5c8542ec35f0ad86dd1aab5d5
+EBUILD bogofilter-1.2.5-r1.ebuild 3736 BLAKE2B 2e71910f674df3919c2ab473084c9e8f1636e2493f9868177770fecb52d067046e3a3b6070d5fb75033380255a1b7d43d514b6a0b9d6f1690d05c40ae59d49bd SHA512 e9390984d632cdc534c902ecb15bb50864afed8609d4311b4cd57e62738e1a28d7072dc65159f14ed291b7df7ddd73970222f3dc7438e2e16a7f643c1c49d668
 MISC metadata.xml 604 BLAKE2B d67129c25f986ca450dd263215cf6f88b5ee0b16ebb3e11aff7d3a8fccf9152ecf78d29b2c02d893e042534b81e603c7aed866f802808be8b9a5aa96ed6b10c9 SHA512 5042ce7da18ccf0327e38b092e0602fa477d646413fd07bd9e58b66883179039c3d4e85d3644f1e9e696b1241447a460eab44aa3ef87470f41a2f32757be5258
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
index 70cd191c4154..e207e681e47d 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="berkdb +sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index 289965261275..16fe3a8dbc42 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,9 +1,6 @@
-AUX libspf2-1.2.10-gcc5.patch 903 BLAKE2B f4ddba2890e1899be3ef054eb8fd3548736b97205738f2e28e660d6ab4e89e3dfe5f0a51448083651b76972fb3b7a991c7e40a09618adcecaa4bb2293683c9ef SHA512 9abe90c668fe49d06d8a6aea096adc35641c1f10f375416223c99a1f624ad562e4c8edad3220c38ea350158c263e20d7bf86cb993b83eabd7bccfe5be18bb0f9
 AUX libspf2-1.2.11-memset-include-string-h.patch 317 BLAKE2B 4bafbb6274a433d6fbbba149fc81ddc30734baa6509493820a9ca3a1c50d90c33db9846d8a63536e05e7960f4ff45c605a66b461bd93b6fab36533b9745512fc SHA512 0c1bf85d52e8c5a8ec0b32485e210139c7c09e17dbca2dbc810eedd7fd9b096fa26d66194b02067186d572a54c049a276dc8f7f1358ca6a9d6883a760b4735a9
 AUX libspf2-1.2.11-musl.patch 816 BLAKE2B 4dde68a54b54f55ad184cdb3d735020f446fcaca5f6751d892eb299962df92fdef144a7ef17ef9775655c088ec73f81eea69bec4aabb65a97ddd809673114a99 SHA512 30d2e27e185d2656d0a2d2fe14f4e735bc533db66f52c1554df19cc635bd1024c7877bb48e7ec20432f23c4e9cc66bdbd7c2b0c8816cf692e627112792ed1fd4
 AUX libspf2-1.2.11-undefined-dn_.patch 5230 BLAKE2B dca3a1c95ad6748936cd444bf7d48265454c748697616790f7f92ddf7339fcce06873e67d31857649b3b9d9ae6dac8131815dc3e8ce7af3697a669931d6068cb SHA512 8159ad3aae731971d6553858ca8c5297eae437f18397605df8bfa285d901e99bb70d18cb09c56cea0d203b1b18103d2dbd41a1fc085ed89f241377d8d1e2da82
-DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
 DIST libspf2-1.2.11.tar.gz 565497 BLAKE2B 4000e15204c962ef438cc8bcf6411f4f965e1451e356923e2764d5a1209cbc9153a38e1d83d25c8b4b26646bfb306ec49b71d273fdbabe200b78ac2694c05a4f SHA512 ad7bea800ad6ec8d00a7f8f381b59d9ba074fb6c5932d8babcb05ab5ca59defb78445dd7bd89767e5c272b6c6638c8000c8c525c560d1803c35712f0ff86fa9b
-EBUILD libspf2-1.2.10.ebuild 1040 BLAKE2B bd3e3d3b08c271fc560a5fbe84705d343c2c717f9c256ea38d045254cffe6560ffd9699be648a46eab06051f9d6ce1c7e2a5153630479d0888c83041d1ee6f89 SHA512 06f54696b73abbf0ccc0d747d4391076eca1ecb04b69832029bb32ce616c62481afd5f87650872f19214fcbc38cf6761813912fd7e470c9666c4c4bae099b751
-EBUILD libspf2-1.2.11.ebuild 1228 BLAKE2B fd41b09e47dec0ad9bf25013a31f143ac0830c59f71ff4f64a9e6bfd75c2b0eb15dd350e4e964cc6bbd2dbc66fb67e42a5952bb752a3c5c7b8e9e827031469ca SHA512 94a8fdd828c6b8da3e46b6832cee8bd6ba98064ecb72a57772cf66a32b6471b5a677bd0025d7d4b325570e545ef3ccf83df44f398366ce8f211f570c56266018
+EBUILD libspf2-1.2.11.ebuild 1222 BLAKE2B fa9b8e8f79f3b195e39a9a9a964af4df4887c3cbd59e78a5025d2c1837c86e11d786fcc40341598773302a022e85d0deba60b2dd55d7a4697bc4590c1629c0f9 SHA512 56277a357ed3f4bb7e642269633c6f4c349972e7ec289f3b7ebd2ee927b9fa0b030349ee853766e25645311e79523c06c48edc9d29bf9a882916c300cf043728
 MISC metadata.xml 661 BLAKE2B abbc96b07e546e6ca06763b871e1b21b1e83220c37f38fff3045485a26394784ad5391d0c5682d0716fb8d68693465b65d3642afdfec9ff33ce2e08bf8a8e776 SHA512 bb8fbd3142a69092b10c0ce665d74db7bb5a11f287a027ab499e89433fa7e4bc35a397d738d7ca7105f723bb941b94e01b2ad6bff515d94d42445fd6d5bc6e59
diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch b/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch
deleted file mode 100644
index 75b3fb899b3e..000000000000
--- a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/shevek/libspf2/issues/13
-https://bugs.gentoo.org/show_bug.cgi?id=570486
-
---- a/src/include/spf_log.h
-+++ b/src/include/spf_log.h
-@@ -60,10 +60,10 @@
-
- #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
-
--#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ )
-+#define SPF_errorf(...) SPF_errorx( __FILE__, __LINE__, __VA_ARGS__ )
-+#define SPF_warningf(...) SPF_warningx( __FILE__, __LINE__, __VA_ARGS__ )
-+#define SPF_infof(...) SPF_infox( __FILE__, __LINE__, __VA_ARGS__ )
-+#define SPF_debugf(...) SPF_debugx( __FILE__, __LINE__, __VA_ARGS__ )
-
- #elif defined( __GNUC__ )
-
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
deleted file mode 100644
index c48e29203125..000000000000
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
-HOMEPAGE="https://www.libspf2.org"
-SRC_URI="https://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc5.patch #570486
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
-		-e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
-		-e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
-		-e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \
-		|| die
-
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README TODO INSTALL
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/mail-filter/libspf2/libspf2-1.2.11.ebuild b/mail-filter/libspf2/libspf2-1.2.11.ebuild
index e80f41ff3ea1..0337bc083c7d 100644
--- a/mail-filter/libspf2/libspf2-1.2.11.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shevek/${PN}/archive/${GHASH}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.11-memset-include-string-h.patch
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 04a396069324..28d7dbd28b1d 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -9,5 +9,5 @@ AUX update-spamassassin-rules-r1.cron 1555 BLAKE2B 3c83a1d3f951c5a7004c6ca838aba
 DIST Mail-SpamAssassin-3.4.5.tar.bz2 6167088 BLAKE2B d99c9e40f6735328b5300f010f248d35a8a8dcd3a3692a8db909234b8de3a5e432d004cf09f7ddb8b2ae82144525ce1ab25d89df92b621d8e119e2128e59cce6 SHA512 46096019ef3d2b6dadb7af0d076c22526786cccb669cd4bed131b64fa935863630ca9f3e78277bebba0ed75099be9fbce97a30a6478ed84093896a1ad3d8387a
 DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6da70c7b846737513bd4d6d2d410872c58ab7cbe7ade6a109a71bdbb6dbaf7aee8eb48520e7de929b27e83546401f3692aeb0c3 SHA512 bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593
 EBUILD spamassassin-3.4.5-r1.ebuild 9787 BLAKE2B eeb5a6103dc393e1777a49c02babddf04009b683781c665d342beb7113bbaf44941fa82c5a601d3b37a6a95109013ff58e77a2bf7bdbc0ea9f51df8ff0425d20 SHA512 1422439239de80d0b24f38806044798c0e9428da64843eecffbcc082ef728cfd482bd07fcd3a287450f16a66e0d2978af72d3571009552df7a53c8e7d9b29913
-EBUILD spamassassin-3.4.6-r1.ebuild 9794 BLAKE2B e493f48584957b7f2225aaebf63593fe8bc8b301cc04958c5f8e4bd4a30e000974649bb47f27a0bed169d394ffae4d204c14b3b74e9a8b72c338bfc5573d848b SHA512 f1b65419729883a010e6da0631bbfcf078cfe29f7aefb97a2e538fd86c270693421e2d4911458b4b499956447dcb601150c4aacdf3f3967fd3c765191099dde8
+EBUILD spamassassin-3.4.6-r1.ebuild 9787 BLAKE2B eeb5a6103dc393e1777a49c02babddf04009b683781c665d342beb7113bbaf44941fa82c5a601d3b37a6a95109013ff58e77a2bf7bdbc0ea9f51df8ff0425d20 SHA512 1422439239de80d0b24f38806044798c0e9428da64843eecffbcc082ef728cfd482bd07fcd3a287450f16a66e0d2978af72d3571009552df7a53c8e7d9b29913
 MISC metadata.xml 610 BLAKE2B 77c0926586d39d559b57a2515700fc5959cca43c335634ca5f12640667b8b7a0ca70507686546207f80420c40a6b1974b46a92c84825512516b4c3efadf66496 SHA512 18ece7c795d451399f0e2a1cbca2a14c39602b1a905727aa1595612ce848f31623d691c13b1e7e264c7ae3eda7488dd01f986a31e6f35ad99b27d2e4cef650bf
diff --git a/mail-filter/spamassassin/spamassassin-3.4.6-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6-r1.ebuild
index d13f67500af6..fb0dd65e00c3 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.6-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.6-r1.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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"