gentoo resync : 23.09.2020

16 files changed, 123 insertions, 85 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 11456a81378c..4ac7f75e783d 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/exim-geoip/Manifest b/mail-filter/exim-geoip/Manifest
index 494a034d4872..dc38b3d75500 100644
--- a/mail-filter/exim-geoip/Manifest
+++ b/mail-filter/exim-geoip/Manifest
@@ -1,3 +1,3 @@
 DIST exim-geoipv6-dlfunc-0.1.tar.gz 306380 BLAKE2B ce51841c988f41e5dff9c545852985e94ed4ddcad7d4575d0001d39a67266ad1083b4bed8c49fafa8ac742e2c8d1a12f78585b29f5887ceecdd37c862bef8c7f SHA512 ab10cf8ccd89772c1b925115d45cbd429f9ad577b4b951b120162516f0702331b8f8cca780d4aa1714435a907deed52f50acb06e9be888136a1745834d73215e
-EBUILD exim-geoip-0.1-r1.ebuild 642 BLAKE2B 172fa9ed530ccaea7e1aede1ab900b063e6bbc004a916883d88578f5a3b1842b0c1213a49b0b2dc4bb8769f44fa287646fe9c50e19605c99066661dc00178945 SHA512 159e12fff213a1645904f47037740fe3761c29e7675a92880e46b6e6a39f41b121dc6687769483851780a8e40e91c31a22b46ae5a0df3a3d68ee0c14b0c7ad57
+EBUILD exim-geoip-0.1-r1.ebuild 675 BLAKE2B a2a2f0bae74373595157afa9e036b6da4008e094e3595abd738f127282b91340c33bdf75acbbb15a100dae19701a421f9fa1fde8facb10381c1b84884b455680 SHA512 9bbdbbb904e93852fd939cf2b319511a0059ce57d7d19efced1661a599f1f9fb8bad8a8be75ba122c8762b0b98c518aa2a6aaa89dabf1d7258529030acf8bd00
 MISC metadata.xml 563 BLAKE2B 04a42876b10c10bb1e4941b0371a9e361023d48e12df440ec20cfdf3d641d830e1cb86e9ecb5c1bf07d1c5ab8bc574c3ec6fac51c11184ee63393583b9c66ada SHA512 62706fd3f95ae73470d26133ff28fe53011d4aa8268822218a69203a95de8b7474da67d8875c4f47953ab614d036a884254f714157f6aa31bbedec167372514b
diff --git a/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild b/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
index 9c12f98603f6..194427736d92 100644
--- a/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
+++ b/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils flag-o-matic ltprune
+EAPI=7
+
+inherit flag-o-matic
 
 DESCRIPTION="This is an IPv4 and IPv6 capable GeoIP dlfunc library for Exim"
 HOMEPAGE="https://dist.epipe.com/exim/"
@@ -16,6 +17,7 @@ IUSE=""
 DEPEND="dev-libs/geoip
 	mail-mta/exim[dlfunc]"
 RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/exim-geoipv6-dlfunc-${PV}"
 
 src_configure() {
@@ -25,5 +27,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/mail-filter/exim-p0f/Manifest b/mail-filter/exim-p0f/Manifest
index e82f65eb31d5..ae188267cf4c 100644
--- a/mail-filter/exim-p0f/Manifest
+++ b/mail-filter/exim-p0f/Manifest
@@ -1,3 +1,3 @@
 DIST exim-p0f3-dlfunc-0.1.tar.gz 307851 BLAKE2B 73bb80220ed65fadb17079b1e566664b51bea95ee12636296054b4bc8e3902d518ab1e63511d49c14f56e5ccb257ac10987fe8fd399c6e33c2f733a94f8f71df SHA512 9f913ba303bb42f6599ed044bb65954f993c2964d84ea0ff4e01e515c35ac7b58118fa6a304cba984499136438ad8f65bfe8c08e22c3be2d4c95f2950ab380b2
-EBUILD exim-p0f-0.1-r1.ebuild 633 BLAKE2B 0ac77a7dcac904fa4269e5d42c5aa5877e32599b2109ebd91fba2e044cf5703c7ad31ea3f794c23a561f9b8aa7a540d1e38fe0e532737257e897c2535e696081 SHA512 81c25a5b7352286a5d0ce4d4be868a113222d57a6124263d117193a64c577641abaf3f8bfabd9ef51bdcf6c833cd38711cd5b0a2adea64908d25680578e44cbf
+EBUILD exim-p0f-0.1-r1.ebuild 666 BLAKE2B ac12b6efaca931dcfc75795ed432c2d3a8ee5d7866048e826d929810a3b3292f593120881aa787e85226811da4a37c7cb08f8d10290513f001dc410799695a1f SHA512 69249b92ada90279228df3449baf5d28fe5a276eb476ca3bd6a4f50ba1f2b81dff3d57d51ad8f762d797e733db83e81762663be7d0eeccfd2c954a65443e13c4
 MISC metadata.xml 583 BLAKE2B c5fc0490ecbd798b0e15bdc44e80dd3f796bb1e5592fe0b1a2a18f59fff2937b4982cca45b8e3fefd88a97af7e446f2cc638e405bfb78e67142790578d2ad942 SHA512 bf47f55a81bc369964e41f01f0d70b966349c5c03100cd0f156c66d6fbf210c9ef93ef6b338b265e927eb6e1fa7a687064d099d6d85b7b1a17210c2466f75cc5
diff --git a/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild b/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
index 8c3b300d1dee..7c203487939e 100644
--- a/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
+++ b/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils flag-o-matic ltprune
+EAPI=7
+
+inherit flag-o-matic
 
 DESCRIPTION="This is p0f version 3 dlfunc library for Exim"
 HOMEPAGE="https://dist.epipe.com/exim/"
@@ -16,6 +17,7 @@ IUSE=""
 DEPEND="mail-mta/exim[dlfunc]"
 RDEPEND=">=net-analyzer/p0f-3.05_beta
 	${DEPEND}"
+
 S="${WORKDIR}/exim-p0f3-dlfunc-${PV}"
 
 src_configure() {
@@ -25,5 +27,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 0ed2e9a5efe4..951a74118740 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -5,7 +5,6 @@ AUX libmilter-musl-disable-cdefs.patch 352 BLAKE2B 192218bd59e4b5b4b7b7dd8f0a7a3
 AUX libmilter-musl-stack-size.patch 1522 BLAKE2B c2348f569cf69d52418beef8b2fc5fea31d5e100ab849220aca1ebbae44a955c482c375a02ddf43524894574355cebdc292b9566bfa420dead96df2d229a44a8 SHA512 d3e12943fe7e9babdf700a2d8c0229bc16fa2ea16097615600341dee13f137b157ffa4b03f76c92ba9c5552ca3bf01cb598f6a6201720408df3a37247001a219
 AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
 AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
-AUX sendmail-8.15.2-glibc-2.30.patch 1381 BLAKE2B 97822902c9a6fb2ca475a3c3deed93d05d89fc891ef7e45ac4fb7466f8bf549883572f97e190165f79db8b5cff5fcd70b2c52f185294bdbbc022b27a81e2c212 SHA512 fa2bf0a1123c82b000d92ab261039203f0426a1b6c874a1309219456378b7fe656ee2e7dce7fa674f55e6c6e5e8856aea4e32d8e0d3ac67dde934dfc31e48517
 AUX sendmail-8.16.1-build-system.patch 9701 BLAKE2B f1bbf82ab321b502ecbd5d2658e549275330ec6f6fdd2a31af36aba580adc1fafa74acaf1213798787c5b6c985e86f366f68e4c260212e4856e5778201400bfc SHA512 9a3dad2df6a84729a5dd7dfc7c696acacdb96d1b0856f763604e1183f9fb7e7e5fc6012d4299c9e0a6a57c65d763d4ca607f3c7862a2055aa3aedf3994ed22fe
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
diff --git a/mail-filter/libmilter/files/sendmail-8.15.2-glibc-2.30.patch b/mail-filter/libmilter/files/sendmail-8.15.2-glibc-2.30.patch
deleted file mode 100644
index 03281d1990fe..000000000000
--- a/mail-filter/libmilter/files/sendmail-8.15.2-glibc-2.30.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/700108
-
---- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig	2014-03-04 19:59:45.000000000 -0500
-+++ sendmail-8.15.2-r1/libmilter/sm_gethost.c	2019-11-15 09:32:25.812406080 -0500
-@@ -51,18 +51,21 @@
- {
- 	bool resv6 = true;
- 	struct hostent *h;
--
-+#ifdef RES_USE_INET6
- 	if (family == AF_INET6)
- 	{
- 		/* From RFC2133, section 6.1 */
- 		resv6 = bitset(RES_USE_INET6, _res.options);
- 		_res.options |= RES_USE_INET6;
- 	}
-+#endif
- 	SM_SET_H_ERRNO(0);
- 	h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- 	if (family == AF_INET6 && !resv6)
- 		_res.options &= ~RES_USE_INET6;
- 
-+#endif
- 	/* the function is supposed to return only the requested family */
- 	if (h != NULL && h->h_addrtype != family)
- 	{
---- sendmail-8.15.2-r2/sendmail/conf.c.orig	2019-11-14 17:36:41.262218822 -0500
-+++ sendmail-8.15.2-r2/sendmail/conf.c	2019-11-15 09:57:43.550284580 -0500
-@@ -4243,18 +4243,21 @@
- 
- # else /* HAS_GETHOSTBYNAME2 */
- 	bool resv6 = true;
--
-+#ifdef RES_USE_INET6
- 	if (family == AF_INET6)
- 	{
- 		/* From RFC2133, section 6.1 */
- 		resv6 = bitset(RES_USE_INET6, _res.options);
- 		_res.options |= RES_USE_INET6;
- 	}
-+#endif
- 	SM_SET_H_ERRNO(0);
- 	h = gethostbyname(name);
-+#ifdef RES_USE_INET6
- 	if (!resv6)
- 		_res.options &= ~RES_USE_INET6;
- 
-+#endif
- 	/* the function is supposed to return only the requested family */
- 	if (h != NULL && h->h_addrtype != family)
- 	{
diff --git a/mail-filter/libsrs2/Manifest b/mail-filter/libsrs2/Manifest
index 84c89f38c5f9..c05b218cb4d5 100644
--- a/mail-filter/libsrs2/Manifest
+++ b/mail-filter/libsrs2/Manifest
@@ -1,4 +1,4 @@
-AUX libsrs2-1.0.18-parallel-make.diff 477 BLAKE2B 21f7d1bdf54c73c28a7c5f59da1deb11282017becf812a3c964363eb6c316a03a9dac8f8d186489638f092b9fa76399a8763ea42104a5c09dafbd0be2253444b SHA512 a30b4ebe22f2f890597c8b1d6ffa5e0d81cc9b5bfb583899cf5996278d0b17a58850870db29d26c032dc10eeb0bf4e660071fc483c84fc70d317687339fbb482
+AUX libsrs2-1.0.18-parallel-make.diff 366 BLAKE2B ed7257f90d466e2e3f503c265e1fadcff2146396c20bf67d10e331bf68f9471574de96f88733fa4ebdc3890510af859232d56178a47f0554b9fd4e9813492c2c SHA512 5995ad456ab133d30e35abc8969ea6b8fa348e6f44d957b541654d25bd33a2018759f933fe7718f4ba38917e9e4533e2073a2f2b0184c6cda153b4774abf13aa
 DIST libsrs2-1.0.18.tar.gz 295748 BLAKE2B c4572ec58b474f47d34e127db7ce142ba6e715fb7f987801ae55a26628b5e2535b645b8209b6f5b106150b7999d2757e6b7bb64ee556d4b1c52df73144081626 SHA512 b9c189caa227487e90566f65430345f09a3d545fc286a3eb0c445aee3a74905c1a9248ce78b36a7cfb6a2936f6cd1efbe99ba7b8df49a613a81c6435396f5422
-EBUILD libsrs2-1.0.18.ebuild 645 BLAKE2B 9498fbbe89354df714c5ad8c3dea93e34be7bc1405a3c07eae01ae0b70158f1bd5e597565e4ec483ec196444071cb4781041507c7f214635387d034f3c4798b0 SHA512 87ec4fb64213d1fda387dbea96ea832b9ff1d05c0fc5fb2398afc7d9d8d93424879d185a20705d6be41f1677807e50f3bb448861c83fec9ab41644d2befd3bde
+EBUILD libsrs2-1.0.18-r1.ebuild 682 BLAKE2B 86b9a4d2a2a9e0fb6b5e676b31b10b2dcf63867fd3244ada53b420c41468542c99d1e8e32d6e6e19a3915338de0be92243f14ca288a87145fd4a6cce72057495 SHA512 d6ceee0f678e622477c7d6d1f9718d9243e86ca82190fee69afcd9110376935a49f45fe8ebd5debe25c2ef655d1b03a41902e49317f833b1a51a68f4dc07cdc2
 MISC metadata.xml 690 BLAKE2B b3a2bc9aa4161919f2180d85d14c186cbb116e48d9ec0594f495b4a592c2e5f35c09402c70acd5ea99af7e80734bfd64a6e8c41a8de8ddd32e5d30d2532fc475 SHA512 477ded5b9f894d5e438356ccbc8a9f39ca4790b965e8fe0a5f7d2ba6af4ccf571306e86fb30523ba4ae837a9ec88098f55e2d988c9bf2a35197aa643d3fe7381
diff --git a/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
index a5ce4d5a0028..9447bb2c4954 100644
--- a/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
+++ b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
@@ -1,6 +1,5 @@
-diff -Naur libsrs2-1.0.18/libsrs2/Makefile.am libsrs2-1.0.18-1/libsrs2/Makefile.am
---- libsrs2-1.0.18/libsrs2/Makefile.am	2004-06-10 11:33:28.000000000 +0200
-+++ libsrs2-1.0.18-1/libsrs2/Makefile.am	2009-09-29 16:08:29.000000000 +0200
+--- a/libsrs2/Makefile.am	2004-06-10 11:33:28.000000000 +0200
++++ b/libsrs2/Makefile.am	2009-09-29 16:08:29.000000000 +0200
 @@ -3,9 +3,6 @@
  include_HEADERS = srs2.h
  noinst_HEADERS = win32.h
diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
index e31cfb85a72c..0ef4838f7bbd 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
 HOMEPAGE="https://www.libsrs2.org/"
@@ -14,11 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="static-libs"
 
-DEPEND="!dev-perl/Mail-SRS"
+DEPEND="
+	!dev-perl/Mail-SRS
+	!mail-filter/libsrs_alt
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-parallel-make.diff"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-parallel-make.diff"
+	default
 	eautoreconf
 }
 
@@ -29,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || find "${D}" -name '*.la' -delete
+	use static-libs || find "${ED}" -name '*.la' -delete
 }
diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest
index 5cdf09214927..7fa6363b460b 100644
--- a/mail-filter/mapson/Manifest
+++ b/mail-filter/mapson/Manifest
@@ -1,4 +1,7 @@
 AUX mapson-3.3-gcc6.patch 10368 BLAKE2B 8c00a3030276c78e09406e4b8fcbab1cccae183af09c8c2dfa31fecbd7673a1a6008c73ce8e872920f34700816d3095fde35a771e9bfe3196b2c8a6dcbc9a869 SHA512 159e5a3e4b7fafe0b1c12e020c9c37bfefa40218fe2d974a263060eb27b1afebff4215d03a574e6487f36a61fc71f19b1bdc69ce4234095a9bc6a8fdc173f1e7
+AUX mapson-3.3-respect-AR.patch 282 BLAKE2B 56dba922efc554e634ead5e8d155019507c085e757d10917c24469b9d0d522589c23091eabaa1d8353c509a42c27067b2f1044ce77a95465955e6f498cbe70f7 SHA512 c34a84a995bfb7fd6f7fb1c1f80d30a41caa6e9e0729e9498b46d6586c743cef72e36c4bd8c9a3d94879fea6c8cbd23c00a81442077e2df946d7df53778f820b
+DIST mapson-3.3.1.tar.gz 553101 BLAKE2B 5100029e4b650b63cf868de48d9c709ac9fa8dcf773adb9ab70061756604116d69a20421d96ca769e19047efbe806cfc63432269cc83133f7f7f54f71b627d45 SHA512 07ecfdd2f9857a8b3818d065e4c342fda5089b77074ea153f9a380fe655716a214ff06f79eebe768b2470724e11a6ee819c1e457a47670c07537d6fd226dc1db
 DIST mapson-3.3.tar.gz 421820 BLAKE2B e12c358113452a426cd5b55b945b77a303b595362064f6c84fe8bd8799502dd72872ca46cf54ce04022c3d27be52a849e337ae149521ce6ca35e990be73c1e98 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0
-EBUILD mapson-3.3.ebuild 903 BLAKE2B 78e07f535d4624288758e613c06fdeaefe183f2b8fe3f1b85df63d0d5e717b1ea60be61bd18e1e54b1495b7e7966a949722c9b5cca7130f131e92e9246371610 SHA512 de34f4ab56b5f89dc70350de3f448bcff1f6d2da10e9d5d83d63fbb253e9a1ed26a8dcd6986024bdc92bf4cde8f8177e6feaa7cfdf8f8d2ec68b5d1fa7bb574a
+EBUILD mapson-3.3-r1.ebuild 988 BLAKE2B c44904bde0782277b0f9f3ff3df21b9f88329c8c33fbd03beae708a1e11bd7b8f5bb28d8cc68f9d5754072474d02fcd44dd59bef1eccdb858c22d48a2e3c2b66 SHA512 42e4b0c617ece918664bd0fd6ec1bb3d86aa2ef1137d18aa7b78d3a6c7d73fb0525e75a1bf1a2dd6173f6a85a3da944b2b8e54737ce18cfdcf7c946894650044
+EBUILD mapson-3.3.1.ebuild 955 BLAKE2B ef02280c792d82ec866cc6276b90c496934697163afa9b78af5b7b2c83e6fcb57be982134f2c7d8d918d3291aa9320879577dbf3a712aedf3b2b1724804f9edb SHA512 748842b3abd81ca8a79aa725a6162e535ec7f8194eb4557da6c54487020662abba361ccb9370224df84dc0fb20de16388e29129abc92a534c7fe14a79b7325c4
 MISC metadata.xml 243 BLAKE2B d67b7acc61a5bb2cbedc654940fe1fe6bee39265ea6526ce527b262efea2e79975f3652c9c56fd31d60d9539f550d91efc7efa07ebd1d3f9f91d0958c2e94f0c SHA512 5d03648b477941f83f642d119d87a9ef99740ac272bbd74cab1b2987eed7e198b3aa658ddeb0db98ee20a2ee4c21d205672290aaeace5ff4dd81e72935a110a1
diff --git a/mail-filter/mapson/files/mapson-3.3-respect-AR.patch b/mail-filter/mapson/files/mapson-3.3-respect-AR.patch
new file mode 100644
index 000000000000..7a5ecaae5d3f
--- /dev/null
+++ b/mail-filter/mapson/files/mapson-3.3-respect-AR.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 8dc1878..3967624 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@ AM_PROG_CC_C_O
+ AC_PROG_CXX
+ AC_PROG_RANLIB
+ gl_INIT
++AM_PROG_AR
+ 
+ dnl Does the system have a working <getopt.h> include and
+ dnl getopt_long() function?
diff --git a/mail-filter/mapson/mapson-3.3.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild
index 5c6ce7bac660..9903dbb7f789 100644
--- a/mail-filter/mapson/mapson-3.3.ebuild
+++ b/mail-filter/mapson/mapson-3.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A challenge/response-based white-list spam filter"
 HOMEPAGE="http://mapson.sourceforge.net/"
@@ -13,11 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-RDEPEND="virtual/mta"
+RDEPEND="
+	acct-user/mail
+	virtual/mta
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-gcc6.patch
+	"${FILESDIR}"/${PN}-3.3-respect-AR.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -25,17 +35,20 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 
 	dodoc AUTHORS INSTALL NEWS README
 	doman doc/mapson.1
-	dohtml doc/mapson.html
-	dodir /etc/mapson
+
+	docinto html
+	dodoc doc/mapson.html
+
 	insinto /etc/mapson
 	newins sample-config mapson.config
-	dodir /usr/share/mapson
+
 	insinto /usr/share/mapson
 	newins sample-challenge-template challenge-template
-	rm -f "${D}"/etc/sample-config
-	rm -f "${D}"/usr/share/{mapson.html,sample-challenge-template}
+
+	rm -f "${ED}"/etc/sample-config || die
+	rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die
 }
diff --git a/mail-filter/mapson/mapson-3.3.1.ebuild b/mail-filter/mapson/mapson-3.3.1.ebuild
new file mode 100644
index 000000000000..4735517e167c
--- /dev/null
+++ b/mail-filter/mapson/mapson-3.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A challenge/response-based white-list spam filter"
+HOMEPAGE="http://mapson.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	acct-user/mail
+	virtual/mta
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-respect-AR.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with debug)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	dodoc AUTHORS INSTALL NEWS README
+	doman doc/mapson.1
+
+	docinto html
+	dodoc doc/mapson.html
+
+	insinto /etc/mapson
+	newins sample-config mapson.config
+
+	insinto /usr/share/mapson
+	newins sample-challenge-template challenge-template
+
+	rm -f "${ED}"/etc/sample-config || die
+	rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die
+}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index a377e5d843cb..1e01f3763ef4 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -3,5 +3,5 @@ AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c
 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 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
-EBUILD pyzor-1.0.0_p20200523.ebuild 1568 BLAKE2B 471cb842c1bf016aceb0c017b4f869bca4caf4526e540f020427a4ab7cb25f25415043587066b0bbd9e3211ba1888c75ac677071a09fc4441a31881b2d9624d4 SHA512 b35c3043c6733101e098edabbfc349891ba2b9fc2b8cccb5b617d916b9d3f4ac12bd76340432dc8ee0043cc7b3b0174955fea6bce01268ba1b7f3ef86f15dc12
+EBUILD pyzor-1.0.0_p20200523.ebuild 1567 BLAKE2B 37d2d4ee4f7d92ab8d8ace453a47d3affbc5df605bb02a224477582e1528c680e1ad152864bdb94871ac060b412cb277f0833081d9989bec907a780d2842915d SHA512 50a3e3d772a64ad9e3f3740717694d93b2c3eba258860dbedcae83225e44a9a5961c53ae2b7b5fd66eb06fd8bb9726674ec8a6257bb578fe764df894c71728b2
 MISC metadata.xml 953 BLAKE2B fe7e5e35caa89645a565b81176783dd56302b60be89423f4dd882f14ec6b437daaacdeb1c253440eb67dc7f9dbc5daa9c838bb39ccea2e38b2eb48817c28a559 SHA512 ab71adbb406760237a26728a512f32a10e3e55d17bed7c09d37e7da32abe21dcce9d4506630c7a59e681e4096ee4c436e8edcf220e22038d45a6b755e123acea
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
index 4ad861c375c7..243f4943c4bb 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc gdbm gevent mysql pyzord redis test"
 RESTRICT="!test? ( test )"