gentoo resync : 25.03.2022

23 files changed, 295 insertions, 43 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 01472f5251a7..f0ef0d5a1d8c 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 61958eaecf81..6c464a02608d 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1,6 +1,9 @@
 AUX 0.9-0001-remove-non-working-test.patch 1017 BLAKE2B bfcecf9261084694a30191ea6793405328d538d49eed3b9721102b5314846acc4329f4c9d46b375c9acbc53bc0d09b9222f85a2f5292ec30983c7efb9f56b5fb SHA512 b30d20495728c7205ad1fb663d1aa61832488f83ef43a6af530500aadf6198335fbc45154952858d4c11364f1349afac40539a721342bbdcb8cf5c40e9c88d0b
 AUX 9999-0001-remove-non-working-test.patch 1017 BLAKE2B 4a12441ff229af7fa0cb58e0e68775bb418afcd621487b46eaa1ce2411eaaa388df26ac04db8dc7c5b5c7342a75f1df70ee8241e60e1da5c28a89a741455250a SHA512 1aa122c884ce7899ad0fe5a99c5acb298fbb20b1ad5df8d264bb133c8f8c439c26cdb0694aa4d61b1b37de72bbe7ef2951d09a11283dbdeeaad103015e48e354
+AUX alot-0.10-no-intersphinx-docs.patch 930 BLAKE2B 6515bfc063cbae84bcfdaf72ec6e3af1ae5946ea309965770328ddbe3e7c8b238f327f4b976056ce7c63d5c03090e9f0fb64b3647a7aa5ffd2b09a53ef64d4b8 SHA512 232c15c36efbde92e572028b6cfb7679dfb6bf5c30065db6ffbb32d36b54e889cffa0ba368ee9f560d8a2ba8b42c47ef868c924516115625e1678d5da8aa359f
+DIST alot-0.10.tar.gz 228451 BLAKE2B a90672817d30a9dc5a50814b123f107f94cc63cb9669578c3ffa9f6282dc0388c91e1a7f14e62c73159573ff97660a57b71b5ecac6549e050758bcef60c54e87 SHA512 b07c77f3a21c9670fb14a760d036ce0e14678dd6ae75585cc929f97db5126a7dbb7f411244d317fea2913692afca6ff9f439f9dbbf047acffb8fcea2ebef7056
 DIST alot-0.9.1.tar.gz 228645 BLAKE2B 7a44542513bc6d90df43cb21daf2ba103cbbae4dd81b44eaf935d764ba11d6c5640774e72728725eca83a777dcf3583bebaa57c9061191499f74ed89d4c11b4f SHA512 ac65c742d5bfb4827482c881ec2eb95b9215e9a5c49d7001421d62ffb1f38c7792dbbf94c0f16578da70b5ce15ba7a28cea0c1bbd34080f8132c80f4a0a2199b
+EBUILD alot-0.10.ebuild 1607 BLAKE2B 7842266bf26d4454edac10350cfc7fc93e19a1dd701f5532f7c0d0a16622270a580464c09805c2e40e5843f33dbf1ff83461dd8484e7364e1b35df39a191fba9 SHA512 4e0a3a7fffde2f24a0242d773ecf63f3b20845a6e21df2cc19d199f67ac5cbdbd44b4732b289b56a31382bc5c77494c07ab67129b8fa5cc2f9927b51e8ef4e34
 EBUILD alot-0.9.1.ebuild 1451 BLAKE2B fef418ed84105d42e9c584d519bf5e51df206e45d8395a55c5abea4ed33fa51f45076b3ce36c177cde8621671039dd6e53c6e50de7df132dbde60b2473c407a1 SHA512 e784edc5d94d2befa333de761f420baf8e41d8dbd4af8cab575af227dc4672134330c2112346e2c82c7fe80deb0c3afe2eb59a8cd2d22abcece2ae0cab32b4a3
-EBUILD alot-9999.ebuild 1591 BLAKE2B 99ef739a0b734cdd1c8223a194e76cfc16eeedf3abf0b2e0344bf8f1ab240eeb362f1f90632412209a3c3d0718035f1cfe082b15a38338be1f51b2a347fee003 SHA512 ce068712d5430d99b7b68188b62b3e6cb7b7516da60573a124e0b13902e530c87d575ed5ce6375c94a39226f1731d5421b46d265891301c4160a4e6a0615aed7
+EBUILD alot-9999.ebuild 1607 BLAKE2B 7842266bf26d4454edac10350cfc7fc93e19a1dd701f5532f7c0d0a16622270a580464c09805c2e40e5843f33dbf1ff83461dd8484e7364e1b35df39a191fba9 SHA512 4e0a3a7fffde2f24a0242d773ecf63f3b20845a6e21df2cc19d199f67ac5cbdbd44b4732b289b56a31382bc5c77494c07ab67129b8fa5cc2f9927b51e8ef4e34
 MISC metadata.xml 744 BLAKE2B 407cd2d09e4e86898b6a946cd9d8c74b85cbb68b337100826c427f04d759a7d80081f64161a5154310cf0649b36d17ccc339d3ef5f4b3f892d218aa382e359cd SHA512 adc232dbb7a363ca1d53958dfa9dbf106c251aee4755dde3f9d86be69201bcf98c8dfc88808d2e1bbffd873467db2fc2c81fa074b7aaa4df56ff27af684e1a79
diff --git a/mail-client/alot/alot-0.10.ebuild b/mail-client/alot/alot-0.10.ebuild
new file mode 100644
index 000000000000..dd3c5c8130c7
--- /dev/null
+++ b/mail-client/alot/alot-0.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pazz/alot/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	app-crypt/gpgme[python,${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwidtrees[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	net-mail/notmuch[crypt,python,${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+	"${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
+)
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	emake -C docs man
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	doman docs/build/man/*
+	distutils-r1_python_install_all
+
+	insinto /usr/share/alot
+	doins -r extra
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog ""
+		elog "If you are new to Alot you may want to take a look at"
+		elog "the user manual:"
+		elog "   https://alot.readthedocs.io/en/latest/"
+		elog ""
+	fi
+}
diff --git a/mail-client/alot/alot-9999.ebuild b/mail-client/alot/alot-9999.ebuild
index 87b22470c579..dd3c5c8130c7 100644
--- a/mail-client/alot/alot-9999.ebuild
+++ b/mail-client/alot/alot-9999.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1
 
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pazz/alot/"
 	inherit git-r3
@@ -16,13 +18,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 RDEPEND="
 	app-crypt/gpgme[python,${PYTHON_USEDEP}]
@@ -30,24 +28,23 @@ RDEPEND="
 	dev-python/python-magic[${PYTHON_USEDEP}]
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/urwidtrees[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.4[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
 	net-mail/mailbase
-	net-mail/notmuch[crypt,python]
+	net-mail/notmuch[crypt,python,${PYTHON_USEDEP}]
 "
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 
 PATCHES=(
-	"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+	"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+	"${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
 )
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
 
 python_compile_all() {
 	emake -C docs man
diff --git a/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch b/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch
new file mode 100644
index 000000000000..6cda5071e226
--- /dev/null
+++ b/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch
@@ -0,0 +1,23 @@
+Needs network access.
+--- a/docs/source/api/conf.py
++++ b/docs/source/api/conf.py
+@@ -56,7 +56,7 @@ from alot import __version__, __author__
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -16,7 +16,7 @@ needs_sphinx = '1.3'  # for autodoc_mock_imports setting below
+ 
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # autodoc tweaks
+ autodoc_mock_imports = [
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 818c0481cedb..08bd4aa9eca5 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,5 +1,5 @@
 DIST alpine-2.25-chappa.patch.gz 172963 BLAKE2B 5e306325beb46fd2f716620794894f563b93e116693a1af050ea5f61c203350d2aa72b67d7f66acc748caea6a73bdef85f45324eb01edf8a6035b07f8a50e2bb SHA512 b88ca58e42a72b2b92cf28e4cae492a5ee75d534821046645fcc358833e87287fc707d5bec5c3508942a0ef1ecffe64916f00f1a01e430048384838e5ca40358
 DIST alpine-2.25-ssl.patch 5431 BLAKE2B 0cf2fcb682fbee41aa988ff089c16b75ebd9bee321c1c130d0b5136e5ca521bded7e9a97cd3ade1c86b17e72136264d4405cc36427a347c9bee84ee8a64548d4 SHA512 698d2a3c3b7b588fe3fcfe0291f0aab05c42b5ea80de1f210c1985082651329b80447de4e8057bc7e962fe8ed5175ea8132bad413c02fb1f0cc67c84e9420642
 DIST alpine-2.25.tar.xz 7495372 BLAKE2B ce2587a309c87ba527d51c360ee0d9627453cce6585631f569eb26db04aa6c5cddb7c9599478092447a040c43e9234e78a942fef4b1186d07c608163f96236be SHA512 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
-EBUILD alpine-2.25.ebuild 2408 BLAKE2B 5e32ac32c617667b787eadaa3834ae53e35bcfb6df2b267757b5a60fd5cbf28c2d0c8b1907f9cd3ac5cafeb93482177e54bf75812dce777445ec45b0cc06be3b SHA512 03bee6d4314609b7a7828dbb0a68621545caea14fdfa7da68136c17a229099e8aa86f267cbb576fdf0ee0c19d24b800a23e2937ca01919537786f32a9381a2fe
+EBUILD alpine-2.25-r1.ebuild 2414 BLAKE2B bcf89fadb7d018a705a513706def00ee55eb620ca205ad60f7bffcf8ae2542f574ff7a697c97f82d1ef3173344db96ed8a18fc5084d1fe7f06d342b36074bcd0 SHA512 122a68f1e817e7b67fce9e3c45af3ce060d83d3de12844df594e8d8168c013442092164138c96e57dba16a9fb7946971f8444e33a261ed9b8d327d439466c3b6
 MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
diff --git a/mail-client/alpine/alpine-2.25.ebuild b/mail-client/alpine/alpine-2.25-r1.ebuild
index 3beb218d42eb..de5b0df28cf4 100644
--- a/mail-client/alpine/alpine-2.25.ebuild
+++ b/mail-client/alpine/alpine-2.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ REQUIRED_USE="chappa? ( ssl )"
 DEPEND="sys-libs/ncurses:=
 	virtual/libcrypt:=
 	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	spell? ( app-text/aspell )
 	ssl? ( dev-libs/openssl:0= )
 "
@@ -39,7 +39,7 @@ src_prepare() {
 	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
 	eautoreconf
 	tc-export CC RANLIB AR
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
 }
 
 src_configure() {
@@ -69,7 +69,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 AR=$(tc-getAR)
+	emake -j1 AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 3a9547d92d07..edbc5e686665 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,3 +1,3 @@
 DIST balsa-2.6.3.tar.xz 3761940 BLAKE2B 8bcd93453a74d2b7ffaeca3131828044a9fc399db8e0e695a31dcdb5b50a400e10b3a49d9484609b59e4348758cbeff6fde30243714693e98ab046f7910d1abf SHA512 7e64f75423dd37536812854e56db1af97c00bc35f640d82c22d86e5212c766926430f1c99423f1a972daf6f20d084d4cf16d89e13deb2f1ce550c016cd132f8d
-EBUILD balsa-2.6.3.ebuild 1869 BLAKE2B 36deff8c9a5a63779e88b2406287ed15a640ba18e9472d6ed28b7ab97ecc10f9754209a7a898a35de50dbaeb7f854b4fece48d86c760696a17c2b38075b429b8 SHA512 488cb2aa382a37ec6ef4474b4382b0b405e2f64a210c66b205228fb23efc54dcdac3da132f64226a8f284903618cb1c6381197cb1c983fa74e8fd52ec0fcf6ce
+EBUILD balsa-2.6.3-r1.ebuild 1871 BLAKE2B 05695d1b964f52540ca46c6c7efd28b4ef0aa2a27273f6b992ddcab808993730f034c004db12eaec7d99b075b78148a13d63c713ff7009fab7f28a6820ba9859 SHA512 190e5b8339f0dc377e1a7be7f95a60ebc39765aeed15421a92dd6263f6edcf0ac5f8c9448532323b047110da4b6af1196708e0003504855010c691756fa0b0c0
 MISC metadata.xml 336 BLAKE2B e86d0170a41846ccb0ceadf9f7c614ba92c79b67076cd315b609079d3515966fed408b7b54072297aede799e344acca1175cf7ea4c7dd3d6ca3176dc88b3f59d SHA512 1d8aee84f50bb7a8a8011a1b47e24da2e101cfd313f50ad736b2094b92a24598e5348f6d9d950db04dde1fe6ffb5e950ec9ac1c28a342d444497d8cdbb6af58f
diff --git a/mail-client/balsa/balsa-2.6.3.ebuild b/mail-client/balsa/balsa-2.6.3-r1.ebuild
index 97f92e6b874d..f629d9ea3c60 100644
--- a/mail-client/balsa/balsa-2.6.3.ebuild
+++ b/mail-client/balsa/balsa-2.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ DEPEND="
 	)
 	>=app-crypt/gpgme-1.13.0:=
 	sqlite? ( >=dev-db/sqlite-3.24:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	rubrica? ( dev-libs/libxml2:2 )
 	kerberos? ( app-crypt/mit-krb5 )
 	xface? ( >=media-libs/compface-1.5.1:= )
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index f8627ff4695c..ff0869cac54f 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,7 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 DIST claws-mail-3.18.0.tar.xz 6517632 BLAKE2B 534a37a081ceeb4d3066717d738d04e2027d38c621c15091506ec117a3b592eedb6f3c67afddd972424976398019fda3d618db4083f0a05f39e7b8f07a1c2138 SHA512 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
 DIST claws-mail-4.0.0.tar.xz 6390300 BLAKE2B 291c62e7dc0329ce12dd571a15f19942ac6ae6f3bbbcba3708afbe30682392883ceba165356d4be68e3b655aade85ecdad4ed8a296517b37fd0f7918e8418d51 SHA512 26d207fb8b5ce8b814a8a712843a209f58c8c9df3e9623387322b2e70ac351c71ac8b1ff77c52c5df9a14a46be7f65413efc0a4dbcda1e70ecb453f042da153e
-EBUILD claws-mail-3.18.0-r1.ebuild 5623 BLAKE2B 2586606c888c1555d0b45a9e07fe57ce87ed3f056536833afa316f2ff62bef1deea6fe506cdc9692bd96d6669f39c52ea7aff37432c97df0254e0c1b6797ab21 SHA512 1b85f8cff6436d96be550bdf9748f9030f66623f19d7710042476979e0e510a6874f17aaf1f034b31605a7c7a97879df2750dd4d9771e318b63963b57c5e6494
-EBUILD claws-mail-4.0.0-r1.ebuild 5681 BLAKE2B 66b437aa63a5b948836334a695c9fd79c50170280c2b74bb70a696467eaf69a487979a8559e9f18fc36322a053125fc6a16f3aa22c6c68398cb2d3d2c79e0aa1 SHA512 270ec0a0715945cbb9f3f19d77adc969c9ea565bc6efdb7c0706487a36da108f4b5aa73b3c2d9fe5e966a929a0f5419fcf4b2e2bc4d15ca7fcd80a099844faff
-EBUILD claws-mail-9999.ebuild 5998 BLAKE2B 40cc26772441e726daf85cffeadbf2738cd5b481d0939a2d28975fad28d71985842c984a02e0983136582de5ff5b162c5ae1b0f7a39dd2fb59a71e4403ccb028 SHA512 10bb308b24ee235a61a2b163cd40edeb98e33b2e12ecb3d2096f26edb3a9c95dbda46f31f2cad82e8265846a158b448d5c6e527d6a4fa1d0c6b2cf9cec2fc3e1
+EBUILD claws-mail-3.18.0-r2.ebuild 5625 BLAKE2B 4901c61956128628c711986624990c46092c536cc3c5b5226b1f6e9ff466f95b27b7fb5c0b3f89a8263df8eb1a1ac47860bbcd5abbc88e46acf7a0c4f095d849 SHA512 8d7587e9a318bdeaca51510202068481bb659ffb5047ae8734645ae86fa8ceeaf96950fa67a76dc9a259eb3d2802a3f930b96266e07c3966529ab71fd5947bc1
+EBUILD claws-mail-4.0.0-r2.ebuild 5683 BLAKE2B e0a64dc57e4e21da7929d9a9e99696531affce5cf0a4c33cabedd0566aaa147c2bf9adb7005629aca7dc931ae8656ef25e647aca16d9e3362d52deafb376601d SHA512 3349029ef7c8f6948e6952b26f623c151e612adc3bc6e4f00f7f09a0574396bb0f1909cc24218c5c256fede6c278fc25929bd53d3aa48a485d1f16ca4d8ed5b1
+EBUILD claws-mail-9999.ebuild 6000 BLAKE2B 1b843c30c450b11ab6afdbfe62f0b458175fedbe8c47657ef3b5a04a0a7fcfaf2d660f526d5b9719e3bc5d18abc5f4db13afded87b7068b093763e8ce0d15560 SHA512 3c4acd7c5fd37fcb3477403266880aabda6dce542f9a2c4536dc6a8b8a3d37900b7324b55629c28c13f756fbeceabb24fc2a50eff0e8d61489ad8efe2441fc63
 MISC metadata.xml 1468 BLAKE2B 51e786691dbf1427b1532311620e6c844eb1c88fdb1df3a4935fdfa07e952fd5b9cddcf4ab2610561cdf381a14aaf42e15c544bd6cff76a62277e15571c9b45e SHA512 da6469f631ee92619caaddc6d924e41488eeaa956d5150414e6552d560f9e188a64b2df1e67738f40b6ad34b60ab9f1ba50fafafdfdfc521c3bddbc6df0b45d0
diff --git a/mail-client/claws-mail/claws-mail-3.18.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.18.0-r2.ebuild
index cfd60ccf3c36..3458689be8e8 100644
--- a/mail-client/claws-mail/claws-mail-3.18.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.18.0-r2.ebuild
@@ -56,7 +56,7 @@ COMMONDEPEND="
 	dillo? ( www-client/dillo )
 	gnutls? ( >=net-libs/gnutls-3.0 )
 	imap? ( >=net-libs/libetpan-0.57 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
+	ldap? ( >=net-nds/openldap-2.0.7:= )
 	litehtml? (
 		>=dev-libs/glib-2.36:2
 		>=dev-libs/gumbo-0.10
diff --git a/mail-client/claws-mail/claws-mail-4.0.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.0.0-r2.ebuild
index 402347eff491..e570c9589d23 100644
--- a/mail-client/claws-mail/claws-mail-4.0.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.0.0-r2.ebuild
@@ -56,7 +56,7 @@ COMMONDEPEND="
 	dillo? ( www-client/dillo )
 	gnutls? ( >=net-libs/gnutls-3.0 )
 	imap? ( >=net-libs/libetpan-0.57 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
+	ldap? ( >=net-nds/openldap-2.0.7:= )
 	litehtml? (
 		>=dev-libs/glib-2.36:2
 		>=dev-libs/gumbo-0.10
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 5ed5d19991f5..47e6a88b592a 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -60,7 +60,7 @@ COMMONDEPEND="
 	)
 	gtk2? ( >=x11-libs/gtk+-2.24:2 )
 	imap? ( >=net-libs/libetpan-0.57 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
+	ldap? ( >=net-nds/openldap-2.0.7:= )
 	litehtml? (
 		>=dev-libs/glib-2.36:2
 		>=dev-libs/gumbo-0.10
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index b424451ad587..dc4932fd1593 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,5 @@
 DIST evolution-3.42.4.tar.xz 12285100 BLAKE2B dd02c84f4eb868b8a266b5d9a2383e16c095c073cd2849b96bee842b8ed67f0af803f14a867202321ad373148f80de142baf7c05b96bf4c84a62f881f5b26c8f SHA512 4319d19089269e53bb751408d5cec1609a245dd366a30ad6e2e117f074ff0b2f55228a5dbcc9af661846a253c0860a61a8648bd582b395851e21e152ffe0b1aa
+DIST evolution-3.44.0.tar.xz 13102720 BLAKE2B 7081cd8a90bb42ec9daba13664230df8a3b465137933b4a90537b51dca94befdf18675bd9f93e3050db95b60783f5dc06783362dba3d603e1708fd469bee167e SHA512 607c6b40717ffe6b0bb9c04897b6e4ea64f47ddb67337f7481bb358a10f489fcad3c5102e6235f7f4098687867762ff12ee86a930f62467604fe4d5fc1de5ef6
 EBUILD evolution-3.42.4.ebuild 3880 BLAKE2B 6f85910a08f61565efbc4a162c1876806d365db44eb9d26a6b4cae118274b7a2818362837bb8fb91b176342cd49c0ae3b21d1fd42948bb90fb6bcdc88dcf89c1 SHA512 5a6ace57dfbacae79f2f54d243871f7ac06f50e657c2107630d561d083a4c478935c15931fd562171e58445530301618fd9807f47f1436fdcb6c62dcdc380384
+EBUILD evolution-3.44.0.ebuild 3953 BLAKE2B 7250a9521676b17c624d7dacdb638dd5349216b7bb94808c7a79b0c0f0fe83b72e8cdcafe8e0de26467915dbe691fcb3a84abd7147449bdde8d7d10e18962d5b SHA512 6f3e01942127645c51c43ac5921d82869bc6f80c38f8c81d7370c0c283c4e15f58c475d8eda1532e5695386b4ec1f90a6eb4fe09bd7c55637cb7ea7099f477ad
 MISC metadata.xml 1078 BLAKE2B b3a32d1876342fba5db22aae478cf1194df56f01719c6322f13a069e9fe8d1f17123b9592e0a0c5c25ac856ddbb9d20266bc11ce7c9a4737aa7dd43e76c0aa8d SHA512 9c3da89a72cc8235f73fb98b2cbe21597a4889ebd4d989a98e105613e131a42236ed115c0ac88cb87a312a43123c5bdcc44aa76328bf3cd537367553691408f1
diff --git a/mail-client/evolution/evolution-3.44.0.ebuild b/mail-client/evolution/evolution-3.44.0.ebuild
new file mode 100644
index 000000000000..455f31d80276
--- /dev/null
+++ b/mail-client/evolution/evolution-3.44.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-db/sqlite-3.7.17
+	>=dev-libs/glib-2.56:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	app-text/cmark:=
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.91.0:4= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DWITH_GWEATHER4=ON
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+		-DENABLE_MARKDOWN=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 186025d64718..ab3d7871369b 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -2,5 +2,5 @@ AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c
 AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
 DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
 DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
-EBUILD mailx-8.1.2.20180807.ebuild 1299 BLAKE2B 013ea84f20c322fc45bbe61b176cad49904541e7afc745158285d3562f2f84f985c32332694907a63c04a7fded219a3a5e81c0d57410f90184192fe94718cfa0 SHA512 7e0b2127dc0db040a1076c63e01f43bbe0432965fcbc7f50f345fcebcecce467dabc9ed061dec565b8297dbaa03e6edfff38dea48eed49afbe38f9170ae81eec
+EBUILD mailx-8.1.2.20180807.ebuild 1301 BLAKE2B afe186ca7cd2e728887d91e6f2c6b891ef79e35837dff291c37e6b8d502115875c01506d4b939d75def45922f987495ad5693223577ef99a7965a55a66e47958 SHA512 517abd9a292ed1b5ddba8d71c66cac1fdae06093821311449918f8f3e4eda946f5229f8d45ec51a12e538e6612adc511e7cca4abcd26ae8f5cf7963a7c0e814a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index a85a025cc1fb..d542d75a55b2 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" EXTRAFLAGS="${CFLAGS}"
 }
 
 src_install() {
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index ca64b3e2cfd4..c905e170af6a 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,3 +1,3 @@
 DIST s-nail-14.9.22.tar.xz 799296 BLAKE2B 4db1b74be9de38d8879b00852545840aa50022f44efc42bc338575111e391db527ba850033a9f25e6d0269f68673a13bbdcd2609c0e74fb88c409040be2d165b SHA512 016e3403fbb3d9954c160690184545fdb4fc384ffb13b146ac8b60b40e43ad1b1a8967f4660904d40a99071eb1addf2b1dd98b06c6033a1a886379c05fc0c9be
-EBUILD s-nail-14.9.22.ebuild 1936 BLAKE2B 63cb3b2b784251483afa658312f752ad1bf59444cc8f715d0e12abc847f835e92045e93503d95204d0a1c38e96311729f7b3c44d2eb60ff3c8be401031e19cce SHA512 139e13edc85333e1df7df209fc6398b181b699b7d7bafa894091f2474d3abda4f887923f50aa0e4bb95abc8a6af7efe1be3435517fd0a9235b7a3ada5adc88d4
+EBUILD s-nail-14.9.22.ebuild 1938 BLAKE2B c8409aead2a8ae902f655499588d943163186eca3f90bd27cb93225b604c998ea96a0448b06a57ab9f41c3efa6aa4db513a0a737e5d2f030501b01413891f482 SHA512 6eb6e0e300c1b9a5c3301c114d6386e4a088c590cc2a80d91882546662a28bc2f5231deacf7325c093ed2c18b6d1a46380b59467e522b2509ffc2b372d9f34e6
 MISC metadata.xml 828 BLAKE2B 7664d3cb16b1dfe54ed2ab4d06e379402c593069008000dff1ef533182ef16cc90b6384d6a09c8fe982afa7deba65782d3fe13c86f322b639c9c0e89aee4f525 SHA512 eef6877163f7fcabbf4da6574483db2d37889ae3c298ee994a38cd9703554cd565e74ac70cc41317028d47050875ddbe2fe109c7e04b97e1f45b56acdda27b0a
diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild b/mail-client/s-nail/s-nail-14.9.22.ebuild
index a64a41ec6766..dd455d2c17f5 100644
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ BDEPEND="
 
 src_configure() {
 	local confopts=(
-		CC=$(tc-getCC)
+		CC="$(tc-getCC)"
 		EXTRA_CFLAGS=-std=c99
 		strip=/bin/true
 		OPT_AUTOCC=no
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 9cc5e8d02571..afe308d44c38 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,4 +1,4 @@
 AUX sylpheed-tls-1.3.patch 496 BLAKE2B faa07a14de7f8f0501a2de29fc98ebcda52138f6a912ceaf114fddd4b5029fb81a2a2c3a55724beb191fcaa613a828225bbacf6a7cdb46a66b69e763525b5483 SHA512 a4590da5381ff60d5d0549af674f9f1a30acb7617a5d76a5e11b34d74d699bc91e1d80380e5b346a66933b097ea915fffd7508571df504686777e13701585377
 DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
-EBUILD sylpheed-3.7.0-r3.ebuild 1554 BLAKE2B 979074642cb276774d36e14bc14a5b639f9166d89e7023e5428a66562e0fb7e894f92dd5624821b522d9575e71af5d3b6fa10d11a22545ad617b6db01583ecdd SHA512 0da6aaff60b4dc8e571edf3b5cfd55463ccf8f7d8eee399693554f2aa31eb3c8ef2f14a9a5e26d91464d2c961adceb33cf45ba0ab711ab475c26b42e9e2c4d35
+EBUILD sylpheed-3.7.0-r4.ebuild 1556 BLAKE2B 28dc992a764a1db708a50f1f606359f392ed70d36c13a37485b99a7d252ed6b8084e071d1538e99915bd6cac3b6d7e697385489c5778d9b3b5b1fd3aba26b0d2 SHA512 07515fc97eed27c8f92435226f105671f79971646709f55bd51a78f497ebde7b54ca80dd223791acadf9a51dd1ea2f5703e9eddec9a6873615025f4fb45eb2ff
 MISC metadata.xml 353 BLAKE2B fcf86ed5908d01a1bbc2ee5c0a20a9b378a72039814d5cdcc1a139c14cab31d4137d020449c705002e61b0fa9294d4f8e1abd09a71ca7adae37f6e298c881448 SHA512 44dac43e49c796178bad4884b9a57cd225e6e6e9f78e72eb01e34a2f68fd277bce050aa527284f9a638d8b05c2cda9fdbdc2af72d2efdeca5ebbd0e0b168fc71
diff --git a/mail-client/sylpheed/sylpheed-3.7.0-r3.ebuild b/mail-client/sylpheed/sylpheed-3.7.0-r4.ebuild
index 86324b7b9e46..87d688309d8c 100644
--- a/mail-client/sylpheed/sylpheed-3.7.0-r3.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.7.0-r4.ebuild
@@ -17,7 +17,7 @@ IUSE="crypt ipv6 ldap nls oniguruma spell ssl xface"
 CDEPEND="net-libs/liblockfile
 	x11-libs/gtk+:2
 	crypt? ( app-crypt/gpgme:= )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	nls? ( sys-devel/gettext )
 	oniguruma? ( dev-libs/oniguruma:= )
 	spell? (
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index d87843716274..f4d811f58f65 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,7 +4,7 @@ AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
 AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
-DIST firefox-91esr-patches-05j.tar.xz 17116 BLAKE2B 5db6d2d3d5432369d2cfcda1a2b542d70ac18c1af7013d91984054c9658d7e3f989527c3a248de53f2e8dc51a852a46477f9ad75e98db28f50f8609fcafe547c SHA512 42080a8e28014d5f8de7ff45e0128ab71747faad7a92f0f7094686125835c168751794bd0229f77290f075502c271af0171ffae2863325d10cc6e8a853a90d3e
+DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7
 DIST thunderbird-91.7.0-af.xpi 561895 BLAKE2B ed4d0c6e98ce53ce4113052bc9ef496d997697d3d5873f8073324754f5b6b278734f12e78ee71448f472d0271f7eae3f055d15364e508af7844f524217c06dc4 SHA512 1f0bdfd7b8bb0e665ef12834b3c656b4cd6140893ef75ec83e20f82a90686a46cc4f573276402fd5fc4e6ded65aebca6af29d3e9adc0d2750574fc64dc1feb30
 DIST thunderbird-91.7.0-ar.xpi 665242 BLAKE2B dcd6571a1783edafc110bfd34b22ef8a9cd1216cbbc3b2b511af76afc66a7f0a013b96a64d286c495c7a49296adc7f0f20e9fd60aefa583d4bbaa5eb20c64ccb SHA512 a61d722e08007099b375ccd2552374ae8b3335919fc6efb7ae2a36898e824a09b00cf85510f8eb0fe43cd28847de238db849e98c240e610bd72f58d57d861094
 DIST thunderbird-91.7.0-ast.xpi 580510 BLAKE2B ba9ec3c24b2eb0f247521512d6334a7c9ea84711d22d6f716aa062dcb84eb2c83785a79aa1bda59ddffc563fe154935ab1b4d7aa436e7af683f7009da6fa96c9 SHA512 34065a120d6bf123dbd892d51ea336e94ffeb8a15d39f9c7d14eb57b04b434da8b488ad6c4cffbd28fc47f3f6ef544a5c4cb6eb34d012776d0991430c559e143
@@ -69,5 +69,5 @@ DIST thunderbird-91.7.0-vi.xpi 720551 BLAKE2B 894926fa3cbfe5fce7191eb1f34f11e09d
 DIST thunderbird-91.7.0-zh-CN.xpi 726136 BLAKE2B 2def8d6a98822e9c886002700417cf1a33db10551419da964fb818c31c7adc0dc47599ab8f4fb00f63373cabb8d20190d28ba7b7c5e6111e7522a96649d0b840 SHA512 5447b0b16597a500e3339d7282bcdd9e6927e719e8c8afa5c71cf608e7a18959be66a4cb3c49eb7400c8fac38ee0ad7d00b41ace819288eb1a9cc2456a32b7ae
 DIST thunderbird-91.7.0-zh-TW.xpi 727309 BLAKE2B d6dc9650e74a0df619df07d17f3f694b72018fe2335e315c30a2efe0182cdec222ebc24a5b11de2b434a6ebd7e9c9309ea0410bd4d1f45bcc49eed79726aeed1 SHA512 14e74a10c7f0b213c39c0cb1a13d9951a6129d4b009c94c24ea4e346b6ac20d9250fd6a0541414d87af65267e7f6455fd343a6ffa1a2f51617f52bba2eec90a6
 DIST thunderbird-91.7.0.source.tar.xz 409451024 BLAKE2B 0fe4c7a2da979a8061b2cfe0dce43b675f8854549a20ddacccccb52e20ec814e3c13776ece89247c76e82496ecfd886c7d23d0997841a3c999803c917eee5651 SHA512 2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0
-EBUILD thunderbird-91.7.0.ebuild 32320 BLAKE2B 071e18a968b45b918075151d4f8b4f31438e1d52adb49cf1e814b17bbf8028661ea603013b638b67f80b348e7a2c21afb2a1d3e24d1cc4b0a4cca3f560f07e7d SHA512 db4fd2042a02e4121a831d4cdcde2094bb2837e4a95bc4c24d521b4ee4d6462085d828de86ab1c6565fb708dfad44954ad299e95a3cebf7ee7f311985316fb47
+EBUILD thunderbird-91.7.0.ebuild 32569 BLAKE2B 6cdb3bfe5c63c6e9354d9543e6aefd08916673921bd87a11606078d48d2cdc60ca2db8bc0f8207c4f5b2fd2fe10fc90b5ec67b56d343a4fcabb17f0224317d53 SHA512 f3fbd9ed51def80da1dfd54f2c98f8574c4592f857d4f40e835675ece91b895293f83fad491077344032a666d9116a71bd74c01a1d853c144e9480ae19a26aa6
 MISC metadata.xml 1952 BLAKE2B e78ac58e80081dd01c281d2cba54bcb5521dce4ed39f8153b79436c009ad718c702cda83c8a9183efe01cfe307385a08d412b76dcc09af4f7b170e40b4575d17 SHA512 66d426940a5ccdc1c1108dda0a5ccecdf3021bb9abfa40c968a1fd6dfd44acbcf984edc772198ac5dc3b6b6c557d021ee9940500feb1a2a4e6688c9f5f1f1fcd
diff --git a/mail-client/thunderbird/thunderbird-91.7.0.ebuild b/mail-client/thunderbird/thunderbird-91.7.0.ebuild
index 7c1faf2231ea..908703b76654 100644
--- a/mail-client/thunderbird/thunderbird-91.7.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-91.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-91esr-patches-05j.tar.xz"
+FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz"
 
 LLVM_MAX_SLOT=13
 
@@ -510,7 +510,15 @@ src_unpack() {
 }
 
 src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	if use system-av1 && has_version "<media-libs/dav1d-1.0.0"; then
+		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
+		elog "<media-libs/dav1d-1.0.0 detected, removing 1.0.0 compat patch."
+	fi
+
 	eapply "${WORKDIR}/firefox-patches"
 
 	# Allow user to apply any additional patches without modifing ebuild