gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-mail
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
75 files changed, 747 insertions, 168 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4d413a92aa18..0a566cbc4861 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/asmail/Manifest b/net-mail/asmail/Manifest
index 4488588265a2..14fa2f48c498 100644
--- a/net-mail/asmail/Manifest
+++ b/net-mail/asmail/Manifest
@@ -1,4 +1,4 @@
 AUX asmail-2.1-ldflags.patch 584 BLAKE2B 58b53fadf6209149a74c65333d742f99c549abab08b87e577e7363ff3a2601dd0e78a9d23181676510d6194e9533eb6293c45c089ccb4dcd85955e7aaf0a6c93 SHA512 d3714a3b250b434cd742c6a72afd73c673194375240c2d3ab3f61999be6c36f07dee9ed8cb86220b559613a10a00431757ad95121aba16196ecbc719eb347dc9
 DIST asmail-2.1.tar.gz 271164 BLAKE2B 00972dcdfd74c717a665425cad17c59b01ec631725b79ccc3ed537232e61c5aef231ec4146491335caf2beb451e686359cb196d01f199c33ed16cd66c625e99f SHA512 1251c9f386c01c23673a6798eafd6a518a103da6d2ab78bb4e22c1107939423c44f555e331f79d1b5b509f271582de285481022ef32375b4267b1f3e398f67d8
-EBUILD asmail-2.1-r1.ebuild 1028 BLAKE2B 7d40195635adc3325f879b87dd82dc35acf20c9a3d897052c8d5ba389e029902e142daa8cd93c0796cd577634bdfe97441603a9033fa1469c11b90873aea1b22 SHA512 1416244e948b528aace379b34f4b0145ec07a6aa57c62d1c989cea30ed67a68b02875c3504c10322beb17c3d5a3e3428d0a6362a00f25af83ef0590f327d6814
+EBUILD asmail-2.1-r1.ebuild 1028 BLAKE2B 51087bc3059e73461f27bf0e17b6a2b2ae10f35b7fce5f84ae12bdc4448f2d07e32f6f304145ec294ad69fee73e419212a7818d6adad5f2cd017892b5b47b4af SHA512 6ae85e0016406529798d176c561b2849bd61ca3f27bc33b02934531eb0be9fc82d78b21ecbbf178dd9b3e6bd302cb7950dd8295744f09fbe1f6b20c49a59a5b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/asmail/asmail-2.1-r1.ebuild b/net-mail/asmail/asmail-2.1-r1.ebuild
index 352f73df0041..d018d7a0ea89 100644
--- a/net-mail/asmail/asmail-2.1-r1.ebuild
+++ b/net-mail/asmail/asmail-2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit toolchain-funcs eutils
+inherit epatch toolchain-funcs
 
-DESCRIPTION="a small mail monitor similar to xbiff"
+DESCRIPTION="A small mail monitor similar to xbiff"
 HOMEPAGE="http://www.tigr.net"
 SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz"
 
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 23dfd3558517..001901a5eca0 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,8 +1,8 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
-DIST automx2-2021.0.tar.bz2 50912 BLAKE2B de6fe1ea6dd5223518683220ff1210baa68c30e67f9cd3aac1a965759cb0f72c1119427043579fb805f68457ac4062000cf8066b6fa6d7106f3ee7f777346a57 SHA512 3ca632cc71d64a9d9d434a7109ab0f55e23e3babb6c1734689f89e5a83c9daa6666af9ce09cb5a0c14256bd6e19f6c5339bd3b3398db7b2d70ff3c6114ddb428
 DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
-EBUILD automx2-2021.0.ebuild 1082 BLAKE2B 42f2ba0ea10140ce614c0143e25d23f6ad3887aaa69c088c83cc37d2f5018b722992bb4ed58ec8c321f848401c56011c0abf9f72e57bf149322b9d762bf30616 SHA512 bf48dede575b1d0c1514006e3d708e9e25233c086608735e38fbb33d1745825d854df44cdba3dd96aaa71563fb78d27642e0d393381eefef51ea8f06041f7c74
-EBUILD automx2-2021.2.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
+DIST automx2-2021.3.1.tar.gz 169574 BLAKE2B cc9fcb1f2009e4c7ee9d827b89dbc7e0e95002b2ee7e6e30f1e27edcef439198db8e1ea3435a124dae3f6af19e12bb9f535af57e02fd56dd12185077db50bba8 SHA512 842cc824a8c10ac86f1d8c1f12984035f58c5c935ab7e0e306ed639100f850b47b65f911328f2d391f20dd2e7fad7c0eb6c533b2f2e1776261cffc934e8ae10a
+EBUILD automx2-2021.2.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
+EBUILD automx2-2021.3.1.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
 MISC metadata.xml 911 BLAKE2B 165f90e9c2fba4a6c9aa505366f9c5bf0289f56a650d75b87ee4a5a3db10fb27e674bc26d15ab8de2990739f982e4ad2894f0bff24962f8c72c19c89457b6a5c SHA512 aed354750fee8837991bef5b71921081f59ddd32c6f5ace53a4249b5782b4e6023efa6343cf1ccc886b4a0936c89a43c376d209323320e98e7aec76172a3bd97
diff --git a/net-mail/automx2/automx2-2021.2.ebuild b/net-mail/automx2/automx2-2021.2.ebuild
index 66b5081f4c4d..a5638470334b 100644
--- a/net-mail/automx2/automx2-2021.2.ebuild
+++ b/net-mail/automx2/automx2-2021.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 BDEPEND="acct-user/automx2"
diff --git a/net-mail/automx2/automx2-2021.0.ebuild b/net-mail/automx2/automx2-2021.3.1.ebuild
index b59149fd7a5c..66b5081f4c4d 100644
--- a/net-mail/automx2/automx2-2021.0.ebuild
+++ b/net-mail/automx2/automx2-2021.3.1.ebuild
@@ -3,23 +3,28 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Email client autoconfiguration service"
 HOMEPAGE="https://automx.org/"
-SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="doc"
 
-BDEPEND="acct-user/automx2
+BDEPEND="acct-user/automx2"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}"
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	sed -i -e "/('scripts'/d" setup.py || die
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index fa38afdabb78..a8ccd6db12a9 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 650 BLAKE2B fea0e029649a7c6f47a354d254b75fe2425cd0113206954e593feacc5ea3859e47a8777c1e6c4a1b5de4af96d7c673a015a17b9db0b21467cd688952b53770e1 SHA512 c02b5c0ad69003b3277e605dd46339a0af7993bd61d7cdd725219d16781d5f632c7e9113da4941ba968802dcbc182ae7a52649b4edc9345a4b87d505bf218787
+EBUILD autorespond-2.0.4.ebuild 651 BLAKE2B a2659ffed5116007a74c5e728c0e015022234b9d15199904b8c71fd03aabf60bca978ce7c1aac633fded526f0391909ce77b32b3f2b944c5c01d67c3ac14c2ca SHA512 aa65d667748562c56839353e149c19cddd09c4fd6f5b373bae6ebc792af31d0fbcc0202bfe98bcd8dbdc9498853057b008884875474701003a4383dd86b6a2c8
 EBUILD autorespond-2.0.5.ebuild 781 BLAKE2B 65782589d2d1daa5a111f9c24df6880b90270e3a7c2fc03730f028956667fbfb74daa6ee4f7e920f53253c4aabce41830b32bc3d11f181e5a0a491753697f955 SHA512 a9d3079fcb362b4b5d0e39baf23f193e2abc021d6c83e5dbca791aec269cc0ee8cf07faabcfaf2c97808d8a8e2047f36ae4beb265c55e191b0170b1977d2492c
 MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index ce4bb83c1c39..538933c4132a 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~s390 sparc x86"
 
 RDEPEND="virtual/qmail"
 PATCHES=(
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index f3670dfdc4be..97d0ec0e44e3 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 917 BLAKE2B 797c3dce214de5ed09dddb3309852efa0df51ff5c80662806b28eb0b25dbf719f1e4cc6bf28ca9b23d2a0033918bfdb49fa69b5a77aaef0e4070de082fe60050 SHA512 b3304aaccc36ab8fc7bdd07542c31b7e58c3241c224da02c43a7a37aee9371aec1d9332f9f65ef397b1a2a1db8df817e8de5af1557ba503f61d45116ddf65e26
+EBUILD checkpassword-0.90-r4.ebuild 918 BLAKE2B a56e4017ee593801109dc4f29f20a7a1e0c984af0f68dba63b9083bdde6cea9d59c7af72f114b1e3c911e7743fd67d70a7cd7c1dd0357fc25493240d777699e4 SHA512 406eccb7e16a689f3fdcb34cc46e0edf16070a985139c3b99e788677f1dd3b2f7c6802eb2f3f0a5817fd94d7d7714ea6ae25123f67411a00afdf3b0cce555ae8
 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 65815d9b39b4..5ced6f5bd2f0 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 16a935bd87d9..4e0073f759bc 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 698042478f72de89f3bf81cb04c42b60975acb1a06d64cf2aea36993127e1936686f466ed427c349169a39ea17c1756563eaafc4fcc4e67ba451ac8dfbf15f73 SHA512 7cd0401ac985d3cd0d2910203543ef4189fa8ed61580730bb348d34de532d57890dc920b96b044bfc6caebea044377510575584220c23d423479f5a5cc35857e
+EBUILD cmd5checkpw-0.30-r2.ebuild 1470 BLAKE2B 38eb508a860474c9705820d7c6a1593c522594d86f9e59e43818ee1cf7e982dafc877174f79d260f83e7124e9b6fb12a1ad5660b870413d018eb76b4ba9dd869 SHA512 3299c9e48209950b774dd86abc8646088885bf0d98f2a50ecb4e3df75726d12c925187afb4810bea0bc6e3bc1108812143714314fa00b12a78f7daff14f979b9
 EBUILD cmd5checkpw-0.30-r3.ebuild 1498 BLAKE2B 361d85015f22038af2d2576da5a3504fd0b5e255900de8ae4e35847b15c2c3315b1dc23cf5a60f284d062771be24886b74553174fc1e2d0de866815b5b32886b SHA512 dbe2aa5ce3e914d178e9bb16c1c0e8fec20439df5825f2da44675a338e2c5774a12d471c6b1b11ad9f93d0ca7df3b2229863f84bcae311ee6c37bdde5794690b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
index a3b6fc0bb173..4f7d262535da 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
 
 LICENSE="public-domain RSA"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 6106b285ade3..3519a570fd0b 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -26,10 +26,12 @@ DIST courier-imap-5.0.11.tar.bz2 3356907 BLAKE2B 6d4aa2d67ef92b318a87d8c71232d18
 DIST courier-imap-5.0.14.tar.bz2 3359363 BLAKE2B 23a734494ee3591b33361f209a465a54f893dd5ed30295fbda4d11707664f9750d5dd422449ff4a159a1fa8130d201bb50cde3fd56051293c45fe53d62c8ed41 SHA512 fa6feb9c6dc04a53e569cb0fdbf34cf4bbccd890cb827a4a0948bd221eb41834033cc7cb7b4c03e8b21c5a59545d73b845865a4da464c1b1b546f70805b18c31
 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 6867 BLAKE2B a89f1c91bf57eb8d1c3d1daf5d8f7e614b5d2cbcfb16fcf2b9a0d659b36d069d430106569ff5a114bcdcde01e5c48647eff80a54ed3ed765963048acd60daef1 SHA512 c9f3dbe5ea757a7a834b90cbdc05acd9811d1fccc0762e4653f9c70afb11024c20c7caa0c1cd7afc7c9c7b7ff69598eec33a7b2a07f7dcc2ab486b85d6bef389
-EBUILD courier-imap-5.0.10.ebuild 7241 BLAKE2B 6ce8c2e5da5c49ac653e62174937688b17663d19632920fc04c6d27675dc2878699f9f37075c2ca530a1fd4a5d5d48f74d78df8d7a4ce1a1c93d784d72aa0a4d SHA512 de16c3a52f8821f2ec9496209be0946df8149e605a3f9894ace4634253f2a2a18525e62eb5f4ad8fe5c1b62e99ffb623b28129a0331c6fe5237d45b7d658fff1
-EBUILD courier-imap-5.0.11.ebuild 7273 BLAKE2B b53b05eb7a25be57c31bba7cf3c52e6689354d17270ac6d33f46d26a36638a04ed687693a1b84bd4d879b5516adc1bc834ff05600b04ae445a19f774d6041bcb SHA512 4cbd94e66b07cc82cd190b05fa3522d95cccd3ceaf5eae59e06d3428dda9620963a52bd62400b646e4b176c5f5072065fbd47ea762f35eec400c056927618d47
-EBUILD courier-imap-5.0.14.ebuild 7241 BLAKE2B 04492f43161ff74e7e235e5029aecb304f6c2d7d7ee6eb7d62b9ca9fba8e84d272b98f27a747b5e04e802d089053c0faea5f9d7e7889a1c064d248350b68ea4f SHA512 4feda04f2da3073e36c4d46ab8f29b3cf5b366bb7cef6b7950a294c7cf299c3141e455763f7f671a256cb32de35bb1e2f05aea91111c6182fa912923f8713121
-EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B b837f5e1fa3bc6bff54dfa3d2138ddc6ce951dcfcd5fbae2181a02eb1436dc25ce3f902eb05a80f29412a45dd593adc7f1618a4dd733727d0c1e793f2268654e SHA512 269e8c6810978ddfd59c768b591ae88d4ab31af6aa2e0e8a0a05913bd8afcbf754e279d090d8facbe6cc8cb4c81f5b17f76704c972e4694ca0042111732a9438
-EBUILD courier-imap-5.0.8.ebuild 7234 BLAKE2B 85d1b623155d06c51cb34c07d39b056688b591b7c496c0793112c477bc1051585386ba6783a761e76cb6fe2f71383ab3e2251b43823e2d8cc98b827646eaa3b3 SHA512 79d89096d502a8491cc5add10a108000a19a282fb746e12314d11ed5a29bd3623bdf208b0cbf4ccf741db2db47d170ff19cae069ec4b224011095f7580b28e7d
+DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
+EBUILD courier-imap-4.18.2.ebuild 6848 BLAKE2B 732340e37f01f207e953291a3d0a4bd52394258be76c4d014369f71440142da22f89e2dae913fb508350765d1ed861a7d5072d98e39891efdec8b2f84250f4bc SHA512 d71e370d537f30fb8324e4c5613de1489bb712776a54f7f992fd2c3def38f5ba5bc63603f248d00f8e201146c5c4e9674009887a06b553954afa41b865143234
+EBUILD courier-imap-5.0.10.ebuild 7222 BLAKE2B 0b959c9d28be0902429365ee9b91332d9eac0eb4f0a02ca309b7503a4b39026987ed943327971ecef89d78c010c9a91e54999ccc45c10c74002564ec923a4d35 SHA512 875530129f6c99aa6c2a0603e76614ac7d675af3ed39da7a05b51b8632e3d1ec714f38c421c29f7bde104b7377a3eadf9b2de632897f968424d2018037c3d9af
+EBUILD courier-imap-5.0.11.ebuild 7254 BLAKE2B dcbbf39d5cb71e5ca8bf7ac02451991c6c036b48c2c0962e616f6fd13f2e2f3bfea62a11dd41df1ae3ffa05ccd0622d896832a5267675121aff99b2ff43a326b SHA512 478c4982f2d77a2597dd33c3b9090475f68497dbc188542e9dcbd3d5f7005035711583742416d572ae6ccd2c58c6875e22d1d59e02fab28b905ec9882b020659
+EBUILD courier-imap-5.0.14.ebuild 7254 BLAKE2B dcbbf39d5cb71e5ca8bf7ac02451991c6c036b48c2c0962e616f6fd13f2e2f3bfea62a11dd41df1ae3ffa05ccd0622d896832a5267675121aff99b2ff43a326b SHA512 478c4982f2d77a2597dd33c3b9090475f68497dbc188542e9dcbd3d5f7005035711583742416d572ae6ccd2c58c6875e22d1d59e02fab28b905ec9882b020659
+EBUILD courier-imap-5.0.7.ebuild 7174 BLAKE2B 9d8bb02d22ea8afb5eaae9917e1ab0502daf12aa58a6e923759268f7534b07ceb1ae7009bbd2a326b06075e8e13b5c281a2444bbcce07be999e712a6e0cfbdf5 SHA512 db5ae896de787b881084c1805e80e749d3e700d56934e694ce9f78b75492afb9f3b78b1b0632fcb327dfdbbddf8e1d946b9e7da4c0eebdd3c56ab6060d3a8707
+EBUILD courier-imap-5.0.8.ebuild 7215 BLAKE2B 51587309e9e6e98e67eb49fb0d32e10662707620074180ddabb7f81110ee54868bdd1c890197a292b5072c2a1d47a2a7358665eaf8091be2ab1937c365367bd7 SHA512 90ee8003dc45d3934e31b97bf3186c934b781b1c0cf4e0514eb97be11feab5e20bd530d081281cb8ce758fc09d87a3fac3e47096001715f0fa10d0a980b64b38
+EBUILD courier-imap-5.1.2.ebuild 7165 BLAKE2B 892fe25559af96c3b32808934cb67b682ed58e215162ab7cbc174ccf66a41e41fec07eaa86314a825bab67718038b34e35d82ef8654724f47e19f7ea7fb4250e SHA512 6d38db70eb35fd145ed75b227ed659f0f5470057708a76ff77eba559c6b92f480bd694e220329a91349f321051257c21d97ded418153d0c2e74b4977822eb0ba
 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
index 2f21769da572..7e69d290f0fb 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,6 @@ RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
 "
 
 RC_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-5.0.10.ebuild b/net-mail/courier-imap/courier-imap-5.0.10.ebuild
index 3d9b947d0c64..f2942b5e36f2 100644
--- a/net-mail/courier-imap/courier-imap-5.0.10.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,6 @@ RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
 "
 
 RC_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-5.0.11.ebuild b/net-mail/courier-imap/courier-imap-5.0.11.ebuild
index 03ee783a1b39..e01978c17a4c 100644
--- a/net-mail/courier-imap/courier-imap-5.0.11.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.11.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
 "
 
 RC_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-5.0.14.ebuild b/net-mail/courier-imap/courier-imap-5.0.14.ebuild
index efa94a72c726..e01978c17a4c 100644
--- a/net-mail/courier-imap/courier-imap-5.0.14.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.14.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
 "
 
 RC_VER="4.0.6-r1"
@@ -81,6 +80,7 @@ src_prepare() {
 		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
 	fi
 
+	cd libs/rootcerts & autoupdate
 	eautoreconf
 }
 
diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index cce241a2107b..b68c4fdd40d3 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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"
+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 )"
@@ -43,7 +43,6 @@ RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
 "
 
 RC_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-5.0.8.ebuild b/net-mail/courier-imap/courier-imap-5.0.8.ebuild
index 2241aa00f31a..b646db648b55 100644
--- a/net-mail/courier-imap/courier-imap-5.0.8.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,6 @@ RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap
 "
 
 RC_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-5.1.2.ebuild b/net-mail/courier-imap/courier-imap-5.1.2.ebuild
new file mode 100644
index 000000000000..89704f000e4a
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.1.2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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[tools] )
+	!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
+	net-dns/libidn:=
+	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
+"
+
+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}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+	"${FILESDIR}/${PN}-5.0.8-ar-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 \
+		--with-notice=unicode \
+		--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 \
+		--with-certsdir="/etc/courier-imap" \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+}
+
+#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
+
+	cp "${FILESDIR}"/courier-*-r1.service .
+
+	sed -i \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		courier-*-r1.service \
+		|| die
+
+	systemd_newunit courier-authdaemond-r1.service \
+					courier-authdaemond.service
+	systemd_newunit courier-imapd-ssl-r1.service \
+					courier-imapd-ssl.service
+	systemd_newunit 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
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+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
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 130e6e3b8c0d..91a19f11cb59 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 882 BLAKE2B a332b388b290800ac883f4f69e2b69cd19728fd2649f78d4602404add27e64630b90bbeccbf5b5ccdc6837bfd78c62edbf5b3c78b1f1415ffb72e764d5f07dc1 SHA512 ccb421e5ecda61f2b92b8846b432a56c1c6dd090b4be6767bfdd6542b5bdf0aa70acfc2bfae6aa915000cfe1a47893c41225961c48c63bef2d9515688fff08f3
+EBUILD dot-forward-0.71-r4.ebuild 876 BLAKE2B a991374281c113d8a71fa1822373c3936556241b82d3af457a914f8fc4a9b1b863910c85f78910776c8e2451693d9d7078901990ceff4f617419fb0b6218803a SHA512 82370cc41070b4933a9cd035742de04d21d28f8236e095b7c0d7ce04841344ddcafe0d209f5916f4e4d5d7c726a0bbc0bf41c8e990b9da7e8d99f8511c655767
 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 1adf2b19eebe..6fd424102749 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils fixheadtails qmail
+inherit fixheadtails qmail
 
 DESCRIPTION="reads sendmail's .forward files under qmail"
 HOMEPAGE="http://cr.yp.to/dot-forward.html"
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index a68614eb7795..84fc2b80be46 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,6 +8,6 @@ DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac
 DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
 DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95
 DIST dovecot-2.3.14.tar.gz 7483769 BLAKE2B bf2606ed64bef66fdeb165da65295031e692b7ba5186847c027adbd50093a9684b57eb724595c27838d91769e097ab2a82978ba845bf4e026dcfd78aa1372501 SHA512 69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103
-EBUILD dovecot-2.3.13-r100.ebuild 8826 BLAKE2B 69dad01a47d80c16364924fc530bfd03e7ac1682501e0dcbbd559a322dbc45808bf93088d9899cadbf8285e83686cfb0aadd9d3e353990381a6f949af9de3ab7 SHA512 f33a85cddba83aa39c27290740cacfcd82b3d0b46e8a103dcaba979d5524eef8c9dea619e3b293a5706ed2439d67ff632f7dfd1a1859b40cced632cdedd735d1
+EBUILD dovecot-2.3.13-r100.ebuild 8827 BLAKE2B eddb29f60f9da2266c2c7c4ed9c7e4bcda36a2547da2a470563809497cbbabc95553e8647585563d06d92d548e3fba929cfa0c5f27e2ad606eb7441b5dd3551f SHA512 9eaf4bf33892242a1658257baa86e5ea63257b5c67953fbe25ea2f7a813189f6d1ef7bc8e15d3b841cde59ac890ad09e87548810eb26cb9c4b722aa7e7f2c6c1
 EBUILD dovecot-2.3.14.ebuild 8732 BLAKE2B 0db42ad38c5a6601ad0b0dd6572f82f383949bda56958241fcb7fc3e6afa2e7831f6abd9155e80b02ecaf6203fc0cf4a59c409f6e0ef49b6ba01b3fae1996865 SHA512 c91c5babf6973aa919ccc623c231a5b363d78db82c48f85420286b0e9302a4e319c4696273a6a7bdae397b7ba11da2a18a6f32b374d718742ad9307d27227993
 MISC metadata.xml 1025 BLAKE2B 8b0f7c2bbb9cfd58d34cafaea132e3d52236f91db59e53a91c0816f12813311b9d9e6d19d2341a044a4a2af5ed961eec8417d0df6826a8cbb02dff528f3cb533 SHA512 0175bb9a54384bf69d99ace11ce8a76dcca1426e4a4edc3a3e6404a0dc1bed8f6912add47735d1924410dca2d80fcfa8c9cab4df4dc7ee25f4dcc1ec004f8665
diff --git a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
index 674e1df17407..539b2a181350 100644
--- a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index b9f03df539aa..1d80bf888855 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,3 +1,4 @@
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
+EBUILD fdm-2.0-r1.ebuild 965 BLAKE2B 2832f7dabcda7b45e66193cbc4da645712318b98712f7859d099bb83c8552d3dd06d2d7a8cd9cb5cd47af84b2ae7c43322a2ef9cf492daf72c83578f4866359f SHA512 335a074dc6f41ce0f8a04a006146eb897eca716a3fd5a5af0335c5e6ec37b48f6fa9c49829ae4377ff447debaba5a31eaa7ec9dcd1c5273b1f9f9f80dfc9f95e
 EBUILD fdm-2.0.ebuild 841 BLAKE2B 90dae6ba8dcfa5a2f9552fd90ce1b94f0816f743a2290afe00381554e34f4dd1c53d1ea5927e9699a82c3fb73751cdf8a83bcad20e28f2675f9b84abfd554921 SHA512 3f94f2ac469eb96c0d14b2568adb5a121aeed43c93bc2ba620803e167a533376cc5d05465e3cab54227f5f39a2d1d40739febe061e0843cb9a2ea4a180c4aa1f
 MISC metadata.xml 295 BLAKE2B 258b3dde768bd93f75108c451644287a850dd28a867429953e65ce650dd9911982f6c47672d6fe75d67f572d28f6d6e3d15393f7e88f9beff7917dea30f53ca4 SHA512 702eb19cdd97836f450877ec4fb366447b32b5eb4c181930c0960b1d5c2638ba1a0c995cb599fa272fd31c80b5ecba93ba4b713d9e913103d5509ba2959f8eb6
diff --git a/net-mail/fdm/fdm-2.0-r1.ebuild b/net-mail/fdm/fdm-2.0-r1.ebuild
new file mode 100644
index 000000000000..4e24d3c741f9
--- /dev/null
+++ b/net-mail/fdm/fdm-2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="fetch, filter and deliver mail"
+HOMEPAGE="https://github.com/nicm/fdm"
+SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples libressl pcre"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/tdb
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/fdm
+	acct-user/fdm
+"
+
+DOCS=( CHANGES README TODO MANUAL )
+
+src_prepare() {
+	default
+
+	# Change user '_fdm' to 'fdm'
+	sed -e 's/_fdm/fdm/g' -i fdm.h || die
+}
+
+src_configure() {
+	econf $(use_enable pcre)
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
+
+pkg_preinst() {
+	# This user is hard-coded in fdm.h. If fdm is started as root,
+	# it will attempt to drop privileges (to this user).
+	enewuser _fdm
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 6779b9ac7e55..a6d1fda9381a 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -11,5 +11,5 @@ DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461
 EBUILD fetchmail-6.4.14.ebuild 2508 BLAKE2B b2c21ed178426350b000b112319ceb77f6779d84de0f94ea30dfc8c61c792f72c34ee1b9e52d6ff0d87edb1a367dad8df4ae07a282fa3ddc40ffbd22824c9996 SHA512 50dfb606ee5d4a151e0ef30288fe9db9ad6c709e57f6a16b115e2d3819b8da9e23def432c53e707e96861491c1ce5f44d68d476e40161e20c3ae38102b0f68f4
 EBUILD fetchmail-6.4.15.ebuild 2508 BLAKE2B b2c21ed178426350b000b112319ceb77f6779d84de0f94ea30dfc8c61c792f72c34ee1b9e52d6ff0d87edb1a367dad8df4ae07a282fa3ddc40ffbd22824c9996 SHA512 50dfb606ee5d4a151e0ef30288fe9db9ad6c709e57f6a16b115e2d3819b8da9e23def432c53e707e96861491c1ce5f44d68d476e40161e20c3ae38102b0f68f4
 EBUILD fetchmail-6.4.16.ebuild 2508 BLAKE2B b2c21ed178426350b000b112319ceb77f6779d84de0f94ea30dfc8c61c792f72c34ee1b9e52d6ff0d87edb1a367dad8df4ae07a282fa3ddc40ffbd22824c9996 SHA512 50dfb606ee5d4a151e0ef30288fe9db9ad6c709e57f6a16b115e2d3819b8da9e23def432c53e707e96861491c1ce5f44d68d476e40161e20c3ae38102b0f68f4
-EBUILD fetchmail-6.4.8.ebuild 2499 BLAKE2B 1463b4dd5a32dd4fe1be1a57ccabe4e6304910ec7f681e896945a55af403d5c42a5c23d50fea90049d018cefd1e2d1bb327c1d6849e4c3dc57e287c60945251a SHA512 4ff39a6cdfc621bd079fba2effd24066a56ef02118ddc00411296b69519d06907f59ba01f76292f3176ea1363b491d5a7bbbb793c621fb03e7eebdbd47deb75f
+EBUILD fetchmail-6.4.8.ebuild 2500 BLAKE2B 510433919d6544d3332af8bef9c08fa03a9a7ebf6e6f9988631f7af04540fd91f6349be27ed02352b6cf615eaa7afc80acfe28a7ff8e8bd392df2bd9e3548ab0 SHA512 eeec4925ba37f523b373ec7ee23b8657880fc3cec1a6ca3e33ccbcb8bedd1ee58b2add1ab09fdc3964aead25aee5373d019db70c68abb325ee4a76b3826572e5
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 603849b9aa6d..4dfbc9b83b55 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/libdbx/Manifest b/net-mail/libdbx/Manifest
index d802a86c34fb..dad5fad5011c 100644
--- a/net-mail/libdbx/Manifest
+++ b/net-mail/libdbx/Manifest
@@ -1,4 +1,4 @@
-AUX bad_c.patch 1510 BLAKE2B 603dec1247bd664ace31c536acb4bcae8094b4f2ede517c17e1135b0ea52f7f2d531444b42edd5751f415334b0413f759f618d1bb3ed026f247d3c7667d187bb SHA512 f69a184369e94a4a3e11b17452380a20a2cfec69bc3e04561411707d06def37f989c105962ffc0992bcf24d7d31a2a173d34b601d586283a952c39c540847e07
+AUX bad_c.patch 1027 BLAKE2B 04f58037dda40bc05601fe0e749d0476bde69be14abb14a8e45dc654418f1c57754772c7f48a56a94569ce981bf797d8626f3b5862db392b7f357e77e9fdb929 SHA512 5ab1bac562edbc2fac7e12a7bf111da862c423171e3664065a55d186e340160ba78581a89ba597316f8d6014d962cac7c16fd5a8065853c153596c944ed4671a
 DIST libdbx_1.0.3.tgz 24927 BLAKE2B 01acc0607429ecc8391540b0833b735e00c2a15efb0441d08d9e6352fd0d19dde4315afc0b22f130f943e96aeffa38781086703357952e446070b95b82aefa48 SHA512 619f7cb25d5742066be6f2addbd06e433502c45489f973c628ae5d26758fc9ce1185185ae48da0de30d927eae8cbc610f775e0af182b10e72ecf5619ae79ba80
-EBUILD libdbx-1.0.3.ebuild 677 BLAKE2B 23a29c146f45d149d784aa2552baee464341d7b0e0c9b63c77f9efba336223194a4e44a776a575daf01e3d991557c869c2b3a8a8b504c5ba575136965bf33480 SHA512 ef8d98fbf045f1d563ff25341efecc7dbfbafd7da9cca2f89f9416097fba01addb3d8d9a898c5076564b91d76206233a1fc4848527701614c8e9ec8c28499ea4
+EBUILD libdbx-1.0.3.ebuild 674 BLAKE2B 0d604bb914ee0a53a1c40a91c2861f2a4da132fcf6716fb306bdf093fd3489434bb8d07a1804cb79a8b30e6c964473efc5ae1c47978d6fbed823a12e73fe2a0f SHA512 90e0516dc4aff181fa0d58929e5c06f80cf686c4cb01173391f08f4ed087eb9c6791e99fdb6188768fe0be3ecef87f9bd95c800ec9fd0ce847fded002d64b4ec
 MISC metadata.xml 249 BLAKE2B 0af29bd5a41c2fb070987a9abd26d497f0ed752901729eb3f4e752674aa9d7f7f7c895c282b9f51f36430c18590150229a8ec591ad7335d2470416d25df5bb29 SHA512 f518f234871c8565fc5a853ca72108ad7f3e7bd1f46ba91530a4a20898406dd52d6eed8fafc16551f5a040b20ec17d90860e9b3ffc28629b0f6a461166256be7
diff --git a/net-mail/libdbx/files/bad_c.patch b/net-mail/libdbx/files/bad_c.patch
index 1f7dc6d8ba03..af6a065064fc 100644
--- a/net-mail/libdbx/files/bad_c.patch
+++ b/net-mail/libdbx/files/bad_c.patch
@@ -1,6 +1,5 @@
-diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
---- libdbx_1.0.3/libdbx.c	2002-10-05 15:07:36.000000000 +0200
-+++ libdbx_1.0.3-new/libdbx.c	2006-09-20 08:53:46.000000000 +0200
+--- a/libdbx.c
++++ b/libdbx.c
 @@ -485,11 +485,11 @@
  	    switch (blockp.type) {
  	    case 0x01: //pointer to flag
@@ -24,11 +23,8 @@ diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
  				readtype = W32FT_TYPE;
  				break;
  	    case 0x13: //recipient's name
-Only in libdbx_1.0.3-new: libdbx.o
-Only in libdbx_1.0.3-new: readdbx
-diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
---- libdbx_1.0.3/readdbx.c	2002-10-05 15:20:25.000000000 +0200
-+++ libdbx_1.0.3-new/readdbx.c	2006-09-20 08:54:10.000000000 +0200
+--- a/readdbx.c
++++ b/readdbx.c
 @@ -19,6 +19,7 @@
  #include <getopt.h>
  #include <time.h>
@@ -37,5 +33,3 @@ diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
  
  #include "libdbx.h"
  #include "common.h"
-Only in libdbx_1.0.3-new: readoe
-Files libdbx_1.0.3/timeconv.o and libdbx_1.0.3-new/timeconv.o differ
diff --git a/net-mail/libdbx/libdbx-1.0.3.ebuild b/net-mail/libdbx/libdbx-1.0.3.ebuild
index 4f8dd3227f74..199b0c314a25 100644
--- a/net-mail/libdbx/libdbx-1.0.3.ebuild
+++ b/net-mail/libdbx/libdbx-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="libdbx"
 MYFILE="${MY_PN}_${PV}.tgz"
@@ -11,16 +11,19 @@ MYFILE="${MY_PN}_${PV}.tgz"
 DESCRIPTION="Tools and library for reading Outlook Express mailboxes (.dbx format)"
 HOMEPAGE="https://sourceforge.net/projects/ol2mbox"
 SRC_URI="mirror://sourceforge/ol2mbox/${MYFILE}"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
-S="${WORKDIR}/${MY_PN}_${PV}"
+PATCHES=(
+	"${FILESDIR}"/bad_c.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/bad_c.patch"
+	default
+
 	sed -i -e 's/-g/$(CFLAGS) $(LDFLAGS)/;s|gcc|$(CC)|g' Makefile || die
 	tc-export CC
 }
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index ceb33c8249f3..9173183d3e5c 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -4,6 +4,6 @@ AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd370
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r2.ebuild 936 BLAKE2B 223e524cf18377928c5d12c4b53609115f144719b3ced84dcb85bcf56a7cf886bda0f4017cd8daa785e2a7718567a65da9a794aded1736e411b6b9b212784ab8 SHA512 f16711ed2cf7a444cb4b9953be642de81aee7455bf349c5ffce99948b2ed748b75bc8718483994b487e33cb9d8e523622734dbf3318648f47a8d63c2a21eeee2
+EBUILD mailbase-1.5-r2.ebuild 937 BLAKE2B 2553e7a535cd094e18c1ef1ed0c18f4c6b4784c9475bc22e70a2681552802455a7004574bd248ca82a62ce621a9ef5318898b343c728ad661303da32e1f91d50 SHA512 610e9c74fee61aa2e1b3275872c062f5a747344ad1f46fbcbb9b9f34120f3ce73b356821330da085d395b40ad24cf9ce1887d3499c40b45b94359ccf8b0bf3f6
 EBUILD mailbase-1.6-r1.ebuild 1060 BLAKE2B 1c1b0e3cb64e9fa19fb435ec8fbe6729c40ab32b87772896e40fbb893259411e7545cca8e71736b6d2ea844f63590d09a24941c37be454be83019fca8a613b9a SHA512 63d52baa7f9cc803c507871937089e69760aae891a88299567dd370b3729897dae780d7b8e7ebcefd20f11f7d2a08b1c53a131e7f5aaa8a5fd9a229819fc0be8
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.5-r2.ebuild b/net-mail/mailbase/mailbase-1.5-r2.ebuild
index e7d481a196e8..5cc221243da2 100644
--- a/net-mail/mailbase/mailbase-1.5-r2.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index a7e214c57fd1..49fdb003e3aa 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,8 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
+AUX mailutils-3.12-fix-big-endians.patch 698 BLAKE2B 5d73570756063047633c82df2038c29999b3f9aaa48d7bfe58cf48c985107c43e36a717203b323506a9c8e24dfc579c218c2107e5a59de642290d3699a9c8867 SHA512 78af75afb332a47b4780ea1a1d67113e7e71febcff6044c8e9281e09017181309d1665da50010db1ccfebffd2c0d9ddd10e753a867c9aee9d99b67f9475ffce1
+AUX mailutils-3.12-misssing-endif.patch 689 BLAKE2B a54f086b1fccd4c5965ef849158e0e667f25abb6f095bd5e8aa63b53199e01327c3de33b43892da1eb1429dc0443a5133880bb27374f128a4f00e58d476a7740 SHA512 40dc7fe324014eadde44e55af2a2de4e474a2f6c2bd3a3fbea10446156b4505cf36c89c7458da74749ab276570f5bdbaddf842ac9cf289ca7e7a4888d463a5d0
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
 AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
@@ -13,8 +15,9 @@ DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df640
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
-EBUILD mailutils-3.11.1.ebuild 3601 BLAKE2B 4a5d51fa321729f32acabe36ffd2f5d8a3350b1d9fd0ea4e3ffc31f60e4c0d8607efec285ff48696bc32bdde7d29547108cf08f140a91d3af6c938afd19579f3 SHA512 d295bfb83b2b77319c24b2f9cae1c7adebe4e8e0bb6d5d1e50a69b5904839d3806122f122132d6c25737334cec11b22397108ac034bdc1e24ac75bdcac84f6c6
-EBUILD mailutils-3.12.ebuild 3605 BLAKE2B a9b90fcf7ff96971b9775be2439225f001e10d1f74322ae4770e915dc4e5b5ab3727e7000496c0ee9d9a79de3d82dabf59ed2be58edbdd85ce19960c095fe10e SHA512 27410269e5e447284c641bc7506ee9747af33a4cf052a0aaddade39f96d6a6c492df1ddb500d25a5706d1f6ab8a32a49c7b7c82bd2323756bfdc6618180d153c
-EBUILD mailutils-3.8.ebuild 3713 BLAKE2B 9378f85c9dda9020ff7af2df2b8400d49aa3e5bc24518e12b1f6d67d23b1fd84eee41e6b1d0a69a078dc2da80829ce294f4cbcb9b42e057fed2523e516eee41d SHA512 5897d19e4601b75fc1f995845501278d2daa9f01df5b48089290f632ae26b72079e157bb9234b96a7c3a78231518408f5f39a9d031ea9c297c10873ed6de091d
-EBUILD mailutils-3.9.ebuild 3726 BLAKE2B 3032236b95f375f3e52b6a05d3c931b161d2c893f835b26420b6f0cb98f0b7543945ef40b28d789bdecd9d95dad7b662367d9ea3b36bcd7c2c82c3d3c371caa5 SHA512 75f6db6e2ea5bf22603dff81cd15c763180c2734ffed11c800e92a33f66d98e005a80585de42d91f5415fd8ffee495a8e9dacd9ed90e0dc7291e9309da285ba2
+EBUILD mailutils-3.11.1.ebuild 3603 BLAKE2B bfc535bd6cfa518cdf7216f2a13a42f3b79d2d7693db77c6dea31e92dc97730d9220bddaf4a95b36a524335b87a242422d84a5914c47b9eb91a4d8e23b041d4d SHA512 6ce4e9ae45f3e75e1b079b465dd5ba616410f02e92dce0b2f3d7de024b84f9e26e0855fcaccc9b423ecc1d37bc2155c84fc7093911c57a6462c4c8ee9bd52393
+EBUILD mailutils-3.12-r1.ebuild 3659 BLAKE2B b35996dec703365a90a655cc834949ef20c22e77feedf58b9a4628fb55f2a6d5e026fcd6fa36999bb3187d54b174922bc997deb5f46d1e3eadba87a5b94dd633 SHA512 9c4c814630d56060292cf6d545c134da0053ea1d80afddb0bc53d638a66c774b605044d168422d6e3a4e1f82451ff01516988964e42c4e41ea0ea31696df465d
+EBUILD mailutils-3.12.ebuild 3607 BLAKE2B 956b53415a8d9b9635a94175587386b9971f2ef9b505a614a25468bb02ab0368e68e9b71f7dd322c291a63a8408348d0e82fcee55f9151b9a8bd5d4a31aea71b SHA512 0bc33916fa673d415fb65e4fd0c7e7ee815770822924ff58b06ad5237ba65d442f2bc6319c6251339510fe7b8f82ed731a364d8a34b62c818d07cb4763cf5279
+EBUILD mailutils-3.8.ebuild 3715 BLAKE2B 41672aa3d57539d8b3bc57f6967749a6c1d7ae2db9639fcbb6fb7145588b200819caab9fb25f71adb58d164b0ed99142f58dd7700915202621c5e7035edbefe6 SHA512 95835164f4504c134c808054d32ce918fdeb0a7cd010fa527c81f73cbb5bc92f03090c536ba377d77ba7da1746c548375daeec6e1793947ec2a20936299d659b
+EBUILD mailutils-3.9.ebuild 3727 BLAKE2B 99ae2d238c552a1adb7907d2716020c8ef34ddb65db4d302b99e4bc192aaa30fc7e4ee6d0ff5d22a8c5878f40c6968105f8981062a2a250d46af172849c7b34b SHA512 9a5c17e89d901a9598ff9bb6845a5d6e95055391eebce6b8e0aa3b9f5364adfc2b22946aab77701f211ad4521956630ee924b8467ce808bada320652b11e218c
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
new file mode 100644
index 000000000000..5dd2f8f035d1
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
@@ -0,0 +1,26 @@
+From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Thu, 15 Apr 2021 08:37:29 +0300
+Subject: Bugfix in mimeview testsuite
+
+* mimeview/tests/bf.c (write_byte): Fix type of the character buffer.
+---
+ mimeview/tests/bf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mimeview/tests/bf.c b/mimeview/tests/bf.c
+index 6ccce848c..2e6b37e4a 100644
+--- a/mimeview/tests/bf.c
++++ b/mimeview/tests/bf.c
+@@ -68,7 +68,7 @@ write_string (FILE *fp, char *arg)
+ int
+ write_byte (FILE *fp, char *arg)
+ {
+-  int c;
++  char c;
+   if (strlen (arg) == 3
+       && (arg[0] == '\'' || arg[0] == '"'))
+     c = arg[1];
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
new file mode 100644
index 000000000000..12d03af7b337
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
@@ -0,0 +1,23 @@
+From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Thu, 15 Apr 2021 08:36:56 +0300
+Subject: Minor fix
+
+* include/mailutils/sys/streamtrans.h: Add missing #endif
+---
+ include/mailutils/sys/streamtrans.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/mailutils/sys/streamtrans.h b/include/mailutils/sys/streamtrans.h
+index 8a4727cee..c9c866013 100644
+--- a/include/mailutils/sys/streamtrans.h
++++ b/include/mailutils/sys/streamtrans.h
+@@ -25,3 +25,5 @@ struct _mu_streamtrans
+   struct _mu_stream base;      /* Superclass */
+   mu_stream_t transport;       /* Transport stream */
+ };
++
++#endif
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/mailutils-3.11.1.ebuild b/net-mail/mailutils/mailutils-3.11.1.ebuild
index df0dac0e2b63..09da4e0a5f06 100644
--- a/net-mail/mailutils/mailutils-3.11.1.ebuild
+++ b/net-mail/mailutils/mailutils-3.11.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/mailutils/mailutils-3.12-r1.ebuild b/net-mail/mailutils/mailutils-3.12-r1.ebuild
new file mode 100644
index 000000000000..723c6c00e3b5
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.12-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://mailutils.org/"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+	"${FILESDIR}"/${P}-misssing-endif.patch
+	"${FILESDIR}"/${P}-fix-big-endians.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/mailutils/mailutils-3.12.ebuild b/net-mail/mailutils/mailutils-3.12.ebuild
index 5376eb73d090..3c4f06c8eef6 100644
--- a/net-mail/mailutils/mailutils-3.12.ebuild
+++ b/net-mail/mailutils/mailutils-3.12.ebuild
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index c26b8260a69a..6aed9177e6cd 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/mailutils/mailutils-3.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
index 6353e86f2d9e..812b2d9dc8d9 100644
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ b/net-mail/mailutils/mailutils-3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
@@ -39,7 +39,7 @@ RDEPEND="!mail-client/nmh
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
 	ssl? ( net-libs/gnutls:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tokyocabinet? ( dev-db/tokyocabinet )"
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 494d7ac89c6c..4c10dbb5f79d 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 1677 BLAKE2B 0cdbf119f79e05c53d3b10d56febc17f254df2e1124a6d7c8a81ece2be77173c2d13d2190890a06b5f1495a338acc4554af08ed131effe04aa41ef4e21893a4b SHA512 4fe27deee3deaae23ac197f876dae3ea0b08f623a2d691073bab5940bc2656644f4a6755a31da4d104fc487a29a3aad8da5044137e370fff54051347bf8545cd
+EBUILD metamail-2.7.53.3-r2.ebuild 1706 BLAKE2B 5b0d5e750be853cf3b1d1f928b896197265873b6b4dc866aaa0360c5057e92b10a4073a6c7d7fdec335d1365b7138de92adf230d8601868768641a6e52c685d8 SHA512 86d389f439052cd8f9e5ca18df027d7ab4c740e8b92a0d7a7ffe39f8b857b0b59157c847d213165feebde153f63db2793ce9d3d8f01dad23f0406d43129e501f
 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 f32b283204d4..6e1b6858a996 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-libs/ncurses
@@ -24,6 +24,7 @@ DEPEND="sys-libs/ncurses
 RDEPEND="app-misc/mime-types
 	sys-apps/debianutils
 	!app-misc/run-mailcap"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/mm${MY_PV}/src
 
diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
index e65d26da5c0e..a32ff6b14892 100644
--- a/net-mail/muchsync/Manifest
+++ b/net-mail/muchsync/Manifest
@@ -1,5 +1,3 @@
-DIST muchsync-5.tar.gz 134107 BLAKE2B cc706aa650b7a2884df0b40c206e9c58f2d633d51e5b465bd11db0cda6ce32a959db045b468c38ab88179e4e8508631b488f869e7dbf4b2038a4e882e14bc7ae SHA512 0b892a145def56712a95a7212850b01f35be2ff434aa07a43badbb298194e8219efb28525063c66a3a53fabc109891631eb653fcb1b8934d5e9ef5480cb4ee4b
 DIST muchsync-6.tar.gz 137023 BLAKE2B b2a60a26bd3a2918b52ea50a98223f828a60c1ba172f349cc350ab8cf224e114623bfb5775a9c05347311f21dbeed14744becd11022fbf8310608faf2a0146f9 SHA512 620e398f7e3973d915c32b1c244e2b1d5ed7c65dfc2a51958e62c229f14f8cf7fe794868930aaddc2d95145795a5affc0f50fc012d2d0b4bf2884930da3eec89
-EBUILD muchsync-5.ebuild 453 BLAKE2B 11ccea149f151df718b14193d4ccb04d7fec50961b8f5b56cd83df4461c5e74135cbceec7737bfd00a382494dd0ffcbec6ee30285cc3cd051b404a01765f45ff SHA512 c90aab62a4f57fafd404612fab4e1fbbea37faec76b1a0a1b6454813cfb01b7e3f64a9c4f5026aeb55b991ecc103bc85385902cd7fc9ad22fde5a905a3e5b790
 EBUILD muchsync-6.ebuild 471 BLAKE2B 22f53fb490558dcad14818b0438bbdccc79bc4258d6d18b812800beec07ce2da92ba067c8d105f383b098c2f1343d45b3617d8095de9c22732dbacd1a4ac75a8 SHA512 c3da2db1a91dba5ab7c5f2dd54041a6428e9c4d711d0c64e751192bd6d41f23c00f58437838805e71b27fe733fcb799eb9888ea6ff2ba9327e15fdff18f95d74
 MISC metadata.xml 749 BLAKE2B 4a7b8a414c555d1ef8837ad06bd33e24b68ddfe419817095ab911ad4db7ee5c59d83ce10d0483ce663a2aa14c7e1d795f28ab2001a2563b143a3b3bd8e87f47a SHA512 64f5a2b2f9392690a118a2f3fe50a7af0cde94e57389f051b5918233f01e0c7c54790779f6c95c19fa9f13d030d7c2887d42a25b53e5569517e9f2e362115647
diff --git a/net-mail/muchsync/muchsync-5.ebuild b/net-mail/muchsync/muchsync-5.ebuild
deleted file mode 100644
index 06745b47f857..000000000000
--- a/net-mail/muchsync/muchsync-5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Synchronizes mail messages and notmuch tags across machines"
-HOMEPAGE="http://www.muchsync.org/"
-SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-	dev-libs/openssl:0=
-	dev-libs/xapian:=
-	net-mail/notmuch:=
-	"
-RDEPEND="${DEPEND}
-	net-misc/openssh
-	"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e93ed95da3a9..1f5e847b4d80 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,6 @@
 AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
+AUX notmuch-0.31.3-glib-2.68.patch 1807 BLAKE2B adca6eef581704ccf91bff0206de9bec8925ea26a837a95f57bf905b15c69cb54b06d1a9d775f55a1829291ae2f3bcde9b6f08e3c3e133824e95e490718b8231 SHA512 a48ae1494b5c7960979dd34d33b8b84f26b763f2a5a987b3964b3a5e256143296eb1d777bb500c65e6559e951075ee3a7e5eac2bca376a8527a9dc291437376f
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
@@ -8,8 +9,8 @@ DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c73
 DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5
 EBUILD notmuch-0.29.3-r2.ebuild 5058 BLAKE2B 01e47dcc8cfee5bf33b921e396094f625049d13671fea805a0213de04596a9c1503724a131ea6c6f2604ab82cd8488765d8d9542333c6f54cd34ae40a066af89 SHA512 8c5ad62d0cc5ce62ad4c87f723014ac2b6037c8c947e34b9e554e17f69f449d15ed47711d5f69255f68c84be5be3f909e81c0be4dee09e3f483d4fc640a5d698
 EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B 7cab0a0c94d9d5743fe16086f2e2d52b6fda2387c4e795a30d08ec68e6cc6422c4126e5bc0191b77f8a8a023b3dbb12dbf62b60d52c8b342f1e5c13c742405ba SHA512 369c528d1daae29466504a67a238f58ac98b67dde87bf2a34d5710f65009fe87910aba401f26cbacde8f73becee714d4efb5123efce8edd5c1ef59df020d1f6b
-EBUILD notmuch-0.31-r2.ebuild 6373 BLAKE2B 16366fa91f7a3b3bc6b87c990fdf1a7be0daa8fc2fbabdb78d8db9594ce922dc11430722601397c9627dd88baa8fae7c5a9e4750d38ea5255c381c6d03bf1773 SHA512 f173ee893bca4a435ccc0f0ef6242b89d048915f6627a94cf7ee9f8bb96b1464ea04644dadd949acae7a1ca8454f235d6d54f422fdaa2a7d7c02c90c7132ab31
-EBUILD notmuch-0.31.2.ebuild 6347 BLAKE2B fc2af8aff2fa4e9a7cb624c031e86c3de253aea975f2daf7bd3b65f6cfe1c66048f8afa12dc0537544f0179ed88934e94362c915516bed8744581cbd7806a621 SHA512 87cc07eac3fcbea143e9fc6d519664d89b0f84ade32dfdf788f619de274a31b6b1f58a07d214f725812292c537ebfcbc2bcec73bc3b26e00e279fcc2917af6ac
-EBUILD notmuch-0.31.3.ebuild 6387 BLAKE2B 93f11704207ffb0f6f098dcfcb9b81f6b0eafc2e96859690585903b6de885bc3001cd3e648ceb247561f961be37d2b4e2305111894e4b3df31f8ffe8607677aa SHA512 2542aece62ff1d19b910fff45450e7bfa1584622ef277e60ccce79218700f6eeaa6e0a2f7200740f14bdfd7e1eed1e2211a9f51f108a0d35b73e264c9654cb40
+EBUILD notmuch-0.31-r2.ebuild 6366 BLAKE2B 3572aa085591ea7f47184fb8449897fa5a6c33e2bd5e1652282c63e09856c1289510958ff47176bbe4908b9f5c82b837f1eb2d86bc061e6b05d6342885a1a9ed SHA512 e4b69653b09c26a5ed8dbacb3b14b2773a4367e7bf4ed849a16e09a86dbfb71464ecbc7ef17c21b4b60031059b97a0861620569799b39f0beaa14fe0ff1a346f
+EBUILD notmuch-0.31.2.ebuild 6340 BLAKE2B 0b13fad7fe76e856d066ef460cb0247103c6f57c2fd1255640f259087beb8edf0b549f335ea4ddd1672dae21f7eef805fe02dcf789170ccb05cda3dc3769f6b0 SHA512 83d494d8a77e1b1543c51e77db21e65c2b291abae3b1ded89d205d52f3e1952008fb14181fc7bd6ea7667a683385b95b0be81500e031ec47117e9a984b178b8e
+EBUILD notmuch-0.31.3.ebuild 6429 BLAKE2B 4974a9db8a5fcfde4f5a357b299bb8bea1602eba958daa187954f01b75d4b26b90b5524dec78bd784329ce0e00a4cbe223007ed7c08bee941c8da15b39cf18c0 SHA512 5cd2a36e83ac60de80f8877014409e6e84b85fb0eb015a9c70c2053dd14cce2617142869b95cafbac05aefcdb990708f55fec3035b527c77fa96b4cb1ab333d7
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 4fcb5ea47f923a98238ef7216627196931f7b89c113f46478139b2cc80856c3800a245a2d25de0b27a4e1676bc106f5b0478fcd029e514abe21d359a64d5e5d8 SHA512 6018522ad82cba4b14cd6b0e407ae475b07ab67648829e29e01d17080cfd6faa87ecef27df458e2699ed5ea5d4e400b4491224bfe5eb7e9d5232d3433adda683
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch
new file mode 100644
index 000000000000..19f00391093e
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/777663
+
+From: David Bremner <david@tethera.net>
+Date: Mon, 15 Feb 2021 20:43:50 +0000 (-0400)
+Subject: fix build failure with glib 2.67
+X-Git-Tag: archive/debian/0.31.4-1~6
+X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6db8b422d91a75b7c16f013f10f41d1109ce5866;hp=1692fe7aa8b137d02817bb11f248d204d6ab4048
+
+fix build failure with glib 2.67
+
+Based on a patch from Michael J Gruber [1].  As of glib 2.67 (more
+specifically [2]), including "gmime-extra.h" inside an extern "C"
+block causes build failures, because glib is using C++ features.
+
+Observing that "gmime-extra.h" is no longer needed in
+notmuch-private.h, which can simply delete that include, but
+we have to correspondingly move the includes which might include
+it (in particular crypto.h) out of the extern "C" block also.
+
+This seems less fragile than only moving gmime-extra, and relying on
+preprocessor sentinels to keep the deeper includes from happening.
+
+Move to the include to the outside of the extern block.
+
+[1]: id:aee618a3d41f7889a7449aa16893e992325a909a.1613055071.git.git@grubix.eu
+[2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
+---
+
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
+index 57ec7f72..41aff342 100644
+--- a/lib/notmuch-private.h
++++ b/lib/notmuch-private.h
+@@ -31,6 +31,12 @@
+ 
+ #include "notmuch.h"
+ 
++#include "xutil.h"
++#include "error_util.h"
++#include "string-util.h"
++#include "crypto.h"
++#include "repair.h"
++
+ NOTMUCH_BEGIN_DECLS
+ 
+ #include <stdlib.h>
+@@ -47,14 +53,6 @@ NOTMUCH_BEGIN_DECLS
+ 
+ #include <talloc.h>
+ 
+-#include "gmime-extra.h"
+-
+-#include "xutil.h"
+-#include "error_util.h"
+-#include "string-util.h"
+-#include "crypto.h"
+-#include "repair.h"
+-
+ #ifdef DEBUG
+ # define DEBUG_DATABASE_SANITY 1
+ # define DEBUG_THREADING 1
diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
index cc1c03f51dae..a9071674030d 100644
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
-inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
index b100aef710ba..c95d95a83e49 100644
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
-inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index d538001bf035..57d73612bb36 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
-inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
@@ -85,6 +85,10 @@ RDEPEND="${COMMON_DEPEND}
 
 SITEFILE="50${PN}-gentoo.el"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-2.68.patch
+)
+
 pkg_setup() {
 	use emacs && elisp-check-emacs-version
 }
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
index bbf3291ff91b..941663520753 100644
--- a/net-mail/pop2imap/Manifest
+++ b/net-mail/pop2imap/Manifest
@@ -1,3 +1,3 @@
 DIST pop2imap-1.21.tgz 10920 BLAKE2B 6f35fc081aa2b27854aaeec191d9d084fbe063e647fc2042ff8a0670dd4420442e1d2da747b6c5ea05481c25751f8f5f774b0afef4d9007e09a15c879585a7e2 SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e
-EBUILD pop2imap-1.21.ebuild 587 BLAKE2B c2933661d99e58b973a483813a0f1825d23076886357ab5f5dd2702536e5be9d0c8a658cb02dbc8ace4b06f6af15cd237fad9301653ac48f2647d28c1b10740e SHA512 a50c510992d4fd7b6aa215b483ed247c0a1eb9f30505dd919559a472ed63a7182444d585903c1dcb47446a96acc42d8dcb907bf26644c197c0d1264e315f495b
+EBUILD pop2imap-1.21.ebuild 579 BLAKE2B 0234fd9a6480cbc4ae130911afa7ffeb33c9ca89d45e0fa2432b0a4364e4552de45927d008b933ce015d8e3db29f4271c08ee18940c342c05f083465a856432b SHA512 34e9ab2bdeb9db3543dfb650e991d8efd4bd90112308e596a8180a2910e34da05bfe8e7deb4087bffaab118440a40380ba17e758b6c76260c5c8fc2be409015e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
index cef59036ef8d..17462534e4a3 100644
--- a/net-mail/pop2imap/pop2imap-1.21.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Synchronize mailboxes between a pop and an imap servers"
 HOMEPAGE="http://www.linux-france.org/prj/pop2imap/"
@@ -10,7 +10,6 @@ SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
index 1348de9a64e9..416820beb691 100644
--- a/net-mail/qlogtools/Manifest
+++ b/net-mail/qlogtools/Manifest
@@ -1,4 +1,4 @@
 AUX qlogtools-3.1-errno.patch 348 BLAKE2B 4a2e1e525a071792f934a7640b0199c7292e08a2c5964f6268c7e5bab945c09d84f09371860311288fb48f7baa24f3d9ad93d57d6e2109a0856e60ef1c0723c3 SHA512 5f9e49aba6e01d5712ceadd8f2a0e3e03bdb2d1cb0c6cc4de7e6b54ef99aff0daa14a93fbeb0557ca9fdb6b75edaf4d0b24ad2b41971fc4f330435ab74ed48f8
 DIST qlogtools-3.1.tar.gz 20868 BLAKE2B bb248aef33e8f8d083956e621437e530c0a7adfe95a8c87503ca7813d756238b54873044777c9d4f362c3c75af24f58c67b8e1fca82724ea8843986fddd4d457 SHA512 aa080114d543d70879b091e3c1d4ddf7a3c1eaf0848c7215fb291e0dac49070833917f66bf02012bcfb1c5df63dadd0ab8c1c1642e5e1c4dd3c34c88bf2751e7
-EBUILD qlogtools-3.1-r1.ebuild 870 BLAKE2B a05e7f0d51497d1241886978ac7f198e5e0c4be85593583d8ff096a381964f43fb0e2186170ccfafb3899bb75860632e611c18e006f8468d4f10858798f2f104 SHA512 d794a2f524dbc0fbbd0f66ccde36239d1d691fd4d4fc0975020eb782310feb43879e2ff6091f2223e9e3c2787d7abee6348c18224f737f415fa1116ad0c5878d
+EBUILD qlogtools-3.1-r1.ebuild 863 BLAKE2B c8a065b30d3fc69b74535a49dc15db05e983d90d891f878edc6ea080cdfaf51d64d34fd8a3c79046c2201da644ae27c4f6da760f611f12e8df9963037fd55620 SHA512 37ff6daf780a265f623ba2beae7b36c7956675e6beaf4321228f61393c8e17c8bbb9ae16abb9a8a05e89d72123fb8b0dec45b35c44ac64a4739e398f55cdbc14
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qlogtools/qlogtools-3.1-r1.ebuild b/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
index df13e770840a..aab3324f175d 100644
--- a/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
+++ b/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Qmail Log processing tools"
 HOMEPAGE="http://untroubled.org/qlogtools/"
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 01df5a56beca..1610268be61d 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r1.ebuild 2244 BLAKE2B f9a9a4f884149126b2061040f7722acae7f3da470256746e1d6a48bb996d232c69dd24e62612198057e060a5a16d3d82faf5677257e6a1e4114c9f14b33dbbef SHA512 dd61c3ff20a341597261ce1dbe9dbf0cab6d1b2a166e4451185467d1b95c0581e2b653994b5d6b13bda68bc915fb76e26e9f66d8a6db91706b3b3a1b9bf63d2d
-EBUILD qmailadmin-1.2.16.ebuild 2670 BLAKE2B 2617371fd0a5cf06535d288b064abe39fda9d9edcde6fa485cf6072e8887e635cbb49cf79d311b3a92de59007f1c225bc9fe7f67b919e41d7853e5c12dd2150b SHA512 a2b87f3dcf71bcfac823038f6d36d452a8af1f7c7bbcfd46426f365f7be8eb4a048e72868ae79a7775a832fa6bd3844befdedd36336f0285c261344a96582ed1
+EBUILD qmailadmin-1.2.15-r1.ebuild 2249 BLAKE2B 00937339b99da654aec25bce4fa8aa7d33cf85f8d55701fc8de8131f7fe1f1843133bfb0f9ca8330442693b5b27098e0ed57ddbd20ea2dda1284b3ca73041a6c SHA512 91c6d9985b30586d7d55e044da958866a838f23772b6cc7993d73d6edcdc46eb15b17a60e063ab881274f64fda72eb6213fca609890f8c3b939286e9111ae8c6
+EBUILD qmailadmin-1.2.16.ebuild 2676 BLAKE2B 19f14a7b388a3dd782934b6a584f8c6ee017a8ef0b4a33ea6125fe8d3dfc0f93a8fc5bb76f70a8c1083dabc512e212ec9d208e8398ff19cdd68eed3104b29218 SHA512 f822e34d6ac09062ce5e5799dc38f0a0c3dd889cef96e6e67e0d6bc51b140a7394830607eeac8231648138f506b88be57164ac86277e56ff89926eb84c0d66b7
 MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index dc2cbff5d20d..20bdc0db0cff 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmail webapp autotools
+WEBAPP_MANUAL_SLOT="yes"
+inherit autotools qmail webapp
 
 MY_P=${P/_rc/-rc}
 
@@ -13,18 +14,18 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
 IUSE="maildrop"
 # the RESTRICT is because the vpopmail lib directory is locked down
 # and non-root can't access them.
 RESTRICT="userpriv"
 
-RDEPEND="virtual/qmail
-	>=net-mail/vpopmail-5.4.33
+RDEPEND="
 	net-mail/autorespond
+	>=net-mail/vpopmail-5.4.33
+	virtual/qmail
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index 914eee6aac0b..e8d3f27890b4 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ RDEPEND="virtual/qmail
 	>=net-mail/vpopmail-5.4.33
 	net-mail/autorespond
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
@@ -92,6 +92,6 @@ pkg_postinst() {
 	webapp_pkg_postinst
 	einfo "For complete webapp-config support:"
 	einfo "1. Add this for the Apache cgi-bin dir: Options +ExecCGI -MultiViews +FollowSymLinks"
-	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin $PN $PV"
+	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin ${PN} ${PV}"
 	einfo "3. Symlink: ln -s {/usr/share/webapps/${PN}/${PV}/hostroot,/var/www/localhost}/cgi-bin/${PN}"
 }
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 20843152a9c2..1a44b382fbf4 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 d17e8e02904b328c58d8ce28041527810ff242259da28588bd461be2ac22267554d4668e30c18570a25afd0932e0e62e5a711ba0ce0558ff0be52289a94a2233 SHA512 d2ff3dca357caab2849afbb214061ea629affbedf7103c2d78edfed71b4dd17b3a4c01dcd93252b96348e36e98f1e75404b861c511892a54776a533bc6ce6f75
+EBUILD queue-fix-1.4-r3.ebuild 981 BLAKE2B 497c46ea9735a8f25153c570a2db22bb7990360a24f493580c73bc7e08b5ce53de069762531ec81538438d06034358e6606889295f48eac7f07673e0c95d2299 SHA512 59b7e897542e68d36f157553889ea3146462e1e636f85fd549e244c57dbab413015aba58de3cb9a7ff567ee15790fff72a2c1161b57e5ede18edfb5e1e2d43d5
 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 01ae38b12b08..9ca616c75b14 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~s390 sparc x86"
 RESTRICT="mirror bindist"
 
 PDEPEND="virtual/qmail"
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index a819225e024b..a6244aca3180 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-r2.ebuild 821 BLAKE2B d30a57e25703bc118cb4edb6e0a74bfde18186c2a24bdfaf54e17c6e3c8a64e4472682f586357a64d41d3a4de5a27480ab796464fea364d4336c5bd59444eb36 SHA512 acb2a58a084617c0453c529e2859c6413ea76065303f065a80aea6c1a5db505d8d217f5ddb3ccba3778c70be2815049d0efd9a3d79e31d82999ea3296e557e9c
+EBUILD queue-repair-0.9.0-r2.ebuild 822 BLAKE2B b4373527607b1ad33b09cbe2f0e5b0ecb577e5c7cf354a893a50b665e33808a6f042c8126718e29ed08edf39f0a2f021dff7d730144ca44acd8e4ed2155a5440 SHA512 2b1fad4b35b901b40bbfdb7c37ee4355deb26de92ec6160cec218520aa978b00ed0e578e75e93b169c084d3f016547fed98f20a2640bf536d1b560bc3a29c13e
 MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
index 8a35395794c7..75f2d05da3ab 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test" # no tests
 
diff --git a/net-mail/randomsig/Manifest b/net-mail/randomsig/Manifest
index 5efe555df4b7..770f59a961d8 100644
--- a/net-mail/randomsig/Manifest
+++ b/net-mail/randomsig/Manifest
@@ -1,3 +1,3 @@
 DIST randomsig-v1.10.0.tar.gz 24910 BLAKE2B 13bfbf39cea7c7d348f5a91dd5700a2e91a93e574e6f1c12afd86d72c7868fd1a89123f52c897d9fff0b765e968980bee69927435a1b24f7f15e81b5f6a025ab SHA512 eb47bd017dee819e7b7151a47f5aca03e688e3aa9a4b9bf4882a4df51c6fcc1880e382b02d68d0c1d3a773b1179d5abb0782ec4d6a7649be226151e9e2579408
-EBUILD randomsig-1.10.0.ebuild 799 BLAKE2B 634102733738a72666c35978a998c3326ec9d8ba00ccf9340be1b00e674fdd0d67a6d48bf93662e9f18abf2118976c52249c601604a1b84111a67120943ce5eb SHA512 b6088411df0d655d4fcacf9c9d9b4657b95e1146856b2815b78718cff8d0b7abf0779475e3092fbf8a8794ea4399fe56ee2a92b1e2434884177fb9036e0d0fed
+EBUILD randomsig-1.10.0.ebuild 797 BLAKE2B f47fb72877d166aba12d501fdf547159eaa9f381661e0c40e648eab939fbc9a6d25d380982f6a50a55b441b51b9a578d27322c661c3c93b17e73f92159a05c65 SHA512 47c0bacb3be8ad2a5a2c53bf68b49218dc86f30b29773566fc403df23eed3f779c289687be06a1ae5fdcc441a2be0bec04decf6268c3bfd94dc5013509e2966d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
index 7ef507fc5e15..f850d7cfcf8f 100644
--- a/net-mail/randomsig/randomsig-1.10.0.ebuild
+++ b/net-mail/randomsig/randomsig-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://suso.suso.org/programs/randomsig/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 s390 sparc x86"
+KEYWORDS="~amd64 ~s390 sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/renattach/Manifest b/net-mail/renattach/Manifest
index 91a919210725..4dd278b377a9 100644
--- a/net-mail/renattach/Manifest
+++ b/net-mail/renattach/Manifest
@@ -1,3 +1,3 @@
 DIST renattach-1.2.4.tar.gz 112566 BLAKE2B 566675e22b35857f3e328cc3f70805b5ce74e7c156f3bfd3aec7d1b217818763b3e12ea5c4c575e98962db2a23cfcf3672348aca321dcb754c907f59fca728eb SHA512 f46aa714d794e8b1c7ff98c1a4210ed9cb83cfa6811d1724c782f25c4c250ab22dd9ff98966e821559cd0f6781ecd491bc2c260cd8f4ff64f678ef59b8cb4ad6
-EBUILD renattach-1.2.4-r1.ebuild 502 BLAKE2B 1af7be1b6460660056df6ecaa62154e462e304d85034cae3648f00cd77b27c4fdcfcfb335e2f1bec842b0c24f01c41f615e3baeb03d643006ab8649d06cc774f SHA512 080a69f2e29dcc0666dc219cea47d7e297d48f55d5656a1f9808d429635081c5ff4354bdfc4a6e7cf9aa433a8c85f2567265b4062e741c06ae9c36334fdeba75
+EBUILD renattach-1.2.4-r1.ebuild 496 BLAKE2B 6ef2aab5f893cfc4beacf156885640a79494f285b4adfedc57755ac2ccf80d92203bd78d0d8067e060c7af3de1a7d0e7f907e16a105302d92238b39e636fb8d6 SHA512 6b1137fc444bc8f211128649670ee6154b50fa680dab522e1a218f62b095df443bcc65dae25b028bd2a06c4f9fd612baddb633d9253a7efd81a1dfdcdb1250db
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild
index b03935f66fb7..42582ee48b6a 100644
--- a/net-mail/renattach/renattach-1.2.4-r1.ebuild
+++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Filter that renames/deletes dangerous email attachments"
 HOMEPAGE="http://www.pc-tools.net/unix/renattach/"
@@ -10,12 +10,11 @@ SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die
+	mv "${ED}"/etc/renattach.conf.ex "${ED}"/etc/renattach.conf || die
 
 	dodoc AUTHORS ChangeLog README NEWS
 }
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 6bbc4d7f9885..b2973febcdd1 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,5 +1,7 @@
 DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
 DIST rss2email-3.12.3.tar.gz 74151 BLAKE2B 5bbd796d204e6fbb7720de3c23df19c28374faea757907f69d6cd38cc560503bdc7229e7dc71aaaa89b8303942369a800d3bf9c5ac2d1d0def2b27d795352bc8 SHA512 189f6d81020a582a6a0d142cd31cf2dd200382037f4e87444a4d3df58d9feeb3b5503a689ea91c5ad88d70cfc6a7f9767314cbaa0dad0f20cb525a8251df3026
+DIST rss2email-3.13.tar.gz 157303 BLAKE2B 907d8f11af6c547287fcaf3fa6063850a98b560db112a047a1c860f82d818b08d4eebc174da8d83ed73673cf5c0105ab7fb7b8fd13c27280535de13f85d843f8 SHA512 548919d11762e751c2ae7ab84135aa8571104a616f0e516faf8bd9c340777972273e6642a91180387d0125300c89d6212a9da7b901f15b430f7b58284d896e98
 EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee764ada6d8d96d1399dc17621ae8c29a6b326fab67ff38ccc0e226ee81c8b276d722aacc9bf7dfa86f590298af8116a2 SHA512 b45fe99e4c1ccfbcb6dddb4fe96764653449a8a2c2df652821770541110954afb76b4e69cef0e75f6d1617f7682eba25554e9a62c071e868d8c80422678cd870
 EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
+EBUILD rss2email-3.13.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
 MISC metadata.xml 459 BLAKE2B d361bd0e82327a97b801bb7c064f0609a67d2fc0cd58b69216e6acb0f304ce0897da7843255f1ce1bbeed76c5fc1e199201b2eb35910fc7b1c5e09d4995bb838 SHA512 4a05845c1148372f0c22bb68bba353aca4fc03e1c418b72f67e85f3cc0a9ee4b029c8bd0271c1d5cbbffe1e5b0105a13dcac544f36b4e3e91fc6c9c0e93d8983
diff --git a/net-mail/rss2email/rss2email-3.13.ebuild b/net-mail/rss2email/rss2email-3.13.ebuild
new file mode 100644
index 000000000000..4efe89638d75
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests are broken for Python >=3.9
+# (see upstream issue https://github.com/rss2email/rss2email/issues/178)
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/feedparser-6[${PYTHON_USEDEP}]
+	>=dev-python/html2text-2020.1.16[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
+
+python_test() {
+	cd test/ || die  # or the tests won't find their data
+	distutils-r1_python_test
+}
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
index 1efa5a7cf411..736615111fe6 100644
--- a/net-mail/sendEmail/Manifest
+++ b/net-mail/sendEmail/Manifest
@@ -1,5 +1,5 @@
-AUX 1.56-overzealous-verify-mode-check.patch 683 BLAKE2B b3b6de3432516007c7c6c8410d99bf51faa36d21b25b60217c1fc5302a21706980cc90e0b0d4f9d12aac3d03850a329cbedb1bf972d49f4972518ebc3063ff7b SHA512 472843ceaf90fb427d626abc4b8484b279d8613ccd39a57a72f689da2f73615a3080a22322ad5cd95d7a8ae10eede7fdb7b51246d810ad066a52b6d2f1498cd0
-AUX 1.56-overzealous-version-check.patch 668 BLAKE2B c05d17287b8b8960022d495769cb459a01af66f09b39ccdcab3a21f5b22f1a2fd78f65643d435614d0a3a5fc87c9ab94d3b5c53c6c45ddc4c22aee5a1cccae18 SHA512 51d43760d0f6bf8905a0c82a5e0a44035246a332e00ae472e3b37725e29fe461beb808f4d74542659e1a7998fbde30c24d4156770058d914b1c08934d5d6884c
+AUX 1.56-overzealous-verify-mode-check.patch 615 BLAKE2B 5913c808221114005129188fbd7fe06a96f51a8fd4569dbb0ec453ee171f5ebf39474ceef222fd5af05088fc21abf498cdf6bcd6587e05646fb01fb4aa5803b5 SHA512 a67c36283a7bd33e8ec6da25aabcb7fad2f19f7988c017429f7ac07b8fa6fd0f1cab95497aa0428db4189f59a0f777a0a7d851cfd6051999e5ab4bfc6d192b44
+AUX 1.56-overzealous-version-check.patch 596 BLAKE2B 278ca2f062e1b96b72fb29fcb4de616e57c26a5531852ca18d8b95b54ba8982b2748d9a27eac36ca7883d84f2578f406024eb00ce6771b433a13fb96a854ba42 SHA512 7a66db3114d229611b8c4c3e29ce5b30d8252efaac1a03223cd82733fbded4e21ba67d6690feff16b814f9327c672a1b307a77b630fc1d5ad33e8426dc4107fc
 DIST sendEmail-v1.56.tar.gz 29740 BLAKE2B 443e80e0dcc500f8fed843749a504a0064f3cec9845cbb6d40e6c49d5a29dbf1874e2e03bbfaf6d511049addd9b3ed26170143dea966087575ad0ab61874c50b SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd
-EBUILD sendEmail-1.56-r2.ebuild 685 BLAKE2B 2c545aec355b5630b954b901c274c7bc60819a7e3ea695e01f55424839aba4ede354f1bf2ca061ed4a3e9d67074788600a9418d71fc31505c729fc0f2753327b SHA512 a6a295c2e1d232e8fbbe9a73b3b3235c1f75a89aa8aa395fbd7b8fda3c4b8e8b21bd28727a590f4fe22b6a19edfd3824bc046aeb044ac82139793ecaefd0b4c3
+EBUILD sendEmail-1.56-r2.ebuild 658 BLAKE2B 8302920f04a684a482295da0d08cf42489704a3b4612f73c807c98378ea952d9b1865b4b37590b648ed17731366fed517fba6a96599e221058bb0863ade96c5c SHA512 39eac56bdbde00e3511b1560fdb482f2f07d469d009361ff627f0b728099ff533afb717a462de11e198cc66fcf40cfeba95419c633f8f9beebb6b662655b4d5a
 MISC metadata.xml 689 BLAKE2B db187f3a6d6dcedcaa0663b47292173ba69945905800205b7a9e9b468e2313c9ce1c69f36ceb6ad838d47073158d5781b5836f4b3f5b42f3fb7200c957c461cf SHA512 61fa434f59304fa18e844d02a363c5fa68e33755108523f9dc27ee9cb7199bcc69113c37d1fb3c5e6503dc36614b75d00aa38a20aec46a39d0577e4965352ea7
diff --git a/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch b/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch
index f5c5c39ee5c7..80b003917dc0 100644
--- a/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch
+++ b/net-mail/sendEmail/files/1.56-overzealous-verify-mode-check.patch
@@ -1,5 +1,5 @@
---- sendEmail	2013-05-21 16:44:18.000000000 +0100
-+++ sendEmail	2013-06-05 09:26:20.000000000 +0100
+--- a/sendEmail
++++ b/sendEmail
 @@ -1903,7 +1903,7 @@
      if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) {
          printmsg("DEBUG => Starting TLS", 2);
diff --git a/net-mail/sendEmail/files/1.56-overzealous-version-check.patch b/net-mail/sendEmail/files/1.56-overzealous-version-check.patch
index 5cd47b06788d..38a18df4acc5 100644
--- a/net-mail/sendEmail/files/1.56-overzealous-version-check.patch
+++ b/net-mail/sendEmail/files/1.56-overzealous-version-check.patch
@@ -1,5 +1,5 @@
---- a/sendEmail	2013-03-25 08:59:12.000000000 +0000
-+++ b/sendEmail	2013-03-25 08:59:22.000000000 +0000
+--- a/sendEmail
++++ b/sendEmail
 @@ -1903,7 +1903,7 @@
      if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) {
          printmsg("DEBUG => Starting TLS", 2);
diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
index 8b8af8e7a317..b84b856369c7 100644
--- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
+++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MY_P="${PN}-v${PV}"
-
-inherit base
+EAPI=7
 
+MY_P="${PN}-v${PV}"
 DESCRIPTION="Command line based, SMTP email agent"
 HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/"
 SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="ssl"
 
-DEPEND=""
-RDEPEND="dev-lang/perl
-	ssl? ( dev-perl/IO-Socket-SSL )"
+RDEPEND="
+	dev-lang/perl
+	ssl? ( dev-perl/IO-Socket-SSL )
+"
 
-PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch"
-	  "${FILESDIR}/${PV}-overzealous-verify-mode-check.patch" )
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PV}-overzealous-version-check.patch
+	"${FILESDIR}"/${PV}-overzealous-verify-mode-check.patch
+)
 
 src_install() {
 	dobin sendEmail
-	dodoc CHANGELOG  README  TODO
+	dodoc CHANGELOG README TODO
 }
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index 1e92b139e2ab..e0afa6f1791a 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -2,5 +2,5 @@ AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2dddd
 AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe45010e331d9b121e8454faa696285a60ca97c5dc74567eb4afd88e4444f4da318f75c02b70d4f5c9ba6b2d2664b68fcd SHA512 55db66e01d6a252e4c9c265de2c14e40a92b5eb33421d05879823a6fc1e37e1b80951bf84087739f39e32850873371461a604584e465576b6f3b269b2ff83085
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3-r1.ebuild 665 BLAKE2B 45299bf6187b0683d33c4f25e3f3f5fc87bb07abbd2d3333522973add50c0c0b5bbbf7325c0a476cd33532121775d68fe1f17ba8734f9006ae54066ee729b887 SHA512 e94023079a127df840400b67e7a7a0504b92480924b9b390284b2db7a2d25090c102e902981ed201fc2e4b4c26d526c957fb7af5f8cee93b584289e0bcc63c54
+EBUILD smtptools-0.2.3-r1.ebuild 666 BLAKE2B f5f54d41eb29cd93db6a82a72f730ad66e0e4e9a9b5fac19f5dc9d32e1c70090fd3ba9198289ff75cc8af3a4378de0cb9b52d9986113f3afad447497d4f6e570 SHA512 81afde1a40024db58ffb206a4d65777d8826b9f378c35f213e02c68fc012754a4b5bf3b1d77d1200bbaf2de220f6474dd37bcd2faa3349dca9472f16116a8bf4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index ea829ce42cac..be42f11b7cd1 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86"
 
 RDEPEND="!net-mail/qtools"
 PATCHES=(
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 72eb2b15371d..0f83a723c2fd 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 657 BLAKE2B 2ca3c10174b40b47539182a9d61bfc654201bdab5d84f7b888d11c8328a1cdbf5fb747406f5ac77e19ec24ba55a3ea3e673ee1e3eed2f608e026554a921e8fe9 SHA512 cb9bc40e5734c01c8073236dfcf4a080fdfd77c7ef4d68517cb22185d5fa61db03bd0ec2a973461358d182b95dd0a8c67156d48657f7b5d165c3c406fee40187
+EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
 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 cb176694e938..232bf9cb8f1e 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>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-mail
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)