gentoo resync : 23.09.2020

25 files changed, 71 insertions, 530 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index cb95ce348678..ac995f1f6273 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b934ff564bcf..224b6e3a24f0 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -13,6 +13,6 @@ DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1
 EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
 EBUILD dovecot-2.3.10.1.ebuild 8629 BLAKE2B 4d664f1ff75b846a2be7dcca52b7189efac3c6f95e40a0af935dd16f857c51db53aa72023e94b4ae86a5bf892475fd4259dc5085ea41a5053b702ced5b2725cd SHA512 d783676c087faaa047de828eb6a38f21a4512e81cea4a1dcb03d4e852518cb520cfa66d88540a63c3805fdc1144f4895d8a4db8269c3bbf93691bcea080dcbec
 EBUILD dovecot-2.3.11.3-r1.ebuild 8830 BLAKE2B becfd7b5ea04d99bca605ab6a45a5a009cc43bb4d8bf0a1c86a4686ef8026ce39a609ca80e5d88bcf8cd301caa28d4d899f25e2bde02b183d95a9a1b1717debb SHA512 61e9918c800bc1c074cfddca4e71859f24dc57905f6ebac7dece8e5fe7b6aabebdf691b0126b9aed4c868ee74e2ee4e7a36c042e97ef7f032d6da1f2a24f8f2d
-EBUILD dovecot-2.3.11.3.ebuild 8677 BLAKE2B 048d0c34b3a8de6484ce8976f80fb6b84e9f0d4654ba3df8a037ac7cb99e5d03ef19b40aecde74285fe2c5a5d457baa2d31ca91e4f1b4ea4f91dc5c4602b5e35 SHA512 098d6e592eadd1401c99a74ba68756857c50363bee2b6f940a4c4f22500d61cc882bcae324d74606b5239592463d98d5371e72115c72339114f529c55300efad
+EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B 3ec42d4194a1db2e6090f223af7d9859c85cb134e31dfad5ed53a8d420594c95b4a57634e88ffbfd057a07c346677134dcb980d3bfda253c5cb1a07e5c7638be SHA512 cc1019fbd851ca8a2e27f9ee9d4004730af8b6eea64c00ee99fa816cd5229e8f523cc6f61ba52ebaf0f684d07d1076cbb497e5720c6b9108c00128803f07e8ab
 EBUILD dovecot-2.3.7.2.ebuild 8717 BLAKE2B 2aef6fffe859d0965f3e809739cdec16165fc4935cda3eae6ea89dce803366ac7fb0ad0dd1a95b3a4ee040a2be61cb44e58e61fb44feb47d0ef9e3496febe30e SHA512 3412f9224528f4872777d580e352e8cd679b7d1a9f88a20594e56358cd026f74343b624205e8ea0972ead3b3c9157a8061ddc7c3181c183fb6caf1d1c2f2f515
 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c
diff --git a/net-mail/dovecot/dovecot-2.3.11.3.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
index eb5ee4009c4e..323999c6259f 100644
--- a/net-mail/dovecot/dovecot-2.3.11.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index 5b6382751460..66abaa786935 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,5 +1,5 @@
 DIST fdm-1.9.tar.gz 299916 BLAKE2B 0c9bb9514a4d36fb1168be73fe745aa136cea75e0ebde28ab181be7d4b7e093c0bec775222e8a333e14baa90871739fa095a89bf8d1f16a86dee03b6d01021aa SHA512 e7e5c8aae8be3e82ff6015d2d87fd9d0dad4fe24796b4f30d6874f761e2df6900c8940d39de28bb2db6ee3ea3faf494c57149037657d986a3b54db3a6a601ca7
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
 EBUILD fdm-1.9.ebuild 920 BLAKE2B 70d8d1f0438dda55671ddba7b17b868d63f89c573d5a8ceb0cf00f8d04253358089b05d29ff7eb7d2e27b431f0c413b007657ef2c2c642d9da829909a761c63a SHA512 d6cb2804a8df302ddc87c3ab84a7f0154d6eee144ebba10ce72a7a427aeebc487132dee472f8496270bf5b13623b66e3dc4a9fd7059817f9549851b2033c15b4
-EBUILD fdm-2.0.ebuild 836 BLAKE2B 49c3bcbfa7d9833fc87f8b68b32ed21f4a88dbb0a80cd0e4094ff12a4a8a73760e291ccbef43704b61a2df92868f05e0b7ab17b0e53c8b5ac2287f4a3f7774ca SHA512 e7fd691956426ac9e198479778ec4bda9b688505ec0ed91ec23999622c317718e8efc89cba31880038ad69e088c8f2b2cdf0daf6decbdf8149512f20a6c3bab3
+EBUILD fdm-2.0.ebuild 843 BLAKE2B 5c9e843970b437211917fa4e65f2414a51473a1e29d8d21b565fe851f3aa77f14b800af4c874ee0e1ebf40e73772acfe0605b40d68e4aebbf663ba6925c477c9 SHA512 9b9bdf95e5de6547848848de16911820d6522bb9e8e7b11c78643a6c63b6a815d97d01f6d25148d82f564a6c1451f7747607e7012be0d5dc0761c1e7e424e1c2
 MISC metadata.xml 395 BLAKE2B d62bae2c039a663b01a2ddaa4a025766c05032c2484eb0638dcf2dff888464fd7e582449a0ae1f53da2e2eced93bda7772e68c89e192bec17b9332ebe3878666 SHA512 08b8b693f7b5750b721c81181cbebc031bcd50fbf2b45706e2e78597f35c567267fa4e924d97f1df9969603d2be74a7e269769d957c1ac121dae772021b00bfe
diff --git a/net-mail/fdm/fdm-2.0.ebuild b/net-mail/fdm/fdm-2.0.ebuild
index 72b297c3ac2f..4646a55c96e1 100644
--- a/net-mail/fdm/fdm-2.0.ebuild
+++ b/net-mail/fdm/fdm-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="examples libressl pcre"
 
 DEPEND="!libressl? ( dev-libs/openssl:0= )
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index e29c5216057d..44a7d2cbf7f8 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,14 +1,6 @@
-AUX 50_mailman.conf-r2 482 BLAKE2B 670ff96cdfed658558a1062259bb95441bb5ca2f54f710532f2ec075efbfb0c216fad255fcac158cb6ef2d987bedccc0feaa518fd2190692922b9ddb2e0d4840 SHA512 c279f8709ea7932469c0d8ff0b645df228562678081df5fc3d946d62f7bbbc33f4723e71fd4560eebfc751052a6a271d4aadf6affadefeca107f41d3193563d3
-AUX README.gentoo-r3 6691 BLAKE2B aa740e1936f756f8eeecfb88629adc36c33d43ab283a298752865913efc1d068ceb45884d9c33fa45fc4e34e6016b6981f42769172fb7f2bac8dd842faa8e26c SHA512 12490bb17b4da308f0855fa9f5e36c2c01c806822021d3ac92dc15cc7901a417dbeb1e1f78c9df2603128076bd11d9ded0a946f4cedd3b056a1694afbdab28d3
-AUX mailman-2.1.14_rc1-directory-check.patch 786 BLAKE2B 24cde989fac774ecaea27075ee58c583bf7812cb0b9b4b12a84bba99e144dd060df2f557d952827a5243c1daccd80fdac7353f931e3fc36d903e26aec595e5fe SHA512 510a67915163732ae05ed9f8920f93eb99538a706d85e4fb2c071e01a6d88be8cd32aa5ea0127d36a1dc4f7a735c179bb1169e7358025ee7d3c85b0c8cda44d7
-AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68a3809f302f9275eade918135bc231860cf9c2ab798827b9f1e5baf59a74cbaabc3787e95f3001426425ebf6de2 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6
-AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
-AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
-DIST mailman-2.1.33.tgz 9412979 BLAKE2B 1018ee5b2993658117ac5a1d76e1742c5e27cef69ba2892e8f56897f6c00394b1b479b3fa00855f78211844bd531a5ac1e5ac8c9d16763dd49303ab3690edc0c SHA512 1e7bb58a9d38e5171f682563abb0b23fcb0a7423e0e7fa883326815ada37ffa8074845ea70fad4ea29fa098a6e7203e259caf57532e09a0f7c05120f89dd83a9
 DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
 DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
 DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
-EBUILD mailman-2.1.33.ebuild 5863 BLAKE2B ce55af2241c9ace4519e33da2fcfcdea4bd5fe04f17a4e075519e73f7153ebe1f385a4663a7042f720a28e96068bcfcbe28aedcd3d88e28a670a942dedf5a2ee SHA512 b221b40ad1dbece603eb7efd175cc52a66a5e298ae4b2e78dcef387f13a82b9597a0e0cf23bb4b052d5f63e911a307c0984a5e96098328743e3fb68a3971ba6a
 EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
 EBUILD mailman-3.3.1.ebuild 1474 BLAKE2B ff1f4e9c30bb04449413f387c37d0e3dabf62895ce8bdba42208ca2f85d0071e4320df2cae180ca1f62d880a6a3f67f5fa846de4534704369cedfa5b5adc89fe SHA512 afe16caa2ec32a4ded2acc05063393884c0409071a82505bc2efaff15941c8cbd03bb43a81a572a2cc7fc15ddd92cc1a86ac9bbdb2101a449dd1830c694871b7
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/files/50_mailman.conf-r2 b/net-mail/mailman/files/50_mailman.conf-r2
deleted file mode 100644
index c0cf69562fed..000000000000
--- a/net-mail/mailman/files/50_mailman.conf-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-<IfDefine MAILMAN>
-	ScriptAlias /mailman/ "/usr/local/mailman/cgi-bin/"
-	<Directory "/usr/local/mailman/cgi-bin/">
-		AllowOverride None
-		Options None
-	</Directory>
-
-	Alias /pipermail/ "/usr/local/mailman/archives/public/"
-	<Directory "/usr/local/mailman/archives/public/">
-		AllowOverride None
-		Options ExecCGI FollowSymLinks
-	</Directory>
-
-	Alias /mailman-icons/ "/usr/local/mailman/icons/"
-	<Directory "/usr/local/mailman/icons/">
-		AllowOverride None
-	</Directory>
-</IfDefine>
diff --git a/net-mail/mailman/files/README.gentoo-r3 b/net-mail/mailman/files/README.gentoo-r3
deleted file mode 100644
index 8584a2d6a071..000000000000
--- a/net-mail/mailman/files/README.gentoo-r3
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-Follow these instructions to finish setting up mailman. This file and the
-original ebuild were tweaked by me <lamer@gentoo.org> but were graciously
-submitted by Joby Walker (YOU RULE!) 
-2003 Jul 09: updated by Jesus Perez and re-tweaked by me <raker@gentoo.org>
-for 2.1.x.
-
-Please view the documentation on Mailman at: http://www.list.org/
-
-This documentation assumes you're using the default gentoo path
-(/usr/lib/mailman/), if you've changed it with MAILMAN_PREFIX, adjust them
-accordingly.
-
-1) If this is your first time installing mailman, after your "emerge mailman",
-you need to add -D MAILMAN to /etc/conf.d/apache or /etc/conf.d/apache2 and restart
-apache.
-
-2) In your /etc/conf.d/apache (for apache 1.x)
-	or /etc/conf.d/apache2 (for apache 2.x) 
-	file add the additional option to the
-	APACHE_OPTS or APACHE2_OPTS variable:
-
-	-D MAILMAN
-
-3) Make sure mailman is a part of the cron group
-
-4) This must be done as user mailman:
-
-	su - mailman
-
-Add the cron jobs:
-
-	cd cron
-	crontab crontab.in
-	cd ..
-
-Create the site password:
-
-	bin/mmsitepass
-
-and main list:
-
-	bin/newlist mailman
-
-
-5) Change back to root:
-
-	exit
-
-(Postfix users: read the notes at the end of this file before you continue)
-Add this to /etc/mail/aliases (and see point 9 for notes):
-     mailman:              "|/usr/lib/mailman/mail/mailman post mailman"
-     mailman-admin:        "|/usr/lib/mailman/mail/mailman admin mailman"
-     mailman-bounces:      "|/usr/lib/mailman/mail/mailman bounces mailman"
-     mailman-confirm:      "|/usr/lib/mailman/mail/mailman confirm mailman"
-     mailman-join:         "|/usr/lib/mailman/mail/mailman join mailman"
-     mailman-leave:        "|/usr/lib/mailman/mail/mailman leave mailman"
-     mailman-owner:        "|/usr/lib/mailman/mail/mailman owner mailman"
-     mailman-request:      "|/usr/lib/mailman/mail/mailman request mailman"
-     mailman-subscribe:    "|/usr/lib/mailman/mail/mailman subscribe mailman"
-     mailman-unsubscribe:  "|/usr/lib/mailman/mail/mailman unsubscribe mailman"
-
-For courier, the aliases have to go to /etc/courier/aliases and you have to skip
-the quotes.
-
-Run newaliases (only if you use sendmail).
-
-	newaliases
-    
-6) Start the mailman daemon:
-
-	/etc/init.d/mailman start
-
-and add it to default runlevel (optional but recommended):
-
-	rc-update add mailman default
-
-7) For each list created (either with web interface or with bin/newlist) 
-this must be added to /etc/mail/aliases (see smrsh notes below)
-replace <list-name> with the name of the list:
-
-	<list-name>: "|/usr/lib/mailman/mail/mailman post <list-name>"
-	<list-name>-admin: "|/usr/lib/mailman/mail/mailman admin <list-name>"
-	<list-name>-bounces: "|/usr/lib/mailman/mail/mailman bounces <list-name>"
-     	<list-name>-confirm: "|/usr/lib/mailman/mail/mailman confirm <list-name>"
-     	<list-name>-join: "|/usr/lib/mailman/mail/mailman join <list-name>"
-	<list-name>-leave: "|/usr/lib/mailman/mail/mailman leave <list-name>"
-	<list-name>-owner: "|/usr/lib/mailman/mail/mailman owner <list-name>"
-	<list-name>-request: "|/usr/lib/mailman/mail/mailman request <list-name>"
-     	<list-name>-subscribe: "|/usr/lib/mailman/mail/mailman subscribe <list-name>"
-	<list-name>-unsubscribe: "|/usr/lib/mailman/mail/mailman unsubscribe <list-name>"
-
-For courier, the aliases have to go to /etc/courier/aliases and you have to skip
-the quotes.
-
-Run newaliases:
-
-	newaliases
-
-smrsh notes
------------
-(if you use sendmail, you are surely using srmsh) you must note that 
-sendmail won't run any program outside of EBINDIR. I tried to change 
-EBINDIR using,define(`confEBINDIR', `/usr/lib/mailman/mail')dnl in 
-sendmail.mc but it didn't work, so mailman must be placed in EBINDIR, 
-which in Gentoo is /usr/adm/sm.bin, so you must run as root:
-
-     ln -s /usr/lib/mailman/mail/mailman /usr/adm/sm.bin/mailman
-
-And the lines in /etc/mail/aliases which refer to 
-/usr/lib/mailman/mail/mailman must be changed to mailman:
-
-     <list-name>:              "|mailman post <list-name>"
-     <list-name>-admin:        "|mailman admin <list-name>"
-     <list-name>-bounces:      "|mailman bounces <list-name>"
-     <list-name>-confirm:      "|mailman confirm <list-name>"
-     <list-name>-join:         "|mailman join <list-name>"
-     <list-name>-leave:        "|mailman leave <list-name>"
-     <list-name>-owner:        "|mailman owner <list-name>"
-     <list-name>-request:      "|mailman request <list-name>"
-     <list-name>-subscribe:    "|mailman subscribe <list-name>"
-     <list-name>-unsubscribe:  "|mailman unsubscribe <list-name>"
-
-exim notes
-----------
-You can write an exim stanza for the router and transport that looks something
-like (Derived from, and in part taken from cpanel):
-
-mailman_virtual_router:
-	driver = accept
-	require_files = /var/lib/mailman/lists/${lc::$local_part}/config.pck
-	local_part_suffix_optional
-	local_part_suffix = -admin     : \
-						-bounces   : -bounces+* : \
-						-confirm   : -confirm+* : \
-						-join      : -leave     : \
-						-owner     : -request   : \
-						-subscribe : -unsubscribe
-	transport = mailman_virtual_transport
-
-mailman_virtual_transport:
-    driver = pipe
-    command = /usr/lib/mailman/mail/mailman \
-              '${if def:local_part_suffix \
-                    {${sg{$local_part_suffix}{-(\\w+)(\\+.*)?}{\$1}}} \
-                    {post}}' \
-              ${lc:$local_part}
-    current_directory = /usr/lib/mailman
-    home_directory = /usr/lib/mailman
-    user = mailman
-    group = mailman
-
-Note the double colon in the require files.  See
-http://wiki.exim.org/FAQ/General_Debugging/Q0060 for more information.
-
-This should be modified if you're using the vhosts USE flag, specifically you
-need to modify the location of the config.pck file, to be
-${lc::$local_part}-${lc::$domain} instead of simply ${lc::$local_part}, and for the
-transport you need to change the last part of the command in the same fashion.
-
-Other Helpful things to know...
--------------------------------
-run "bin/check_perms -f" from the root mailman directory
-(/usr/lib/mailman) to check and fix permission problems.
-
-The INSTALL file is located in /usr/share/doc/mailman-$VERSION/ 
-
-Postfix notes
--------------
-If you're using Postfix, don't manually change your /etc/mail/aliases
-file, as described above. Instead, follow these instructions:
-
-http://list.org/mailman-install/node13.html
-
-This will set up Mailman and Postfix to automatically generate the new
-aliases when you create new lists. It will also make sure that Postfix
-uses the correct group ID when it's talking to Mailman, otherwise you
-will get security errors from Mailman.
-
diff --git a/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch b/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch
deleted file mode 100644
index a3c26ede877a..000000000000
--- a/net-mail/mailman/files/mailman-2.1.14_rc1-directory-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mailman-2.1.14rc1/bin/update	2010-09-09 18:51:09.000000000 +0200
-+++ mailman-2.1.14rc1-1/bin/update	2010-09-14 01:02:09.000000000 +0200
-@@ -35,6 +35,7 @@
- """
- 
- import os
-+import stat
- import sys
- import time
- import errno
-@@ -428,7 +429,7 @@
-     # Now update for the Mailman 2.1.5 qfile format.  For every filebase in
-     # the qfiles/* directories that has both a .pck and a .db file, pull the
-     # data out and re-queue them.
--    for dirname in os.listdir(mm_cfg.QUEUE_DIR):
-+    for dirname in [x for x in os.listdir(mm_cfg.QUEUE_DIR) if stat.S_ISDIR(os.stat(os.path.join(mm_cfg.QUEUE_DIR,x)).st_mode)]:
-         dirpath = os.path.join(mm_cfg.QUEUE_DIR, dirname)
-         if dirpath == mm_cfg.BADQUEUE_DIR:
-             # The files in qfiles/bad can't possibly be pickles
diff --git a/net-mail/mailman/files/mailman-2.1.9-icons.patch b/net-mail/mailman/files/mailman-2.1.9-icons.patch
deleted file mode 100644
index 07cd63e58812..000000000000
--- a/net-mail/mailman/files/mailman-2.1.9-icons.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rau mailman-2.1.9-orig/Mailman/Defaults.py.in mailman-2.1.9-mailman-icons/Mailman/Defaults.py.in
---- mailman-2.1.9-orig/Mailman/Defaults.py.in	2006-08-04 14:20:33.000000000 +0200
-+++ mailman-2.1.9/Mailman/Defaults.py.in	2008-02-03 14:27:02.000000000 +0200
-@@ -54,7 +54,7 @@
- # disable Mailman's logo footer altogther, hack
- # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links
- # and image names.
--IMAGE_LOGOS = '/icons/'
-+IMAGE_LOGOS = '/mailman-icons/'
- 
- # The name of the Mailman favicon
- SHORTCUT_ICON = 'mm-icon.png'
diff --git a/net-mail/mailman/files/mailman.rc b/net-mail/mailman/files/mailman.rc
deleted file mode 100644
index d748a2c96734..000000000000
--- a/net-mail/mailman/files/mailman.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting mailman"
-	su - mailman -c 'bin/mailmanctl -s start' >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mailman"
-	su - mailman -c 'bin/mailmanctl stop' >/dev/null 2>&1
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting mailman"
-	su - mailman -c 'bin/mailmanctl restart' >/dev/null 2>&1
-	eend $?
-}
diff --git a/net-mail/mailman/files/mailman.service b/net-mail/mailman/files/mailman.service
deleted file mode 100644
index 21b819565549..000000000000
--- a/net-mail/mailman/files/mailman.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=GNU Mailing List Manager
-After=network.target
-
-[Service]
-User=mailman
-ExecStart=/usr/lib/mailman/bin/mailmanctl -s start
-ExecReload=/usr/lib/mailman/bin/mailmanctl restart
-ExecStop=/usr/lib/mailman/bin/mailmanctl stop
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-mail/mailman/mailman-2.1.33.ebuild b/net-mail/mailman/mailman-2.1.33.ebuild
deleted file mode 100644
index f4b289046d8c..000000000000
--- a/net-mail/mailman/mailman-2.1.33.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install() {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mess822/Manifest b/net-mail/mess822/Manifest
index dbaee0c54784..93257f468575 100644
--- a/net-mail/mess822/Manifest
+++ b/net-mail/mess822/Manifest
@@ -1,4 +1,4 @@
 AUX mess822-0.58-implicit.patch 1373 BLAKE2B 39fde0a0ab48958774493aebebac5ca82beb74430cbf94e9634f1b0a74963d08f98a6196d10cf2d774241538b395cdc70c710d6dc6885d93a35c4073564eafdc SHA512 ee2819702b4dfc558eeea8e2885ea16c69c3fc9b48a4713d8eead6ba03a870c583406d6ff37269c11cda11f4a0f70caf45a2cf3569acba31d938ac75379a4b8d
 DIST mess822-0.58.tar.gz 64287 BLAKE2B d24c7c6c4d3cfcd21166ba9ac2ec72c0a0dbd05fb8329ac04668d9febe8632f63304342642f8c1a3543d4edd94ee5bcc7a2688ccc6f4afc12bfbd8d38eaccea5 SHA512 5fb30f06dfa08f60dc8760f9c5d692e59397ff848441bc94313a079bac8fb53b779133b48abae9b487dff6fbb277d5210a9690a138366bf4d34f052d661be65e
-EBUILD mess822-0.58-r2.ebuild 1236 BLAKE2B f54190b7049910238117ea52c7e8cca5daf22503584f37ced24920e61f0f4a0c08b6fd5ea366ec345688b85bfcd7119e5e77ad592f4dc24a17441f313ea5d104 SHA512 560ed33b23ac0d78824a4ab9dbe6c5a18856d0f8bb9b18329565c603bea252ec657808060ca6181a09622e97254f6423b04580907166df6a9139abe785a5b802
+EBUILD mess822-0.58-r2.ebuild 1412 BLAKE2B 1d456ac1d4759b4d263c532cc09bdade9fe5f162f761bc04e524990caea5b13ce38ef695eb10a353bee940850bda99b5e22504d602b62938a63bf3168447eb46 SHA512 fc035effa578da07710514b9dfcb0ab3fcb254ba07204b86529ceab63a36bd2f4c873281d0d84916a89552c1091ed99ee8f90c85b709e60a668db928ec321a6e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mess822/mess822-0.58-r2.ebuild b/net-mail/mess822/mess822-0.58-r2.ebuild
index 95c6b44751e5..f4e4688dd5b7 100644
--- a/net-mail/mess822/mess822-0.58-r2.ebuild
+++ b/net-mail/mess822/mess822-0.58-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Collection of utilities for parsing Internet mail messages"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
@@ -18,15 +18,22 @@ RDEPEND=">=sys-apps/sed-4"
 DEPEND="${RDEPEND}"
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit.patch
+)
+
 src_prepare() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
+	default
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
 
 	# fix errno.h problem; bug #26165
-	sed -i 's/^extern int errno;/#include <errno.h>/' error.h
+	sed -i 's/^extern int errno;/#include <errno.h>/' error.h || die
 
-	epatch "${FILESDIR}"/${P}-implicit.patch
+	sed -i -e "s/ar/$(tc-getAR)/" make-makelib.sh || die
+	sed -i -e "s/ranlib/$(tc-getRANLIB)/" make-makelib.sh || die
 }
 
 src_install() {
@@ -35,16 +42,16 @@ src_install() {
 
 	# Now that the commands are compiled, update the conf-home file to point
 	# to the installation image directory.
-	echo "${D}/usr/" > conf-home
-	sed -i -e "s:\"/etc\":\"${D}/etc\":" hier.c || die "sed hier.c failed"
+	echo "${ED}/usr/" > conf-home || die
+	sed -i -e "s:\"/etc\":\"${ED}/etc\":" hier.c || die "sed hier.c failed"
 
 	emake setup
 
 	# Move the man pages into /usr/share/man
-	mv "${D}/usr/man" "${D}/usr/share/"
+	mv "${ED}/usr/man" "${ED}/usr/share/" || die
 
 	dodir /usr/$(get_libdir)
-	mv "${D}/usr/lib/${PN}.a" "${D}/usr/$(get_libdir)/${PN}.a"
-	rmdir "${D}/usr/lib"
+	mv "${ED}/usr/lib/${PN}.a" "${ED}/usr/$(get_libdir)/${PN}.a" || die
+	rmdir "${ED}/usr/lib" || die
 	dodoc BLURB CHANGES INSTALL README THANKS TODO VERSION
 }
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 5f6449401217..196358c21bae 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,6 +5,6 @@ DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
 DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5
 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
-EBUILD notmuch-0.30-r1.ebuild 4344 BLAKE2B 7d7e6d4c1d043d1d1d3b35a5332670a741f42d84287c99aa60e95dd355f3cbf23fd6f38eafdd0aa6d96dababbade1382565263ca411bf129673e3471aaa4280b SHA512 598f7cd99b432aa7414bc89e7b865cf638c6d075b0bf304f8c94a03e67f34bf8e454dd18d431250c941f0353171bb6f990be3d482b87bddc7f48ada25b4c692c
+EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B f53eff50b205bffdb6016118997a5b5176a88ca704999e2b4f3bef4f107a79e7e89e68010fc35bd756aa8cbbe168f73700eba9b33ec8f1ce32a676b1b592e5da SHA512 bde0d770ca18d3c55c79be0b4e6fb360f61bf0f404397448fb311c1cf107b07b5f9633643a04a0e6615acd61934635845d1a2a47283795e3fd69c050939858b1
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62
 MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e
diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 35f5ab16a29e..36c6213ab658 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
index 6906b3a7656a..39ebe6cf6667 100644
--- a/net-mail/pop-before-smtp/Manifest
+++ b/net-mail/pop-before-smtp/Manifest
@@ -1,4 +1,4 @@
 AUX pop-before-smtp.init 613 BLAKE2B 3afc3d71e3c21b8f9d6d9066883f90b0b0f2bd0a9bf3934e77a86370872a33cd38ecf3eb0c424e6d7aa81ceaa6cea15348537f7f74da36d50bd0e237dbfcac16 SHA512 5018ab8d4acf4bd58c635f029c32ee691462836da37b75afd7e26873b0f0e94969a18cdbd77e69aeb7aa32e5ab08b2c3b644939799e3601367ab0380423516ca
 DIST pop-before-smtp-1.42.tar.gz 40612 BLAKE2B 44e43be5abf9f1b98ae553f3f782747e5b26a54d03fcaef33b60d05fc757439c6b7c7e00fa972a76bfe0fa4dc7e86751b7f3edd946c209b1fd00a8502ceb22b2 SHA512 54556509dcd51025519deb1253e0860c23e2862061992781c79606af00d6db493a5b3b1ca505f609f6a157918b19e959568dc138cc926f8886bec54cf9b404ea
-EBUILD pop-before-smtp-1.42.ebuild 962 BLAKE2B 58c0f0d562f0c353aca872fd7a2b03e5cd198c9950c3be1bbf4f19d47b14e22f4374405aaca646b4e47d921cfae0179cb2c1aa5c0a4ae1916cfc78ba20b1cb15 SHA512 747b4f2b67709e52200940ac0fe72a6aba10f5ef7953b8212b5eda27c5e42b31dfbed384023ac947940c227146d6722151f228102b7e4416de5f7568ab109e56
+EBUILD pop-before-smtp-1.42.ebuild 961 BLAKE2B b0133c345804af24231d6b4710d9264d0fa4a32e08e6ea3c99e25d9e7b8b558a2de4891d1b62e0c7502dc99c7df321fa3b446fdcf2ec494ca13f93d83de90478 SHA512 f9d190c89996365d5344c5c8ddda5d8af266db0805b47e261c96d2e4025a5e36093f5babcd87ba576f673f66a09f8d24284a7594833d4f716242794ea4973b60
 MISC metadata.xml 245 BLAKE2B 3d5de245eda58e732472f2263b8c5fc684e0e08a02785faab3a1000330ba68645ba430d94078b6389416f9c68762281cdc13df617f5ad6f0e6a76723d321834c SHA512 c1ef9f4751b9cc88c5a98477014b5ebb726572a0efc21dfd3e03c9c7d7b895adcc10e4f07025d45e92e86122be408de589128248c866fe26bd8b458810aa0d94
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
index 0bcf260b4cc6..3ebc73117b32 100644
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
+++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-DESCRIPTION="Simple daemon to controll email relay based on successful POP or IMAP logins"
+DESCRIPTION="Simple daemon to control email relay based on successful POP or IMAP logins"
 HOMEPAGE="http://popbsmtp.sourceforge.net"
 SRC_URI="mirror://sourceforge/popbsmtp/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 BSD Artistic )"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl[berkdb]
 	dev-perl/Net-Netmask
 	dev-perl/TimeDate"
 
 src_prepare() {
+	default
+
 	# enable syslog
 	sed -i \
 		-e "/^=cut #============================= syslog ===========================START=$/d" \
 		-e "/^=cut #============================= syslog =============================END=$/d" \
 		"${S}"/pop-before-smtp-conf.pl \
-			|| die "sed pop-before-smtp-conf.pl failed"
+	|| die "sed pop-before-smtp-conf.pl failed"
 }
 
 src_install() {
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 354e8f47eb5c..f41f219520cb 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,4 +1,4 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
 EBUILD queue-repair-0.9.0-r1.ebuild 712 BLAKE2B 869ab7d7dac0a90708da400c680d206fe619d1798b0e23841922d4d8bb17cba3f8af7552dcccfce09a8c5935663c8a0e25a0d52c926f75b2f40f2bb34698dafb SHA512 ea2eae4c33583966571da8647761f80e6457f5110e1c81f3ac04f31dd4bf093977a456e5ee616c962edc0f107360d645cfc40b0795dee285a56e15cb018d5aed
-EBUILD queue-repair-0.9.0-r2.ebuild 824 BLAKE2B 703bae7f00c410e2381d48f9435bc6b828513a75875a72ec666b8a597f1111c423ad965a37a6438a05c9a27aa6442fc564b24aebe05edbb0d189d179391093fd SHA512 e72593fb8b5eb51e7645f0e36e09544e2b8739c27cf53acdb5ebe04d858e9dcd05be990f7c243d10ac4d331a54e536be5c8c0733ae2c84e46568932cfefe9ecd
+EBUILD queue-repair-0.9.0-r2.ebuild 816 BLAKE2B 947aff25964509108987b359546164b7fc8a8d43eac898ef0eda9ceb440e11a9057be5bf6dede3d1942ede7862cf4a53b6f0b182e0ec723764ae5e59c48048e6 SHA512 9b8bfd9c40480adce979a32d16b492cbe9ca27cb29173e44ffe3c8f6b30b64ad2ad7975d0e26dde2a41b49538679c0357d28b7f9ac97f3850754323e8947fcf5
 MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
index a67868c14c27..1c3689c51898 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test" # no tests
 
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 14e91c50721d..31c2ede75a29 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -1,6 +1,6 @@
 AUX serialmail-0.75-implicit.patch 965 BLAKE2B 1e0d173dba771330c8eb9993b3a4428161f8f3969975ad9026fd4cddf80681b2d0d95eec71205f0546355d30c2fe2eeea9714c93f6363a3cc071154bd23c7a37 SHA512 2c3bb49ed651aaea32f29e25db29c2a7d538e583c8d2b2200cb68790c397edebda5f8d36cf997059694f8209472e5d3949d934be9877cf0da524ff816a2ef268
+AUX serialmail-0.75-respect-AR-RANLIB.patch 560 BLAKE2B 0198b3d97c956dc28645176afe849ad7fa0d91d35412677d48432616bb7017c77cd540a4a27b91b2e34e5afde42e3bcee4958313dec31b15c9717ef3b54fb21a SHA512 f1de8fade3884acf8e1a7fc38192a831c66e89579a4e98fba871124288a2f307a46891a70f877261c125303cf3bb6858f2a6eaf47ee004233211b36b3860f55c
 DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
 DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
-EBUILD serialmail-0.75-r4.ebuild 1266 BLAKE2B 81a70cead5573b817728c7483dd7e27b84367cf6c4041d26b90f37f8b955dfe0cf1300b1f1cde9fe69a57f0bc5fb36087739b19428f91a0d755535374bff9b98 SHA512 479c3380acdcabd58e1c5a06e9404f876e087acfaebf9cb3a52d1f3245f7806bf7337ab1b1aac7c20496916cfec5475a263810fe7e349a7fa3e09977ab166ab7
-EBUILD serialmail-0.75-r5.ebuild 1210 BLAKE2B c1bb75f96a99ce070a7dc9e088d0cb5a2fde12fe0807c3f0db7351c9e5d51be64aaf6fade8c4e3a8e807a29c0b89feaad9db590052772c3b52e95c4716f5ce94 SHA512 1fecd6cc02cb974f6330c928f3b87741e879262492569fcda9c3f65c809e77a316db134b267c57c0d7242fe0e9fb95e562d78936adeb7ab25922d3860af816d3
+EBUILD serialmail-0.75-r5.ebuild 1311 BLAKE2B 7cd31971e68f804e83acab6d33f7d32332cfec703f458e5db671ad50a9976b68dc630d50d7a150b4a9ae88dced0bb59695fabfe2288eee170f061ca27f7f946f SHA512 1359bf48278f48d549d876089e83d78c83bb3e36adcd21fbcd158e3b404196000f036a3692610bad75edbd366f20c16946cb2aa2f223f698417c337c67a35743
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch
new file mode 100644
index 000000000000..c04f0d78a28c
--- /dev/null
+++ b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 4edccea..7530107 100644
+--- a/Makefile
++++ b/Makefile
+@@ -369,7 +369,7 @@ warn-auto.sh systype
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+ 	echo 'rm -f "$$main"'; \
+-	echo 'ar cr "$$main" $${1+"$$@"}'; \
++	echo '"$(AR)" cr "$$main" $${1+"$$@"}'; \
+ 	case "`cat systype`" in \
+ 	sunos-5.*) ;; \
+ 	unix_sv*) ;; \
+@@ -378,7 +378,7 @@ warn-auto.sh systype
+ 	dgux-*) ;; \
+ 	hp-ux-*) ;; \
+ 	sco*) ;; \
+-	*) echo 'ranlib "$$main"' ;; \
++	*) echo '"$(RANLIB)" "$$main"' ;; \
+ 	esac \
+ 	) > makelib
+ 	chmod 755 makelib
diff --git a/net-mail/serialmail/serialmail-0.75-r4.ebuild b/net-mail/serialmail/serialmail-0.75-r4.ebuild
deleted file mode 100644
index 78801715a18e..000000000000
--- a/net-mail/serialmail/serialmail-0.75-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
-HOMEPAGE="http://cr.yp.to/serialmail.html"
-SRC_URI="http://cr.yp.to/software/${P}.tar.gz
-	mirror://gentoo/${P}-patch.tar.bz2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="static"
-RESTRICT="mirror bindist"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88"
-
-RDEPEND="sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	virtual/daemontools"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo.patch
-	epatch "${WORKDIR}"/${P}-smtpauth.patch
-	epatch "${WORKDIR}"/${P}-smtpauth_comp.patch
-	sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc
-	use static && LDFLAGS="${LDFLAGS} -static"
-	sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld
-	epatch "${FILESDIR}"/${P}-implicit.patch
-}
-
-src_compile() {
-	grep -v man hier.c | grep -v doc > hier.c.tmp ; mv hier.c.tmp hier.c
-	emake it man
-}
-
-src_install() {
-	dobin serialsmtp serialqmtp maildirsmtp maildirserial maildirqmtp
-
-	dodoc AUTOTURN CHANGES FROMISP SYSDEPS THANKS TOISP \
-		BLURB FILES INSTALL README TARGETS TODO VERSION
-
-	doman maildirqmtp.1 maildirserial.1 maildirsmtp.1 \
-		serialqmtp.1 serialsmtp.1
-}
diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild
index dff981e6190b..e7b04e421d3b 100644
--- a/net-mail/serialmail/serialmail-0.75-r5.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
 HOMEPAGE="http://cr.yp.to/serialmail.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz
@@ -10,9 +12,9 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="static"
-RESTRICT="mirror bindist"
+RESTRICT="mirror bindist test"
 
 BDEPEND="sys-apps/groff"
 DEPEND=">=sys-apps/ucspi-tcp-0.88"
@@ -26,18 +28,22 @@ PATCHES=(
 	"${WORKDIR}"/${P}-smtpauth.patch
 	"${WORKDIR}"/${P}-smtpauth_comp.patch
 	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${PN}-0.75-respect-AR-RANLIB.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc || die
-	use static && LDFLAGS="${LDFLAGS} -static"
-	sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld || die
+	use static && LDFLAGS+="${LDFLAGS} -static"
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
 }
 
 src_compile() {
 	sed -i -e '/(man|doc)/d' hier.c || die
+
+	tc-export AR RANLIB
 	emake it man
 }