gentoo new year resync : 01.01.2021

35 files changed, 126 insertions, 37 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 28c030d3d9e4..702ac0fcc1eb 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 486bb4f35e19..0c3137262eeb 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,8 +1,8 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
-DIST automx2-2019.0.tar.bz2 46670 BLAKE2B 6f62b4429be8046fce18ccba6827879a99627d8fbe9cf7973d8059e87b4968a280b62d5d005aaed3b0e1074053f4a6355c34f2cdce2f06a9afb14c52b4504fb7 SHA512 e494a48ffd3e6d133a89db5afd1dc75116a8efcc41f0571a24271bcbe6074c86d62184ce00bae9ced888a70be7d20f2a3614f28007d4481537d42c680dca4daa
 DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f
-EBUILD automx2-2019.0.ebuild 1020 BLAKE2B a485a862178572b4d6f795c098c2e973491e5024d3bf12d68c50eff2f502f3a848a85e0b4fd50dac7601aa953f5ddc30c4e5038a53defc2f12beea8e3e69de54 SHA512 bbe51e2f4fbd3b13ee3f30e6e7d95bb20021ceeadd3daffee5d1c538395a40539f0f4cd65c14f5d0288d230fbb3dd61f06b79cac4026090683e829dcced22c01
+DIST automx2-2020.2.tar.bz2 50740 BLAKE2B 394d26a06d23efe18a3c147f89660a9dbdde7edba078fd361f188738fdc28d36122aa8182e965bb8e3d69d4cbcd3cb784bc7722dd382d1fbee36213459b91fa1 SHA512 dce790c754fd089a15d0baf023a9cb2e04ebb42a4558fc91b06c2de2105f3e00f3675a555739ff1bc35166c98f6cecec62c95f18f4144e88ac6024eaa6f39abe
 EBUILD automx2-2020.1-r1.ebuild 1051 BLAKE2B 2e2568827ebdeeacb4b498b8957194717a79ea42dfeff122ce147fb9265e5b3e8d1b3f59e48f6d57a18aac46926fa2a7f749694bc052bb530bcb51aac7935119 SHA512 fe8c8bed829328968351bf490542331dfba4438eac36b1788beb5a8cea57bbbec9d94c087ccdd81e5f9abd122448285fb2f75d0fefb2c97fe40eb5e7a517070b
+EBUILD automx2-2020.2.ebuild 1083 BLAKE2B 645fb871bcb0c972282a4bc9162a4a5b1d9790cb38ad6fd3d49aaac84e01ea58974f1c3ca313361dc49575df18cf229c4f4fe8eb80a28ff60ced96f3498cbf0e SHA512 3a60d200e101a70bd2e6c90f4a5083783c1eed24180e0a05a091d1605a0af3aee48ab051202ae5c24f66344713ae3bc80263b0cb4a39b3bd14bbe1e847e0b73e
 MISC metadata.xml 887 BLAKE2B 7ce022391bdee85ab1ef45f2ea94fa1b17731879d883a582bc775efe1f75d67fd6fd178aa6a3406b57caa20ca646773dbae3b43bbc636a99ef414d03f9bbf6ff SHA512 dedc41f6f1e6a3ce8cf1041841d3e981e7cac0ee00815e580a15013bdb09415df65136ce169899dc719a705ef61e02c5f17e8d7736c6a74ed9ae2b2748c82fd8
diff --git a/net-mail/automx2/automx2-2019.0.ebuild b/net-mail/automx2/automx2-2020.2.ebuild
index 62c3980bd7bf..7f3fa33fa4fd 100644
--- a/net-mail/automx2/automx2-2019.0.ebuild
+++ b/net-mail/automx2/automx2-2020.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -17,7 +17,8 @@ KEYWORDS="~amd64"
 IUSE="doc"
 
 BDEPEND="acct-user/automx2
-	>=dev-python/flask-migrate-2.5.2[${PYTHON_USEDEP}]"
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}"
 
 python_prepare_all() {
@@ -27,7 +28,7 @@ python_prepare_all() {
 
 python_test() {
 	export AUTOMX2_CONF="tests/unittest.conf"
-	${EPYTHON} -m unittest discover tests/ || die
+	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 1831d0839310..fa38afdabb78 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -2,6 +2,6 @@ AUX autorespond-2.0.5-no-include-bounce.patch 1185 BLAKE2B 275a35692afc5101dca27
 DIST autorespond-2.0.4.tar.gz 7884 BLAKE2B 35b682ecb4de27c4db97f6594e49d05305ff5017e8e6c56bb44d51712a24a21ab70cd242a0a0c1fd5da4c8ed7f2d5efc548b5f2d59ab16ace929a90509a930ef SHA512 0bde01482a1bf16f5c4e478fad8a36ef6a34dd3a753edfdea0787381380c50ab5a95b94e0464dd874cb1a666f9dfb196de55506503bbb589dd5974867298fc62
 DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844ab47e196822d1bceb0543878085de7595b37323ae5134d6d98ff0864a1865fce4498f0f4b9464398b0cc2062d1e7 SHA512 c27565962677654251062538a76ebc0f5402cb8b0027352060e6aa51871be27c0e32c6898be7cee72d2a80680b79d1ce7bf23249abfb486a851d73005ef7e7bb
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
-EBUILD autorespond-2.0.4.ebuild 649 BLAKE2B 896051d0cd18d6fdf7142b4243070381281218c2945fa189a1062401713801441ff89c03b0f1e20b958fb4a3c4f0350f26bd63a7a85e86dec8c55bec9d08de6a SHA512 c87f8e7e23271682dcf399ebd97abe73c7e51cd764d3e79dc2b146109127c887eba14dc5630703623a3cac56364bcdfa3a6c7c2beb7707e9bf8c9ef7cfed568c
+EBUILD autorespond-2.0.4.ebuild 650 BLAKE2B fea0e029649a7c6f47a354d254b75fe2425cd0113206954e593feacc5ea3859e47a8777c1e6c4a1b5de4af96d7c673a015a17b9db0b21467cd688952b53770e1 SHA512 c02b5c0ad69003b3277e605dd46339a0af7993bd61d7cdd725219d16781d5f632c7e9113da4941ba968802dcbc182ae7a52649b4edc9345a4b87d505bf218787
 EBUILD autorespond-2.0.5.ebuild 781 BLAKE2B 65782589d2d1daa5a111f9c24df6880b90270e3a7c2fc03730f028956667fbfb74daa6ee4f7e920f53253c4aabce41830b32bc3d11f181e5a0a491753697f955 SHA512 a9d3079fcb362b4b5d0e39baf23f193e2abc021d6c83e5dbca791aec269cc0ee8cf07faabcfaf2c97808d8a8e2047f36ae4beb265c55e191b0170b1977d2492c
 MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index b1853c18e1ee..ce4bb83c1c39 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc s390 sparc x86"
 
 RDEPEND="virtual/qmail"
 PATCHES=(
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index d6fb7efb00e1..293512e21a89 100644
--- a/net-mail/checkpassword-pam/Manifest
+++ b/net-mail/checkpassword-pam/Manifest
@@ -1,3 +1,3 @@
 DIST checkpassword-pam-0.99.tar.gz 83751 BLAKE2B 398344f6ae8556a40db2d217fe38d20a6f0159bbc7750c3d4c115ca6a383dbfa9018af1f0f5404b34b349e998093307de333434ea0b9b176a9491a48f4d5c044 SHA512 d7c9cbeec7fb15c07dcc3c6e6b7f38884bdf0fd2fe31d3a38b2f6f58deec57716b5d65387b03cb858c1bf5fbb5dce88e0451bf1b866b88fbc17165100040baec
-EBUILD checkpassword-pam-0.99-r1.ebuild 434 BLAKE2B 59a65f160d1dba54ab71346035b1883fb64c00b27b3f3873b228f6585ce3d266ed61fda0bf81383d71a8b14a6508ecdaf099030518dd0ae078f7df5f4ed1784b SHA512 648bf87a2365f4e96ff546fb65141fd8e3358b92cbbf213e1642b2bf0484b47b1b71dae6e89178618159b15a69dc6e90e43dc808a112a1948486b8a74df3980a
+EBUILD checkpassword-pam-0.99-r1.ebuild 435 BLAKE2B 124de20612fdf2876feccd8c53342489228d855c221defa8dfcc34be3d2ad11a60e95d155e660600673cb2b4685b535c4ad47c5a5ecf9e0a471b835a3be187fe SHA512 c78892b65682b06d4e91b40903090eaa973533b48e9f1190474e409b498c334233614476ecb7499035c9b6b4a87af1529efe40305d509077f4fbce3f7b80467c
 MISC metadata.xml 252 BLAKE2B dbe9a6c6c10ec16a5261653effdb4d744c1c8e6477eae5ad220f9add922d1321f7c7101596283cd8e68b20b6d9d5ed969518afcaf64e3fc047144bc2731bbb63 SHA512 75e23f3cd2f7515225a9c07df4ed31b0b6519b055bd4d793b83783a32b4b9745f76ae17054a0b6a91ba16975538b92e603e94c4934c25c8cb753c38a72a8edf9
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
index 2fa1687d06bf..634545505455 100644
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 hppa ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc x86"
 
 DEPEND=">=sys-libs/pam-0.75"
 
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 79c52887face..f3670dfdc4be 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -2,5 +2,5 @@ AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7
 AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
-EBUILD checkpassword-0.90-r4.ebuild 916 BLAKE2B 0c9efadbd44ebe838e81694f0f5f21569573246947cebadfe3963935016965a552e71afce3bfc7f1b3b9bcba557349f5ab4148b9c230ddf12282e92a68b25621 SHA512 0937ba5d43103f65378dbdfe629961f3cde1bb89bb21a4c07c0e12fd083a59ef4714e39fedcd126ac98713db6eb77d78ca0c233ad9b2b1f38575b6da5d357e8a
+EBUILD checkpassword-0.90-r4.ebuild 917 BLAKE2B 797c3dce214de5ed09dddb3309852efa0df51ff5c80662806b28eb0b25dbf719f1e4cc6bf28ca9b23d2a0033918bfdb49fa69b5a77aaef0e4070de082fe60050 SHA512 b3304aaccc36ab8fc7bdd07542c31b7e58c3241c224da02c43a7a37aee9371aec1d9332f9f65ef397b1a2a1db8df817e8de5af1557ba503f61d45116ddf65e26
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index ac723ca4c9f3..65815d9b39b4 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 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"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 5a3810dcbc10..16a935bd87d9 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -2,6 +2,6 @@ AUX euid_030.diff 1107 BLAKE2B 558ad9c23f2e4c48b22b0ccf520537a6eaad28592105ede40
 AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d80a8be916aeb1f99059b42aaeb948a7a4614a7746a74e7904703a9eb7824e3e98c1a4c05e SHA512 74eb9764b4c9fd251e9bb408d3ace9bcc30f9d638963cd5f385ee6c2c839f1de51b7f55c81d5e0111b568a308eea08185c8bcc965decf36a963b78bf4aea8671
 AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
 DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r2.ebuild 1468 BLAKE2B c3782fe2192a9d6396273e4bf84c7364314321c7145f505135b32bc25f4e63bc6aea47fd0e1266a5c2879890c31e686ae77135f2051273e2cb798f97f0594a39 SHA512 ca4b0a5b9aa2bfa0dd8e720ec526638eaabf977f13b4517e1735af52ba1b8ed18bd567a53d02607cf8a7c90e04cf2adc3b045c3fdfdcb16c9bdc202afcbd98bd
+EBUILD cmd5checkpw-0.30-r2.ebuild 1469 BLAKE2B 698042478f72de89f3bf81cb04c42b60975acb1a06d64cf2aea36993127e1936686f466ed427c349169a39ea17c1756563eaafc4fcc4e67ba451ac8dfbf15f73 SHA512 7cd0401ac985d3cd0d2910203543ef4189fa8ed61580730bb348d34de532d57890dc920b96b044bfc6caebea044377510575584220c23d423479f5a5cc35857e
 EBUILD cmd5checkpw-0.30-r3.ebuild 1498 BLAKE2B 361d85015f22038af2d2576da5a3504fd0b5e255900de8ae4e35847b15c2c3315b1dc23cf5a60f284d062771be24886b74553174fc1e2d0de866815b5b32886b SHA512 dbe2aa5ce3e914d178e9bb16c1c0e8fec20439df5825f2da44675a338e2c5774a12d471c6b1b11ad9f93d0ca7df3b2229863f84bcae311ee6c37bdde5794690b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
index 7942da5f0a0d..a3b6fc0bb173 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
 
 LICENSE="public-domain RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 5e1ee7e4ec3f..7e5b4c87ac4b 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -5,5 +5,5 @@ AUX dbmail-pop3d.initd 1539 BLAKE2B 9b74cb310b832bf3cd37bcbb6a25969221792d7694d7
 AUX dbmail-timsieved.initd 1554 BLAKE2B b082e00fc491c768fda2afce07bc30c087a7bf927f8cb16e79d60609932fa09e1052acfd39526cb7fb256c5c44cbcdbe6ac94f59f3b12330fe6e51648fa2aae7 SHA512 2340916c1f6abb0ccfbc98f0cd91a042035c0ff6751bee944e6b9227c14bb829152f22763bc87244b6718e4c3df44de6892b1961923a54eef5724ba9befbc34b
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 EBUILD dbmail-3.2.3-r1.ebuild 4680 BLAKE2B 97cf83e0334b3c9f595bdaf535b5033c2e98be7343631e3b6942d8ed83e540e77c03ca2aa60f1941ee6179dd51cf571554ec40bf9a969f28c920c2f3cf19fd34 SHA512 a6735361b215507ab298b9c7d1f701f10e90b9a6e79c5b73b7e0a4e11d630ddcd40de89d318359b0ad3cb84ebe270942290563b1b5dc87a60ede08a6da95f155
-EBUILD dbmail-3.2.3-r3.ebuild 4002 BLAKE2B 0d922a30976d78f3d894bc5bd99a041b13fe64fdbe2a49d0f44787ec23abbbcd481524e8cfd14eff6e72c1a6926de6844d87cd0de0f047e97744c9d83e45615a SHA512 ab2fc9bd14893d0246109290c58df39174e45f5e47d9a6371b8c1ec054cfb2af2934291f1d1371f0c5b928ecfbc9b466f371c68437c48e9f75351c54b308409a
+EBUILD dbmail-3.2.3-r3.ebuild 4001 BLAKE2B 21dd65758bf6ff0b1c889d958b6503b53b5e392a29ea8ac58b20617cb9c3953723ebaf278d28215ebf6b1046b14b02b7650939c2ac1deee361aa3d16d5823b2c SHA512 177c0966dc5235df994fd3f62d84e82b8a48ae4b45c3732e5aad21911f8b0bb58d1fca91f54728a28b487aeea3361ed26358a380c0223d4700e9b50177edf116
 MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
index 39d811d7e7c9..74e8fdf282c9 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="ldap libressl sieve ssl"
 
 RDEPEND="
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 101da73d268c..130e6e3b8c0d 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,4 +1,4 @@
 AUX 0.71-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
-EBUILD dot-forward-0.71-r4.ebuild 881 BLAKE2B f9b8c17251523c664db40cd8eea21ca5bdf7867bdb20bf8f4a73486dca1c530f28d271440a2c681c7fd246b96d3ee4e58e9d46bbcbb86331957042d3ff1c1ae2 SHA512 7d953f2b5aa94e94ecb8a369bb9d46e27cc8898683ee582f49ac52b8d96051ba0dac68b3200d73f8f1d1fd14be8ae1031be86808f020e2021480fdb7d4e9dfc7
+EBUILD dot-forward-0.71-r4.ebuild 882 BLAKE2B a332b388b290800ac883f4f69e2b69cd19728fd2649f78d4602404add27e64630b90bbeccbf5b5ccdc6837bfd78c62edbf5b3c78b1f1415ffb72e764d5f07dc1 SHA512 ccb421e5ecda61f2b92b8846b432a56c1c6dd090b4be6767bfdd6542b5bdf0aa70acfc2bfae6aa915000cfe1a47893c41225961c48c63bef2d9515688fff08f3
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
index 1702c556f970..1adf2b19eebe 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 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"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index 19c99e2422bc..469102350e9b 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,3 +1,4 @@
+AUX eps-1.7-static-libs.patch 346 BLAKE2B 79173cb773a3e6a6b2ce1e299f57e2a3022ac84a5fb6179ab41c1fc47876df57048ce5332917ef8f639917a00e4b284ea56b983fe23f8037287495265b3e3503 SHA512 83704853338dd5f267e18023ef88fc5dda610fca73caa6ef9e7fb67ca1e30200fd923212381ca0b85a2f2b41322612b68d1562afaa19da82ccc9fa38ce77e7dd
 DIST eps-1.7.tar.gz 29913 BLAKE2B 83205ed03cd4d28538c356b3d905437179c961e8a3d60059a59cd32b16548a4cb9bd73382bd4a948fe4a985a5cc39a85ec84126df1a61799a6dcba3a6227ff66 SHA512 be7df0d5bce5798afda0573b5d943da7e69e6b99817f4ed6d87e2858e75d7c2408d7fa9942dfc6277db0bedb73cf1f5ca64542d070075dda544cbc695134b1a0
-EBUILD eps-1.7-r1.ebuild 809 BLAKE2B 0b09b965c8d853375db7e6bfe9113665dd831db65fa4928ca045774577b2cb16ec0f6a3227097936e746af05ea3c94c032a9c50fcb870488720461ca0b42c7b3 SHA512 aa69fdadf60a454d7ddecb68cd8a290842e87d8f8bb5b1f5f9a821abab5b262e9e1afe80cffab5a75ea3cbcb7b223e371768c976b2897aef372e705243a582e9
+EBUILD eps-1.7-r1.ebuild 814 BLAKE2B 0c2de3b48c275b5954da416e5659d9c74c3a68a0a20d8d487a628bf5ef4ec6a128bbc3270c9bf7fe10af118573f6874ecb2753b112d714e33f8895dc35ac6cd7 SHA512 d8e7992cb75e70bf2faaf8c452c7ef7f6662c7dd604352c1a302adb51ef7ed8e61644c428650a0d3b3e4a7d763109eeb120f714236a18267ae4af8c06057317d
 MISC metadata.xml 447 BLAKE2B 30f8317f4095ee7a5ed8a600490bc7301155dd104cef82870a10e39319026366c3f34c3f4db90c86b893dc5606e4f3d76571ebbade82398ef40b6943f2ccd4f1 SHA512 40a941eb593ad63194da271f682313ac5792ab0147f95a3cb9e5f68bde2dfe0bb138aaf941d861f96ee3803ef2d146728600372525002c070b832d393d35b490
diff --git a/net-mail/eps/eps-1.7-r1.ebuild b/net-mail/eps/eps-1.7-r1.ebuild
index 92434d568c07..40d368deccd5 100644
--- a/net-mail/eps/eps-1.7-r1.ebuild
+++ b/net-mail/eps/eps-1.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,10 +12,8 @@ SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 
-DEPEND="sys-apps/sed"
-RDEPEND=""
+PATCHES=( "${FILESDIR}"/${P}-static-libs.patch )
 
 src_prepare() {
 	sed -i -e 's:/usr:$(DESTDIR)$(prefix):g' \
diff --git a/net-mail/eps/files/eps-1.7-static-libs.patch b/net-mail/eps/files/eps-1.7-static-libs.patch
new file mode 100644
index 000000000000..06fa8bc82559
--- /dev/null
+++ b/net-mail/eps/files/eps-1.7-static-libs.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ CC = gcc
+ AR = ar
+ STRIP = strip
+-LIB = libeps.a libeps.so
++LIB = libeps.so
+ 
+ AROPTS = -cru
+ RANLIB = ranlib
+@@ -20,10 +20,6 @@ DEFS = -Wall -I.
+ 
+ all: $(LIB)
+ 
+-libeps.a: $(OBJS)
+-	$(AR) $(AROPTS) libeps.a $(OBJS)
+-	$(RANLIB) libeps.a
+-
+ libeps.so: $(OBJS)
+ 	$(CC) -shared -o libeps.so $(OBJS)
+ 
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index ae987a5d5800..b5612312e069 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,3 +1,3 @@
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
-EBUILD ezmlm-idx-7.0.0-r3.ebuild 1423 BLAKE2B 4f6a84b02abd79a9c467327d79afc26b97b32a2290d21f79c8fef34edcc8f17026edcb294575a1ac7c31e61030e4ebd270ac97d6a281654762014b27221177b7 SHA512 ba54c966d2dccc584cb29c7f8d9334a9a9c83c0ba528023c762892b14ac5f54371dcc67efaccb34e94db6fd412a7d479eba62824517b01bbc60baacc168a707d
+EBUILD ezmlm-idx-7.0.0-r3.ebuild 1424 BLAKE2B 8ea76be3cc3ce3826ff5c1be24cd660835578acbf544d363a607ac8ab362085b973733dc38ab59d70b375373ba41343687bfe75f450338a15d4ad1f95c990235 SHA512 50fd8d98bf69dd62c1bdebe02247014fc42c3581279846c078ceb5739455c9b07f10f5a50d9e6ed9fb9ae4d9fe6cebdb41fe90ff0061058c0c832eab5f0b4361
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
index be9e1266ac47..7cac1d1df219 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
 IUSE="mysql postgres"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index ffe747e35243..a936451cde3d 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -14,5 +14,5 @@ EBUILD fetchmail-6.4.12-r1.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3
 EBUILD fetchmail-6.4.12.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
 EBUILD fetchmail-6.4.13.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
 EBUILD fetchmail-6.4.14.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
-EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B ebc8a846792c69dc12b7d8030efbd68994d41e1cab51ec8ef5007ec5b8f036f09ac12a69b5c02efb06fa2eb71e5d24655d844661b50737bb4cad5d8322acf9ec SHA512 03e1eb61afe94c73b103f3a56e016f28eb8ed719c44e2f75cf11d81acec5c911a2485d99a74de8bb6c37710f0e6be0daf55b8a675f98a330d02dceea21b0cea8
+EBUILD fetchmail-6.4.8.ebuild 2512 BLAKE2B acca0a8069a50be6fd697497fd1d002d1f66389d9a26d0a1d6836c80c611b57a34e5a652956157844d45ce59c255261bbdf53857c7d35214f395d41355b46cd2 SHA512 2aca0b2cf67b940df64684327173bd5c6fcb7e746bab89d3f29ec0557a15293b82fbc8479e152eca3f0cbcc135da49858fe194dd1f83e2a31a37aa55e665c5c1
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index aacadaf2ec82..00ecb9e90131 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index b21c52cdfa4f..00178ec863a3 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -2,6 +2,8 @@ AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e
 AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
+AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
 EBUILD mailbase-1.5-r1.ebuild 933 BLAKE2B dff96452b2c4043a97165146a6b8d5aa4f1264f2e5497e816df4f85709c11f5e0f16f2182655acd222aa32616830391d43345e76afb7137a92fe0153628175fd SHA512 db38019437af137541a3a0a72abcc0157404063e1eeb43cb7721d4ddedafb10c195d5d26343a54d529d676fdf849725936234f510771fab39db215c3fc06de7e
+EBUILD mailbase-1.6.ebuild 1069 BLAKE2B 3393b12beb89da539288b7b62fa028859dd88968d20406dfc2d662b7c8f162d31a3dda3dfe6e3ad7721d4be7947c43f26973463cd010368943211a86c7e9673c SHA512 66849a318e085c9fd7f27682390719defb3c426d9743d401e8f58bb8a42275f9278eaa62e6c127f42e6655cac4e62b2f179bd41bfeeed32d77d47221cecc436e
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/files/mailcap-r1 b/net-mail/mailbase/files/mailcap-r1
new file mode 100644
index 000000000000..0ffdcca3783f
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r1
@@ -0,0 +1,19 @@
+application/pdf; xdg-open '%s'; needsterminal
+application/postscript; xdg-open '%s'; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f '%s' 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+
+audio/*; xdg-open '%s'; needsterminal
+image/*; xdg-open '%s'; needsterminal
+
+text/html; lynx -dump '%s'; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l '%s'; needsterminal; description=Man page
+text/*; less '%s'; needsterminal
+text/*; gview '%s'; edit=gvim -f '%s'; compose=gvim -f '%s'; test=test "$DISPLAY" != ""
+text/*; view '%s'; edit=vim '%s'; compose=vim '%s'; needsterminal
+text/*; more '%s'; needsterminal
+
+*/*; less '%s'; needsterminal
+*/*; false; print=lpr '%s'
diff --git a/net-mail/mailbase/mailbase-1.6.ebuild b/net-mail/mailbase/mailbase-1.6.ebuild
new file mode 100644
index 000000000000..b48682ed1741
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pam"
+
+RDEPEND="
+	acct-group/mail
+	acct-user/mail
+	acct-user/postmaster
+	pam? ( sys-libs/pam )
+	!<net-mail/metamail-2.7.53.3-r2"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	newins "${FILESDIR}"/mailcap-r1 mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	dosym spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 978f13b605f8..494d7ac89c6c 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -2,5 +2,5 @@ AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 BLAKE2B 8261d06b58fd84d2e35b7a2e4
 AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e8631e2447b77758155431355c804543afa509fba81627cb6e2d93af5e9e6e0d7853a82afb12a657c8afc970c1f6b768dd10394 SHA512 077ad34f5d7664ef9824b623c17d9828b64aa63045f854b4b65567a35bf6fd1d5753d6d3186e3a7d6b63c2854f23cb566911c6bc4dc0904ad7d035229b2543e4
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
-EBUILD metamail-2.7.53.3-r2.ebuild 1676 BLAKE2B 45dcda56531104bc856f775a789b85581b24ad39c979b59cd05adae75d08f32de9c226562db4db86cd5220e9be1786dd388f4faca647c389cb3f8d58366dc5bd SHA512 662edc51f08f7f4e5224ebef6a41d41f3b357b63742b267c6120b3d33c69a40549e8cfcdf248802d2650b77f232bfa3f9d06291a5f45ab9f321ad59ddb2f7330
+EBUILD metamail-2.7.53.3-r2.ebuild 1677 BLAKE2B 0cdbf119f79e05c53d3b10d56febc17f254df2e1124a6d7c8a81ece2be77173c2d13d2190890a06b5f1495a338acc4554af08ed131effe04aa41ef4e21893a4b SHA512 4fe27deee3deaae23ac197f876dae3ea0b08f623a2d691073bab5940bc2656644f4a6755a31da4d104fc487a29a3aad8da5044137e370fff54051347bf8545cd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
index dcfb0fa94ea3..f32b283204d4 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-libs/ncurses
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index a322c350c308..4c8948d320cd 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,3 +1,3 @@
 DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
-EBUILD qmhandle-1.3.2.ebuild 661 BLAKE2B 5ce59d4836e911ff5a9d4d1f6d89e903c23f9f41bd2cf3ffa85dc80c01df829ec73c75402639c3892904b0a9f6d14ff071707da8753dc179855c4839fb2ff54a SHA512 046756f1300258cb02b1a78e9cf53660ef10d9677f989599e365afdb77c3a80e7bffc2c8e46bf95e4d76c41af4677b364143afc7f183ca05b09d7ba830c7d393
+EBUILD qmhandle-1.3.2.ebuild 662 BLAKE2B 44ac2ff417b76b80d8f2fbb218677fed2e64c807b43d46f4211e70a7a375dfdbfaab105879e8dd95a61cd9e0ffb89f88c0043b51370daf0f40a969baf0631fca SHA512 400db56aaa24e7c20d0c139da21b3defd0fb212b3e11fa23fe32a5b8fbd93877cd8a164aaec81396d834e97a701f7f10da649b8ca61d56d332050ce7944ee558
 MISC metadata.xml 651 BLAKE2B 9ccf8ab79b762d85da5c18ef6797e024ca9b9d83a4a83a8b2938073e59fa0bf47ec785415eac661c043e0b52de656e6d53107f445789d3d6b029120401180c3b SHA512 0beb930e70f222cbfd47d27c407fb51c1043f84cc5937c3082e55fe512208e3d2ae774255d41e2e43284e574fec994c84cfdafe46c017730a400d0247a50fafb
diff --git a/net-mail/qmhandle/qmhandle-1.3.2.ebuild b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
index 2775b27533dc..f59fc76b821d 100644
--- a/net-mail/qmhandle/qmhandle-1.3.2.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/qmail
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 0ee00a0f6e01..20843152a9c2 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -2,5 +2,5 @@ AUX queue-fix-1.4-errno.patch 505 BLAKE2B 06e1e44c8ca40c0c2594020bb2cde469da1789
 AUX queue-fix-1.4-stdlib.patch 926 BLAKE2B 62e8a37e118d4fa523a2b1c8d0752c0f6d1d82a242660a4246280f3dd74df694905c30ebfe807abf0c4834a391b13a2e5234b9e237bf20987ad438872ee0edd1 SHA512 8e0e021ebab88decd36a0ba2542315e7d3a0ed4ff1d18fc9242790f67a6f2441501d16087307788351d84e64574313fe731bfea968a034551b1086d642572db8
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
-EBUILD queue-fix-1.4-r3.ebuild 979 BLAKE2B 27139bd8cd5280a905a096d8625e90b71b8bbb03288c29dd4cf240a32f3acfcb8df7541c06a081ea5375aa3ed53bd8a08b090a720d296eb4d0c608a41bd845a9 SHA512 e298e41b0242e7fa5cda5ea0942f02f7150ecead30094c25c4ed73e25d899ed89099ed1d0d16f5d6a8b123fbad91a6eb6fa67b1ad13bd3715263a337c2874374
+EBUILD queue-fix-1.4-r3.ebuild 980 BLAKE2B d17e8e02904b328c58d8ce28041527810ff242259da28588bd461be2ac22267554d4668e30c18570a25afd0932e0e62e5a711ba0ce0558ff0be52289a94a2233 SHA512 d2ff3dca357caab2849afbb214061ea629affbedf7103c2d78edfed71b4dd17b3a4c01dcd93252b96348e36e98f1e75404b861c511892a54776a533bc6ce6f75
 MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index 87c0144acd47..01ae38b12b08 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
 RESTRICT="mirror bindist"
 
 PDEPEND="virtual/qmail"
diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest
index 58ad6e27a2c3..a2333b85d9e2 100644
--- a/net-mail/ripole/Manifest
+++ b/net-mail/ripole/Manifest
@@ -1,4 +1,4 @@
 AUX ripole-0.2.0-ldflags.patch 495 BLAKE2B 28c2a580563fd4de93199d8242b5f3673f9bc81247be65ce4a7136e28a3204dbd48553cdc6de4c7ef7f13c4332120dbb415320616e4b34656b5340d976714ea6 SHA512 749d9a864c1cbc4c28e6a8b8dfd69fddb72e4bd0150a143bd4398e4757edc8326c6c2c7da4d0ce3e17a212636b3894726a6488d8b03618b3d0641faff390d1d3
 DIST ripole-0.2.2.tar.gz 30629 BLAKE2B 63ff7c0d086861d8aa9c1fea7e69086874b90e3181898e36338cb3913e90c6ed7e6f222ff985d92386535a222e44e8a324658f0b4bd51de508f92a82f37f5eb1 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92
-EBUILD ripole-0.2.2.ebuild 561 BLAKE2B 05f8c0ca648fd239ccdc2a7c33fb46294c944a2a10732cbf34af08587385dffd330edf9b83540349583bf02b5754ba6d677c1f763bbe752c9578c1fcfd8fcd66 SHA512 1c6e9a4fc133606feb71e5227e68f650f6e148538115f78e6b82250354b441e48c80266f8e15180ab2e96019bfc7777c3e32f6e6ebf9f2efb7cc2c9e3deafb3c
+EBUILD ripole-0.2.2.ebuild 562 BLAKE2B 1a28ef5251bb69e2620e146c997dcfb3fae05426b299a1a1d994ac4f27f8a182cb43730f6c2b9fa52ee0f1c6a14963f70d7adadeecbbde49ebd3ae2f4ae6cdfa SHA512 177f41de49c704c751b49d23c329ae760f16fa454f4980327b260f6369e0a1febd86390546d5e20540ae9f2c83a4b085fe42cb2e5c32141e1727707c494f9d1c
 MISC metadata.xml 325 BLAKE2B edce91179b4c014b34923d673bd254b4e46e04362e7873b61660e69143cfaab7f5894ebf10858dc2028d3b8d866ead42411f90db2b11b5e4f6906a1cc806189a SHA512 fddd77a4694de0ec2c881c393854557ec48e5f6603c795f93467f700750386563c297302fbfaba72d4980b68fa1c5c0f000c292b9e59ac0463dcb079bbd3c035
diff --git a/net-mail/ripole/ripole-0.2.2.ebuild b/net-mail/ripole/ripole-0.2.2.ebuild
index 43f2b111e819..9f121991a1f3 100644
--- a/net-mail/ripole/ripole-0.2.2.ebuild
+++ b/net-mail/ripole/ripole-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.0-ldflags.patch
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index fa12350cc2fc..1e92b139e2ab 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -2,5 +2,5 @@ AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2dddd
 AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe45010e331d9b121e8454faa696285a60ca97c5dc74567eb4afd88e4444f4da318f75c02b70d4f5c9ba6b2d2664b68fcd SHA512 55db66e01d6a252e4c9c265de2c14e40a92b5eb33421d05879823a6fc1e37e1b80951bf84087739f39e32850873371461a604584e465576b6f3b269b2ff83085
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3-r1.ebuild 664 BLAKE2B 5cf2f15f1c93a62d2683715ef7360e44c56f2a6907a07d6c38f239974b5dae4cced62b51989247c9e49bdd8c4cd442430ee2a4877ae9666a91835b3b5bec8235 SHA512 5788d2a130f5daa94fcc4d5e5429140937c91c6b8ba4bcf6bf44a2905fd8ef70797564a5452c6e907653adb82d3672ad700c49bd92c4749dc77836b5cb7ae9c7
+EBUILD smtptools-0.2.3-r1.ebuild 665 BLAKE2B 45299bf6187b0683d33c4f25e3f3f5fc87bb07abbd2d3333522973add50c0c0b5bbbf7325c0a476cd33532121775d68fe1f17ba8734f9006ae54066ee729b887 SHA512 e94023079a127df840400b67e7a7a0504b92480924b9b390284b2db7a2d25090c102e902981ed201fc2e4b4c26d526c957fb7af5f8cee93b584289e0bcc63c54
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index ddcb822d258a..ea829ce42cac 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
 
 RDEPEND="!net-mail/qtools"
 PATCHES=(