gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /net-mail
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
58 files changed, 88 insertions, 1025 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 971a31f30446..88e81215fdd5 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 01e116ed394d..93795cbf3299 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 646 BLAKE2B ee8943a7cdd3ed890bbd85546fcd82ccb34b2dbfa9cccb9e3053bc8d5857f5f2c98bd68daf4e1e739b445721d16172d1bf9ae1b9810af2dfa7cdccf7f0c8c5fd SHA512 126933c6ee615bb01edde97cb98651eddd405d47e8b95a290f3a5c6b6ca2b76a61dea326e76522a6ab38036abdf0e538f014b67e37fff9838768c3b3ee306808
+EBUILD autorespond-2.0.4.ebuild 647 BLAKE2B 7036c6db2dedc2a53ac6a4a10f6dd378b7d549ade7f00e6d02208cdf710e0854bede516a64b5201d90532fc205eebfef0dfbbd524b60d79ca8c75ccc905377b5 SHA512 ebed2f7c2f717ffb78c45911573e0c90cba66462e37441841144ae4d6bdea62c8cc334d37a7c24a158beb75395591235811d135415214c32890f765a5eb946d2
 EBUILD autorespond-2.0.5.ebuild 785 BLAKE2B bdab2b95893a4525f6b080a81310e8695ef8ff0434f21db5b27ffe4056e811c5bf6078d7e6d6de34c036a392f102520ce96dfc093b22339133e51a7dffaf253e SHA512 bea6b4a537a05d774bc72df1cc9493f8d550be94090bb8a62d7dc203d57cb47a0b0d436f7089a26935c40a2a5dda4f0de7d2801029b01fe7e037d358e16e44d4
 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 d3be500ebcd5..76782d85398c 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc s390 sh sparc x86"
 
 RDEPEND="virtual/qmail"
 PATCHES=(
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index 64d3e636051b..7b92da5d0fae 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 433 BLAKE2B fc2fb4ac54621804e6436c1e19ab9c1895073aec2d49d4c8de4f5bce23a40c79f8d419b8dda8ae6f3a6ebbf129f3171f9aa4c6f30e407f2260f429bd7af76d2e SHA512 43958cbd1b9b5afbceca7065a19a8f728c0258ba579e42f85ef777dfa85da0d1b1db51b08a8df806cb87a5a465cdb1e975604d5ec1f1dbc3a1a07e87a899abed
+EBUILD checkpassword-pam-0.99-r1.ebuild 434 BLAKE2B 8e8edd4cd267877d2ce8e0d11773c9ca4b3ca811c517dc142ce8c4a4bf6085cf584e231161a2c7aa6f15b4f3b021d22f34d4639ceef63a8514c49b9a861020bb SHA512 54d1d14d93b5b403a84c0c089ea696b5fddd94bcb31c533172cc4291f3f85ae8d7bc0c44676a2c79e47260fd62cc225eaf3224cf2f83c90597b8cf5abbac12e2
 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 da5f73d157ab..473b355f62de 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 0f84b13809a7..034ba39f64f2 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 903 BLAKE2B dcfe4b86caa062fe2ec380c27ac32c6bf5fafef3c26eceaac59b70b862a791ef7eba6d44fe9d33a0f97bab42fcf7f31aee755634ebb55e551ea51480eea19c43 SHA512 6d7e6b444ffdc60021cc2a2aaa35079922d308e22d51e45676c545252e349ae55d8f00b9d17da8222a2107c335202ed2b372070afb66d2d82f16d72524becbad
+EBUILD checkpassword-0.90-r4.ebuild 904 BLAKE2B fba4b76ad6658d0f80ea97e17faa5c6d05b078fa830886f3c934bb51825d6bb6b9f04b9075f2ed7f5a54ed30e2b5a3a4de482cf23092fc8aca484d3b335980e1 SHA512 408c2c0e7ef520ae8df26d48007de4c476d1f1527d2176324d96de34df27822418690fb89a79f793be4a85ffa86ad36faacc589e3ac1d8e33a4fa6f6806fbe0f
 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 4a7578dd6e97..20d54f0f76b0 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 63da9e870007..9d3db6da49f3 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 1469 BLAKE2B 721a3a3adbabb37d64682a32ce6b408233e2b48c829073bf33fab34569c40929eea64628430629f7fa20faba941e78c8f7806444b18955006c5417b65eba2632 SHA512 1fcfa408df2b0396fde4e536918986834feff35c566ed30b4eead67c50e7c289e31b02a63e9ab67b2a8e3fe75c6faeb04b0cd3d85efdfbbff9074555e060e58e
+EBUILD cmd5checkpw-0.30-r2.ebuild 1470 BLAKE2B 52df1de1981dc7cbccb51c7ef5a65b5387f680ff81360b01ec49a8cf7a05f68fa0f0a02f3019b871ccc1118fa5e993399c7b1198d271bccd96ef0543dff43cda SHA512 349cd329312f721d931134dba40ae26712fb8cfad8e1eee9ce07cbf294390ade385213907ad8e88291c982fab6dbee759a54c057915e59a2312a39fc2408bd8c
 EBUILD cmd5checkpw-0.30-r3.ebuild 1502 BLAKE2B 24c68fd6903d4db526612b4b66b6d6fdee68474a0083fe37b8d2af93d2804bbc8a458954f25b9f8c5ab97ee681bd04d11ff12c24cf56c336d74d1d5c9374dbb8 SHA512 1582add7c5c0be47de9c452e244c7173882fc22876b452468c9ffdfde97c0cad9584f457b4d70a421e8ae55b3952ba6c063b22df2490a2d4dde3bfdf0ef35c85
 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 44092352e1b7..a07c834a331b 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 062d3c82a721..7ec281a1796d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,4 +1,4 @@
-AUX courier-authdaemond-r1.service 373 BLAKE2B e816210503501eb0922cf773757ce0368d5ecd46ddf3eb2decf8171c18e034c9c2e9358bb4c680aeeeeefbdecffa3253e49e80ff321ba065111fc9c9c43e311e SHA512 5ef9b65c24700f93a31626d2a657e19165853151e5c33eb96b0d41b818b4669a2785dfb868054231df20acfdfc4218a0bbc7e21260e337a3075c54f97ba9c46b
+AUX courier-authdaemond-r1.service 365 BLAKE2B 61d17a71045867fa4e913b646cba81a3d13984b54a350dbf805780bc8989c6eaf2af52a9cc6f5abe5336487c11f737c89c1af7bfce854f9dc39892a742e1187e SHA512 38e49c678de86eb0e9e862c365c75e70d9812d561495af4abfb9bfba8189e60567cb1ba9d5788dfb59598b6c72ae3bb17b092077979b13fa387160c28e058855
 AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1041 BLAKE2B 4e6062b79152204a330537affaf21b0a2ff3907849a620a292bf5edb7b19f9bd088156531439f932948d145fee595667fefb3a8a9ab3afea62c6380d57a55ca0 SHA512 62efe81649b35bbb08899352428742793ac2336f95e74f47b9d32c445ce943201fff2c7801f8ff2d9977f68cfdd8c0ef35223f5019642acbc3ba1298f81a6a59
 AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 BLAKE2B 94246350517110281e3f87331d0e955e6f719e71000bf6ec094c6b97a1a8510b51905fab0e7d45640804b7bbabcb9200e857d8ebd413cabf4aaf17d92228d076 SHA512 22108e1a09e9fc6e6c035ca7f55ba382ec87bf889dd88c2f9934b087d285853a6eb8453fadfe456f9a6de57f973c988bbaba8ec449366f0df8396b430b1d64bf
 AUX courier-imap-4.0.6-r1-courier-imapd.rc6 796 BLAKE2B a66a0aa3084d1536e2fb90b727c744fd0132b466bb82e888f739bb96fcfa5daa40f8879d0c23de28a5b737a9d71ccc39d7c6f7c4a8e5df757d6b69586b688812 SHA512 a51a098afd97948fc50747819ddcb9d96c3a79c1e13d3dee58f2e500808fa9ac6d87706b845b4a2abb0e55bebfb242f264cfc72062f84197805dd5fd27366e8d
@@ -19,10 +19,8 @@ AUX courier-imapd-r1.service 299 BLAKE2B 7b1fb3acc3b75cac873967f1eca099e9f65951f
 AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c528f8f67271fb690deb6905e2638a7fb22ea7c2c3133edc510185684e9297c53aabc8c7ec628ec51d920857e9e11b SHA512 431a1113cbc10aa4042c621fda43eabaed79b4e0fabbc4692073c92368448324f958d3ad922b99b4290efad8a8164aff3698ac69e4e3c1f457d1616f769c11e5
 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
-DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
-EBUILD courier-imap-4.18.2.ebuild 6856 BLAKE2B d8c71d90f31c9e4fe42140c079618793373ae718f10fc793d0cbd127323718971ec48a020a138078dcaa86ca911ff580d9d062e8192f98f706ec549b2ea4f570 SHA512 7c471c0045bdaf0d411af81bb104fbc416dd451a790668b1e70fcaab70a1621b6ab22a287b793ebb6ea9c234df85016a96258c2e0bd4e168d716fc8c87566b95
 EBUILD courier-imap-5.0.7.ebuild 7191 BLAKE2B bc85463316bde1b8633211a66a9c217bfa7957043279d16b314744caaa0af15ef9d8cb3f56cb0874370f6092ecd52851248c7458e5450666e57a509b6fa7c01c SHA512 2d4df7f3f46dd9a4921fdcdbbec87f771b9a382b0b1d20da2224e6139ea2b0c155163cafece4f755254d982a04bd337779eb10627532b5b76b36b1d1b0e433cc
 EBUILD courier-imap-5.0.8.ebuild 7201 BLAKE2B 46c82223b33b151946b01ede4b2e2fbc0ec46b312127f7c5c639937d3b72c5e6cf8b4d5a07b5212acc51d1d1a1fbb75ee2417de5d59a6ca21a58b6b137696cf0 SHA512 20e3f77b3c7c961c4210dc53f4ce586e97361ca233fa5592ddff36b411179cb0c6ce2c8182bdc3ff505ea7963675ab731f115809b3af1a515f345292e19333c9
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
deleted file mode 100644
index 1850e72c378f..000000000000
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool readme.gentoo-r1 systemd
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/imap/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-
-IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=net-libs/courier-authlib-0.66.4
-	>=net-libs/courier-unicode-2
-	>=net-mail/mailbase-0.00-r8
-	berkdb? ( sys-libs/db:= )
-	fam? ( virtual/fam )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	!mail-mta/courier
-	userland_GNU? ( sys-process/procps )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )
-"
-
-# get rid of old style virtual - bug 350792
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
-"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-# make check is not supported by this package due to the
-# --enable-workarounds-for-imap-client-bugs option.
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
-and remove TLS_DHPARAMS from configuration files or run mkdhparams
-
-For a quick-start howto please refer to
-${PN}-gentoo.readme in /usr/share/doc/${PF}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
-	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	# Default to gdbm if both berkdb and gdbm are present.
-	if use gdbm ; then
-		einfo "Building with GDBM support"
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB support"
-		myconf="${myconf} --with-db=db"
-	fi
-
-	if use trashquota ; then
-		einfo "Building with Trash Quota Support"
-		myconf="${myconf} --with-trashquota"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	econf \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir="/etc/${PN}" \
-		--libexecdir="/usr/$(get_libdir)/${PN}" \
-		--localstatedir="/var/lib/${PN}" \
-		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with gnutls) \
-		${myconf}
-
-	# Change the pem file location.
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		libs/imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		libs/imap/pop3d-ssl.dist || \
-		die "sed failed"
-}
-
-#src_compile() {
-	# spurious failures with parallel compiles, bug #????
-#	emake -j1
-#}
-
-src_install() {
-	dodir "/var/lib/${PN}" /etc/pam.d
-	keepdir /var/lib/courier-imap
-
-	default
-	rm -r "${D}/etc/pam.d" || die
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	for name in imapd pop3d ; do
-		mv "${D}/usr/sbin/"{,courier-}${name} \
-			|| die "failed to rename ${name} to courier-${name}"
-	done
-
-	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		sed -e 's/Maildir/${MAILDIR}/' \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-	done
-
-	# Rename the config files correctly and add a value for ${MAILDIR}
-	# to them.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		mv "${D}/etc/${PN}/${service}"{.dist,} \
-			|| die "failed to rename ${service}.dist to ${service}"
-		echo -e '\n# Hardwire a value for ${MAILDIR}' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for service in imapd pop3d ; do
-		echo -e '# Put any program for ${PRERUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
-		echo -e '# Put any program for ${LOGINRUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo -e '# this is for relay-ctrl-allow in 4*' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for x in "${D}/usr/sbin"/* ; do
-		if [[ -L "${x}" ]] ; then
-			rm "${x}" || die "failed to remove ${x}"
-		fi
-	done
-
-	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
-	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
-
-	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
-
-	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
-
-	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
-
-	for initd in courier-{imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
-			> "${T}/${initd}" \
-			|| die "initd libdir-sed failed"
-		doinitd "${T}/${initd}"
-	done
-
-	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service \
-					courier-authdaemond.service
-	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service \
-					courier-imapd-ssl.service
-	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service \
-					courier-imapd.service
-
-	exeinto "/usr/$(get_libdir)/${PN}"
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
-			> "${T}/${exe}" \
-			|| die "exe libdir-sed failed"
-		doexe "${T}/${exe}"
-	done
-
-	# Avoid a collision with mail-mta/netqmail, bug 482098.
-	mv "${D}/usr/sbin/"{,courier-}maildirmake \
-		|| die "failed to rename maildirmake to courier-maildirmake"
-	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
-		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-	readme.gentoo_create_doc
-	dodoc "${FILESDIR}/${PN}-gentoo.readme"
-	docinto imap
-	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
-	docinto rfc2045
-	dodoc libs/rfc2045/*.html
-	docinto tcpd
-	dodoc libs/tcpd/README* libs/tcpd/*.html
-}
-
-pkg_postinst() {
-	# Some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
-
-	readme.gentoo_print_elog
-}
diff --git a/net-mail/courier-imap/files/courier-authdaemond-r1.service b/net-mail/courier-imap/files/courier-authdaemond-r1.service
index 239821647c26..1b62b3abcf3c 100644
--- a/net-mail/courier-imap/files/courier-authdaemond-r1.service
+++ b/net-mail/courier-imap/files/courier-authdaemond-r1.service
@@ -3,8 +3,8 @@ Description=Courier Authentification Daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/lib/courier/courier-authlib/authdaemond
-ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/lib/courier/courier-authlib/authdaemond
+ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/libexec/courier-authlib/authdaemond
+ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/libexec/courier-authlib/authdaemond
 PIDFile=/var/run/authdaemon.pid
 
 [Install]
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 911022a28d6d..d86789a57d47 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 2762cb51f5b7c1f3431c3fd048eee6829d3a9be0e884ffbf8981855549f44b4020228811c88a610c499d178b2cdb5536b821655da038aabe365b7e5116e04dcf SHA512 f3c74f36ed2ceed3a1916263c0689f5e6cc9b57a60b4c66879ccbee51188264dfc8cf459992ea55c8ff30e50c63e7a159d016f51dac535da2c53e08cbeaad865
+EBUILD dot-forward-0.71-r4.ebuild 882 BLAKE2B 16ce234f25151bc85b95eb7a48c35ee4217b8651b9f78b9245c64f6b191c35dd602405a1cc60876a5feee8436b1e6fd64e08d5b2dfb84bb8543419e8a663eb67 SHA512 d54f3c79d2609c47e73dc517d89d62f4cfc50eba67307f174f3158d5bc46023dd8f4fad049159cc8b997d6de974b03f415d603018cc6a38a8efa49a30eaac1eb
 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 052a8455d217..c931116e695e 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index c1103d622e86..8dc159bdf1d3 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -9,7 +9,7 @@ DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1
 DIST dovecot-2.3.8.tar.gz 7136958 BLAKE2B 2769169519f0fd9293178e8d200467bc5be0f362bc6bfb3dcc6cc74ed146ecf66dab7730013704b70f0cc75a87ee5e52994137cd63c7c12c56bddcea37cedd07 SHA512 f62439e2ea77ffb544a7752c07085582c5653c64671cb42dd7a7e5aa69eb87059c677aa1fa071efa1ddd2287ab621e9a264ec115be2aeb2f43ab4c685411eae3
 DIST dovecot-2.3.9.2.tar.gz 7182306 BLAKE2B 942718ebdb7c447096895fc4309dea930ff87166f06be3365c6463e2aed95bb2620a5e45a8ce260df647593d9d2cef1d2a3ba3aa0afb397dac81653f9a4fd519 SHA512 36e8270bfa33e2bd6aa89017e65c7d1650c494c79ff297759a4b01c026aebcfdf5b1b542d4357e1f9dc2bb8169ef67064f0699b17ca36d658deb70b4c800b253
 EBUILD dovecot-2.2.36.4.ebuild 8572 BLAKE2B c5900ba2365ac280429b669a91f4cfc537f689c9fc9d52d3bd62a170467278ddd4736c2ba850ed1f97f775eb9fd132047bf9ea84625d3665270b83ab380c2931 SHA512 8c48542c6bd7831aca19b38b3af1c220cc43f1b9a1db22ce44d2c9c9f8f44a1387cb4e0b8ced38304e1e6b790c6ab81473f418f14ca922dbd50554e9190c596e
-EBUILD dovecot-2.3.7.2.ebuild 8684 BLAKE2B 8f660cbe9a2f12c077d301167700ad9da9ee47491d33208279f1ba9516ec5e215e3c8fc23ecba65e769ff4846b01574c4254671b23ad1f56aeafa69077e07725 SHA512 8c8ec87757307bf05f754defc080dcd3d56db79f17de7962d1868275925e896282db3877d4948557c94b6d29732cba2d74105642931b0876579392abef468986
+EBUILD dovecot-2.3.7.2.ebuild 8685 BLAKE2B 3d1e881916c146ddb99e35d4b2685621b15b8fc53bed5c7f27722df2b0ed69d37c33fcbc815c2b9c4aed91d4345918d4537863b60cf902ca54d756ec52e58ebb SHA512 4069533fb22ad76836ccbfe3ef76ae9fa9cd276de0e21a23555cdaf9d645a76f65a9552037de26c1eeb04aa0ce18ea90255fdac09c91c09971384bf589eda185
 EBUILD dovecot-2.3.8.ebuild 8558 BLAKE2B 7aa5ef722151554d553c69c02aa8c38622306561acf87dd02d0f84d32121f3d527f13b7aaf45656aa7055594ba15ba45f4933ccd82456eb8276ab39bc64a4222 SHA512 a5448124ac35c0d660998f1de3d2209d1e7b6d6bdc6de4e1811b8572aa19b4aa41aad01f4741cc6ef9abcc66b051ffec9fd106be8c31772781d3e74f0a46042e
 EBUILD dovecot-2.3.9.2.ebuild 8558 BLAKE2B 8079b41d7d4a3e96aa36ee7e2a83a95142e0d54cd7a633211ba3d80fbb97f68edc65d559497b64c2cf912ed4d42b27e6f9bfd963ed1f13ad1bae6d05dd5df45c SHA512 2c8845baa6064cc79533f24a83bba84f322681710b76a9900e2b644d312db90c162155d2aa8ed2b40616dd7b22c6dd9f8d4a6fe7349eecb31831e35e498b2dec
 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index 271aecab0c4f..d8cce941ec7b 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.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/email/Manifest b/net-mail/email/Manifest
index 25e01c603c7a..bc3d31636cbe 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,3 +1,3 @@
 DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
-EBUILD email-3.1.3.ebuild 558 BLAKE2B 47884a0b4af4c192ad593c6c43a422c308dc320e61c6b7494178657ecda9c0d0945b56406e18c63a99f996f21b93120a532099de451f3324fb049cfb74b2f24e SHA512 849dbb318fb20a479fe2c46fb8bd7fad9679d8983de5ec4c27040d75401d703c96073fea84e1b39474a07bc1e6d014175de0de3ea1429eb82fcdfc31aed33593
+EBUILD email-3.1.3.ebuild 559 BLAKE2B 05f6c52121102f10119a3b628351e7ed22b6f99cfd5e5ba26ea97516047076861c098bb7172d07fa8f88a95f35fdd6d8fabe198edcb32e3769049bb872f321ae SHA512 9e1a2b0de8f05c32f15fcf2774ace59b55349a465229fdf14a37bc22bb7a36ba10d8282529c48a962af25753ce915f396790991a3cd26dfbd3308b231e25bfd5
 MISC metadata.xml 259 BLAKE2B 340db8ab484f8fe7b7a74af660d7ef8f4d99d98b2feaaa02836808ef6da6176f6c15ea5525a097b8556d434a4c8d6a6c49d97a1deb1376edac3220b4d9a07208 SHA512 be960a9ee308ff2013fbd23ae68a484a273afb04a49490859d0bd5f01e21d176937386bb2704b6dba5599ae3c71f5c91c995a46dbb162b0925c41a025567ed81
diff --git a/net-mail/email/email-3.1.3.ebuild b/net-mail/email/email-3.1.3.ebuild
index 24fdb011d93f..becf130d9720 100644
--- a/net-mail/email/email-3.1.3.ebuild
+++ b/net-mail/email/email-3.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha amd64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 82aa06d6a34c..e934af108623 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -8,7 +8,7 @@ AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27f
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
-EBUILD fetchmail-6.3.26-r4.ebuild 2641 BLAKE2B d8613523a8325dfd7428d8dbdf9a03daea325cd3964abd269874885a07a9fa8fed07ed9f413aaa02250038dba6a59cbd7cdec26a93b81220ec35fe508e0a036b SHA512 921afff61fe1bb5ae117d77a7472d0e61d093b92bbe09a08a76d964b161882fefdec6dca090267d14e60e2374bbfc82177d271518ce9dcfeeefc61e63909d12c
+EBUILD fetchmail-6.3.26-r4.ebuild 2642 BLAKE2B 6abd9112ae12ffede4149e16e2ecb09ce5d53fb8efc9f3660a8b41b37095e0e7940b2ceb4b3ecd348bf7c7671b0c714b71297c5939f60728b7818d1e109498f8 SHA512 351f3f8aab84802b43c7b0cf7a224626ded48a1fd22c1e4b5af64ef9db829fbae78858cac968e453ad879be88d083e70616e4a857fa3e4fe2972bd93b1dce4fb
 EBUILD fetchmail-6.4.1-r3.ebuild 2429 BLAKE2B 5e089f5b9bdc9371e6701dfe48e140df30a38cae1ebc89c4032e030737c316f622632c31fa3d7f1f55c4461cc0a7127674191a5f3f94955e32474a3161e64490 SHA512 4d3a571f7943f2d8d3cde6a35ff71ac6ef41ed36f12d1fd18d81a9efbdb8e463d9e8be6d92459503ca7c4494af4e8f132e877a3cb809f9c72ac220f5a82aae2e
 EBUILD fetchmail-6.4.1.ebuild 2606 BLAKE2B 4597ff6bd5653d6b075498fc4a2175b3d0695ca2934734bc4565152c7f868b211116274aad9a61b7c57120e1d9a2101244aefec54bb3f9da7f721148c4889750 SHA512 6c852431b6d438067247f5368cc8e7966a986223485faeb667dd31be756a3570738a6e19685dafd0050c89caa3ac34471603f43f6b7f1df9d67f1173597b0640
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
index 3a46ab22e32a..b08a90d709c0 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh 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/isync/Manifest b/net-mail/isync/Manifest
index 43604e90f8d4..472200303803 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,6 +1,4 @@
-DIST isync-1.3.0.tar.gz 309459 BLAKE2B 852b37e1d9d5b0c4fc2f84305e88263adff5448ea355782da17f295a22e3265e68edcc049ce6172155ab0be7518a0431091d45f4e012f49b500fde7c28491ece SHA512 b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa
 DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
-EBUILD isync-1.3.0-r1.ebuild 702 BLAKE2B 7e04e4ff0121252958df13a783eee3c0d5593ad3b0682b976ef676ac49575d464757db79a0e8d3865e572a09487218b28d1c234dfab4cf9727e90a2822d4534f SHA512 4de3f8e020c188e1103f9ea20af277ba7dca9c091c2058e1e5e674e07612b9f104fa8a554d8c325285f741f4b1420f27bbc8bd7fc3dbe0156f82329b2bba9300
-EBUILD isync-1.3.1.ebuild 848 BLAKE2B dbd8cb2c51f9ce18203eca7de5b9c504b0da51a72c319010b154491aad436f1df4b1986fb032b0e3d669aac232b7ed3d2e54a590c76351a052b7bea40d0b65c3 SHA512 46f12eb44e886cba9067e5425daddc824a5886b0d6a55cc518a5d4067ae2bcc167e0a3c7e2bc586194442fbb33af2fbbc425c8d44bdf412ab07c1bca1aedc8fe
+EBUILD isync-1.3.1.ebuild 847 BLAKE2B da908a26f1d0afcf55304c26833e816ffeec41aaa6fce5d5a47e6a86e6092dcfa0a775fbd959599522d8f092c614787fb3fe59d308bbb5b28c7f8ddd7ace20bf SHA512 db8cb458e1af7b1a2b3e7794adc99e47d5474fe868840237001ab3d4b9dde4da7c838e310a1626bc0616549594d9f6682997693c880df572a33a47cd1384aeee
 EBUILD isync-9999.ebuild 849 BLAKE2B ad7c0cd7fa2f4b2d6efea4de7743b2173d513cf78d247a684787a97b433435d28d3468964699f543cda45d69c96a2a8dbdb59a580d52db50933efb2bc7f122d9 SHA512 981add2caff2810e074a8b0944d3ee59bd9ab35976baa4d436a0e16e145422a6aaa7c42efd162927db4129191027c6781d0f457faf25e8cd05c436541f579dff
-MISC metadata.xml 363 BLAKE2B 6dec111933ae495659c17c49ecf8020fa2f202c3a2e45178b8ece570ffa8d4a15330c873d32cd2325f9f138528ae8e498b2b9b3e1de063f42a028cb4d302be6e SHA512 04a35386c0d3af6f95c57060fff261063ead761033c0f43f9cfa09afb65f6c708de90813d50a812c5be6c76aa869540757a7aef9296ba831136314f509e29e17
+MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
diff --git a/net-mail/isync/isync-1.3.0-r1.ebuild b/net-mail/isync/isync-1.3.0-r1.ebuild
deleted file mode 100644
index ed92112b1459..000000000000
--- a/net-mail/isync/isync-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="compat sasl libressl ssl zlib"
-
-DEPEND=">=sys-libs/db-4.2:*
-	zlib? ( sys-libs/zlib )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_with ssl) \
-		$(use_with sasl) \
-		$(use_with zlib) \
-		$(use_enable compat)
-}
diff --git a/net-mail/isync/isync-1.3.1.ebuild b/net-mail/isync/isync-1.3.1.ebuild
index 7fec5f34da7c..dbd86955dbcb 100644
--- a/net-mail/isync/isync-1.3.1.ebuild
+++ b/net-mail/isync/isync-1.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc x86"
 fi
 
 IUSE="libressl sasl ssl zlib"
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
index eb327c5a181d..6c541c70fc0f 100644
--- a/net-mail/isync/metadata.xml
+++ b/net-mail/isync/metadata.xml
@@ -7,7 +7,4 @@
 	<upstream>
 		<remote-id type="sourceforge">isync</remote-id>
 	</upstream>
-	<use>
-		<flag name="compat">Enable legacy utilities</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index eb337735fe82..6f73f2a74a01 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,5 +3,5 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r1.ebuild 884 BLAKE2B 0b8ca2501fe7f11f9112299804d7ed47bc895c4fa9eb9cfa27685c72a1a883b8e8d0d3f8af3f49283beadb1f638abc461b969168d3e35dbfa31721e837f4f203 SHA512 dbdd0888d7bfaf472f44044510bca8659ebbc3e33b68aaf50aab47b8cc9a6c54aca3701423a9b084a63d7b2c08a231667f3765ceada635e1ac377e06242a5366
+EBUILD mailbase-1.5-r1.ebuild 885 BLAKE2B 1e3badf3de05482415b45df62a011a58b60795b735f8a54ca374acf885d216100404836d24947a18db5a1ae74935d9b65dc5ac29f0498662b249b3d7c7f710e6 SHA512 f1888ace508c01145981bc733353d70994d517501ad69097a5557a77b0d7678607a75f1e8db5ef9379a6a8cb7619321eadcc53c8a28446888f009bf2c86107a1
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index e4aeaa32cbcb..77a5c3c409cd 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
index 5aeb89853e75..b7380bf802ee 100644
--- a/net-mail/mailbox-count/Manifest
+++ b/net-mail/mailbox-count/Manifest
@@ -1,5 +1,3 @@
-AUX mailbox-count-0.0.2-ghc84.patch 905 BLAKE2B d786519b6c9bcebd0c2d5719e469b2d3be2553b46ae58878ba47b7720111355b64c31e67f95a84b99dd482e7c88b81426eb35da3938937a030e31e5577cdc290 SHA512 046b2a6a185ee43823bc1b4906d3b3f79a4785e61b2c8c856cf0426dfc3de7dc59be9ab981f5b0a76c2eb4528c6f15a5c4672cb266de69bc299cf0aa4e6e8bb2
-DIST mailbox-count-0.0.2.tar.gz 20644 BLAKE2B 036d118f9c23d42e21de06405d2703e97017f35d618a90e77561d604441092b543a8ba03b50dee5a7c2a48c2b8c0d6e87c06c2338853d9c508de7b6ea9d86006 SHA512 98e39927382719295260c64bd5888244000dbbb3fbd7f6405dcffe78a4fc5f1dea7f8236542e58eb0118bb421c19225a8be0560b92c7688c0701418c7221d569
-EBUILD mailbox-count-0.0.2-r1.ebuild 821 BLAKE2B b9a4977bb2af16c294a8559ab466a568cae6e60192e9a3cbc7e69e590baa0f896d87b52a8e756f17ac47b0fa3b9756a64252a3a0f6cc18f4f0bda55b8c4a630c SHA512 3c6a241379adcc4d4892b6c44cc4bf889816fcaf9d48e9cbc96987f2e729eae734ef1020cb69d67d8042443638370cea44889bd20231f359c7ecd1f5b361ef74
-EBUILD mailbox-count-0.0.2-r2.ebuild 931 BLAKE2B c8d77610209bc30e992e1daa1eac40870c86de575f4fb116fb1a6d77015395fa6f3dec228018c20ce2055dfa97e5c9a78f0fd95fe5bd3fb2bc057df6e996a186 SHA512 207abfda7a3f50a7ee18b44461887bcb5b7680bc29d5fea864d564293ae271158b93261e22e1ebbfd990ed3df0102d7cacdb0861338c92c48e0ffd6ada2fe7b0
+DIST mailbox-count-0.0.5.tar.gz 21476 BLAKE2B 3ad79233ae1dbb202bc46c60e8a7d13d5d6820f74e090056f37eacb7b37c2f18498f599603d1ee32a7ac43b5f9931f26aba1780ff5160333c66129889ac6812b SHA512 3c63bd9021f64ba745572907eae8bc25e9ddc7d443d5ab84626dd90f95af71267cbffb9d371f0e308988fbdf14f3a126d93a727d55bf9ee3e02037e687267d26
+EBUILD mailbox-count-0.0.5.ebuild 984 BLAKE2B eafb2dccc798c8a94e8dec3fc6b47e6ec8b42efaf2054c306b966695214f09682a7ae27d674b15657c65b8cd8367e6201a1b5a8936ac4c7a97242f3750f2eebe SHA512 4e9b39e561fc96b6feaa5b92f9378bb86b66568a1f1c23b9eaf3c92a51f73fd88e616fc31b709a3e4ee991a446838773ccea5bf0704be616c88c98ae441e171c
 MISC metadata.xml 3288 BLAKE2B 15a60ecab50dad246513c9060e9cf73b4a00c4a6264085357c04461e83a262497780c831823fd54a94d2c2a2b10cd836c51632e24683bbc5d0541d657e383a4e SHA512 95bbd72ec2a640fc2f4d9b67ce8388edbf3b7e01e181bc874fd62d11fabc5858506c35e613bb9215e6732ae4c968ad87df3b93b917cded023691452d0368e8d9
diff --git a/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch b/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch
deleted file mode 100644
index 5257a10a3ac3..000000000000
--- a/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/OptionalConfiguration.hs
-+++ b/src/OptionalConfiguration.hs
-@@ -27,3 +27,3 @@ import System.FilePath ( (</>) )
- import System.IO.Error ( catchIOError )
--
-+import qualified Data.Semigroup as S
- 
-@@ -65,2 +65,16 @@ merge_maybes (Just _) (Just y) = Just y
- --
-+
-+instance S.Semigroup OptionalConfiguration where
-+  -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@.
-+  cfg1 <> cfg2 =
-+    OptionalConfiguration
-+      (merge_maybes (database cfg1) (database cfg2))
-+      (merge_maybes (detail cfg1) (detail cfg2))
-+      (merge_maybes (detail_query cfg1) (detail_query cfg2))
-+      (merge_maybes (host cfg1) (host cfg2))
-+      (merge_maybes (password cfg1) (password cfg2))
-+      (merge_maybes (port cfg1) (port cfg2))
-+      (merge_maybes (summary_query cfg1) (summary_query cfg2))
-+      (merge_maybes (username cfg1) (username cfg2))
-+
- instance Monoid OptionalConfiguration where
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
deleted file mode 100644
index 737684cfbc1f..000000000000
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.2
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Count mailboxes in a SQL database"
-HOMEPAGE="http://hackage.haskell.org/package/mailbox-count"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	>=dev-haskell/cmdargs-0.10
-	>=dev-haskell/configurator-0.2
-	>=dev-haskell/hdbc-2.4
-	>=dev-haskell/hdbc-postgresql-2.3
-	>=dev-haskell/hdbc-sqlite3-2.3
-	>=dev-haskell/missingh-1.2
-	>=dev-haskell/tasty-0.8
-	>=dev-haskell/tasty-hunit-0.8
-	>=dev-lang/ghc-7.6.1
-	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/filemanip-0.3.6 )
-"
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
index 275709ed0d99..00d1fe4550c6 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
@@ -1,27 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.4.2
-
-CABAL_FEATURES="bin test-suite"
+CABAL_FEATURES="test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Count mailboxes in a SQL database"
 HOMEPAGE="http://hackage.haskell.org/package/mailbox-count"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT=test # Could not find module ‘Paths_mailbox_count’
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
+RDEPEND="
 	>=dev-haskell/cmdargs-0.10
 	>=dev-haskell/configurator-0.2
 	>=dev-haskell/hdbc-2.4
@@ -30,11 +24,18 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/missingh-1.2
 	>=dev-haskell/tasty-0.8
 	>=dev-haskell/tasty-hunit-0.8
-	>=dev-lang/ghc-7.6.1
-	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/filemanip-0.3.6 )
+	|| ( >=dev-lang/ghc-8.0
+		 ( >=dev-lang/ghc-7.10.1
+		   <dev-lang/ghc-8.0
+		   <dev-haskell/semigroups-0.18.2 ) )
 "
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/filemanip-0.3.6 )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc84.patch
-)
+src_install() {
+	haskell-cabal_src_install
+	dodoc "${S}/doc/${PN}rc.example"
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 8884ff423c4a..6854364d19ac 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 1678 BLAKE2B ae957433c723aa32dfd555b57e3c38f60355f4257a605eedca26316145ab3146ac73ae6a3957230e3c85612c36a33653d9416026cde9babc7f1c88f97c64a6f7 SHA512 5eff50ab38578869569f19ea724516c4af208a588fa29f287e928462a8058717a86c3683a6fbb6bc6fc388f141a56a1fc2fb30126743c36a7129294ed33605e8
+EBUILD metamail-2.7.53.3-r2.ebuild 1679 BLAKE2B 00814493655e6390baa2fde0022979c79a84e5f7e6a943def8ee6860c0c5f80fe4cb05f1ac4cd57de783e0376e7fee72705216b84dde69fb4ad52d1de644c439 SHA512 2efb760ad728c1636b47c5cb6b52f510b19a984fb44c2032e351898e4b4a2f3aba694494509871e651f3cd2c4e7cdb1efe984c16932e42802c65d1b81b828659
 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 5cb57a3a37a0..f98289096931 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-libs/ncurses
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index bf2c519ad6af..bfee9535483a 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,6 +1,7 @@
 AUX mlmmj-1.2.19.0-listcontrol-customheaders.patch 1231 BLAKE2B 8726f9436c7536ae3cd3c2970fd73420d7ad3258d24aa893a6ec9a00439c3e854fb6e7c3dc671857a89c0196a81e9eb68fb51cee112101cec3c14a5ad36a46b3 SHA512 d6e55a1697ab44ea526c0f24930e0aebe088a9f6e2f6726b9557f350fb0b8f86b11441eea3c389593bbaa5e592c97c71b664dba8a3b4eaeb899e318e90d11114
+AUX mlmmj-1.3.0-gcc-10.patch 636 BLAKE2B 7b34596b4ec6e932f35a8b5135dd2fed611bd8432174544eb850856eb9389b1bc2687a0acceedc9780b0047e3d0ffec24187aad1a6b4158a3906f4886a94e7a0 SHA512 83446b655afe86a48e2d544fbf52cd6c688541d46f1f7b8e0eb59702a10474b4419eec3833e452e674d202782444e80e2bea4feed1c33d6e755eefebbe552bfa
 DIST mlmmj-1.2.19.0.tar.bz2 284701 BLAKE2B a145b742a6024447d107b40bdd4072c1933069493360600161a3f585575a8cf2252393d53e8a66c0702301f148d73df7173b50234818bac4ae5b2269ff42f72b SHA512 c0f23b434941bfb5bfcb9a0f292edcfa62c9bb357014d41f82b03bd8ed1a951e3c8f09293dd333030b024d3da82c514de789b8916cc3c0f493ad8fefbe3a3afb
 DIST mlmmj-1.3.0.tar.bz2 292519 BLAKE2B abaf5c7ad53034d2201a2d3ba6d7f99ca83f47ec83df59e12a90a7118fbbde941d5ed2d14864a4af1568f67e74ea082fbc70fc9e44390673b76377bb3679c817 SHA512 c704d89f8a96c0ffc751a744ffdefb5e4304ab74be89292f06ce0c337b8ff1cc5a91737c8b1bd96fe3e993338986fa42bf360cfefc508e1eac74ab88ffda2494
 EBUILD mlmmj-1.2.19.0-r1.ebuild 991 BLAKE2B eb491ba912a45592cbd24a63c495702ac9f0bdf2ad41db9e7d0cb13b0928b5a5398a3b303f908ff3e17451f2621d17982f30c8be4ea83a30b42fd2798d1c6cc2 SHA512 5f2df9329d2f98ac3d531cdf706283cce3a3637bef5a02867e41b5bf66de7dfa64c649c95a060f4635dd34dbb229a3f6ee431e9e268deea3605030622dd5a0c2
-EBUILD mlmmj-1.3.0.ebuild 994 BLAKE2B a3bf2ac06a899856a33dff5c1bee54b2a98a50f272fb8450c105d136f552b06a582ef81509cd121d0898216431032a4b35ec6f9f4ff964a14b66a8d8e2ad2a04 SHA512 d80921b01c315a14e34b34ab3b0c6de8765527893020ebffc5151fba888c22bc176e5ebe0bcf8911b12b56a63bef45618aeab690df1300d3d0e4fb1fc4014d1b
+EBUILD mlmmj-1.3.0.ebuild 1031 BLAKE2B b33ad2dbfa855166f54c4b8a9d3f4cfd25b39afdc511affdab3eb8ae97b4e1f2d3e8883f291e050408e6f733d6a5a9e115a464cdb33fbbeed3b982703969428b SHA512 a3d050f06ae5f27229770ae4de611e5f758250b41129d4002c04d092ea2a33c98ad936f65d96d5a4e07aad14332ff58c194e5ccdc4f48bab5f7c7f9d37b558c7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mlmmj/files/mlmmj-1.3.0-gcc-10.patch b/net-mail/mlmmj/files/mlmmj-1.3.0-gcc-10.patch
new file mode 100644
index 000000000000..83217241e1db
--- /dev/null
+++ b/net-mail/mlmmj/files/mlmmj-1.3.0-gcc-10.patch
@@ -0,0 +1,20 @@
+--- a/include/mlmmj.h
++++ b/include/mlmmj.h
+@@ -81,7 +81,7 @@ enum subtype {
+ 	SUB_NONE /* For when an address is not subscribed at all */
+ };
+ 
+-char *subtype_strs[7]; /* count matches enum above; defined in subscriberfuncs.c */
++extern char *subtype_strs[7]; /* count matches enum above; defined in subscriberfuncs.c */
+ 
+ enum subreason {
+ 	SUB_REQUEST,
+@@ -92,7 +92,7 @@ enum subreason {
+ 	SUB_SWITCH
+ };
+ 
+-char * subreason_strs[6]; /* count matches enum above; defined in subscriberfuncs.c */
++extern char * subreason_strs[6]; /* count matches enum above; defined in subscriberfuncs.c */
+ 
+ void print_version(const char *prg);
+ 
diff --git a/net-mail/mlmmj/mlmmj-1.3.0.ebuild b/net-mail/mlmmj/mlmmj-1.3.0.ebuild
index 66a6bc8a1e10..c955caee3007 100644
--- a/net-mail/mlmmj/mlmmj-1.3.0.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ S="${WORKDIR}/${MY_P}"
 DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
 PATCHES=(
 	"${FILESDIR}"/mlmmj-1.2.19.0-listcontrol-customheaders.patch
+	"${FILESDIR}"/mlmmj-1.3.0-gcc-10.patch
 )
 
 src_configure() {
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 6cccb23ef05f..6558cb1d60f5 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,13 +1,6 @@
-AUX 0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
-AUX 0001-Use-loopback-IP-address-rather-than-name.patch 2100 BLAKE2B c949840e8f25a7730b895aa4bd71003ddbc239dfaeb28ec20158b48bb8de29babb5d6e3badeeee601a1037f080349a57d0a4da5ac9dfe226234fdfc223e60bff SHA512 35ee1baee61d773f9c21ef8fc8f3703347a9cb7a4bbc9cd3fe733dd91cf5c0b06716f25ced78d3d34d9725f0cbd8916a71e415b5d2cbdd58936546a9d09288ce
-AUX 0002-Fix-jobserver-unavailable-warning.patch 813 BLAKE2B 092eaecce7cf8beccb8e314fb818a3af4e5009009ed4d0d1fdfc1a526621f1df386c021d57ec02d6af2b4d98f1738875f054cf32e9a5f4fca310c282f85e6b0d SHA512 f1ffce7811f68e404118ad0147269c8d959d748e2e368d66dfe7eae5e995f1c405daf6ba6f45e9122c7aa249da190e54cd54b7c732a9d122e0c604454a53fce4
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
-DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
-EBUILD notmuch-0.28.4.ebuild 5084 BLAKE2B cf95b8e988b47cd8eb83905b201ce07d56a1ec37abd6bdf4e571b0085cca56d7df5b5604eace1acc484229d08fb04d9351c1665110d2bdca4e36875b8651a61f SHA512 c31e331f7e8a32b06b98c00126c33d9ec1bebf70abd66925b395aa7958c3712f57d698d1c3f72f63fcc7ae7399a4dcb50a87d80aab77a5dfdbb40db7a54a6818
-EBUILD notmuch-0.29.2.ebuild 5054 BLAKE2B 7ae1eb18daaad1dde46e7661d790c1341e704f6d620e103921959330cb8334c09bc21d9f16260e52d2b71b0fc5b6b5b0a1fb8f65ce25cc2e97eb19e8be666231 SHA512 ec2e75b01da6ccf2f1180bc11619be6fc1c28c1e49c75337c4a3378bedad8cc73e55709d0e32582062da7bd8f6e95ae36d9ec8a6caa0f64201065e9826090c92
-EBUILD notmuch-0.29.3.ebuild 5054 BLAKE2B 7ae1eb18daaad1dde46e7661d790c1341e704f6d620e103921959330cb8334c09bc21d9f16260e52d2b71b0fc5b6b5b0a1fb8f65ce25cc2e97eb19e8be666231 SHA512 ec2e75b01da6ccf2f1180bc11619be6fc1c28c1e49c75337c4a3378bedad8cc73e55709d0e32582062da7bd8f6e95ae36d9ec8a6caa0f64201065e9826090c92
+EBUILD notmuch-0.29.3.ebuild 5052 BLAKE2B 79c4a122ec1a94cb12e755a1827c3cf968afab31e036fbb3b91c8d03f9b24522a2817aea8ea6a963fc91ec1f33e054eddd23c20bad3837e58899e0ae6af101f9 SHA512 61d4bd24e18eaf523ba4f28c554aeadf0f86dde480b888d2edadf19b67cccdc930d6ec476f8a7816c07527d442303865b7f4d2a95f7efcd2d6b3971cfd690cfd
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch
deleted file mode 100644
index e47224695953..000000000000
--- a/net-mail/notmuch/files/0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 59b5bfb6e2095c62925b31e087571506edae7956 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Sun, 7 Jul 2019 11:33:09 +0100
-Subject: [PATCH] Use loopback IP address rather than name
-
----
- test/smtp-dummy.c | 8 ++++----
- test/test-lib.sh  | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
-index a7c1fe4f..822a986a 100644
---- a/test/smtp-dummy.c
-+++ b/test/smtp-dummy.c
-@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
- 	fprintf (peer, "502 not implemented\r\n");
- 	fflush (peer);
-     } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
--	fprintf (peer, "250 localhost\r\n");
-+	fprintf (peer, "250 127.0.0.1\r\n");
- 	fflush (peer);
-     } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
- 	       STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
-@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
-     size_t line_size;
-     ssize_t line_len;
- 
--    fprintf (peer, "220 localhost smtp-dummy\r\n");
-+    fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
-     fflush (peer);
- 
-     while ((line_len = getline (&line, &line_size, peer)) != -1) {
-@@ -183,9 +183,9 @@ main (int argc, char *argv[])
- 	goto DONE;
-     }
- 
--    hostinfo = gethostbyname ("localhost");
-+    hostinfo = gethostbyname ("127.0.0.1");
-     if (hostinfo == NULL) {
--	fprintf (stderr, "Unknown host: localhost\n");
-+	fprintf (stderr, "Unknown host: 127.0.0.1\n");
- 	ret = 1;
- 	goto DONE;
-     }
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index 616cb674..dd887773 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -336,7 +336,7 @@ emacs_deliver_message ()
-     test_emacs \
- 	"(let ((message-send-mail-function 'message-smtpmail-send-it)
- 	       (mail-host-address \"example.com\")
--	       (smtpmail-smtp-server \"localhost\")
-+	       (smtpmail-smtp-server \"127.0.0.1\")
- 	       (smtpmail-smtp-service \"${smtp_dummy_port}\"))
- 	   (notmuch-mua-mail)
- 	   (message-goto-to)
--- 
-2.19.2
-
diff --git a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch
deleted file mode 100644
index f7e1d7e05e35..000000000000
--- a/net-mail/notmuch/files/0001-Use-loopback-IP-address-rather-than-name.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9c15b508819d15d0852d71c2e897550cfaac09ba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Thu, 7 Mar 2019 22:47:55 +0000
-Subject: [PATCH] Use loopback IP address rather than name
-
-With FEATURES="network-sandbox" 'localhost' name lookup fails.
----
- test/smtp-dummy.c | 8 ++++----
- test/test-lib.sh  | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
-index 71992edd..e72ba2d0 100644
---- a/test/smtp-dummy.c
-+++ b/test/smtp-dummy.c
-@@ -76,7 +76,7 @@ process_command (FILE *peer, FILE *output, const char *command)
- 	fprintf (peer, "502 not implemented\r\n");
- 	fflush (peer);
-     } else if (STRNCMP_LITERAL (command, "HELO ") == 0) {
--	fprintf (peer, "250 localhost\r\n");
-+	fprintf (peer, "250 127.0.0.1\r\n");
- 	fflush (peer);
-     } else if (STRNCMP_LITERAL (command, "MAIL FROM:") == 0 ||
- 	       STRNCMP_LITERAL (command, "RCPT TO:") == 0) {
-@@ -105,7 +105,7 @@ do_smtp_to_file (FILE *peer, FILE *output)
-     size_t line_size;
-     ssize_t line_len;
- 
--    fprintf (peer, "220 localhost smtp-dummy\r\n");
-+    fprintf (peer, "220 127.0.0.1 smtp-dummy\r\n");
-     fflush (peer);
- 
-     while ((line_len = getline (&line, &line_size, peer)) != -1) {
-@@ -182,9 +182,9 @@ main (int argc, char *argv[])
- 	goto DONE;
-     }
- 
--    hostinfo = gethostbyname ("localhost");
-+    hostinfo = gethostbyname ("127.0.0.1");
-     if (hostinfo == NULL) {
--	fprintf (stderr, "Unknown host: localhost\n");
-+	fprintf (stderr, "Unknown host: 127.0.0.1\n");
- 	ret = 1;
- 	goto DONE;
-     }
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index fca5277d..fa8fd5bd 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -320,7 +320,7 @@ emacs_deliver_message ()
-     test_emacs \
- 	"(let ((message-send-mail-function 'message-smtpmail-send-it)
-                (mail-host-address \"example.com\")
--	       (smtpmail-smtp-server \"localhost\")
-+	       (smtpmail-smtp-server \"127.0.0.1\")
- 	       (smtpmail-smtp-service \"25025\"))
- 	   (notmuch-mua-mail)
- 	   (message-goto-to)
--- 
-2.19.2
-
diff --git a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
deleted file mode 100644
index 85ca4b6d4a52..000000000000
--- a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b5e15feee139096720272d2b435ce7c4114fda15 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
- <aidecoe@aidecoe.name>
-Date: Sat, 9 Mar 2019 22:42:21 +0000
-Subject: [PATCH 2/2] Fix "jobserver unavailable" warning
-
----
- doc/Makefile.local | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Makefile.local b/doc/Makefile.local
-index bab3d0d2..dfe62295 100644
---- a/doc/Makefile.local
-+++ b/doc/Makefile.local
-@@ -56,7 +56,7 @@ sphinx-texinfo:
- 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
- 
- sphinx-info: sphinx-texinfo
--	make -C $(DOCBUILDDIR)/texinfo info
-+	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
- 
- # Use the man page converter that is available. We should never depend
- # on MAN_ROFF_FILES if a converter is not available.
--- 
-2.19.2
-
diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
deleted file mode 100644
index 902126ad2395..000000000000
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.gz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-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 x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-24.1:* )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		>=app-editors/emacs-24.1:*[libxml2]
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	"
-
-DOCS=( AUTHORS NEWS README )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
-	"${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
-)
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.gz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_setup  # for sphinx
-
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
deleted file mode 100644
index b10795cfe09a..000000000000
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
-	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
-
-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 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-24.1:* )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		>=app-editors/emacs-24.1:*[libxml2]
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	"
-
-DOCS=( AUTHORS NEWS README )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
-	fi
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_setup  # for sphinx
-
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index b10795cfe09a..c8ab2a408976 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -18,7 +18,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 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 x86 ~x64-solaris"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index de8250417597..dde1a05d0bef 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,6 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1406 BLAKE2B e0bf8ce404b0a5924d258c9d9e5e5ee75e8d73d7676ba6bd4bbd2e2c6c0da1678d1f80579fa626456b4019e813a9e8b8b175349faa90e228bd1258872c10b07f SHA512 54fb56f1b98e4afce05b2959f0ca46634948181977070b7515496e8ceb16c372051041c071cae1d8be3761f22a24384573e694b7bcdc9b43e1905bd9da99bf52
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B 0a635f13cacfe2d6b31b47fe6a65b55c34e750fe11f83d08fda254f260b2a26ddc60b1e217094a064302fc2ba41fe46a49a0fc6709158cf9edb226f71fd8c257 SHA512 e248936a769f31856b2d0defbd74b419eee25d65afc455810d631cdebfd0112b2ffbd558aa0f8c882a4190b6e031dbb30e073e59cf8d0a472e66bdf4518c670f
 EBUILD qmail-autoresponder-2.0.ebuild 1018 BLAKE2B 8318b4e6ed59736d28ef5abf37e8f52a1cfe6b236f0f9dfee3ee4535e2dbae2a2e5b8028ff710dcd9325ab8f46b322334f9f6a5bf7165e71bff6b41b14ccb315 SHA512 5318cb60a7f57345dcf16b4ea00bdbea0fca485683c8dc378f9d1eea8847eb68a98ec1b4bcafc3f7fa4a4e059d9d02a452b97a2752fecd45d3fa147d49fe0a4a
 MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index a55799d54849..a870147e0830 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ~sparc x86"
 IUSE="mysql"
 
 DEPEND=">=dev-libs/bglibs-1.106
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index 3c615812cd26..a44cf7276e78 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 659 BLAKE2B f5f1c88f08bb70b18c50d75b5c96b901883742a028dacd7c1c3bb39216ab8d859960694713d5e7380b1e41aabad80e71ca800092376cdadac3003066e61ae9e2 SHA512 945d9c184a896dd8c13c2a371c13c000583f60785be44b6a5db4c08b82ba2e1dbcb918456513b4260709c2699a64d2799973485f02bb5b3c303da89a0638d59d
+EBUILD qmhandle-1.3.2.ebuild 660 BLAKE2B b89d47c73e61f91c9ed714b1cd17414a98586b17e77589693b39be0811a1dc55043222c27742be79f391baa47a5e5dbf920903ebc71065f7088c767c742b15e4 SHA512 a6339656b4e870766289285ac0dd4b05480d0777e164e8d8f04daf03316c2037dcb51817824b2965084ce1ebd0183cbbade1aa61a68876a7e85496a965c9e2c7
 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 b335ed852a20..892b1e25b9ac 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/qtools/Manifest b/net-mail/qtools/Manifest
index 1fc24b0d20c7..efaed5f232f7 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -1,5 +1,5 @@
 AUX qtools-0.56-errno.patch 291 BLAKE2B c204bc9a9c210b849f9a4978a7f19e94ecb9e46991a710dd58d9375b332e062f527b6ac274f9c2bc6d1037395e0f17afd920927400c4f72997e491c90b434770 SHA512 ca8fc0fc14724a1dfc9931e24071f0b72ba8bdc3c13c3dc84a597b73e92541043526a288ceb2e260dfb8ab8ce4f970b6505b323458817e499188cc4c6680ba22
 AUX qtools-0.56-head.patch 2117 BLAKE2B 2d0468547e2d67b65be1a8448c9b89f2e2a4ee307a79c47957f465d20671b947ef322af65ac94185cd39a9d98450d517d715c25f182eaab184286cda3d9685bc SHA512 0701bfa739cb163f4463b5ffb1a0242027400fd38e27e2533915f2698712177421f38d9d5b7a02caf1c23ade31bf02ce9236f18e522b688b6adc71af15b32a87
 DIST qtools-0.56.tar.gz 37748 BLAKE2B f4bb79259d2ceb99f21ec87dcc8dac6dca740a9bb1fb723f0393384996e51cdd0a56b92c066161dbcd75adf6d1e008041b5bfdf4abe7534279f504ed2c318111 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085
-EBUILD qtools-0.56.ebuild 1076 BLAKE2B 976f40d338bee88313856a7d4948099df3825c8f0c8c5bb1087eaf5b5cd7b0cf0bfb667903239e806d8b2a2ea5651114abf20d59b5329840a7f0082a27ba310a SHA512 c383d5433c61f78151b2d4aac0947d037dc8900bf523aae6db479b6229db761f3d09648a02049d54d6141064721537223d65fa5df5cb4bf02cfe85ad376b7893
+EBUILD qtools-0.56.ebuild 1077 BLAKE2B 3b3fab787bb06085ea0a5a82366dbf19e81b7983e380a45522756ebc7d15fec545c22b86adb24f037efc8017d9abaf8d554a38d3c0c87554fb5ecde9de2e75fe SHA512 2773bf0789bb8b790d5771a1040a38397d9a441fa994811d7739075605d8352e4715daab89449452eeff837a1c5f2f223567896c58dde646fd9e86817ba87aaa
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
index b5c83062f98b..3e144da8421e 100644
--- a/net-mail/qtools/qtools-0.56.ebuild
+++ b/net-mail/qtools/qtools-0.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.superscript.com/qtools/${P}.tar.gz"
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 721fe77b5930..18aa790d79d7 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 980 BLAKE2B 428b76a9a597e2b42db3becf1755d6ce847af614511f68b85037d485cb2af86469edcc7da6bb0e219aa2292493a53607a2864dc602152feb3aba7356c0ba13cc SHA512 9ae821dba999ab9b2cd86dc31ae720b9724e4bcd39cb41b4dbf1f89c4517186fc3913f4e6d12a1ac6bfbf65d03c386f0cda8ec566206b655b55b3137d343d770
+EBUILD queue-fix-1.4-r3.ebuild 981 BLAKE2B 1dfe03f09c38cc0147bba51e0775319079b555034cdefa6d20eaf923866d3fbbc61fecc96fa33f3dcb44d45d38c5baf3980d59a28c5e27c8409fd96eb9317bd4 SHA512 38435b54acd6b7972b9337de05c61e03e020d4626d23e38cf2ecd3e0fb4dd12bfd2b0afd79d0ec30553f2c526560cf367716c437a533c9e5bf3cb6e7e09670ae
 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 3469cd9c2024..4dc2c863c9cb 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86"
 RESTRICT="mirror bindist"
 
 PDEPEND="virtual/qmail"
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index a104d9c499da..de8f2154230b 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 716 BLAKE2B 95494245c70d0a865d17d9563d14bb4331df637a846cc674c2ff4aa57cb8b00a7b55069f956776b7847f2ba5fdd6a4abc432378f1116f774a962262d5104f102 SHA512 10a24c65683ef07392226b98aba27f932c8dd4031876b495a17793c2cc1ce4817331445926b45326dfa1720479945dff33b45ebac6acf4b302088f2ce00b0f2a
+EBUILD queue-repair-0.9.0-r1.ebuild 717 BLAKE2B 6d54d31220dd819bdbe456a5737cefb62dd0a2540375660a09271671094090a83588abaa04d4b82ac5d0513a8a1b54c55cd17e45f9c4c72d65bf192d9a6553fd SHA512 6ba3fb3710934556d25407fc81a373d3954e77f677669c8545025fd21c7a8018dfe7ca48ad39eb8b76e591fe94af0ebd87bc00ea8cdda53b7226ec6c52ab25f3
 MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index e885be14ff17..60260372c2e0 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index b5e16be6d4c1..d8211400fcfa 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -1,5 +1,5 @@
 AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2ddddc455b38aa66b69919e360c51ac76eec02359230b73ee300f8bf6a93459e391a2c4bddbc704a5149857862658057994a1e SHA512 3d5984bd432dc6ca7e52a8b7e8cb52e3a77ef7c3d42343388f55d8d71251a4c13fd008c907af735b966672ccdf80e4d4e64de9a64ea6117843556577ea2ddcd2
 AUX smtptools-0.2.3-cleanups.patch 1878 BLAKE2B 6667a9f32632e87e047d87b3ea4f1836908bcfc3f4ddcc7ecc77e9fc176be3644a69a33e10ed1963bd011f254464bb3dc9b0e44e12840266ab79733ab0ff54f0 SHA512 5bd29abde5b8b80c5a1ed688baf9cc3abe9b9516228401e9395f56f8e5af4aa725774128f1571a8e501d305a8c7258122a9bcace716d8f7704f89bf3bb2b34ec
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3.ebuild 652 BLAKE2B b163e50564b882e842f47498ccec844e78372732e61a2a378c71c38d45c8e44c3f1c134fa3c6e66f37b98a10cd25902f7a9f0c253eedb92c6d7e5db5dcda15d3 SHA512 5a26ba5791236746f798ee48ebc11265cefa6a68a627b15b4e1a953d4ef28d2f237f2c78254e616290888ad607793c0f8719375877176e44c7d5021ac7e4dd6f
+EBUILD smtptools-0.2.3.ebuild 653 BLAKE2B 63f26d51d9922acc1c5dcda5cd1e8ebc4bee2e210be536d469f67aa41aeeb6bdcf867fd23ec7902620ffd7f2fbeea38bca7a08cf49265d27cbb4c41ec12ec8d2 SHA512 fe1735c91f3365def57a839a4af643b5b262d101aac5b2c3ba72ed19b7abfaf89d470fe0e78781ed44b258d9c6f68fa78b5e554b6c836e0cefd2d8703b1190c2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index 875d3efd46de..e99e0dbb3a28 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -11,7 +11,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 sh x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
 IUSE=""
 
 RDEPEND="!net-mail/qtools"
diff --git a/net-mail/vacation/Manifest b/net-mail/vacation/Manifest
index f172ecb71d7c..a821533c420a 100644
--- a/net-mail/vacation/Manifest
+++ b/net-mail/vacation/Manifest
@@ -1,3 +1,3 @@
 DIST vacation-1.2.7.0.tar.gz 63849 BLAKE2B d2f2737677b0fe075041bac0a32b6f5f57d072040448b61416e7fee98e7d4184bbd22e25734ed5e4deeabb0d0c32953821d383c9d16cf79b325fa7f261956333 SHA512 50473777fa5d36c1b7ab438e1072a56298f8155c7aaa8f8d8daaa1dee5f85f54a7b17903c416e67dbac734368b1cdbbc599cd9aa58132b0ecb145ae8e058e97d
-EBUILD vacation-1.2.7.0.ebuild 683 BLAKE2B f82fdc4a3a3f25949694b8ad41b30d0a5a2abdd0ef6fc5bc453b363b395d39f890a8430cd503e365f0753fdafe29bbcf4d0807d3bc9c441356cefc9407e338f0 SHA512 33690a825953a6f9d6a3328ba7e2ec3ce0e27250cc8d41a5574aad96eec5a028c823b016af0bc267298f5b493e3c91755d9230747fa1ff9b0cae00d5570278a1
+EBUILD vacation-1.2.7.0.ebuild 684 BLAKE2B 472495a3f3599d92ab5e86f085e056f32418709e71b35251ddc3c5db812134140fd5aecd0429f024b0b33d7d034af2d0f6074eb320f2c6f32d7c7a5901c4fa2c SHA512 0df2ce2ee909a184ef7aec1914a2c15a55b4632d861fc150dc921b90dca0421fc5fadaa03042ff6df871b33dca1770c9ed51f070ddba1808f1d85014cfa48e02
 MISC metadata.xml 250 BLAKE2B d0daf7c0246f1ceb0d3323e9c0a24dcd85198cbd2a1cee896efc79add248a7ecd4d84a47d82d4681d44adb831285c82aedab58d1ad4aff0337deaf39c8df5de3 SHA512 eb1ce5a9aee93887dfd2e2492529a60e4b95b9dbf2dd1bb49cfa4cc00cc1388fe8c2d7f0c51a9155df1b0f7f04035aca2e3320ead405517e3da2d34914515c1e
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
index 89462f5392f1..f817a83cd416 100644
--- a/net-mail/vacation/vacation-1.2.7.0.ebuild
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://vacation.sourceforge.net/"
 SRC_URI="mirror://sourceforge/vacation/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha amd64 x86"
 SLOT="0"
 
 RDEPEND="!mail-mta/sendmail
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 35186639246d..073119440a88 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,3 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
-EBUILD ytnef-1.9.3.ebuild 659 BLAKE2B 46aba528873a1ddf3bbd427d719406fe68199f011e9fb1b3b672128a116613ea86f6a86496d4e4c916d8ed2b63fcb45a966446734d161ab99547b257c6dd3117 SHA512 daeb7ee57b2e9b44509612fde38e35b4c37bc86f1cf357c691088bdf361e0d3635b348df7fa4cc5651e56b9f8b8de3fec53a15c689619930f5a3ab23789dedd3
+EBUILD ytnef-1.9.3.ebuild 660 BLAKE2B fb3c509b6e366d01a506f873637e6f35968f21304816b35581a5c28a8a1701295c1d329e82ae2d5d05a72eb33518cfe36849020a50311273a3c672be85547dd9 SHA512 f02a63bf9083477fe40ddf1d23bbfb5a00b4285992b6f0f87a9b5b046852953d202f72705bb4ac91f5e3a6582668d5189bf50a33feb9f892436420d02db7df6d
 MISC metadata.xml 338 BLAKE2B 788b29610ed73aba390c90c1b6ac4028d5f607e5f5d93dac1ccf945602ba2c0640574ac222761544a47761a40b300ee773aa710a5d2afa0dabe40da9461940cd SHA512 5239663e2ba3a103c1e331b53393658e47d29b2fa4daec1bdea8ff727c39196e6c44a62db613893b4ab7266878c75c0bda21bab9ca25d26fd796ffc44af5703e
diff --git a/net-mail/ytnef/ytnef-1.9.3.ebuild b/net-mail/ytnef/ytnef-1.9.3.ebuild
index 8445b62441db..42d6ee2ad9c1 100644
--- a/net-mail/ytnef/ytnef-1.9.3.ebuild
+++ b/net-mail/ytnef/ytnef-1.9.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef"
 SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /net-mail
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)