gentoo new year resync : 01.01.2021

33 files changed, 166 insertions, 547 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 621f849db882..d9b3c73beae8 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 263821409bee..ab249bb32daf 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,5 +1,8 @@
 AUX imapfilter-2.6.16-libressl.patch 920 BLAKE2B 6c0bc84885354f2f95430f9e827c391063acc8bc12113a775a24b6af58679c43eea500bb57405ddf89cf09a0a97c5255e49257cb76b87f3481a3b65b62f8e884 SHA512 81ff9036b77d763c57287b4852ae6e3c746478c1b1a98ee62d5021a8580c0245231078b806eed5e6857e71ed2935788552f6fc2565506c21ae336dd89b8b70a2
+AUX imapfilter-2.7.5-libressl.patch 806 BLAKE2B 4b0b40913d047f39b2faf23ebde782d5b34bf11f7e25243ea021c792d6a6854565e2df9924cd73b705d65a98dbe411677321dd848a11e929d8e32ada69937033 SHA512 ace3a8631dd23350a6a918bb2cd54d8eb3b9204c2f07d9fc64668216d0071a1acad76d2628936e0ac4a0b6e3ccc16299f17a8c833e866c3f346c27365a368051
 DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
+DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
 EBUILD imapfilter-2.6.16-r100.ebuild 1091 BLAKE2B 996c763bd57aa8a66b7c5a87bc5829c11e31dc640d895d5a252d71da1626cd9d077a07e062c177e0a9d1b572b1f644832e8fe559fcfe26f11e49749f0a721171 SHA512 bd78df4f6ba278d13b67371b2b248dfc84b02d9e6de2af9053812eb81bbaee5d8f922c80cafce83bcc3e95fed99f9110651156bd5a7321e9bad776d23832e75c
 EBUILD imapfilter-2.6.16.ebuild 943 BLAKE2B 0e72053ad84e72f68d3e9843c1185a55808b9199bbd210807f331c7cb1e9a7a37321eb666cd1ff79e39a321a74fe8f6ca6af8fbf3c8c2e7659ae87f357078c9a SHA512 40f46f9811433188b70013a609713fa33c413197156741f95044c1123724d3dd755b9c3101461b49c519b042518d09828d5b5048d65c9e539d60ce54c6aea9f5
+EBUILD imapfilter-2.7.5.ebuild 1082 BLAKE2B 690d68059207515a33ef73b4b09197c12b5503efdb1ca694af05313145d02247ce38fd31f55aa78fec1aa4c794caacb1bbe388e8559cc948570087e70ec2b84a SHA512 6811135be7ce4febfb85719713de25c22633529542ba431e9f5d8b0110ce42632369ab8cf1c5db75ab81649a47cdae83c2e3e5acd49658b4b230dd630cbff79a
 MISC metadata.xml 249 BLAKE2B 8f4404564610b1fc4705b073c963909d882aa72717e386d0ddaa11f4a58ea4fedb0505711baf498cb59107d8486b890eb337d56fad641a0c656d4553fc0139fd SHA512 8fb3a6309758c23abad3fd09a007212a6f5c0beb6d03d3c7d94f5fc8b8818d5cbddd55ef8fbe25700eb11dce04486295ddcc413a3fe568b5ba620b0b5fe0b0a6
diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
new file mode 100644
index 000000000000..fb665f852710
--- /dev/null
+++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
@@ -0,0 +1,26 @@
+From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 30 Dec 2020 06:48:40 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/socket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/socket.c b/src/socket.c
+index aa2ef4f..fa75de4 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
+ 		goto fail;
+ 
+ 	if (get_option_boolean("hostnames")) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 		SSL_set_hostflags(ssn->sslconn,
+ 		    X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ 		if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
+-- 
+2.30.0
+
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
new file mode 100644
index 000000000000..b894e8eda7c2
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="https://github.com/lefcha/imapfilter"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libpcre
+	${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
+src_prepare() {
+	default
+	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^MANDIR/s:man:share/man:" \
+		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+		-e "/^CFLAGS/s/-O//" \
+		src/Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
+		INCDIRS=$(lua_get_CFLAGS) \
+		LIBLUA=$(lua_get_LIBS)
+}
+
+src_install() {
+	default
+	doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 951a74118740..c9c763023170 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -9,7 +9,7 @@ AUX sendmail-8.16.1-build-system.patch 9701 BLAKE2B f1bbf82ab321b502ecbd5d2658e5
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
-EBUILD libmilter-1.0.2.ebuild 1902 BLAKE2B ca8b7252baddcc96ce6660356a29a8f1006a7d9ae737f7dff3306d3a80cda8ce553d4e7d53a5b2ad646e5cb12b987e0c6052b6eca9fcf65c60eb87d8f67bc8be SHA512 a02c5bd778ac79e6bdb66c6dd76687517a28f105622988330860257790d79b65edb514749a44df548480cbf27701f29db4117732e1cededfec8dff23350d4bde
+EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0
 EBUILD libmilter-1.0.2_p1-r1.ebuild 2074 BLAKE2B 36c4542a04de6abbf5b5db4050391d4b1c5d484bdbe5981c510d9750019607794106d5ea5341c8077d31efbbfe302ac997c1d6d62f11d7b73a6ed95800ea9c79 SHA512 74a7fe12545fa88abe48b5fe2d229b874070c5e44de70fb8e1411150523d4fb7624e01490d1871aa9a9b398ab2bbae3de5bce804d36af08ddd4a86272f55b7fc
 EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
 MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild
index e9c4a3b0d423..31d0b281a4e3 100644
--- a/mail-filter/libmilter/libmilter-1.0.2.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="ipv6 poll"
 
 DEPEND="!mail-mta/sendmail
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index 714d71efaed0..786a8290542b 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 1217 BLAKE2B 1bf70c5a8adc6658410a40975197dc227d25a62658d7cbb1533c940067e1b161969ab9783f8229f115d08d36f5c5b0d91e1a8da65efe24c7c15feb4fcb8768cf SHA512 66032f679276548e0b3e8999922e7008508d35824d59131c10c9eebe971675ade779a7377e73e414073844563570eebbdf5c2e7af4734280b1286649b15d3a14
+EBUILD libspf2-1.2.10.ebuild 1218 BLAKE2B eac84ec72789cc29c569ff7ac4be765f77c3281e00214ecf174c6d06b5c36cbabfd8579bf8ad74c9274fac2550a5262e8014ebc2f04b05f77d77582d457f05cb SHA512 cba2838ec663c5b7f76717e69931672c8e230e2c4b13624b2017047c5132893e5c0df6b0e093f36031522e55d0b7ed17167e7b82387d2de45429f005d80ec1fb
 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 8e1ef5506072..4738d9ee9e12 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="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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~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 cba2c4d58a28..ac385a210da2 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,4 +1,4 @@
 AUX libsrs_alt-1.0-ftime.patch 313 BLAKE2B f634abd1e527a199374fc55bf84927c5e38730f79d1b13f7cb0199ce338f825902df662248fa99bb3baf4c4c07117031b52e3e986a7ad0b2816ca28cfe7601b2 SHA512 2566c9b7e9187a243f5eb6b4b67d649bc081538350f647f1afa69812892a8ff8ef889068ccb73f019cf287e9e6ae3999bc62b2003d197963606a4c30ebecd214
 DIST libsrs_alt-1.0.tar.bz2 237984 BLAKE2B e55b01f28fdf240ccf2fea8b43e930bc02a78bfb82a2b9fe573c1c09e0839f89a0bdb51844dae237ed66e4bda925b5b3b93842462987e7f300f6f5d763adf382 SHA512 1e15f8b12c2174c8ee085fc5adae4cb267f69dd5656066d33af106ad4940769552e04cfc67af4ad9650eece2519c03ef383290f36a22df7d9e03fa2186262404
-EBUILD libsrs_alt-1.0-r1.ebuild 1161 BLAKE2B a46930a064932ca18d874408332fd9661e4ea5ec54c7082acef63cd78b4fc906e41b5f07ce9abcdd4da8cde638c33bf19ae0240cd8e35c6cf1cb92de40459aec SHA512 9cf9bdee482d84b55258b3b446542264326442473ba117a723127675261c38cd23a3834f138c83c60a9f3be2bf09ddce1527d63fb2bdd8158458f180af4eebae
+EBUILD libsrs_alt-1.0-r1.ebuild 1162 BLAKE2B abe2d3edc71617faaab4ab4dbe310c3697d8f83d6a8dd28791e48258697bd8eb763d6f817be09f03d02e2ea546ee29636df05c1a5026d9108ec09064527f61e3 SHA512 215d4b7bc55a3e36b682b7dbb2a061e0eeef00922a8db02a875f19ce0e07ac8e547722e51c94d8614363a0329d965f6268f009e6f1da5a9b1d6b06fc1547324d
 MISC metadata.xml 506 BLAKE2B 85745c6fffc19e1064f5d2bde90dbe56f5bdd674d4189630ccbe3d012e505dec487878097ed83d031e79e46478e7f0281f5edda1a94057671bcc051ca202025a SHA512 6a6096ee6f1895de958b8167e1a9632dc6901b16908d94af86932aead64fbc1690ffd300d8cc97792d46201e64cb20d6696e232e9d796e33fe4484e808e111ee
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
index 4d0c263508ed..ad3fc51b0e44 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index a55dc00859a5..1d1fc2fe0739 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -7,5 +7,5 @@ AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r17.ebuild 7372 BLAKE2B 1eb362d660bbdd27d71c08e2abe086fefacc7c7e5f731887ecbad762c9370eeb39ed731210a0debe3ca419b0119b0f1ffb142f31f379974a496361d3fa5a014e SHA512 b8a056fcb785dea25fffff98fea7f071de14201b192ffbd162463f3a4eae1c481e3c7306d79a9000ccf8d5892824f10417de8cba8edb83bfe3ae8abb374124e7
 EBUILD opendkim-2.10.3-r19.ebuild 7537 BLAKE2B 0616b19c9311bd00b3163852f6e1d8c091659efcdfcba2987a96793f59bfbf7c09f5b354ebebbb9631f1ccd84807f5675481903f4c052a75349fb21ef12d76a0 SHA512 25e21bb76901057ad1818adaba45ad1894b91f8f2ea68d4d3694e0fc3fe920438f6848c939e7b69a10432d6078ec735169e6d9521d719cf2c4c9acedd53f7f7a
-EBUILD opendkim-2.10.3-r25.ebuild 7675 BLAKE2B 2addb6c91c5736023931e1210001411cee9ae9e9d5182ed0ac4fb6a02fdd78b80c8acdc694965c22b89b93b3bcfe65342f8bd7fe9cb5527f337b0e7e337cd238 SHA512 98a8cdb930c177d1bcfeca302435ce985e103b5bd3c9248111d9a69c5c2b8c09503c88da942875c4b08bf96b27be6f1de7b2de6f2402bfa5b15080128650493c
+EBUILD opendkim-2.10.3-r26.ebuild 8173 BLAKE2B 312b3fdbd08af6cfeaf5cac0616fe7d88b172a66f881e88d8d221f1ac7fbe9ccd30f21b3f4ee68879734942b50c55eaf5415b265e4947197ed7a584e3a0abd5f SHA512 99f03228461cc9b0ae18fe1d22f33ff7e29597553170089d632f6f8d48aaa4ac0aa41f9f994330fcf4a876f998722f64833ed6fcb5b5b947a311136cc2f58b5f
 MISC metadata.xml 1942 BLAKE2B baf1f8f5be8cca84723fe3a17e91a2684a41445cfc707aadd1073febff1102505cd6fbfdce3756bb6f6c1529d9b7506d1baa5f50799c79ab4be79b4dcd17e9e4 SHA512 10256aaf84cccecf4a78df6a2572e1abc296c2e200269a2f5693a1664431d556d3e79a0820076965d6c56d70056562cfac458add472ce47043734edb8e228a90
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
index b105074a89ac..5aad117eed35 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
@@ -68,6 +68,15 @@ src_prepare() {
 	sed -e 's:dist_doc_DATA:dist_html_DATA:' \
 		-i libopendkim/docs/Makefile.am \
 		|| die
+
+	# The existing hard-coded path under /tmp is vulnerable to exploits
+	# since (for example) a user can create a symlink there to a file
+	# that portage will clobber. Reported upstream at,
+	#
+	#   https://github.com/trusteddomainproject/OpenDKIM/issues/113
+	#
+	sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die
+
 	eautoreconf
 }
 
@@ -121,6 +130,12 @@ src_compile() {
 	emake runstatedir=/run
 }
 
+src_test() {
+	# Needed for now due to the expected sequencing of the setup/cleanup
+	# tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
+	emake -j1 check
+}
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -type f -delete || die
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 80eaae969ba8..a06c4ec64bbb 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -4,5 +4,5 @@ AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664
 AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
-EBUILD opendmarc-1.3.3.ebuild 1886 BLAKE2B 0acb875bcbb65e6f3dfd440435da8e5d8bda669ee844aa2e9260d82c8b00bf1af73360791be100a3c2ab664c32d335210d04b4b4639cb1cbd9ce3ad7e9241d70 SHA512 b7c8008538b68585f5e61311b9a4a10f9dab56ec88e52401e2ee4d59ff3cac9834cc852f201a4bc82817a10478c7966f45852c912482b14b4091326ec263db49
+EBUILD opendmarc-1.3.3.ebuild 1887 BLAKE2B 86943d32f4a005804e78b18bf32e5ec43633fd460344f406941a03588013d079d443b1de5e6fe7e0df19eccb0e6d620c2ca33e69c955ee351f9638289e934c8a SHA512 263f1ceb65ad702c403c79a19cfaedde2301820ea42126adcc2dd277ce6f5b43f35c746313d04a7b006f818b51da86425372b83109bb60e1f54eef94764ef452
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
index dfd9b437f63c..01e87e8cf8cb 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 33d73acfba45..f931a6059c8c 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,11 +1,8 @@
 AUX postgrey-1.34-r3.rc.new 2373 BLAKE2B 6f7a1197735b710fbb23fd49acb1fc9a9b743e7c2e27c93441d2670de58448003d9c2d47305c01c8e54df8e958532a064cb413f010b744c058ceeb8016f973a2 SHA512 a9f9c841249b303da2bd4c976e2cd2fe85264929e298745e08f684f86659da548d9348c15a5723697835ee44c584405582605792f545eb9b1c097f82fc15720e
 AUX postgrey.conf.new 1914 BLAKE2B 826949afe4a8a7bbfe9dec493fd619b91235945420bbd5e4c70709aff23a7393277c88edac1b1f149ea34b4fdfce4649715a97b38052d3e2c360716439bf6489 SHA512 07c7bf82fa24486a62701238bc3684e7ed445bceeb54c842eba39b0d83732b704954247978784142ecf20329352dbe698ba2d9a76576d5082315a314278a6740
 AUX postgrey.service 345 BLAKE2B 4ca6ab7a5649ea49fe69128b64111113301ab891f3de9f2d433e40eca14d178dcb992f70802cc73d003e7903fc3edcb53242c656b9208fdd0aaef2562577d522 SHA512 f5f92cae916a8000da460c0c5bd2194b49518cf2bdadf7f6c4512a29dbee73b4a75d530ed0d2049ac46103235246b5b3b88e55216c9ed1a012ed306a4bf7d58c
-AUX targrey-0.31-postgrey-1.34.patch 8555 BLAKE2B 5957c9ea2fa62554bb45ecad71712f5a5c7c655a132434fe6520335a07f2ad5475cd45fe592c8769f44df03f951ee6bfffa1aad2c331aa393ea20b64fe783d96 SHA512 af4433f08120ae6ab07179f1adb88ca8c86c142b68727657555cef04d84105912e8e67c969c860ea000930196c6046b7b2bef2647f04b202ceecaf163d8515d5
-DIST postgrey-1.36.tar.gz 38797 BLAKE2B b8e4dedb28ababc92cdd1d128652a468caeb55eb611ca019148a2e538d3cc0d397cd14889942904b05c9471bb13ed9fa6250e399d47df22241895c109a68315d SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395
 DIST postgrey-1.37.tar.gz 41815 BLAKE2B dd8a1f62f56a614c25863afde089f1882a1567e3a53a24b1d12b6f23994388caf99059f05775853065143f4f953a6fd964625d5c865993e0e679dd545b848c11 SHA512 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca
 DIST postgrey-1.37_p20190625.tar.gz 124667 BLAKE2B ca2caba51a72198e42d6d4d9c5c7590b62c1bd1589d05bfb4096fb4d95ff62ff96976beac8c1b35136a4a6830af936244485ff7dcdcd46d8558a4bef0bbb123a SHA512 f3caf3c7663bd8784701c7e1ad45d1c577edf6fac14591a6983fda25e7f8a875f2501780a8f97ce72e6a324878404e9ac2a003a07ae07ad4debae61fe734b8d4
-EBUILD postgrey-1.36-r1.ebuild 1748 BLAKE2B 17fa8ad75a46cac8658b70666b16427405282799ce1d2528677fefb573c0e8638d68075b7dc6401ebd5722639404a970f1644e0fe7bb1afb6a81bf6af00a6ba6 SHA512 0ea4a73933a11d84894bc8a286193a3b1d71f2ecf5ac2513e9c3cf18364479485519839d09fed3a15152a1208c9dd908695c853a2a17a003b295f9842bbf99bb
 EBUILD postgrey-1.37.ebuild 1656 BLAKE2B ab895b8c30d8817c7bb8d990a8828540ade53107ce56c569cfa1fe5a4c76140c3b57d38cafc8320885ecaa1cb4c32dc09788dc32ff029a5620dea31ef4d74408 SHA512 3fc92f83203ffb093268aae830bbdb2aed01da388fed571ebe530b8d43261aaf0c6ab2ed4ec37384a5912e8d4f42f9ad982e5e296274c68de14ca75098813a3b
 EBUILD postgrey-1.37_p20190625-r1.ebuild 1723 BLAKE2B 1fee548caf43321267bc90f709464b559778b865c6eef028b0429a8df88b96bb7dae63bb38f2c42a0a2268226e600fc26bee1c3f507dd1118d7d50f4987af6c4 SHA512 cf9b26c4c940b2c2937e24573bc187e2016d0f08ee90147254a43f0a95b31f29c3cd473de03d53420b5e87c4fd0fb21dda92b218bdbe2ca2947f48d9625b2467
-MISC metadata.xml 541 BLAKE2B 8f30317d462b08e6fffae9e71ebe09c5eaf7d2595df60211201a0c63c409693617bef6be47862d323a50ca5037b28aee97811ff846324fd470d7745b812d632c SHA512 3211c4a2afbd3bb58fc4a179776014e1bf85571ad8e522b5f07171305f934c353b531d2adf12588c076d0122ccaf079a23d71cd3b3c854f4c2d01ee80e7f5de1
+MISC metadata.xml 470 BLAKE2B 28f461f109f6883bd605e86a4e13436960db61cdc30467545a0a3826fa5f5282af1d73806288845474c87aaed616a83f9e77a5d264cde6dd07b2c8d9cdde0bba SHA512 9dec84c40a4b8705b458687fbd1d8300531bc77975f96be5e94ad251c8df2b2d1f20a08d4082f228353ee98cbf4f691b778d5bfdb9faa89ea1b3dd68b71fd331
diff --git a/mail-filter/postgrey/files/targrey-0.31-postgrey-1.34.patch b/mail-filter/postgrey/files/targrey-0.31-postgrey-1.34.patch
deleted file mode 100644
index a17b6457d39a..000000000000
--- a/mail-filter/postgrey/files/targrey-0.31-postgrey-1.34.patch
+++ /dev/null
@@ -1,202 +0,0 @@
---- postgrey.orig	2011-05-04 22:54:15.000000000 +0200
-+++ postgrey	2011-10-17 10:10:21.000000000 +0200
-@@ -309,6 +309,22 @@
-             $self->mylog(1, "cleaning clients database finished. before: $nr_keys_before, after: $nr_keys_after");
-         }
- 
-+        if($self->{postgrey}{targrey}) {
-+            # cleanup tarpit blacklist database
-+            my $tarpit_db = $self->{postgrey}{db_tarpit};
-+            ($nr_keys_before, $nr_keys_after) = (0, 0);
-+            while (my ($key, $tarpit_last_seen) = each %$tarpit_db) {
-+                $nr_keys_before++;
-+                if($now - $tarpit_last_seen > $retry_window) {
-+                    delete $tarpit_db->{$key};
-+                }
-+                else {
-+                    $nr_keys_after++;
-+                }
-+            }
-+            $self->mylog(1, "cleaning tarpit blacklist database finished. before: $nr_keys_before, after: $nr_keys_after");
-+        }
-+
-         $self->{postgrey}{last_maint_keys}=$now;
-     }
- }
-@@ -383,7 +399,7 @@
-         # whitelist if count is enough
-         if(defined $cawl_count and $cawl_count >= $self->{postgrey}{awl_clients})
-         {
--            if(($now >= $cawl_last+3600) or ($cawl_last > $now)) {
-+            if(($now >= $cawl_last + $self->{postgrey}{awl_delay}) or ($cawl_last > $now)) {
-                 $cawl_count++; # for statistics
-                 $cawl_db->{$cawl_key}=$cawl_count.','.$now;
-             }
-@@ -392,6 +408,28 @@
-         }
-     }
- 
-+    # check tarpit passed if targrey mode
-+    if ($self->{postgrey}{targrey} && $attr->{protocol_state} eq 'DATA') { # passed tarpit
-+        # remove tarpit blacklist
-+        my $tarpit_db = $self->{postgrey}{db_tarpit};
-+        my $tarpit_key = $attr->{client_address};
-+        delete $tarpit_db->{$tarpit_key};
-+
-+        # auto whitelist clients by tarpit
-+        if ($self->{postgrey}{awl_clients}) {
-+            # enough time has passed (record only one attempt per hour)
-+            if (! defined $cawl_last or $now >= $cawl_last + $self->{postgrey}{awl_delay}) {
-+                # ok, increase count
-+                $cawl_count++;
-+                $cawl_db->{$cawl_key}=$cawl_count.','.$now;
-+                $self->mylog(1, "tarpit whitelisted: $attr->{client_name}"."[".$attr->{client_address}."]")
-+                    if $cawl_count==$self->{postgrey}{awl_clients};
-+            }
-+        }
-+
-+        return 'DUNNO';
-+    }
-+
-     # lookup
-     my $sender = $self->do_sender_substitutions($attr->{sender});
-     my ($client_net, $client_host) =
-@@ -402,10 +440,11 @@
-     }
-     my $val    = $db->{$key};
-     my $first;
-+    my $retry_count=0;
-     my $last_was_successful=0;
-     if(defined $val) {
-         my $last;
--        ($first, $last) = split(/,/,$val);
-+        ($first, $last, $retry_count) = split(/,/,$val);
-         # find out if the last time was unsuccessful, so that we can add a header
-         # to say how much had to be waited
-         if($last - $first >= $self->{postgrey}{delay}) {
-@@ -426,16 +465,19 @@
-         $first = $now;
-     }
- 
-+    my $diff = $self->{postgrey}{delay} - ($now - $first);
-+
-+    # enough waited? -> increase retry_count
-+    $retry_count++ if($diff <= 0);
-+
-     # update (put as last element stripped host-part if it was stripped)
-     if(defined $client_host) {
--        $db->{$key}="$first,$now,$client_host";
-+        $db->{$key}="$first,$now,$retry_count,$client_host";
-     }
-     else {
--        $db->{$key}="$first,$now";
-+        $db->{$key}="$first,$now,$retry_count";
-     }
- 
--    my $diff = $self->{postgrey}{delay} - ($now - $first);
--
-     # auto whitelist clients
-     # algorithm:
-     # - on successful entry in the greylist db of a triplet:
-@@ -443,23 +485,41 @@
-     #   - client whitelisted already? -> update last-seen timestamp
-     if($self->{postgrey}{awl_clients}) {
-         # greylisting succeeded
--        if($diff <= 0 and !$last_was_successful) {
-+        if($retry_count >= $self->{postgrey}{retry_count} and !$last_was_successful) {
-             # enough time has passed (record only one attempt per hour)
--            if(! defined $cawl_last or $now >= $cawl_last + 3600) {
-+            if(! defined $cawl_last or $now >= $cawl_last + $self->{postgrey}{awl_delay}) {
-                 # ok, increase count
-                 $cawl_count++;
-                 $cawl_db->{$cawl_key}=$cawl_count.','.$now;
-                 my $client = $attr->{client_name} ?
-                     $attr->{client_name}.'['.$attr->{client_address}.']' :
-                     $attr->{client_address};
--                $self->mylog(1, "whitelisted: $client")
-+                $self->mylog(1, "whitelisted: $attr->{client_name}"."[".$attr->{client_address}."]")
-                     if $cawl_count==$self->{postgrey}{awl_clients};
-             }
-         }
-     }
- 
--    # not enough waited? -> greylist
--    if ($diff > 0 ) {
-+    # not enough retry? -> greylist
-+    if ($retry_count < $self->{postgrey}{retry_count}) {
-+        if($self->{postgrey}{tarpit} && ! $self->{postgrey}{targrey}) {
-+            # do tarpit and greylist if tarpit option only
-+            # don't add message after greylist_action
-+            return "SLEEP $self->{postgrey}{tarpit}, $self->{postgrey}{greylist_action}";
-+        }
-+        if($self->{postgrey}{targrey}) {
-+            # do tarpit if targrey option
-+            # add tarpit blacklist
-+            my $tarpit_db = $self->{postgrey}{db_tarpit};
-+            my $tarpit_key = $attr->{client_address};
-+            my $tarpit_last = $tarpit_db->{$tarpit_key};
-+            $tarpit_last = 0 unless (defined $tarpit_last);
-+            $tarpit_db->{$tarpit_key} = "$now" if ($now >= $tarpit_last+300); # update if 5min ago
-+
-+            # return sleep if not tarpit blacklisted
-+            return "SLEEP $self->{postgrey}{tarpit}" if ($tarpit_last == 0);
-+            # greylist if tarpit blacklisted
-+        }
-         my $msg = $self->{postgrey}{greylist_text};
-         # Workaround for an Exchange bug related to Greylisting:
-         # use DSN 4.2.0 instead of the default 4.7.1. This works
-@@ -517,6 +577,7 @@
-         'syslogfacility|syslog-facility|facility=s',
-         'retry-window=s', 'greylist-action=s', 'greylist-text=s', 'privacy',
-         'hostname=s', 'exim', 'listen-queue-size=i', 'x-greylist-header=s',
-+        'tarpit:s', 'targrey', 'retry-count=i', 'auto-whitelist-delay=i',
-     ) or exit(1);
-     # note: lookup-by-subnet can be given for compatibility, but it is default
-     # so do not do nothing with it...
-@@ -606,7 +667,9 @@
-             awl_clients      => defined $opt{'auto-whitelist-clients'} ?
-                 ($opt{'auto-whitelist-clients'} ne '' ?
-                     $opt{'auto-whitelist-clients'} : 5) : 5,
-+            awl_delay        => $opt{'auto-whitelist-delay'} || 3600,
-             retry_window     => $retry_window,
-+            retry_count      => $opt{'retry-count'} || 1,
-             greylist_action  => $opt{'greylist-action'} || 'DEFER_IF_PERMIT',
-             greylist_text    => $opt{'greylist-text'} || 'Greylisted, see http://postgrey.schweikert.ch/help/%r.html',
-             whitelist_clients_files    => $opt{'whitelist-clients'} ||
-@@ -618,6 +681,10 @@
-             hostname => defined $opt{hostname} ? $opt{hostname} : hostname,
-             exim => defined $opt{'exim'},
-             x_greylist_header  => $opt{'x-greylist-header'} || 'X-Greylist: delayed %t seconds by postgrey-%v at %h; %d',
-+            tarpit           => defined $opt{'tarpit'} ?
-+                ($opt{'tarpit'} ne '' ?
-+                    $opt{'tarpit'} : 65) : undef,
-+            targrey          => defined $opt{'targrey'},
-         },
-     }, 'postgrey';
- 
-@@ -633,6 +700,11 @@
-         require Digest::SHA;
-     }
- 
-+    # --targrey needs tarpit sec
-+    if(defined $opt{'targrey'} && ! defined $opt{'tarpit'}) {
-+        $server->{postgrey}{tarpit} = 125;
-+    }
-+
-     $0 = join(' ', @{$server->{server}{commandline}});
-     $server->run;
- 
-@@ -711,6 +783,13 @@
-             -Env      => $self->{postgrey}{db_env}
-         ) or die "ERROR: can't create database $self->{server}{dbdir}/postgrey_clients.db: $!\n";
-     }
-+    if($self->{postgrey}{targrey}) { # use targrey
-+        tie(%{$self->{postgrey}{db_tarpit}}, 'BerkeleyDB::Btree',
-+            -Filename => 'tarpit_clients.db',
-+            -Flags    => DB_CREATE,
-+            -Env      => $self->{postgrey}{db_env}
-+           ) or die "ERROR: can't create database $self->{server}{dbdir}/tarpit_clients.db: $!\n";
-+    }
- }
- 
- sub mux_input()
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 53aeb0809926..3532fe99da7f 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -8,9 +8,6 @@
 	<longdescription>
 		Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.
 	</longdescription>
-	<use>
-		<flag name="targrey">Enables the targrey patch</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">schweikert/postgrey</remote-id>
 	</upstream>
diff --git a/mail-filter/postgrey/postgrey-1.36-r1.ebuild b/mail-filter/postgrey/postgrey-1.36-r1.ebuild
deleted file mode 100644
index b86f673b9997..000000000000
--- a/mail-filter/postgrey/postgrey-1.36-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd user
-
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
-HOMEPAGE="http://postgrey.schweikert.ch/"
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
-http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86"
-IUSE="targrey"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6.0
-		dev-perl/Net-Server
-		dev-perl/IO-Multiplex
-		dev-perl/BerkeleyDB
-		dev-perl/Net-DNS
-		dev-perl/NetAddr-IP
-		dev-perl/Net-RBLClient
-		dev-perl/Parse-Syslog
-		virtual/perl-Digest-SHA
-		>=sys-libs/db-4.1"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	if use targrey ; then
-		epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
-	fi
-	# bug 479400
-	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
-}
-
-src_install() {
-	# postgrey data/DB in /var
-	diropts -m0770 -o ${PN} -g ${PN}
-	dodir /var/spool/postfix/${PN}
-	keepdir /var/spool/postfix/${PN}
-	fowners postgrey:postgrey /var/spool/postfix/${PN}
-	fperms 0770 /var/spool/postfix/${PN}
-
-	# postgrey binary
-	dosbin ${PN}
-	dosbin contrib/postgreyreport
-
-	# policy-test script
-	dosbin policy-test
-
-	# postgrey data in /etc/postfix
-	insinto /etc/postfix
-	insopts -o root -g ${PN} -m 0640
-	doins postgrey_whitelist_clients postgrey_whitelist_recipients
-
-	# documentation
-	dodoc Changes README README.exim
-
-	# init.d + conf.d files
-	insopts -o root -g root -m 755
-	newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
-	insopts -o root -g root -m 640
-	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
-	systemd_dounit "${FILESDIR}"/postgrey.service
-}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index d7e9b8b34ea1..5fceb991efae 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,7 +1,3 @@
-AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
-AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
-DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
-EBUILD pyzor-1.0.0-r1.ebuild 2016 BLAKE2B 34903bbfc8348b6d8f43f251743e41b3542eb536a0cf53cca4e3e866e1041b739f1db8f64bf46ec6ce5ff0e66ae89c71411428b116a984e9f48eab4bb0a33d19 SHA512 23e7b62bc729406edd320928983eda6b7ebde88978aa7dfedb64d2eddaa0e9a16702218d0b74bf6350360b9eebe863bc33273c2b1ccd189f2d07cfc99fd98ba8
 EBUILD pyzor-1.0.0_p20200523.ebuild 1564 BLAKE2B 1488769018ef6b43adac5d6405cbe48829104e432ac6edbd0d356172caf3f17f6c87853667af9fabdd1de74fcd4471210ad2549e82ec7e8801bf8d277f50875a SHA512 d80a983108f7cd22493b8108f5d704f19f5fbde15e7a8559fc78e5b41b3cd53475dca2673a9ed8485f0de25f27b634b994a5c2262c1a73e4cda8480d7b59ff34
 MISC metadata.xml 953 BLAKE2B fe7e5e35caa89645a565b81176783dd56302b60be89423f4dd882f14ec6b437daaacdeb1c253440eb67dc7f9dbc5daa9c838bb39ccea2e38b2eb48817c28a559 SHA512 ab71adbb406760237a26728a512f32a10e3e55d17bed7c09d37e7da32abe21dcce9d4506630c7a59e681e4096ee4c436e8edcf220e22038d45a6b755e123acea
diff --git a/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch b/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
deleted file mode 100644
index 03031a976690..000000000000
--- a/mail-filter/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 66225b32d2774cf37fa7f702f7eb26cd94094482 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 4 Mar 2018 17:27:01 -0500
-Subject: [PATCH 1/1] scripts/pyzor: replace the client with the git (+ issue
- 64 fix) version.
-
----
- scripts/pyzor | 33 +++++++++++++++++++++++++++------
- 1 file changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/scripts/pyzor b/scripts/pyzor
-index 19b1d21..86c6f7d 100755
---- a/scripts/pyzor
-+++ b/scripts/pyzor
-@@ -17,9 +17,9 @@ import tempfile
- import threading
- 
- try:
--    import ConfigParser
--except ImportError:
-     import configparser as ConfigParser
-+except ImportError:
-+    import ConfigParser
- 
- import pyzor.digest
- import pyzor.client
-@@ -110,7 +110,7 @@ def load_configuration():
-     config = ConfigParser.ConfigParser()
-     # Set the defaults.
-     config.add_section("client")
--    for key, value in defaults.iteritems():
-+    for key, value in defaults.items():
-         config.set("client", key, value)
-     # Override with the configuration.
-     config.read(os.path.join(options.homedir, "config"))
-@@ -171,14 +171,35 @@ def _get_input_digests(dummy):
- 
- 
- def _get_input_msg(digester):
--    msg = email.message_from_file(sys.stdin)
-+    msg = email.message_from_bytes(get_binary_stdin().read())
-     digested = digester(msg).value
-     yield digested
- 
- 
-+def _is_binary_reader(stream, default=False):
-+    try:
-+        return isinstance(stream.read(0), bytes)
-+    except Exception:
-+        return default
-+
-+
-+def get_binary_stdin():
-+    # sys.stdin might or might not be binary in some extra cases.  By
-+    # default it's obviously non binary which is the core of the
-+    # problem but the docs recommend changing it to binary for such
-+    # cases so we need to deal with it.
-+    is_binary = _is_binary_reader(sys.stdin, False)
-+    if is_binary:
-+        return sys.stdin
-+    buf = getattr(sys.stdin, 'buffer', None)
-+    if buf is not None and _is_binary_reader(buf, True):
-+        return buf
-+    raise RuntimeError('Did not manage to get binary stdin')
-+
-+
- def _get_input_mbox(digester):
-     tfile = tempfile.NamedTemporaryFile()
--    tfile.write(sys.stdin.read().encode("utf8"))
-+    tfile.write(get_binary_stdin().read())
-     tfile.seek(0)
-     mbox = mailbox.mbox(tfile.name)
-     for msg in mbox:
-@@ -372,7 +393,7 @@ def genkey(client, servers, config, hash_func=hashlib.sha1):
-         return False
-     # pylint: disable-msg=W0612
-     salt = "".join([chr(random.randint(0, 255))
--                    for unused in xrange(hash_func(b"").digest_size)])
-+                    for unused in range(hash_func(b"").digest_size)])
-     if sys.version_info >= (3, 0):
-         salt = salt.encode("utf8")
-     salt_digest = hash_func(salt)
--- 
-2.13.6
-
diff --git a/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch b/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch
deleted file mode 100644
index 93d0f07a2579..000000000000
--- a/mail-filter/pyzor/files/unfix-configparser-compat-for-2to3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e4f06e21f697b863fa45a50e535ff0c6e3621a60 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 25 Mar 2018 10:14:21 -0400
-Subject: [PATCH 1/1] scripts/pyzor: undo ConfigParser python-3.x
- compatibility.
-
-The build system for pyzor-1.0.0 still runs the 2to3 utility on the
-scripts to be installed. As an unintended side-effect, the python-3.x
-"try... import... except" compatibility block for the ConfigParser <->
-configparser module gets modified (the module name gets mistakenly
-lowercased).
-
-This commit puts back the python-2.x "import ConfigParser" line
-unconditionally, and we'll have to rely on 2to3 to fix it when run
-under python-3.x. In newer versions of pyzor, the automatic 2to3 will
-not happen.
-
-Bug: https://bugs.gentoo.org/643692
----
- scripts/pyzor | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/scripts/pyzor b/scripts/pyzor
-index 86c6f7d..2750d92 100755
---- a/scripts/pyzor
-+++ b/scripts/pyzor
-@@ -16,10 +16,7 @@ import optparse
- import tempfile
- import threading
- 
--try:
--    import configparser as ConfigParser
--except ImportError:
--    import ConfigParser
-+import ConfigParser
- 
- import pyzor.digest
- import pyzor.client
--- 
-2.16.1
-
diff --git a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild b/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
deleted file mode 100644
index af40ded0281c..000000000000
--- a/mail-filter/pyzor/pyzor-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PV="1-0-0"
-DESCRIPTION="A distributed, collaborative spam detection and filtering network"
-HOMEPAGE="https://github.com/SpamExperts/pyzor"
-SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gdbm gevent pyzord redis test"
-# The test suite is py2-only
-RESTRICT="test"
-
-# The mysql-python library is always required for the MySQL engine. We
-# depend on it conditionally here because otherwise repoman will balk at
-# the potential conflict between PYTHON_TARGETS and USE=mysql. But as a
-# result, if you try to use the MySQL engine with python-3.x, it just
-# won't work because you'll be missing the library.
-RDEPEND="
-	pyzord? (
-		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
-	)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-# TODO: maybe upstream would support skipping tests for which the
-# dependencies are missing?
-REQUIRED_USE="pyzord? ( || ( gdbm redis ) )
-	test? ( gdbm redis )"
-S="${WORKDIR}/${PN}-release-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch"
-	"${FILESDIR}/unfix-configparser-compat-for-2to3.patch"
-)
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use pyzord; then
-		dodir /usr/sbin
-		mv "${D}"usr/bin/pyzord* "${ED}usr/sbin" \
-		   || die "failed to relocate pyzord"
-	else
-		rm "${D}"usr/bin/pyzord* || die "failed to remove pyzord"
-	fi
-}
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index cfa07b5e26c3..701c4379a6eb 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -2,5 +2,5 @@ AUX razor-2.85-cosmetic-pv-fix.patch 616 BLAKE2B 58def0277c1142b664f65ae9f6e7f31
 AUX razor-2.85-makefile-quoting-fix.patch 574 BLAKE2B 03616893b3537e00f0a56b357a70956cb87e266feb72d588343427f248d73c2e61d8c9515572d7bc0f312420d5328dd6e0039a297be322f83dfd270615922289 SHA512 ee43993dbf4e1ed932a293636cfad98c8c4bb5b94a8df00262c39d34dd9c95143ba8dca1f088185123d352b940e0dd19d5b0a6f4afc04e63b36cc49a4963cbe4
 AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289
 DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db
-EBUILD razor-2.85-r3.ebuild 2594 BLAKE2B bd09d4bd2a2367570c61da4955225d2864e284b7c6c27f74a67c4871029bc982fa2db6402dd81f7300a092b7a2357674dae3bb130bc84dc471cf12fa1a16aa08 SHA512 a9289bce20ffb2cdc3faeb6f76eb05c243b9b749d6927c2032d3db41a3b747855b58856d8bc72fb590f0be910521b75107f6cf21b63483b1f071320113d928e6
+EBUILD razor-2.85-r3.ebuild 2595 BLAKE2B e932ecfad8f5199ffcc4359845cc5320d132c8c87dca6564f9e84fb34ad07cccfc0b7a6a7a52acd918b725244826f76f6b02d71c1fc7453b3fb1ea913fd30780 SHA512 c0816c276ad8e450a702fd05ecf8f1a987ee916be0ecdcd7b4a550f654402f46e45ab16f99ef6fde6e819392bef832b85727cc90d08a2a47ad5b187e74bc188a
 MISC metadata.xml 581 BLAKE2B 7a4fa065ec593200d844a2c5cba9df1711608fb089b4c568bc4095e4feee3ebfbeb53aa866b6c6a3044ccc9e6d5fb5b71319ca1f12f7ad7b8693567a1eda4b1c SHA512 6de4a7f82c7b1bacda76f5bb13df29a130c7c7cc4612071178b78a252cc029deb6b596847db37d6b305b5776fa2ce5e0475856fd0e0ea71b56cae36f89d389c8
diff --git a/mail-filter/razor/razor-2.85-r3.ebuild b/mail-filter/razor/razor-2.85-r3.ebuild
index f69dfd96977d..25a70af6703a 100644
--- a/mail-filter/razor/razor-2.85-r3.ebuild
+++ b/mail-filter/razor/razor-2.85-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	dev-perl/URI
diff --git a/mail-filter/rblcheck/Manifest b/mail-filter/rblcheck/Manifest
index 8c39c006a86e..f0c4ed682fa5 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 598 BLAKE2B 318189cc98cd6c141df90342bea181eb3a1464e47c8a231ad1898818d5111b777901d30620984b71d7e40e0e7f9c33772313603c4ef70a21fbea10fe8d5bfa71 SHA512 8ca4aac95d840a9e6761e52b1b4787211db0267ef697c799cc99c30a6b3f7552aea65fae7578ab2aa3e9b66561d7809e1e709af3f8de6c3a864469cac732e016
+EBUILD rblcheck-1.5-r2.ebuild 599 BLAKE2B eef2369f8ce2018552b19547e8a79c0e5cc1acb089f7f1358a5d1e7d674ecba8140bd38390f7573ac4be766bd118c8e46fb8fdbf6a137a57690ab75f0af954eb SHA512 5e8cf82f6a87ec8ba6738c77b79aa4a3d50087806e5b61476d23842210e371c77ac49070794608ece63b14bb25357f1da9356483860986b65c94061536ef00b9
 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 f9305dbb4bf4..f8aa98a7b716 100644
--- a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
+++ b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/logic/rblcheck"
 SRC_URI="https://github.com/logic/rblcheck/releases/download/${P}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/mail-filter/sigh/Manifest b/mail-filter/sigh/Manifest
index 72c9cf128e23..3ff85689d633 100644
--- a/mail-filter/sigh/Manifest
+++ b/mail-filter/sigh/Manifest
@@ -1,6 +1,7 @@
+AUX sigh-1607.1.6-fno-common.patch 565 BLAKE2B 6c6c7e97a20a098ab7dd6924a5156f718a293cda0e0106ee0f96219d7183542cd7a363ae2b7cddcb85026a14cf60f9870247d8024822e8ebb57f99c956955e84 SHA512 4a80085b4da8df37bc8577d598f0966be402be77fed26f7d59e47c2c5836c45e0fba83bf00dc5b5e52be53e54eaa670364244f5405cf52653f41904347987523
 AUX sigh.initd 485 BLAKE2B 329efca4f269586b191e3cef3311d465ef1fbe760d34a7dbe8089cc187fe2c35b4b64be283edf8cef3efff1b3bd90cbc092a22bcdb9de3a2e118b204bbec5230 SHA512 34e1cc17fdc09ad0377604c951cc85682f56ed4a2a2f6f396d2e4d30777fa1bb8ddf693487eb100ff45fe15612bb68ba641eca3c28008431649b7f980cb3fec0
 DIST sigh-1607.1.2.tar.gz 57662 BLAKE2B 288430b3016483340f7bb6c69060f6c2f38efee525b45d505e965c12e84c66d241d0a90c8a3f55e0b9bf801d8686ee1d2fa5eb03afad4795df620e594468afd9 SHA512 410883b55072b6476fc454440cf5f0e048587853a5095fddd7870b0efb5eca82e257f34ddef821f1a1968e1859207e7972e645922675fddaa2bf05b314bf5f60
 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b
 EBUILD sigh-1607.1.2.ebuild 824 BLAKE2B 450f88ec31ccb9904bf61d019b70a9dfde190a5601420547d0229ea0bb5e7c21a26febe06f895cbe648fc729e5bac7771b6b45e8e2b2cd0d00e5fc7826f28789 SHA512 c53474a0a48bd3e3fc26874da3896bd2282de2b4a2365b69b6a1ec8eda87b6fb0592767899859dacb84d367cf06557c30c08c6f61f65fffb666b600cf9150203
-EBUILD sigh-1607.1.6.ebuild 824 BLAKE2B 7d304bf4be564a1cff6c28c15cfc795f14a4d8e333b69dcc3ec17ed12134cf268c32c529fc06939fd707c1a4d17d124bd7a3ef54db9596dbb5fd5fd9d5487e6c SHA512 9acaced78dddf9bd4060429fbad09fcf8c9d7f0711337a1cc0668c4cfc5d2586a82a4f84505040b2420dade826863bc50745f4fb0b21842c975d4c8b6b954dc7
+EBUILD sigh-1607.1.6-r1.ebuild 612 BLAKE2B 7f583ba82990777fd20784686f8f00769f5e63c617c4c130faa2b8ea0603b3c724306a574bf02ba68f0e22f57c64ede168aa2edf6aba2f3ad9f073e55d2b0760 SHA512 7d403598c1bd858102282eb07665bc59215635b06b18626cfe58f4f21ed8b8c68118f16f380d0425e0495ff6aa383912a1b06ff555ac5cf921fe8f13c53b34a1
 MISC metadata.xml 554 BLAKE2B a5d8c99d19476f1bb337117ec670d81fca6ec22198276eb2d81831c787652acbed6b4f2c895f337e78e54b7870fd13d34a55c4ba783fcc086b48ff6b341760f4 SHA512 756248356f113ab607ace3d3b4688f09d5e1d4e908bd65b1bbdedef9ed607cac6b458c43fd6db8abf21874e1a8e0bc04d0c5b480c29ea96ff559ffd2d1c65bf3
diff --git a/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch b/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch
new file mode 100644
index 000000000000..a76b102be147
--- /dev/null
+++ b/mail-filter/sigh/files/sigh-1607.1.6-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -28,14 +28,14 @@ namespace util {
+      * @param x A string literal
+      * @return A pointer to char
+      */
+-    auto ccp = [](const std::string &str) {
++    inline auto ccp = [](const std::string &str) {
+         return const_cast<char *> (str.c_str());
+     };
+ 
+     /*!
+      * @brief Data structure for each client connection
+      */
+-    auto mlfipriv = [](SMFICTX *ctx) {
++    inline auto mlfipriv = [](SMFICTX *ctx) {
+         return static_cast<mlt::Client *> (smfi_getpriv(ctx));
+     };
+ }  // namespace util
diff --git a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild b/mail-filter/sigh/sigh-1607.1.6-r1.ebuild
new file mode 100644
index 000000000000..43bef3b3b138
--- /dev/null
+++ b/mail-filter/sigh/sigh-1607.1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake
+
+DESCRIPTION="S/MIME signing milter"
+HOMEPAGE="https://signing-milter.org/"
+SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/sigh
+	acct-user/sigh
+	dev-libs/boost
+	dev-libs/openssl:0=
+	mail-filter/libmilter"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
diff --git a/mail-filter/sigh/sigh-1607.1.6.ebuild b/mail-filter/sigh/sigh-1607.1.6.ebuild
deleted file mode 100644
index b0d0ac055922..000000000000
--- a/mail-filter/sigh/sigh-1607.1.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils user
-
-DESCRIPTION="S/MIME signing milter"
-HOMEPAGE="https://signing-milter.org/"
-SRC_URI="https://github.com/croessner/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="mail-filter/libmilter
-	dev-libs/boost
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.build AUTHORS LICENSE )
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	enewgroup sigh
-	enewuser sigh -1 -1 /var/lib/sigh sigh
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc "${DOCS[@]}"
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index b77216e83843..115e37cd5805 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,6 +10,6 @@ DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32f
 EBUILD spamassassin-3.4.4-r1.ebuild 9757 BLAKE2B da5bf1a73d699e1ef3542c98b2eef0ebdee1e8e51b50e69464ddf67772b05a76a669420cbe6be829ba4fe7f2fea7401e1c3a98af26ae73cfe6478085079feb9e SHA512 18f4c03126fae90068b57a302a309a00a9cf4ca55783bfc9a890c9107bfe5a578eb8b9dff184ff98ad86434fe084609fbdaa8f44914ecef2fe9d124e9364f820
 EBUILD spamassassin-3.4.4-r2.ebuild 9632 BLAKE2B 6b7816eeb6eaad6ecc1734e3b67b9b05df800ec0d8087cc3465fd451808216e06c497fdcaa66449ac4016869295dd6c8087054be9deded9e8f0bd28def29a5fe SHA512 9a3c46f95e944de3500e0adbbbff093d2f4fd20568907901c381bee0941c8f4ebc04f8609da26c7582e8c6b732710a20e09b0e081745246a9974843e042c9d27
 EBUILD spamassassin-3.4.4-r3.ebuild 9512 BLAKE2B bd5116a376a3bbf87ad962453e32bc60ccd3868c767a96b71fdad39d7753eb1d27a7f3eba8ba0b62ebed31c9e3f27711d04a8135bf3a3e276023478200c69c56 SHA512 20b012f637533a50cda2c921a6345595eaf6f6354577f976b875b31b2f5832cd329b6c775e915e9f2bf3f35c6dcdeb41f51640b8276e7a23b277c0c3452a09ca
-EBUILD spamassassin-3.4.4-r4.ebuild 9596 BLAKE2B e518e8ef9aa013aef40e4e44aae907d66cd77c2584306a5eadd7ec68a46d935af8d7179e7e568fecba4ff83c5fadf04217469b66a282c98c81f97e6781054135 SHA512 05dfa1745adfbc6792b46591b340bf57fe8917362b6cb92372b9c40b23f83af7d5114e29cd8fecf3cd566e333e44a9e955d952a14bf9f6e531eff03bdb2b22b6
-EBUILD spamassassin-3.4.4.ebuild 8488 BLAKE2B b6d4f0dfd63739daaf7b48352caf580130dad0aa765c5f3347d790eaae6410703d8f66dc2b1b365e056c7b18bf1df3e2110b2f8cc3b4f2c6f67095142553dbad SHA512 12d0b6ae6e886d42448329f8bee89ab015a391dbe7497888a5b35a7e41463a52d2c51ca13e567f1cd2f4f6cfd9686a8425947fc956a5523438e710e20b90ca16
+EBUILD spamassassin-3.4.4-r4.ebuild 9597 BLAKE2B b6143545ad7d644a9b871beb76280cf91c4b7a1c4f027b86e732ee3b7e416c11723afa81cc59d850bbc20d00e7f2335b258e4e4b6cfc238b9a27998a829f492a SHA512 9dc6d93468aa16cbf118fe3c1871b7b112b65f8d5f6a53df4dbb273dcb8e50790f48ed60d5790f1bd55fb35b3d1b799ff1e011857826fb5a57953a3e2d9321b8
+EBUILD spamassassin-3.4.4.ebuild 8489 BLAKE2B cd3f696609d30b48e0236c92d0be7aa5ec0ab42f6ef0e90c992a0b42899d9225794867dd984475b138efb4304e3bf23e5f21ae4710e30a4487a60adf1d32fb10 SHA512 26958f349da7f79fbe29a524acd415d1067fc9949c9bd049be457efa7bcb2c7514e4956082d45986bcf9da9f6061d740758796193a4a6453712fbc6cc0dd54ed
 MISC metadata.xml 579 BLAKE2B 98c1b526193c33a3f6d7aac34f9e93dcf81dfbd5b288da9a9a196d94e03fe7cb17d3b06de41042941a70f70215a6104a048fe67ff97b225490139bfb06fd8186 SHA512 f02b525fb0daf5a90edb2cfff536c51240bcc4c040f6ee6126b95865d0c61b1ded0d72d89b114ba58389963b033df1d8df97df6c39e49ac1ffbb69fee96acc7f
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
index a5ab782e6ed5..5b15b0b3ad6b 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.4-r4.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 libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild
index e7e986455f6f..14997d22b436 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 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 libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"