gentoo resync : 03.03.2021

19 files changed, 174 insertions, 197 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4f6c3afc450e..be31c3260b22 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 2c7e62c21673..c3ca0e442b56 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -6,8 +6,10 @@ AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27f
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.4.14.tar.xz 1309352 BLAKE2B d763f4a2fc036ef9c611829fbe5ec9eeed730429c746738203f852d8812609ad91fe179f8c43db1ad819a5430d3bc0a3c9348ab97cef312889cafb05b76a7d5b SHA512 a0295094462abfd6ddeef32772c591f1ec87765f76e116e0bb17af1215c61be965bf1e9f10864fed53b4c072b240a40d43fe51f4287f0ed138795a630be2a276
 DIST fetchmail-6.4.15.tar.xz 1309584 BLAKE2B 8348c345679ae482dfee414863836d5cb4212a09935e7febec7e4f74b9e651eadd298d7cc3b2671429649c777bfebb15d3bd023ee51c369faa7dd6a60193cffe SHA512 9b87aab65c3f102df07df52508bd18ae97ec51e106e238675e3f58c9460050c54fea72550fe33c727aeae723494370f6ea6438a96231ae0eacdbe437552d76e2
+DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
 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 566de0e251273f1fda56763791e104c83bded450c91595fc759af89072d76ba9ccca16e6dc88d4045b5a7404ef28ad6199b0d2db81902efc34bacccec570a016 SHA512 864e3d202e843d6fe045e4f189af3a000e44c0696b95a01f069346c753362a07890d498549a7e497da4b5843fb9213628d302c7ce3d75576b34e64a032a3baf6
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.16.ebuild b/net-mail/fetchmail/fetchmail-6.4.16.ebuild
new file mode 100644
index 000000000000..6c2e6a41f1b0
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.16.ebuild
@@ -0,0 +1,107 @@
+# 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="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${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 tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || 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
+
+	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 tk && 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/imapsync/Manifest b/net-mail/imapsync/Manifest
index 44da5f534a11..da6ae41eb76e 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,5 +1,5 @@
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
 DIST imapsync-1.977.tar.gz 1814568 BLAKE2B ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910 SHA512 b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9
 EBUILD imapsync-1.882.ebuild 1942 BLAKE2B 9fb12473d1bf460d5b1a80924b3abf7c4c0480fc33b08cc5eea9258bb87db7cd0040bb29551670991806e92f028bff28f606eaa7da590bb924978a5d2f6174ee SHA512 39831b911f0a92d5d3000e7d69cecb068a8fca0dc66f033a2bc6c03ad5dc48390081bcaf3452d2aeb9396c1b5d6291af292d9f4c863f3b352f9333cf37289eae
-EBUILD imapsync-1.977.ebuild 1892 BLAKE2B be4da87f3112d91975c90b83d203287c2bfbcbb59207a250a5bbdff761f8db211b2b2085a81a80d43bfe9c3414ed5631c0eeec41ab8dd607a43b2a6611b840a0 SHA512 a72f01a8c49ad40a138ed6eb0198679d6f4547a75e0e53e6407bf88801e91c4d5d2b7c90118c99fae3073c7d303b191fdbb2a8242fe3512a8c6705f23d1fe5b8
+EBUILD imapsync-1.977.ebuild 1889 BLAKE2B 03229ec748f0dbe2ab20f11a33cb76e8d92e24ddd233f28fa413b6370dd251fda434f1b6b4a38f2c62c8c5c310565ad6421a9068dcd65ba718303e4eae37d283 SHA512 e3e6be608cd773f9e017653517102cc9242fb16e23271963571c2d8f2e1806cfca156319581192fce975ef42fd27a638c92a144841aa7adc81b61403d98d8294
 MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
diff --git a/net-mail/imapsync/imapsync-1.977.ebuild b/net-mail/imapsync/imapsync-1.977.ebuild
index 77e3d52596f4..94d001832ff1 100644
--- a/net-mail/imapsync/imapsync-1.977.ebuild
+++ b/net-mail/imapsync/imapsync-1.977.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 #IUSE="test" # not fully supported yet
 
 RDEPEND="
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index f6140c8d4012..35a01b0adea8 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD isync-1.3.1.ebuild 859 BLAKE2B bb36f26b449eacdf714b047e8ab0facbf6487fa1abbe1e2e054ef2775486e9a0fc2af67f701281ecd44c15096daff32760e2360ceefe29cab363ee4924a06f20 SHA512 673c7da19bbab310ba3bb451d274ced14b40f68527828d2fa0fbe551edbd87cb3384f9d6441bb8c81723d7caf779d93f4f34caf7cf6bf4f973147ec992bc3701
 EBUILD isync-1.3.3.ebuild 868 BLAKE2B 950ddf7a95e06e272bad96255922e667176856d73d1a9e01ae99add5a1716f78d60db9b3f3b575fe406b58a48db99f626118a2af5bfda5508a4dee8473bd3c9f SHA512 39af3a19cfaaebd9835fe35c23f8e557ed54762e53ee54bc5af456125875bc51577de4a2c68c6a19b277405d25e7f3bb35b6093cd9538e11abde7e32d826ddd1
+EBUILD isync-1.3.5.ebuild 870 BLAKE2B 622511f268094f7bd37473eb581a1766345b1f14d3033d6ee4217b403cfa4c2290a1d0139fa02a8f0dd00dbf248f54268bac72a71fc0481ee0432cc632274a67 SHA512 5ee25308a100fd6135cb4335fe72678f1442de7a656b3c019d0dd3019ceae70a883591269db0c3f19f48b60c632849620eac17939f9c6955998daf20fbe289f6
 EBUILD isync-9999.ebuild 870 BLAKE2B f53cd1e1bd39fd318159f35dbc507a444a4a07e0d323969971496ba6995af6237dcf50670c8fa1998d9322cbe3069f480c4cc6735ac25bda80ecceda5807a3d5 SHA512 6aabbed6126f463ab6e865f5c8e74fab789648aa9cc81a0bf8bddf9477bbf9e237066b443c2e8aedf9aec56727ff904f9317cb1489c69491cab7b45465b0da38
 MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
diff --git a/net-mail/isync/isync-1.3.5.ebuild b/net-mail/isync/isync-1.3.5.ebuild
new file mode 100644
index 000000000000..652bed336e03
--- /dev/null
+++ b/net-mail/isync/isync-1.3.5.ebuild
@@ -0,0 +1,45 @@
+# 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="libressl sasl ssl zlib"
+
+RDEPEND="
+	>=sys-libs/db-4.2:=
+	sasl?	( dev-libs/cyrus-sasl )
+	ssl?	(
+			!libressl?	( >=dev-libs/openssl-0.9.6:0= )
+			libressl?	( dev-libs/libressl: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/mailutils/Manifest b/net-mail/mailutils/Manifest
index efe4552a53c0..a7e214c57fd1 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,7 +1,6 @@
 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.10-get_size.patch 989 BLAKE2B b24d0c942d35b943ff211d9b688ee3a4f805e42de63f1d0a9309beec7a0619d2e2d093e5e632bda8268bd34cac460fe9ed38c0e7fe7e827faaba4d6a2099ef80 SHA512 13aea65571a073eb9a556d74ae0384ffd326ca39854b47b04208f2543fc26bf6fcad5ced60b912c2569e23a2d89b8109ddc1182ec95bd40d6ed0cbb5acf677d8
 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
@@ -10,14 +9,12 @@ AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d0
 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.10.tar.xz 3102328 BLAKE2B 49ea417f71816db2ca1e6a514e5f662d7ef66dc72ae93141ebb8ee006d78ad89587f4b09a96985fdb17335b5f58f8eb654cef23d64fc6d994948786e4a4b1410 SHA512 3a74c9a4bb197feecb2e2c4acfdfac6104c723722b1b2026183bc4cdb6872a45563034f82a56374fd3f51a79999b0f1d47e1169c971d1222fdc1f7b67e66550f
 DIST mailutils-3.11.1.tar.xz 3129416 BLAKE2B f7a13bd1c545b051d213656bea52d9df6409baffe8f1d9755826ef306cc5dc2433b9fd57ea56d5a64d299e8c4babc2dfee8b8f2ee8f1537519c0cb2a568a7717 SHA512 6a1f20d6bf9cda9c90d3bd07a4c23a52d78153a18e89b1cb69682b5efc6c450d7791d430855b47ed97e078e0ec175c4b2732317fd7115767ff01dc808f36145e
-DIST mailutils-3.11.tar.xz 3114388 BLAKE2B 69c648c412db8480366a27bdd654fcbac076e42417519eaaf4a30ea1bf87a8bc58ebbf8dd8499ea5fa81bcdbf844f6066644c8f7b0abf678fadfd8c8e6b3208d SHA512 98584c827780405c701afb1d75aab30a1a63be0456e51ff1ecff0f89422b993cad573d4d8559444de73ace738a7899fd491b6778294ecd0c96b279be833b5438
+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.10.ebuild 3642 BLAKE2B ef773a495bf84faa66af2eb9e820e9747a1f07402359f7bd38cfb3f2428c24be9fdae65d3d85cb2bf721003bcbfaa1f4cec0ce82223cc2f0ffbc8c747d224963 SHA512 b9bb5edd87293be017e2f57d9beee45401b3eb87a84c27042264fbe4540aee830271f8b3b6bdb78d19c4a8b4005496e0a7bf212b7686436bd68e2cb13dc3e1db
 EBUILD mailutils-3.11.1.ebuild 3601 BLAKE2B 4a5d51fa321729f32acabe36ffd2f5d8a3350b1d9fd0ea4e3ffc31f60e4c0d8607efec285ff48696bc32bdde7d29547108cf08f140a91d3af6c938afd19579f3 SHA512 d295bfb83b2b77319c24b2f9cae1c7adebe4e8e0bb6d5d1e50a69b5904839d3806122f122132d6c25737334cec11b22397108ac034bdc1e24ac75bdcac84f6c6
-EBUILD mailutils-3.11.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
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.10-get_size.patch b/net-mail/mailutils/files/mailutils-3.10-get_size.patch
deleted file mode 100644
index 3ec15968916b..000000000000
--- a/net-mail/mailutils/files/mailutils-3.10-get_size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 37713b42a501892469234b90454731d8d8b7a3e6 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 17 Aug 2020 20:34:21 +0300
-Subject: Bugfix (complements fd9a86d37b)
-
-* mda/lib/mailquota.c (sql_retrieve_quota): Fix a leftover use of
-get_size.
----
- mda/lib/mailquota.c | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/mda/lib/mailquota.c b/mda/lib/mailquota.c
-index 7b7dd52d9..af719a591 100644
---- a/mda/lib/mailquota.c
-+++ b/mda/lib/mailquota.c
-@@ -270,16 +270,10 @@ sql_retrieve_quota (char *name, mu_off_t *quota)
- 	}
-       else if (tmp == NULL || tmp[0] == 0 || mu_c_strcasecmp (tmp, "none") == 0)
- 	rc = RETR_UNLIMITED;
--      else
-+      else if (get_quota (quota, tmp)) 
- 	{
--	  char *p;
--	  
--	  if (get_size (tmp, quota, &p))
--	    {
--	      mu_error (_("bogus mailbox quota for `%s' (near `%s')"),
--			name, p);
--	      *quota = groupquota;
--	    }
-+	  *quota = groupquota;
-+	  rc = RETR_OK;
- 	}
-     }
-   
--- 
-cgit v1.2.1
-
diff --git a/net-mail/mailutils/mailutils-3.10.ebuild b/net-mail/mailutils/mailutils-3.10.ebuild
deleted file mode 100644
index 7a8971fad43d..000000000000
--- a/net-mail/mailutils/mailutils-3.10.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
-	"${FILESDIR}"/${PN}-3.10-get_size.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.11.ebuild b/net-mail/mailutils/mailutils-3.12.ebuild
index df0dac0e2b63..5376eb73d090 100644
--- a/net-mail/mailutils/mailutils-3.11.ebuild
+++ b/net-mail/mailutils/mailutils-3.12.ebuild
@@ -72,7 +72,8 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 
 	# maildir is the Gentoo default
-	econf MU_DEFAULT_SCHEME=maildir \
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
 		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
 		$(use_with berkdb berkeley-db) \
 		$(use_with bidi fribidi) \
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 41dbcfeb14ad..6d478eac2c3b 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -2,5 +2,5 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f485
 DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
 DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
 EBUILD mu-1.4.13.ebuild 1774 BLAKE2B d4f32fe1efff5bec341b413caadc6841f85a1892fae4d428ece9cac413ddca7c4b3d05bb68dec532f328b4c0a16fc12ca6f6c0cf430b8a351be64dcef16ed361 SHA512 2c6a3d5ae29ff7d46954b32b30d0d7f0760e6f648e80b5ca1c1f8eaa16be54e92105ceeb8ccaac1169b54b8e9e2225b67dded9a7e39829257277d95f2696b24a
-EBUILD mu-1.4.15.ebuild 1776 BLAKE2B 3cf3dcf35f805d2be465b05908112c241513ab63f1c1ad68118ef063ea25e11cf084fdc4cfb63b50866672425c9fb71d2d8fce48e283421b0a8eeea3e11d7638 SHA512 3f455fe4bf7f32aee6a680a3ab78df2c953c2df565e203dc575d3faada6d73d5b62186453ce3fe131aec0a44c63d96349632197ec0945d148b6ee063a4307c0b
+EBUILD mu-1.4.15.ebuild 1772 BLAKE2B 8b31278a7ee402b88f93ddea57340c8067be56a7b9377d20d705bffb56c2baac4e0c9c1bde2ce0b1b432e68b7bf40229e4ac775fa66a43df126f7cf22aa504ab SHA512 a611058c25591343bf57a5a820481516b71005e811e60a26b47d25f04f7ec8c5ca9b9936d5259f8fbd9f17c296a01246a48b451ef21a52268991b19dd6960441
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.15.ebuild b/net-mail/mu/mu-1.4.15.ebuild
index ab29acf0a6fd..dd311566d5bd 100644
--- a/net-mail/mu/mu-1.4.15.ebuild
+++ b/net-mail/mu/mu-1.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="emacs guile mug"
 
 DEPEND="
diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
index 4a1f86205b80..a58ce35d839b 100644
--- a/net-mail/muchsync/Manifest
+++ b/net-mail/muchsync/Manifest
@@ -1,5 +1,5 @@
 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 472 BLAKE2B 6a33500642df19fa1d1f01b6834c0f9ceb4bf000b7055596fb40f608226aeecd89e68435e696f457dc76ec034c8cd759f6c854daf6c3faedccf43f59d8af4a14 SHA512 12819d2e22432d307cfaa3f9fe85a2dbf86f534fe518df0c34396e89d16949912102580acd90b5083bfce76f06366d43eae8c2c9964f2ea9fe386d74096924a1
+EBUILD muchsync-6.ebuild 471 BLAKE2B 22f53fb490558dcad14818b0438bbdccc79bc4258d6d18b812800beec07ce2da92ba067c8d105f383b098c2f1343d45b3617d8095de9c22732dbacd1a4ac75a8 SHA512 c3da2db1a91dba5ab7c5f2dd54041a6428e9c4d711d0c64e751192bd6d41f23c00f58437838805e71b27fe733fcb799eb9888ea6ff2ba9327e15fdff18f95d74
 MISC metadata.xml 719 BLAKE2B a7666967c221dbb5cd6e9ed36c8762b7ee234778215b131135b4055c371d51f618b82d221ff2e15c8a3a811fec3999a7e40a3db517b6bc2a7057e67e76c133c7 SHA512 e6628b58c52919894747a4490a76d8e9e1a772b0be0d62effbfedd0d27afa0be0629d5555f6796eee663c511ee23b3a1a42aa66425c502f5ff0cc46e4e1d355c
diff --git a/net-mail/muchsync/muchsync-6.ebuild b/net-mail/muchsync/muchsync-6.ebuild
index 2a36e5c9ba4a..43414dafbc15 100644
--- a/net-mail/muchsync/muchsync-6.ebuild
+++ b/net-mail/muchsync/muchsync-6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="dev-db/sqlite:3
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index da61d8bce522..452d3a52d03f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,9 +7,9 @@ DIST notmuch-0.31.2.tar.xz 713388 BLAKE2B 20029f55206b66e7956316fca2d16ae53a49fc
 DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c733dfe6f0761dec5522eae94bacf0c01ab7c8212373f1857eeecbad569482365a53a10f56dfee72cefc8d3f4f05a SHA512 99119216b7ef7f9e336b11d03ebb61d9667a8fbddcf6fccc49b17d07f07867f0342b2766375e164b58eaa9a43237ec4d6567d616fe8813b929d28b203aedfa44
 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 4341 BLAKE2B a4d8130f215d76a096e35536a88f0cd7117922f2a331590a98629d2cf35c74934eebf0ce3d79a2fb5887ad74a4b2239faa5a782882c2712e6c155986b70ea780 SHA512 58a44ae2f262435fa333a30908bdff4e19a9be290ec93049ccddf1b0acebcc1660ea66d1cb927dc31b12758928983699df723d422cafd73caad7cc0af26b3d5c
-EBUILD notmuch-0.31-r2.ebuild 6373 BLAKE2B 47c8c658132f91c248ab54aea1a2070eaa72d8650744c4a7dfcdf6899cfafa6180fc5604aaffe7a7ceaf70e76395372c60dd7b8b58bd4f6bb9c5a6467de83c15 SHA512 75ef94b623f6f612ed42c9f1cfd97ed951f575d8862c1c19df90c20aaadf53fe457d36170e9624d20e998ee266a6546df7df6750192ef1ea0456c18dfe2e0798
+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.ebuild 4458 BLAKE2B 97b63d76664c8ba9036153e5f028de2d0e55308adf82744f43a10fb5d4e8131385044d321dc259c9efbef7b38033333dd1658dd1e315e7477c1b25d8e9561a8c SHA512 b9a24e76c99bb3dc2e88d9200329abac5d0e46c4af6bcb1d71dde4b3f1cac781045d86d686d04b5ce559bcc2d42cd0c5d2a77cfd3328cba391fe4a5b9946563d
+EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 4fcb5ea47f923a98238ef7216627196931f7b89c113f46478139b2cc80856c3800a245a2d25de0b27a4e1676bc106f5b0478fcd029e514abe21d359a64d5e5d8 SHA512 6018522ad82cba4b14cd6b0e407ae475b07ab67648829e29e01d17080cfd6faa87ecef27df458e2699ed5ea5d4e400b4491224bfe5eb7e9d5232d3433adda683
 MISC metadata.xml 1288 BLAKE2B cc1d703a011971c9d6c89237847c84caeb83d1a6b62d95ee9cb1b0138919ea24cce578d7f55cdb749b448d6f2c9c77895285127d9c509532b5b58c66db2528a1 SHA512 68066c76c92534adb837ade1aa93a6e58f2d1b288e9cb75753af2c9dc1feac145be1976163b535f4bd5671f73f0dc93f204fe74ede74c10f081bba1d3be3d1dd
diff --git a/net-mail/notmuch/notmuch-0.30-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 5bc0909030c7..2e892bb5e51f 100644
--- a/net-mail/notmuch/notmuch-0.30-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
 	pax-utils toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
index fc743453f793..cc1c03f51dae 100644
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-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
diff --git a/net-mail/notmuch/notmuch-0.31.ebuild b/net-mail/notmuch/notmuch-0.31.ebuild
index 03f24db64a5c..7e7b6616497b 100644
--- a/net-mail/notmuch/notmuch-0.31.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
 	pax-utils toolchain-funcs