gentoo resync : 25.03.2022

2 files changed, 12 insertions, 4 deletions

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