gentoo christmass resync : 25.12.2020

16 files changed, 149 insertions, 70 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index dac381a54eca..621f849db882 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 4295ef169533..9f3c540c9598 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -2,5 +2,5 @@ AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d6
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
-EBUILD mailfilter-0.8.4.ebuild 682 BLAKE2B 9850eedda9e8df78ea8f98c4d629781d23ba1d6f12e806380a0e4ca389032a4002ef049c6b3eb89ad13fb6772d338bceef09b3f3681367ac48c6366ac70ba109 SHA512 98dd725f1d6281caece3c27b152c53f55c43bf0ed5d8c124da43496a182332f9ee61f3feef60faba06d8fb493f65605ca1a95ba10368717d01b51dba0d07e2a2
+EBUILD mailfilter-0.8.4.ebuild 679 BLAKE2B 0a2118ab1a38866d1428a0396b5e420486a4ee57e67a66d56c67d48eafbfb0b3903ef48d6467649e4e653f6f960bc1ff1dfaa1f6ef25ea1da8ab56da043a75df SHA512 46297eec51a0e51601c369392c59780330316aa5356155dda50233591e3896a7fa81629cfd4894953d7e8213da5cf9fee61a2a70773bad641da41063aa04c7df
 MISC metadata.xml 247 BLAKE2B 7d481b0cede6e8bdaa87e4e460a2e9c022147ff75e58fa9f0c3881cd10a0feb7210be0f15ad4359c284db38388f74fe7308e9a415b8c85537adb0afbd867ef5d SHA512 75a4c0de2951d0542c787fc15e0b22ae7af87f391bcbb5416b0bd984a9ea6f1d384de28227dae6718a75b0f3826d24adec3192d0d8aec2b9e27b92defc1b4423
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index a5a9171da42b..b84a6c85d78c 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index f873bb527f55..a55dc00859a5 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,10 +1,11 @@
 AUX opendkim-2.10.3-define-P-macro-in-libvbr.patch 1111 BLAKE2B ef21e6609a80eadfc3c493b088df6afe368d0ed833d04e7cde922e643b434a7033c888e1b7158d1085152b128a60d95fae722885f15be08c63bed898e4924127 SHA512 6cf0cb4e54814f661f9869bfdfda0ab44c67f237475ebc69b18c670de9f356bb5375740dc8e0a922f25a3215ad5a884725629c92eac1dbf8251364725d77c105
 AUX opendkim-2.10.3-fix-libmilter-search.patch 7465 BLAKE2B 9b6de6dd084437dd9fb2d905ba3addd3d39150b0cc36d7d62f8f10390acb3adb584dd23f8ee5b87c2b322cee34580e16725ce86b5967f14067d7ccae070ce7d4 SHA512 f8c675abed82f2058403b80162f83e6f44f7cc7502e32228f3127d332d17fd664dbb91a27a93717bd45cac875f356d9c6af1807ceec46ffe1d73e1a603615219
+AUX opendkim-2.10.3-lua-pkgconfig-pt2.patch 1728 BLAKE2B b80f8a21dc19a0e8b37a02c3262698dd08da79d067fbff4ac04b1dfa39d133ee0a113984d4e35e7fc835c0d801d0485b3eccad76f93e9274106e166850a91cb5 SHA512 47fc79f46ae7e4178fc1062f342182b7b783274ac84d99dcb5155a12adb85b42ae597defb3a0da888a70d01e86b068647eb48d881aa107318a355cedd3a6cc4a
 AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad01a39e85a6f1e440e3754e497082f5f1098dfc8c31771b1f83ae59f1e53ef242af78093601b1348b62945deacf8afdc42fca0 SHA512 b9ee7e625d1a3f00dcda7e441a81749d773daa9cfad7f046dd03d775564f1c111648c883ef1dcc16a6b518239b6a66bee4ba59f59227d182fcf61b887594d1d7
 AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r17.ebuild 7372 BLAKE2B 1eb362d660bbdd27d71c08e2abe086fefacc7c7e5f731887ecbad762c9370eeb39ed731210a0debe3ca419b0119b0f1ffb142f31f379974a496361d3fa5a014e SHA512 b8a056fcb785dea25fffff98fea7f071de14201b192ffbd162463f3a4eae1c481e3c7306d79a9000ccf8d5892824f10417de8cba8edb83bfe3ae8abb374124e7
 EBUILD opendkim-2.10.3-r19.ebuild 7537 BLAKE2B 0616b19c9311bd00b3163852f6e1d8c091659efcdfcba2987a96793f59bfbf7c09f5b354ebebbb9631f1ccd84807f5675481903f4c052a75349fb21ef12d76a0 SHA512 25e21bb76901057ad1818adaba45ad1894b91f8f2ea68d4d3694e0fc3fe920438f6848c939e7b69a10432d6078ec735169e6d9521d719cf2c4c9acedd53f7f7a
-EBUILD opendkim-2.10.3-r25.ebuild 7632 BLAKE2B 61ec5b795f374b7fe884f9ef841605a05b4c67678c8a6f908aa94874837998dd7a42bbc773b76b280ed58d2a4851bcabcdee30498497854a8113efc1326d7830 SHA512 78dd8a2a723d5990e12c58ceb2ec45c87c2034019e0c57f6d614d38d653c3dc5667d45f0b6ddaf95ad5aa07355c9c3b269d8a3b366c880c54642eac137dc299d
-MISC metadata.xml 2185 BLAKE2B 0cfb33303e8edf764700664863e2dbf90a288e71cf1a078c33ebaac20b11e398e34ae8ca289732b24401ec1f4b192e2c922a86297632af9a039736c52e0ac143 SHA512 56753bc62e8fa16ad3df9e49c2877bbfa5ca8f2f617455c8b9757e50cdd2afe6b27d2d185edb3620d447e42277d755373eafb448da08262723cfb0b5863c3399
+EBUILD opendkim-2.10.3-r25.ebuild 7675 BLAKE2B 2addb6c91c5736023931e1210001411cee9ae9e9d5182ed0ac4fb6a02fdd78b80c8acdc694965c22b89b93b3bcfe65342f8bd7fe9cb5527f337b0e7e337cd238 SHA512 98a8cdb930c177d1bcfeca302435ce985e103b5bd3c9248111d9a69c5c2b8c09503c88da942875c4b08bf96b27be6f1de7b2de6f2402bfa5b15080128650493c
+MISC metadata.xml 1942 BLAKE2B baf1f8f5be8cca84723fe3a17e91a2684a41445cfc707aadd1073febff1102505cd6fbfdce3756bb6f6c1529d9b7506d1baa5f50799c79ab4be79b4dcd17e9e4 SHA512 10256aaf84cccecf4a78df6a2572e1abc296c2e200269a2f5693a1664431d556d3e79a0820076965d6c56d70056562cfac458add472ce47043734edb8e228a90
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch
new file mode 100644
index 000000000000..9e963eced4dd
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch
@@ -0,0 +1,51 @@
+From 6dcab8d2e001bb4b91314693affa65e9c1a9adbd Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 22 Dec 2020 19:36:28 -0500
+Subject: [PATCH 1/2] configure.ac: drop lua5.1 pkg-config check.
+
+The official upstream name for the lua pkg-config file is "lua.pc", so
+preferring the name "lua5.1.pc" to the official one can lead to
+problems when both are installed. Specifically, if lua-5.2 is
+installed and its pkg-config file is called "lua.pc", then ./configure
+will still detect (and use!) lua-5.1 if it happens to be installed
+with just the right name.
+
+This was honestly left in only for superstitious reasons, and now it's
+actually causing problems on Gentoo systems that have more than one
+version of Lua installed. So, time to go.
+
+Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/111
+---
+ configure.ac | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 828fe53f..d3d688ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1517,20 +1517,10 @@ lua_found="no"
+ 
+ if test \(  x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
+ then
+-  PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
++  PKG_CHECK_MODULES([LIBLUA], [lua], [
+       LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+       lua_found="yes"
+-    ],
+-    [
+-      AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
+-      PKG_CHECK_MODULES([LIBLUA], [lua], [
+-          LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+-          lua_found="yes"
+-        ],
+-	[AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
+-      )
+-    ]
+-  )
++    ])
+ fi
+ 
+ if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
+-- 
+2.26.2
+
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 224c3bd7ac44..47cb0241dd48 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
-  <maintainer type="person">
-    <email>gentoo@seichter.de</email>
-    <name>Ralph Seichter</name>
-  </maintainer>
-
   <maintainer type="person">
     <email>klondike@gentoo.org</email>
     <name>Francisco Blas Izquierdo Riera</name>
   </maintainer>
-
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-
   <longdescription>
     A program implementing the Milter API that signs and verifies
     using the DKIM standard. This is a fork of Sendmail's DKIM-milter
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
index 8ca7f3a8623d..b105074a89ac 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 lua5-2} )
+LUA_COMPAT=( lua5-1 lua5-2 )
 
 inherit autotools db-use eutils systemd tmpfiles lua-single
 
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-openrc.patch"
 	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
 	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
 	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
 	"${FILESDIR}/${P}-fix-libmilter-search.patch"
 )
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 180a866dd058..33d73acfba45 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,10 +1,11 @@
-AUX postgrey-1.34-perl-5.18.patch 952 BLAKE2B b84356fcbef08e1029501dd36bd31d6b4477c3ae30ba9bbb31bc40544d5dbc4e92cde46b88c1141186d0a9af039746b6f46aa992731a42420a4d79b9e5927fa3 SHA512 2145d3d0fff5c993075a3a792adb899a9d28760b43a21daacb4b4a94b5f3a587ecd29700314ae20379d4909bf22d518161e9dcd556963dc185c014351845f6b0
 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 1662 BLAKE2B b4f70a90e59b28635840c222dc6fb6d7a9008705649db3ed50445ed1c19b0c15be49d5574547197a82ada5242115f4c358e8245b27dc1c18073b119eef6d20a6 SHA512 17512115c889bceccc2a8fd09ffc8aa5815b37256b473a7f794c42f4fd561dc625e7d72f6f67b9a1abe2b89a6a14e0f51ecec913029ea7fd12e1fdca8d707790
-MISC metadata.xml 582 BLAKE2B 68f063bb59cf9526167905dc77294f8c5da400bf2a128dab804f2286c594db84c397f98233fe4428842f0191d495c776b299bd6ab8fc9c3fda509df7c80f3611 SHA512 0b40a89f66f637c4086475a4808771e967063ad6841a7b23174ce2a2adc7c3bc25ce683a37d18c6935f9d2f4ef081cac0c465270484bc15cbe552fd2a3160e01
+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
diff --git a/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch b/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch
deleted file mode 100644
index 615c6e5b77d1..000000000000
--- a/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9673b54064691a5b9c295ffea340d8a1f9ee1cb8 Mon Sep 17 00:00:00 2001
-From: Yasuhiro KIMURA <yasu@utahime.org>
-Date: Sat, 17 Aug 2013 22:05:27 +0900
-Subject: [PATCH] Make postgrey work with Perl 5.18
-
----
- postgrey | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/postgrey b/postgrey
-index 7cb0352..37f69bd 100755
---- a/postgrey
-+++ b/postgrey
-@@ -557,6 +557,16 @@ sub main()
-     if($opt{dbdir}) {
-         $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1;
-     }
-+    # untaint what is given on --pidfile. It is not security sensitive since
-+    # it is provided by the admin
-+    if($opt{pidfile}) {
-+        $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1;
-+    }
-+    # untaint what is given on --inet. It is not security sensitive since
-+    # it is provided by the admin
-+    if($opt{inet}) {
-+        $opt{inet} =~ /^(.*)$/; $opt{inet} = $1;
-+    }
- 
-     # determine proper "logsock" for Sys::Syslog
-     my $syslog_logsock;
--- 
-2.0.3
-
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 2805de6dd07d..53aeb0809926 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>lists@xunil.at</email>
-		<name>Stefan Weichinger</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<longdescription>
 		Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.
@@ -15,4 +11,7 @@
 	<use>
 		<flag name="targrey">Enables the targrey patch</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">schweikert/postgrey</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/postgrey/postgrey-1.37.ebuild b/mail-filter/postgrey/postgrey-1.37.ebuild
index 37e2c1011e8c..03ab30c7a0e3 100644
--- a/mail-filter/postgrey/postgrey-1.37.ebuild
+++ b/mail-filter/postgrey/postgrey-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
new file mode 100644
index 000000000000..7714cf102c09
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+COMMIT="eb420c5dee57dd54e6f63bad5d74e85f5cc9535d"
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="https://github.com/schweikert/postgrey/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	acct-group/postgrey
+	acct-user/postgrey
+"
+RDEPEND="
+	${DEPEND}
+	>=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
+"
+
+src_prepare() {
+	default
+	# bug 479400
+	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+	sed -i -e '/git/d' Makefile || die
+}
+
+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/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index 2479dc701410..fc6617599740 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -1,5 +1,5 @@
 AUX postsrsd.init 737 BLAKE2B 76342c7707e86c8d111e550393ce2e624c2ed192e16a4521cf6b14deb81a21d2bc8be9ca1027890dd0dc883cadf6659fedd17b417d0712e55e38781f5ec8cffe SHA512 9550e26ddee4eec5b324bc6364b52ea8ebf755c1463498ab7380aac87e79d1a84e2048ef0bfdd250d029674d5050bab1bb5d1cec455ec5d4863e08d320e06111
 AUX postsrsd.init-r1 787 BLAKE2B 6d5431bb32974dc88ace86d2781681fdc9058475569080d057cb0336f337b8ccb3bd63f12344829085e5ba7399569dc951a820e6bdb8c5e0cecba718bfa19774 SHA512 dd80b6be1e2c28ddd7ff48ac761ce15b46d01db58aa91ddaa29db63acec5c071a52c055b9ecf8839f04696765a937dfcd2532be4a99fe2cf04bd881a7bd5acc2
-DIST postsrsd-1.6.tar.gz 32111 BLAKE2B 5b4e562aa9c9b5faf0e45c035a71d76dc2b6e9b3d4399108f06e6d0ad3e4f7abfcb8c18c818f3b4787bab155bf7895caaf127a97b861b26525ad5a27f2ee4dc7 SHA512 b2df4cdec41361e15cd8c9207fb16564d607559bcb36dd73c9347b90e4f3c2414b88434ef1ffe6a18783f38c5960383516e40e4ffa28802a03539e52ca723aa1
-EBUILD postsrsd-1.6.ebuild 771 BLAKE2B 63cdc5cc1f67a499b8c96a27c788f0fb565834184100268afa722d46a91e534257c6a24c1b28c2f7fa3201ff40500a1a7ca14e8ecd96262cb6e8dc73d0c58ce9 SHA512 90f45343c349513fbcbb4af3fc8b1cc19be465e53dda7dd086758fd28bca469db30d30b3f980c8aa3fe2c1a384397310846357f5c8ab26b9fc9aa976de9dc461
+DIST postsrsd-1.10.tar.gz 34844 BLAKE2B 4722e8f3ec1d5d7de0648d8afc03c38f485c92b092bd42bc02c82c4072b5eb053cbb907bd1198de1219acf465c850b4f08ee8bca629f85734ca2ff643d77c1e4 SHA512 79f824cbc56de2e79da2eb67b1888c1c171a10a7bae5f19384c22024ff7e65dd36a447e632ddaf77bea6bdfa4972c7a918a30cd3b06f7b7ae49ab7552c43be0e
+EBUILD postsrsd-1.10.ebuild 754 BLAKE2B d28c852abfe740d9ae0f443e275a97d99dfdfd98773f1234be34eac7b83b9f377a861ef4d775d91002166b89517b12b521af465a513b8b1bcfdfb8caac5b9f02 SHA512 fe657197db0f0fc3d699f32bb0055e74385be862bba28cc4b021e919fe61ec4026dcf87bfacc60a2c17ff5b4018a8440c0d6c90784a202b13d39bb83046fe29e
 MISC metadata.xml 337 BLAKE2B caac016ab1be7bad01670321e5aae7cf8c3699a394f4911350b4104d313e5b921071cb3406a47f976f16d1fc6879a16b2d6be03e0765a02f0e1e65de5703df0f SHA512 9093270e1a174ca6c5e1316015b3e9605f247bcd4fccf1e1c9595f5b94e3e182e532dced5c483a0be24c053fd453a5b9ba272c1004fbc54fe95cc3069dfe7d59
diff --git a/mail-filter/postsrsd/postsrsd-1.6.ebuild b/mail-filter/postsrsd/postsrsd-1.10.ebuild
index 5b7fe63b27e0..9e1777c300cc 100644
--- a/mail-filter/postsrsd/postsrsd-1.6.ebuild
+++ b/mail-filter/postsrsd/postsrsd-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Postfix Sender Rewriting Scheme daemon"
 SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=dev-util/cmake-2.4"
+BDEPEND=">=dev-util/cmake-2.4"
 RDEPEND=""
 
 CHROOT_DIR="${EPREFIX}/var/lib/postsrsd"
@@ -24,11 +24,11 @@ src_configure() {
 		-DCHROOT_DIR=${CHROOT_DIR}
 		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/postsrsd.init-r1" postsrsd
 	newconfd "${BUILD_DIR}/postsrsd.default" postsrsd
 	keepdir ${CHROOT_DIR}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 0d9ed0dfc0ae..2e19487f1ff1 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -14,6 +14,6 @@ DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b226
 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 EBUILD rspamd-2.5-r1.ebuild 2565 BLAKE2B b8e44e7c74887186c9a228e0fa706f8070b95238a2d63e1ecb0e26d89b930442f8e72c5371d50236e34e67c1f6991c1a36e74fc06bb66fe965fd2565c238a9d3 SHA512 c34e5d2ec35dd9dfb2586a4690221c7aab98459c69694f1c82795c264e41723fc791c830c940df97bcbfd611ff1461fb0ddd142bf0e6c8c6dce25e6110db08b0
 EBUILD rspamd-2.6-r100.ebuild 2746 BLAKE2B cb91e2db0ade31521975900a4d3ccd3bb68119aca71eec4139843d204477ee556b59ff5082e3eba1b0afbf49af1e4ed182bf9b165e58bd7b9c3608676fbcdf71 SHA512 668e8baeea10cd5e213f9d2d259447c678726ab5dc11bf1b95ffe716e321c5900a85ef98c4d459722e163be5730511b6eede0151700b5b323ddb3a6897916538
-EBUILD rspamd-2.6-r2.ebuild 2535 BLAKE2B 5968455ea16f256449cef924f026fc1f30186e1805902bf4e34de0c4c0d6b6dd16ddb39e80be352b0ea113203e164c2aa28c8b2bca9e0d34c5c09fad82827cf0 SHA512 d6a5710aaf4db8f40f959e92811875f01b1fd2c1a248a0875bc65373bc453ec488314c267e83c98884bb7a52a328d5c10efbe381b0383856178dc6767bb3ae51
+EBUILD rspamd-2.6-r2.ebuild 2534 BLAKE2B f9a60233509527d4e593f832083cd7414390ada25a036ea1e388f3303ca29d96e38eac9a262d11b47e2889b007f598907ec9d899d388210760f2069b735634b8 SHA512 a1b1334e4a97685cef7a3a01934accb9a7ceac19e6cbdba240717cc65f53cba52fc83bc15035bd78d79a0258c05752f07bad1afbd3ab63155e6324ef5f588210
 EBUILD rspamd-9999.ebuild 2747 BLAKE2B e3f88f2d25c948628dcd8619137ee9aeff91bedde69e7e328a1113858867ef53116cdcf06b21fc6c86b8f0e51d81d2657913243d34b645d099abb858d66044e7 SHA512 95f70ab731b647f74fa433c86f6ec3692f6b746c8064da41ecde3b79e705467bac28f03069b623c7c1fff1837d06e5ee9d9ba1f5915a5b77bceb6f5361e0f9b2
 MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index a31a0897fc9a..d22ac2c67f30 100644
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"