gentoo resync : 15.06.2021

32 files changed, 730 insertions, 747 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index a856013bd9ae..0be5fb2aeb76 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 001901a5eca0..aa0f52becb3e 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -3,6 +3,8 @@ AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab713
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
 DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
 DIST automx2-2021.3.1.tar.gz 169574 BLAKE2B cc9fcb1f2009e4c7ee9d827b89dbc7e0e95002b2ee7e6e30f1e27edcef439198db8e1ea3435a124dae3f6af19e12bb9f535af57e02fd56dd12185077db50bba8 SHA512 842cc824a8c10ac86f1d8c1f12984035f58c5c935ab7e0e306ed639100f850b47b65f911328f2d391f20dd2e7fad7c0eb6c533b2f2e1776261cffc934e8ae10a
+DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
 EBUILD automx2-2021.2.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
 EBUILD automx2-2021.3.1.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
+EBUILD automx2-2021.4.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
 MISC metadata.xml 911 BLAKE2B 165f90e9c2fba4a6c9aa505366f9c5bf0289f56a650d75b87ee4a5a3db10fb27e674bc26d15ab8de2990739f982e4ad2894f0bff24962f8c72c19c89457b6a5c SHA512 aed354750fee8837991bef5b71921081f59ddd32c6f5ace53a4249b5782b4e6023efa6343cf1ccc886b4a0936c89a43c376d209323320e98e7aec76172a3bd97
diff --git a/net-mail/automx2/automx2-2021.4.ebuild b/net-mail/automx2/automx2-2021.4.ebuild
new file mode 100644
index 000000000000..a5638470334b
--- /dev/null
+++ b/net-mail/automx2/automx2-2021.4.ebuild
@@ -0,0 +1,49 @@
+# 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 distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc"
+
+BDEPEND="acct-user/automx2"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	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
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export AUTOMX2_CONF="tests/unittest.conf"
+	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
+		HTML_DOCS="doc/*.html doc/*.svg"
+	fi
+	sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index 4c9c81191158..a93b9712c65f 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,3 +1,3 @@
-DIST b4-0.6.1.tar.gz 63430 BLAKE2B 2bbf36dc5aa6c0bdd3ef792137b6cae5a6d4f53b8935d773d8efa7adc9d802d5f8faf49f5a31024eba706f97d5673820c415d2828bd65fca281acab0e41c8693 SHA512 2a4fcd04bbda02ef9cec843658bd9ab5df5aa3275b592c852725f343e66914f95fc7c7be4ccecd86cbbc60feb8630fb804368333ddafba11113269c81055e29e
-EBUILD b4-0.6.1.ebuild 460 BLAKE2B 5e66aba9bcd86ea8c6498f583692aaacd91a2d48a93b87fdf1688f1b3df132439855cf3b7e1dfcd45ab3c132b942b028a8566ab773ab18945b6f015be648d0b1 SHA512 ba071688ffdf37d562446c752330fffd230a36575dcbab7152d7fd23c94b8fde6f6918755428411f1e3fab75f163db7ade7401669ecf9db1353ff7c1cd5c26e5
+DIST b4-0.7.2.tar.gz 64196 BLAKE2B a947b1feeb7fc0144f282caebdcf44f40a0b13137262ca608f260006bdd0a4db6d7347cc1dfe023336566306bb80bcfbbc7c9b71964a949100365d4daa9d4046 SHA512 0a55302c41fa1b5208fba0fa8631e9fdcf37f340f6513a351ea69915f703db7f441a8a7ebcbb29f657049db691de8ed316a6febdbc7b7e75957c7d328fa948f0
+EBUILD b4-0.7.2.ebuild 465 BLAKE2B de5e4a39cef67e0f8f284544da670957785414fc991993f1fd3993289c09a796ab9103e3c3923adf4e19913b78fb32303659194c5f8ab043a16ac3890a6222d9 SHA512 8e9ee5875bc984662e31ff3aec012e70f6cba5e36b61e7a1c8a2e800b5307ff4f97bbcf566df261d542fcbe7598d01de8889fc652d1fb937cf8459b7c8c8b5e8
 MISC metadata.xml 315 BLAKE2B a201784cceecdb6e5beccc05f33f31bf35b4a8cebcbd439a968ffc58311e759d1622438eebbdb91719e6c25e6336d3dbc0fcc978840467a7ed688993ea694a20 SHA512 82da8cb6c4b38292564285922dff9718640cd2193ca8ceed00b516f3dc1c5cff9bb86b854a207becd2ef88c4128dfb2cd505e51dcc6241495c10cf1dfb6d0bc9
diff --git a/net-mail/b4/b4-0.6.1.ebuild b/net-mail/b4/b4-0.7.2.ebuild
index 753bd0cedb09..d078544023be 100644
--- a/net-mail/b4/b4-0.6.1.ebuild
+++ b/net-mail/b4/b4-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 97d0ec0e44e3..5179a1873bb1 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 918 BLAKE2B a56e4017ee593801109dc4f29f20a7a1e0c984af0f68dba63b9083bdde6cea9d59c7af72f114b1e3c911e7743fd67d70a7cd7c1dd0357fc25493240d777699e4 SHA512 406eccb7e16a689f3fdcb34cc46e0edf16070a985139c3b99e788677f1dd3b2f7c6802eb2f3f0a5817fd94d7d7714ea6ae25123f67411a00afdf3b0cce555ae8
+EBUILD checkpassword-0.90-r4.ebuild 948 BLAKE2B c4f3f62bb5912aac678e2e7b6af84c8606a1aed0c1c31ba952b06e27b747b5904e9264ede9491d9802a7a705c17786b407d2c2ba8c834b0478d5d74a64507f35 SHA512 67eee00e7582195fd0fa81fd7d739d42b4b4cff2de6f6b924193514aef9f1587bc246c0bb9f7eaa9aa78bfa545fd0b2aff2755e810c1920a741b9e4aaf971666
 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 5ced6f5bd2f0..1f19512efe51 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="A uniform password checking interface for root applications"
 HOMEPAGE="https://cr.yp.to/checkpwd.html"
 SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
-LICENSE="all-rights-reserved"
+# http://cr.yp.to/distributors.html
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 90c20400d24e..cb8824b580dd 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -11,6 +11,6 @@ DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e
 DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa
 EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74
 EBUILD cyrus-imapd-3.0.14.ebuild 6029 BLAKE2B a42974b90673ee9d7306e21732fc2d98ddfb1e6e79a98fb10de8e5cc2062eb040f3840ab1c6d7804bf50a3845b6a6ef8b937fa74119eefe11830c46a7ce0dabb SHA512 ad87a1b5cab6503d30f8c0bd22c0ad67e22f4d09e1c6d5d859eaae741b140439af984d3b4943cdd707dc9683c144e3cc2e73b4fc5411be0927511afa6b982db3
-EBUILD cyrus-imapd-3.0.15.ebuild 6018 BLAKE2B a29b25cd54fc59d2c821ccb3b8f4cfea6e9351c4e00f46290c5f5afd8192eec42b88bd3904800b58f6c647d797f90a225f6abe425525c29d459f980bab586b15 SHA512 ed87bec9b03819b45844be784599c88136ba67ebd9f0980371da8f604e25aee6987d89dbdfb02c591f70de6640b5c2a1781a2b7769e8e8cc1fc0716ce26e8236
+EBUILD cyrus-imapd-3.0.15.ebuild 6015 BLAKE2B 894d3cc94f84d838e170f237f90512a019f52ab0282be552b26c435db66a1ceabbef722927fcc56a70c30d01824dd77e09abb62ab5b37e57c1305d960476bc01 SHA512 dff114cd5d3f25481b60df1dc47149b78b21d4419ccf2554b21429276e2987ddc8f1cb2d2337deeead16337743a9652aa93207515a663b0826c4a5b23067f7a9
 EBUILD cyrus-imapd-3.4.1.ebuild 6108 BLAKE2B b0f21a6fce58a4dbfb8506f48c8e2c49107b512de45b4c6439631b36c8d25c9ab06b4478dbcf8cbdd6c363803181249b96698778e441d23bc5ab375ba82d3086 SHA512 959da94dbfe7b9a0b7502d545f6fc612056e97fcac789338b49a01e6b08768493904cf11a1c67f30c681013da4099531c151423ad74b818d34a09060e128e434
 MISC metadata.xml 755 BLAKE2B 91a98ad4c523212160a8d64843fbc77a376c13d69c4a0ebf6c2555f546634f6192c40c75f3a0f8c24b23283643e216c33e2d9e3fd52d663b5f90b956d6f6bd9e SHA512 a289dce9ddd43330b438c3096c8b186cfbb1a0e9d0398e76cbcaff28f72b21735d699d3c470164c5dc25cd9a609ba100e794860f03a87286cdbab9e41e2d41bc
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
index aa2bb2f6608b..fa548a22b7fe 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index b08d10285e6f..a5c28d645317 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,7 +7,9 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
 DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
+DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
 EBUILD fetchmail-6.4.16.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
-EBUILD fetchmail-6.4.19.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
+EBUILD fetchmail-6.4.19.ebuild 2389 BLAKE2B fd515cc8505dc7b96ea5b27766b689de3abce6751ba5a985d264bfcf3f77c018ee5818d38e50c9024b66471bad0c5f2ba99d86c4e4be6c344c9dba15bdf80fc1 SHA512 70f3a116f552cf47d7f9277588fcdc18b8ee4acbee8388b2d5cdd9c9033420769862ad644fa0e9f800e2108ecfd40ec0ede8b17e24f23f3f8965d6dce4b8736f
 EBUILD fetchmail-6.4.8.ebuild 2387 BLAKE2B 898edfe5dd3c8e3bb68103130af2e4fdd0e9c99a0c9fe31d1b5da9c2eb709400eb2aea7a9aacbe4c869e8175b23cd2c1f1635fbb87ee720d48e4fa932f9a25da SHA512 24279e83b1dc8427d9206fdca009f2852410ae00d06f4e8347a6ae530bc1dd58a65b66edb9ca115020322d4a10d69958839012fb6dbefb75334671d9227f7bcb
+EBUILD fetchmail-7.0.0_alpha8.ebuild 2509 BLAKE2B 0f652d7a1f9f41f8d512a1535f25f3faa5ec49d61394334979be0324b7e9b614f4dc19cd1a59c4ca219af82593e1402a1ddcc039cf87a00c37d8cfbcb2aa9833 SHA512 fb9f10979419fd96cc2c22d438c2806741107fd83e1b920690a95d53253a11f512fdf71a750af5680f181fd7d98f7c5a2eaaefd630c9333dcce043b1ef8a977a
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
index f39826489a82..96584027a596 100644
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.19.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"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
new file mode 100644
index 000000000000..73e3f2376e41
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="tk?"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+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"
+IUSE="kerberos nls +python socks +ssl tk"
+REQUIRED_USE="tk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		>=dev-libs/openssl-1.1.1:=
+	)
+	kerberos? (
+		virtual/krb5
+		>=dev-libs/openssl-1.0.2:=
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use python && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use python || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	use python && python_doscript contrib/fetchmail-oauth2.py
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index f0bd683a8097..b851d0fdaa12 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,10 +1,14 @@
 DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
 DIST isync-1.3.3.tar.gz 315912 BLAKE2B 64a6130fd2e0b6bcb4c57e7e353c1227f65ec84b557419aaff617f9cde186e1e8f906a9448e4642bd1f6db245a769923cb8ec779ac077225c47a16160d3a8b10 SHA512 915824272606f75da8c05fb75872bc5cf528fa555024245094d14a25b190f1b813dd5723e9b87f27f3fbb14b100311ee487bc409d074a68d67e9ab675b12c7a1
 DIST isync-1.3.5.tar.gz 316671 BLAKE2B 3018236aef71e7eb9dcb3c0ce4dee208a6b53060cf5354fe142095f227c29aecba34d9a41db24e53b6bcf9e8bb5c9be163178bed30c41117fd459284f18292af SHA512 d3e12ca461a0cddcb7a59665d0b08c5bc690cc187bca68d0bebab2d406382a3c28d015ed6a37bdb13f3dc6295b8381c3e5a6e1a3ac0e7336d1885eadbb0ec451
+DIST isync-1.3.6.tar.gz 317174 BLAKE2B 3a230cd4bfac061ceb3325732c336ccd808a662989d2fc81459b4b27fce927a62e335200ef233f63d28b80f6ba79b1e5e102fda8ec68c9cd8e368f8ddd7188a0 SHA512 16e859361b27f00e1ef9eda0a2d06edf271b2643107a1f90c90713c34ffe9b542cdedb31218db72db633e12cf39a6aa2ac509333647c79a1825faac8ad4ead38
 DIST isync-1.4.1.tar.gz 336281 BLAKE2B cb15a8c0dcadbc3db072fcb10a6f0d83ccef0de1c49a9d30a7c189f616c965d8e759a72c4e35927e20e2d7995f9430bffa22e535684a7b7290516d8bc78bf071 SHA512 87d1101d3e39680c1d101653a6f48859d539f0d37d65db8d90566fae22f2163c76907d561b2a487d3ed2ab459c5703fa8e077cc3e1f156a895d7ef9078af91e8
+DIST isync-1.4.2.tar.gz 336940 BLAKE2B d37dea100c5a994ce65812612a9571fe5649168560799ae17ec866774bb46b4ff989a87f4172a24006f0704e4387260716f4811f6e765df17719e598064119bd SHA512 4f95e06c5bf159b7bd8fedb75e72a8f08ee0907362dde068347706610ed251eb511b00281711ddd40a0ece31dbf07f07487cd4e5504f0898638870c51a506853
 EBUILD isync-1.3.1.ebuild 792 BLAKE2B 9756b0b7045fff9aed767adf783385c4824f806575a929a61d4672f2c93a8917b9ea7915a96f8920e7ae0dfafed51650f04e614189b232a18147b042440df627 SHA512 93f724a0665fdd2735e98f0b9ff5324fbb20167c9c35e9dd04365b17cb5ca97032217c9213035e11d665a63c175055ffd6118fae25154b1534624f5bfb578012
 EBUILD isync-1.3.3.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
 EBUILD isync-1.3.5.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
+EBUILD isync-1.3.6.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
 EBUILD isync-1.4.1.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
+EBUILD isync-1.4.2.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
 EBUILD isync-9999.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
 MISC metadata.xml 376 BLAKE2B 80ca8b6998c755cf2138227e2a05f8919dd649879df8fd94a040336c7e3d8c30cedcf10bd85ed056876cd785910e49570308978cdd0cc9a58d307d259adb8527 SHA512 137d80b0d9f99344e1d82cf27a3eb7c92b98b97f84a5353035bdd8c80f0627f2fb1cf8ebe65aa7f4775be79198950a37840b4243d60d72a0555412e11944ff51
diff --git a/net-mail/isync/isync-1.3.6.ebuild b/net-mail/isync/isync-1.3.6.ebuild
new file mode 100644
index 000000000000..4f5fbf97af86
--- /dev/null
+++ b/net-mail/isync/isync-1.3.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+fi
+
+IUSE="sasl ssl zlib"
+
+RDEPEND="
+	>=sys-libs/db-4.2:=
+	sasl?	( dev-libs/cyrus-sasl )
+	ssl?	( >=dev-libs/openssl-0.9.6:0= )
+	zlib?	( sys-libs/zlib:0= )
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl) \
+		$(use_with sasl) \
+		$(use_with zlib)
+}
diff --git a/net-mail/isync/isync-1.4.2.ebuild b/net-mail/isync/isync-1.4.2.ebuild
new file mode 100644
index 000000000000..07b35974fe65
--- /dev/null
+++ b/net-mail/isync/isync-1.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="MailDir mailbox synchronizer"
+HOMEPAGE="http://isync.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="berkdb sasl ssl zlib"
+
+RDEPEND="
+	berkdb? ( >=sys-libs/db-4.2:= )
+	sasl?	( dev-libs/cyrus-sasl )
+	ssl?	( >=dev-libs/openssl-0.9.6:0= )
+	zlib?	( sys-libs/zlib:0= )
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	use berkdb || export ac_cv_berkdb4=no
+	econf \
+		$(use_with ssl) \
+		$(use_with sasl) \
+		$(use_with zlib)
+}
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 5479d7c4a5fe..b82cb9dba029 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,5 +1,3 @@
-DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
 DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29
-EBUILD mailman-3.3.1-r1.ebuild 1470 BLAKE2B 74ab102d2a641fa568eaaa184f48b190d6e57d47c917f0085af4d419d75b40a0e32297c78a44dba86048994868d12431db3d5a62096ef2ac5769ca69bab96913 SHA512 7eff01bc4d0a51935884883347a2f13d3818158167782f38cca77d020e1512f782d12a178f7a9b4f85abfb72b9cc34a897f9eea417a4dd265fac188c2c5e8a0e
 EBUILD mailman-3.3.2.ebuild 1402 BLAKE2B 89a4684901834c58bd6cae588f917f686fecd0500df16ec42c26a324c59ddace83c55d2ef3f674b16f1da0d47b8c0d3459751ff64abe1ff67872b770fce5aaed SHA512 577e48ff8745a2221add6e4228ef7851c0762bbeea6d3e1d7e2e17d9b77a5da4b57a402b4de5d3692c069b572049928cf62f00dc0377cde393d4c0985dd42fd9
 MISC metadata.xml 341 BLAKE2B 0666e6113e8f6a96d07865e8e365281376370fb18c64cb060bf75a3ec049481fed396fc3e08fea433ae7103e913ae362cd0df3e6f6187cfd51fb6fed284be186 SHA512 48aed4040c25a4200f406b21901cc83763d65cfaa3f682639b06e8eca663dcb595179435ebe96f1684c65a8d451c55e028e1492b9e986efd802e30b303d3270d
diff --git a/net-mail/mailman/mailman-3.3.1-r1.ebuild b/net-mail/mailman/mailman-3.3.1-r1.ebuild
deleted file mode 100644
index 878e9fb39abb..000000000000
--- a/net-mail/mailman/mailman-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="3"
-#KEYWORDS="~amd64 ~ppc ~x86"
-KEYWORDS=""  # nothing til this is finished
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
-"
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 00e14558ea99..6799d1af71f8 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -4,20 +4,8 @@ AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed
 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
-AUX mailutils-3.8-fno-common.patch 652 BLAKE2B 696761bb11c568fee6c809896702db9fcda70bfbff2404f5140ca137b9bd5742e96f3690ee5c097f21d5e76003cc1236936051a58fdc8cb547d017222029612a SHA512 220263cf3ba348114eb7f21454f70dfb03b8fa50d0d72d986bdcb7e10b873e8c549c4322ef78c4c06d91363caa1a0daeeafce02db22180019f5760a86e752516
-AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d02e4dadf7ff55a2a7f1ac9b66586905f59b6516f581d5033c3cda2e3df325d69b5c4c0944221798ac37b7ceaa0a86ab8875 SHA512 42a4e45d1d35f92287d2c1075fcea0aa61c422a4f722f857d7b93b19c2cd41678d98b36b28e78209cef8dab33a0f473b1e3ba0610c6c66b9675480d4066d3a78
-AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff49461c8efe1e06e3dee213f9910253e014a8e44a3ae34006c2b8bc56dad687d0522eb86e6bd040c08bc714717c49fe2885ad SHA512 8782f59323ea426ecac65ad5b5e22e37f1150bab8782889b0c16f7d28c10030a78f77210141d1f74edcdaf47db70154616003df4143f664cb01b875e2fee1348
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
-DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df6409baffe8f1d9755826ef306cc5dc2433b9fd57ea56d5a64d299e8c4babc2dfee8b8f2ee8f1537519c0cb2a568a7717 SHA512 6a1f20d6bf9cda9c90d3bd07a4c23a52d78153a18e89b1cb69682b5efc6c450d7791d430855b47ed97e078e0ec175c4b2732317fd7115767ff01dc808f36145e
 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 3603 BLAKE2B bfc535bd6cfa518cdf7216f2a13a42f3b79d2d7693db77c6dea31e92dc97730d9220bddaf4a95b36a524335b87a242422d84a5914c47b9eb91a4d8e23b041d4d SHA512 6ce4e9ae45f3e75e1b079b465dd5ba616410f02e92dce0b2f3d7de024b84f9e26e0855fcaccc9b423ecc1d37bc2155c84fc7093911c57a6462c4c8ee9bd52393
 EBUILD mailutils-3.12-r1.ebuild 3652 BLAKE2B fa988cc38dc08a42302af9c2277f781c54872d256d74a62a72aff4ce1fe3ffdc57fa6ec9e48c66374f94ee4d447943141e3f43443c1add2907894705d68e6686 SHA512 6858b64fa798f4945f71c5d41ad7d47c2b7559f00698d0e21e11239fc7b7ecab8cc8851772b2c6aea8ac2b2c821079db4e67c9db852192f935c92c193c62b390
-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.6-underlinking.patch b/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
deleted file mode 100644
index 512a05f3a313..000000000000
--- a/net-mail/mailutils/files/mailutils-3.6-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2019-02-26 17:11:29.398115222 +0300
-+++ b/configure.ac	2019-02-26 17:14:13.733899654 +0300
-@@ -985,7 +985,7 @@
-   AC_CHECK_LIB(ldap, ldap_bind,[
-    status_ldap=yes
-    AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
--   MU_AUTHLIBS="$MU_AUTHLIBS -lldap"],
-+   MU_AUTHLIBS="$MU_AUTHLIBS -lldap -llber"],
-    [status_ldap=no])
- fi
- 
diff --git a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
deleted file mode 100644
index 90808d883226..000000000000
--- a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 2fe205b5e0b025200150c62581283e99598a80a6
-Author: Eray Aslan <eras@gentoo.org>
-Date:   Fri Nov 8 10:57:43 2019 +0300
-
-    save mailboxes as mbox for make test
-    
-    when default mailbox scheme is chosen as maildir, mda tests fail with
-    messages like:
-    
-            sed: read error on spool/root: Is a directory
-    
-    make sure we save the test mailboxes as mbox
-    
-    Signed-off-by: Eray Aslan <eras@gentoo.org>
-
-diff --git a/mda/tests/forward.at b/mda/tests/forward.at
-index 96170ad6a..75a9d6966 100644
---- a/mda/tests/forward.at
-+++ b/mda/tests/forward.at
-@@ -19,7 +19,7 @@ AT_KEYWORDS([maidag forward])
- 
- m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
- mailbox {
--  mailbox-pattern "$(pwd)/spool/\${user}";
-+  mailbox-pattern "mbox:$(pwd)/spool/\${user}";
- }  
- 
- mailer {
-diff --git a/mda/tests/mda.at b/mda/tests/mda.at
-index 6623fb623..083e7c318 100644
---- a/mda/tests/mda.at
-+++ b/mda/tests/mda.at
-@@ -16,7 +16,7 @@
- 
- m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
- mailbox {
--  mailbox-pattern "$(pwd)/spool/\${user}";
-+  mailbox-pattern "mbox:$(pwd)/spool/\${user}";
- }  
- EOF
- ])
-@@ -56,4 +56,4 @@ cat spool/root
- 
- AT_CLEANUP
- 
--m4_popdef([TESTMDA_CONF])
-\ No newline at end of file
-+m4_popdef([TESTMDA_CONF])
diff --git a/net-mail/mailutils/files/mailutils-3.8-fno-common.patch b/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
deleted file mode 100644
index c7aa72df10e8..000000000000
--- a/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/imap4d/imap4d.h
-+++ b/imap4d/imap4d.h
-@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_conf;
- extern int test_mode;
- extern int silent_expunge;
- 
--int tls_available;
--
- /* Input functions */
- extern mu_stream_t iostream;
- extern int  io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
---- a/lib/tcpwrap.h
-+++ b/lib/tcpwrap.h
-@@ -17,7 +17,7 @@
- #include <mailutils/types.h>
- 
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd, 
diff --git a/net-mail/mailutils/files/mailutils-3.9-python-config.patch b/net-mail/mailutils/files/mailutils-3.9-python-config.patch
deleted file mode 100644
index 5a2ecdd2aec2..000000000000
--- a/net-mail/mailutils/files/mailutils-3.9-python-config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5e3463bf6b5deb8ab5c6dffc6792a0a9a3bd7890 Mon Sep 17 00:00:00 2001
-From: Jordi Mallach <jordi@debian.org>
-Date: Sun, 22 Mar 2020 19:58:31 +0100
-Subject: Call $PYTHON_CONFIG instead of pyhon-config.
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6946a1aa6..4c089555a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1218,8 +1218,8 @@ if test "$status_python" = yes; then
-       esac
- 
-       # See https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
--      PYTHON_LIBS=`python-config --libs --embed 2>/dev/null` || \
--         PYTHON_LIBS=`python-config --libs`
-+      PYTHON_LIBS=`$PYTHON_CONFIG --libs --embed 2>/dev/null` || \
-+         PYTHON_LIBS=`$PYTHON_CONFIG --libs`
-       PYTHON_INCLUDES=`$PYTHON_CONFIG --includes`
-     else
-       status_python=no     
--- 
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/files/mailutils-3.9-underlinking.patch b/net-mail/mailutils/files/mailutils-3.9-underlinking.patch
deleted file mode 100644
index a7992aff9462..000000000000
--- a/net-mail/mailutils/files/mailutils-3.9-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2020-03-23 14:09:46.662589298 +0300
-+++ b/configure.ac	2020-03-23 14:12:36.191030873 +0300
-@@ -958,7 +958,7 @@
-   AC_CHECK_LIB(ldap, ldap_bind,[
-    status_ldap=yes
-    AC_DEFINE(WITH_LDAP, 1, [Define to 1 if you want to use -lldap])
--   MU_AUTHLIBS="${MU_AUTHLIBS}${MU_AUTHLIBS:+ }-lldap"],
-+   MU_AUTHLIBS="${MU_AUTHLIBS}${MU_AUTHLIBS:+ }-lldap -llber"],
-    [status_ldap=no])
- fi
- 
diff --git a/net-mail/mailutils/mailutils-3.11.1.ebuild b/net-mail/mailutils/mailutils-3.11.1.ebuild
deleted file mode 100644
index 09da4e0a5f06..000000000000
--- a/net-mail/mailutils/mailutils-3.11.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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://www.gnu.org/software/mailutils/mailutils.html"
-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
-)
-
-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
deleted file mode 100644
index 3c4f06c8eef6..000000000000
--- a/net-mail/mailutils/mailutils-3.12.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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://www.gnu.org/software/mailutils/mailutils.html"
-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
-)
-
-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.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
deleted file mode 100644
index 6aed9177e6cd..000000000000
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-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://www.gnu.org/software/mailutils/mailutils.html"
-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}"/${PN}-3.6-underlinking.patch
-	"${FILESDIR}"/${PN}-3.8-fix-tests.patch
-	"${FILESDIR}"/${PN}-3.8-fno-common.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.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
deleted file mode 100644
index 812b2d9dc8d9..000000000000
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-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://www.gnu.org/software/mailutils/mailutils.html"
-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}"/${PN}-3.9-underlinking.patch
-	"${FILESDIR}"/${PN}-3.8-fno-common.patch
-	"${FILESDIR}"/${PN}-3.9-python-config.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/notmuch/Manifest b/net-mail/notmuch/Manifest
index 6069afb01d89..cb1b146b2a56 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,6 +1,9 @@
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 AUX notmuch-0.31.3-glib-2.68.patch 1807 BLAKE2B adca6eef581704ccf91bff0206de9bec8925ea26a837a95f57bf905b15c69cb54b06d1a9d775f55a1829291ae2f3bcde9b6f08e3c3e133824e95e490718b8231 SHA512 a48ae1494b5c7960979dd34d33b8b84f26b763f2a5a987b3964b3a5e256143296eb1d777bb500c65e6559e951075ee3a7e5eac2bca376a8527a9dc291437376f
+AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647fddd6ef28ede2b1878aeb3ec3f6c5bfa5ac250c10f7cba3923031af3c4665a06190ab78b481448d9234e63e67594 SHA512 7870b5381b257cd9acc31c67f2654ecc711ddfde36c5f4a9969e43051eb43c1f0b716f926a85da4a8ec6c726bff1543cdcee9520e9b25eba2f8730bf206add5d
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
+DIST notmuch-0.32.1.tar.xz 725196 BLAKE2B 6163f512e88f1b9415b93f7c4a146dc1af6e41bacdbbd29bdb48706af4af4822b626a719d50146f0cfe4d35508d8aa767b0e75eadebf9d619912f3ee6ba0e59e SHA512 c561658919a3c19bfe282e28a5c95db5d58030f044307fdfcaee02d3bf6fc15c9ae9d6d9d8a948c9e6f9b54f563dc82cde757a26a7d7c33eb976b3cfe7ce8c36
 EBUILD notmuch-0.31.3.ebuild 6641 BLAKE2B a0c17d112a37b8307196cca220428c838db9bf1f888256eb910b4f9adfdcd3b485a90d225b84960dd350b066bd37887580fb328fa5edef01c6017a40fbca8756 SHA512 b464c82b4d12678b227fa28080fffe95d55a49b3d62f6cc8f2a08ce0b5f487beac8fdc0fd2268f5c9e4e7abdea7107d4f16a8b53cb9941ea96bcc539de37d3ca
+EBUILD notmuch-0.32.1.ebuild 6688 BLAKE2B 99f1356677865eb7012fdb8c4345e9455be3e752238465e6f78242d7b1fbc77da9dab8f3c947580b9e442a7f492118cf262b291ee7f7a975921d6630c15a5d15 SHA512 077d70b4d1b586927f6aaa95a88bd52c7a8dbc62bc5a0b78625795dccaeae93aef9f7dfd6074f9c479c55cbe5528a9ac88ad674d69b239d2baad5bc342159d3d
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/files/notmuch-0.32.1-tests.patch b/net-mail/notmuch/files/notmuch-0.32.1-tests.patch
new file mode 100644
index 000000000000..8a5643254856
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.32.1-tests.patch
@@ -0,0 +1,174 @@
+From: Tomi Ollila <tomi.ollila@iki.fi>
+Date: Sat, 22 May 2021 13:39:57 +0000 (+0300)
+Subject: test: replace notmuch_passwd_sanitize() with _libconfig_sanitize()
+X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=8675be1d307bc2df882107744641f6a7858e65ad;hp=3baa61e0e58402bc50c5df529fcf669bf4b2facb
+
+test: replace notmuch_passwd_sanitize() with _libconfig_sanitize()
+
+notmuch_passwd_sanitize() in test-lib.sh is too generic, it cannot
+work in many cases...
+
+The more specific version _libconfig_sanitize() replaces it in
+T590-libconfig.sh and the code that uses it is modified to output
+the keys (ascending numbers printed in hex) so the sanitizer knows
+what to sanitize in which lines...
+
+"@" + fqdn -> "@FQDN" replacement is used as fqdn could
+-- in theory -- be substring of 'USERNAME'.
+
+'user -> 'USER_FULL_NAME replacement to work in cases where user
+is empty -- as only first ' is replaced that works as expected.
+
+In addition to ".(none)" now also ".localdomain" is filtered from
+USERNAME@FQDN.
+
+/dev/fd/{n} is not defined in posix, but it is portable enough
+(if it weren't it is easy to fix -- now code looks clearer).
+---
+
+diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
+index 745e1bb4..bc7298f8 100755
+--- a/test/T590-libconfig.sh
++++ b/test/T590-libconfig.sh
+@@ -5,6 +5,25 @@ test_description="library config API"
+ 
+ add_email_corpus
+ 
++_libconfig_sanitize() {
++    ${NOTMUCH_PYTHON} /dev/fd/3 3<<'EOF'
++import os, sys, pwd, socket
++
++pw = pwd.getpwuid(os.getuid())
++user = pw.pw_name
++name = pw.pw_gecos.partition(",")[0]
++fqdn = socket.getaddrinfo(socket.gethostname(), 0, 0,
++                          socket.SOCK_STREAM, 0, socket.AI_CANONNAME)[0][3]
++for l in sys.stdin:
++    if l[:4] == "08: ":
++        l = l.replace(user, "USERNAME", 1).replace("@" + fqdn, "@FQDN", 1)
++        l = l.replace(".(none)", "", 1).replace(".localdomain", "", 1)
++    elif l[:4] == "10: ":
++        l = l.replace("'" + name, "'USER_FULL_NAME", 1)
++    sys.stdout.write(l)
++EOF
++}
++
+ cat <<EOF > c_head
+ #include <string.h>
+ #include <stdlib.h>
+@@ -380,26 +399,26 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} '' %NULL%
+ 	 key < NOTMUCH_CONFIG_LAST;
+ 	 key = (notmuch_config_key_t)(key + 1)) {
+ 	const char *val = notmuch_config_get (db, key);
+-        printf("%s\n", val ? val : "NULL" );
++	printf("%02d: '%s'\n", key, val ? val : "NULL" );
+     }
+ }
+ EOF
+ 
+-notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
++_libconfig_sanitize < OUTPUT > OUTPUT.clean
+ 
+ cat <<'EOF' >EXPECTED
+ == stdout ==
+-MAIL_DIR
+-MAIL_DIR
+-MAIL_DIR/.notmuch/hooks
+-MAIL_DIR/.notmuch/backups
+-
+-unread;inbox
+-
+-true
+-USERNAME@FQDN
+-NULL
+-USER_FULL_NAME
++00: 'MAIL_DIR'
++01: 'MAIL_DIR'
++02: 'MAIL_DIR/.notmuch/hooks'
++03: 'MAIL_DIR/.notmuch/backups'
++04: ''
++05: 'unread;inbox'
++06: ''
++07: 'true'
++08: 'USERNAME@FQDN'
++09: 'NULL'
++10: 'USER_FULL_NAME'
+ == stderr ==
+ EOF
+ unset MAILDIR
+@@ -694,23 +713,23 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL%
+ 	 key < NOTMUCH_CONFIG_LAST;
+ 	 key = (notmuch_config_key_t)(key + 1)) {
+ 	const char *val = notmuch_config_get (db, key);
+-        printf("%s\n", val ? val : "NULL" );
++	printf("%x: '%s'\n", key, val ? val : "NULL" );
+     }
+ }
+ EOF
+ cat <<'EOF' >EXPECTED
+ == stdout ==
+-MAIL_DIR
+-MAIL_DIR
+-MAIL_DIR/.notmuch/hooks
+-MAIL_DIR/.notmuch/backups
+-foo;bar;fub
+-unread;inbox
+-sekrit_junk
+-true
+-test_suite@notmuchmail.org
+-test_suite_other@notmuchmail.org;test_suite@otherdomain.org
+-Notmuch Test Suite
++0: 'MAIL_DIR'
++1: 'MAIL_DIR'
++2: 'MAIL_DIR/.notmuch/hooks'
++3: 'MAIL_DIR/.notmuch/backups'
++4: 'foo;bar;fub'
++5: 'unread;inbox'
++6: 'sekrit_junk'
++7: 'true'
++8: 'test_suite@notmuchmail.org'
++9: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
++a: 'Notmuch Test Suite'
+ == stderr ==
+ EOF
+ test_expect_equal_file EXPECTED OUTPUT
+@@ -723,25 +742,26 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} /nonexistent %NULL%
+ 	 key < NOTMUCH_CONFIG_LAST;
+ 	 key = (notmuch_config_key_t)(key + 1)) {
+ 	const char *val = notmuch_config_get (db, key);
+-	printf("%s\n", val ? val : "NULL" );
++	printf("%02d: '%s'\n", key, val ? val : "NULL" );
+     }
+ }
+ EOF
+ 
+-notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean
++_libconfig_sanitize < OUTPUT > OUTPUT.clean
++
+ cat <<'EOF' >EXPECTED
+ == stdout ==
+-MAIL_DIR
+-MAIL_DIR
+-MAIL_DIR/.notmuch/hooks
+-MAIL_DIR/.notmuch/backups
+-
+-unread;inbox
+-
+-true
+-USERNAME@FQDN
+-NULL
+-USER_FULL_NAME
++00: 'MAIL_DIR'
++01: 'MAIL_DIR'
++02: 'MAIL_DIR/.notmuch/hooks'
++03: 'MAIL_DIR/.notmuch/backups'
++04: ''
++05: 'unread;inbox'
++06: ''
++07: 'true'
++08: 'USERNAME@FQDN'
++09: 'NULL'
++10: 'USER_FULL_NAME'
+ == stderr ==
+ EOF
+ test_expect_equal_file EXPECTED OUTPUT.clean
diff --git a/net-mail/notmuch/notmuch-0.32.1.ebuild b/net-mail/notmuch/notmuch-0.32.1.ebuild
new file mode 100644
index 000000000000..26acc520cdb7
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.32.1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+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/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+REQUIRED_USE="
+	apidoc? ( doc )
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? (
+		app-doc/doxygen
+		dev-lang/perl
+	)
+	doc? (
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)
+	test? ( sys-process/parallel )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib:=
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests.patch"
+)
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	use python && distutils-r1_src_prepare
+
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override 'install' target, we want to install manpages with doman, but let it install texinfo files.
+	sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die
+
+	use test && append-flags '-g'
+
+	# Non-autoconf configure
+	[[ ${CHOST} == *-solaris* ]] &&	append-ldflags '-lnsl' '-lsocket'
+
+	# sphinx-4 broke everything. https://bugs.gentoo.org/789492
+	echo 'man_make_section_directory = False' >> doc/conf.py || die
+}
+
+src_configure() {
+	python_setup # For sphinx
+
+	tc-export CC CXX
+
+	local myconf=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with apidoc api-docs)
+		$(use_with doc docs)
+		$(use_with emacs)
+	)
+
+	econf "${myconf[@]}"
+}
+
+python_compile() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_compile
+	# copy stuff just in case
+	if use test; then
+		mkdir -p build/stage/tests || die
+		 cp -v tests/*.py build/stage/tests || die
+	fi
+	popd > /dev/null || die
+
+	# TODO: we want to drop those, research revdeps
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_compile
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc	&& emake -C bindings/python/docs html
+}
+
+src_compile() {
+	python_setup # For sphinx
+
+	# prevent race in emacs doc generation
+	# FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti'
+	if use emacs; then
+		use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn
+	fi
+
+	emake V=1
+
+	use python && distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		emake notmuch-mutt.1
+		popd > /dev/null || die
+	fi
+}
+
+python_test() {
+	# we only have tests for cffi bindings
+	pushd bindings/python-cffi > /dev/null || die
+	rm -f tox.ini || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+src_test() {
+	local test_failures=()
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${S}/lib" \
+		nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" )
+	pax-mark -ze notmuch
+
+	# both lib and bin needed for testsuite.
+	if use python; then
+		LD_LIBRARY_PATH="${S}/lib" \
+			PATH="${S}:${PATH}" \
+			nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" )
+	fi
+
+	[[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}"
+}
+
+python_install() {
+	pushd bindings/python-cffi > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+
+	pushd bindings/python > /dev/null || die
+	distutils-r1_python_install
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		pushd doc/_build/man/man1 > /dev/null || die
+		ln notmuch.1 notmuch-setup.1 || die
+		popd > /dev/null || die
+		if use apidoc; then
+			# rename overly generic manpage to avoid clashes
+			mv doc/_build/man/man3/deprecated.3 \
+				doc/_build/man/man3/notmuch-deprecated.3 || die
+		fi
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		domenu emacs/notmuch-emacs-mua.desktop
+	fi
+
+	if use nmbug; then
+		# TODO: those guys need proper deps
+		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
+		dobin devel/nmbug/{nmbug,notmuch-report}
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt > /dev/null || die
+		dobin notmuch-mutt
+		# this manpage is built by pod2man
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd > /dev/null || die
+	fi
+
+	local DOCS=( README{,.rst} INSTALL NEWS )
+	einstalldocs
+
+	if use python; then
+		use doc && local HTML_DOCS=( bindings/python/docs/html/. )
+		distutils-r1_src_install
+	fi
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+		xdg_desktop_database_update
+	fi
+}
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index a6244aca3180..6c68c04921e5 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 822 BLAKE2B b4373527607b1ad33b09cbe2f0e5b0ecb577e5c7cf354a893a50b665e33808a6f042c8126718e29ed08edf39f0a2f021dff7d730144ca44acd8e4ed2155a5440 SHA512 2b1fad4b35b901b40bbfdb7c37ee4355deb26de92ec6160cec218520aa978b00ed0e578e75e93b169c084d3f016547fed98f20a2640bf536d1b560bc3a29c13e
+EBUILD queue-repair-0.9.0-r2.ebuild 824 BLAKE2B 224c1dbdf6bd93f364e573259c3105c33927e379e40f4b2f76efa0c053a14f7abb5a3dd165e0f8535d970995b9ad366e1c819be034c9ba6b23bf941c98c2e3f9 SHA512 7e94dabc52ffd97a9dbb0eef7cd3460605bbe99ae04a45b190d2e6f909833faab9cf0b62012f4a1deb86403e3b4f5b02a9d9719e4f25117eac6585b772935a72
 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 75f2d05da3ab..dcad85db8ec6 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
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-single-r1