gentoo resync : 09.07.2022

3 files changed, 2 insertions, 1207 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 3556b72ac3eb..9275995f7339 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,72 +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-09j.tar.xz 19508 BLAKE2B e9890c37cc2f86414e2167dda830387f6bfc06ef1f95347c46ae97b04da0515aa66bb8733e7312efa04205a08895623e8b95c58bcd543564e8eff5ba77a91612 SHA512 75d9420a7a5724420766c220c92650c8e16966d0f0c9ddf98e23a3b0c11dee255dddefd762d247f555c2e200b6796cb196c8eba4ee6f5c3567b2ba0c42865d34
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-DIST thunderbird-91.10.0-af.xpi 561895 BLAKE2B c794ce6b0e504f9d85ca954fa0d93cfd886e614ce6187f98555482297ebdc75132b3067f0e940fb4d2664a30aa71a74ff8d4bebb116df3706d48c290f213520b SHA512 465c30a199e6d9f85f3c2b2306d91cc07822dc57752e750c527aefbc5e8da13c91e1df03dbe37d72c377fa99c6472c682a9b7b94550b3b8088d7b49e9e82585c
-DIST thunderbird-91.10.0-ar.xpi 665731 BLAKE2B b450a3563929686946ce5c74f49f9976ca69e5995a13af19893f7ec25cb64236207f805e4c99b02387d4eda32c46ad1fdeebfb59f835954a9c9a55a7db1a0b79 SHA512 f039df005d4bf66ba38491ac9986d6543cc6c8c5d7d1d2eb30f286b8652e0948406b7a1fa85422ed1dc059e3ba99dcf7dca0f8d54a92a0e7b6fe00d2964b8414
-DIST thunderbird-91.10.0-ast.xpi 580512 BLAKE2B 57e31d67fc6c59c148cc8556df40a5d6173867fa6e7d8f1824be682cdc0d618b67c1365b87caea43adfb93994f1693bcdf070473453b068a59c055ec1c3607d4 SHA512 e92b2ea2ed9e4617cb1915f7baf32abc930fd571b8039c657f01b3cb4139bdb147f2e7718eadb8a7601cc1968c2daff4471624476b0b95ebca403ca75c846a39
-DIST thunderbird-91.10.0-be.xpi 695198 BLAKE2B 4c1887fc67a932df49977a590dc976cc13dbeb478cfa46367d4e7daf420b8af1823f382a570db40a5ea32f1b3affe450e4aa4149f9dd7e52a1339b9b56a26954 SHA512 70d5029d8c0f6cd9b12db02f8000320c17c3d70c331d329e254e4007b004c8791941fdfd2825b4b2e3a36a3e0715e22bd883ebf332f6aa23efc62d0306ee94bb
-DIST thunderbird-91.10.0-bg.xpi 690996 BLAKE2B b2ed32416183b4c30865d43702e502a22f24d010d5a036ca5f6e11677e5c86bca823e2f0e2583a3103e2b9d9c2aee80896d9ba6b08ea92d3f1b79a9e2944d9f6 SHA512 1b7074e9e79182162e889c6fb9585328f9667d89764463bd95e821c38d62a02440702115d389cefde71bcdeff1016dd066b59b1f217950873d81ae5cfb42bb53
-DIST thunderbird-91.10.0-br.xpi 620588 BLAKE2B c0d6fdc6dd61a723194336b305ba949d61e6f82128da79d99e33f6d4227f4acd4bae1ff14302a67654f0ab6c828225c538ddfd1600cb7ecd2756c8d8f9b7e414 SHA512 119b0b62e9e26cd3f7483150052771b4227f202bf5ed6ebb28bd66c95755521b0cfb3330a2cba679ee1af48f28974875394ff40d24ad60f102f7d3ccb7ccd8d0
-DIST thunderbird-91.10.0-ca.xpi 645976 BLAKE2B 3c5f35a4e46e40baf0bdb0bd14352a0f78f7c4a95c2d2a612dafda5338d7923926a0e36b894ff599bdaafb813118ade58f1830f3b0584572ab705dcf3edc10f7 SHA512 d1494f59dadc03da9300e4731f4eb3631a3bda1b6bd3783a2393d6cf376482c759e4d6ec89f5cffaed00481887157c2a5be353eb753dbb351d1bb3d69600a157
-DIST thunderbird-91.10.0-cak.xpi 652066 BLAKE2B de64bd3a01130053332f14a1bb4a42063b8fc4c38fe58ad0672b1a5c2e1931b6e7644f71977e6ba797d1840128c80db890ef3783dc43cdc35ca7c1c06ade3e66 SHA512 436ab9176e424fd44d8bbb9f55330b1f63e32820e263e7c11c8aa97682675c3b28c8c1ed72a374ec981b50ebf94739ac47815eacbf1691aadf4c6b8f5d4e1d8b
-DIST thunderbird-91.10.0-cs.xpi 711939 BLAKE2B 2796105e518cfa93fff2a0d99d935407a9e626032b12cef65409424f02e2d5704d444b2ff6d1a8de91386c6b25ceb5f82eaaf2665841a153d5353ab9c9e88399 SHA512 0c167b073f86201ac090befacd518e3d01a578056b6ed5799b0d94d8c211ee016d7c7c782372b0cc752eced6363fdbe21acac4f7b31c72332968e14d5750b94f
-DIST thunderbird-91.10.0-cy.xpi 688889 BLAKE2B d29e97144abea36368d360b29a8e4de1ffc9140f7a9e41dbbac4956950c497d8ace78e58a03c3ca59a161c3d044fea4897da08e3c20f7df40ff58b8057ce4c69 SHA512 3490393b5567f73d92e07b1cdac67ac87140b55626988970805297445d00288bd87f5d8e6af4ce1b0706dbeb94ac00af42af30c80db8bd76f724149661163714
-DIST thunderbird-91.10.0-da.xpi 674445 BLAKE2B 087e2bf0ffb1dcf60c7bb786792c884262fd83ae7ad68c9748fd54a4c1b0bf995e563484e1a7b76571032cf58b23f92ab4de0b58bd1f160dc0e6446e0cfd73db SHA512 582dcdc386a186b38d1e17bba3ee6c440aea552484a4414c9b8d01acc6d79f74bd5597482860e188de004556382516b3b08d41f22cff6fa338333416e17285ed
-DIST thunderbird-91.10.0-de.xpi 697527 BLAKE2B 15f1906ae7497b2eb882a091dbd44eb2c8cfdaa44612f27229ccaee7578076301f71aab15e4907e6f9c303dfb5ac77fc9b18226cb3ea211ab9483f63dac14652 SHA512 5d4052ed64e8f2c76c040cff29f7a49fa9bebde758ad842463f5b83b7d8bf16ea5c6aa0da4872408f8ef36e9532118f801055450077a45f914302129fc669b20
-DIST thunderbird-91.10.0-dsb.xpi 724000 BLAKE2B 2fed239b5304d1ca1a347638815f938d3a7bcb6cb347162716032434e25026b4781aa3e275b3c11d75287250b22e98d40a46ffcc6baaa07407e1e453c37bd83b SHA512 f59c58904a68def999e044bd7e2f87baa25eae785d6ec41f225af09cada49e38930f4c0e59ac11a0462088ba7162825f638f93fe4bd1c29c018046495bf0be23
-DIST thunderbird-91.10.0-el.xpi 821181 BLAKE2B a8809eb67d0596334e2a037d3195a7f390bf94382bf1413a1c8bc27be4b2984af59c4e6945fbbbca3cfa75a853f5980e2528f7cc3138b2a9990fed49e20ef2cb SHA512 19a663f63fff7cd4b8e02df4187050b953b2d430ab1e84834ff176dc224c4d727ca0d853da59091de54663ceb960ecc78e4c2352d1d4337b996dadd77a78d5b4
-DIST thunderbird-91.10.0-en-CA.xpi 647814 BLAKE2B 803af21e1118ec9ff2762ed683c7f7c675d69edd783b077520a39abe25046c5b5984a9138d268efe77d218aa6d9a4b43abbe3626e8d0c1ce7b71170b9c65b9ec SHA512 663958945d408b30b933a522ca6c36fccf1a0c351582469155d18490103f912849a897ef188f4921ff41dae7a7d1ca4acbbe65531538dddcac70da4b8825b6b7
-DIST thunderbird-91.10.0-en-GB.xpi 650553 BLAKE2B 49c0744e737ef21738a74b6f9c083634e2282136f75255b3aed2409fb134b32222595cc767f47f48df2ae3358b4dca159c383e5cc2445a6e724952d51bdecfd3 SHA512 76a681875978abe62e9f7a9fb622dbd7777893320936c83d9b9954ccaa5fc83e40cc168cc6477ed7e134deceaff7abd454c0cc02e0bec1292659b4a019b867d3
-DIST thunderbird-91.10.0-es-AR.xpi 700497 BLAKE2B 795e775fe7055afa8f309ab430ae03a2b9463da7347f70a85f855914875958e9ff8f51eb38233cbaadaeedc0fcd6aef9066adde294af671a637166633534c3dd SHA512 839387e2ff2292811670f2fbfa7b9ad2cf3a99be2f79783110d42edc1cae4923394b2bc48240083e3b35996e75842c9f8cc101fa70faaf3de79008968a1d2da0
-DIST thunderbird-91.10.0-es-ES.xpi 630921 BLAKE2B 924901fff5c591514f4899ec581ee7cbb6f492fd9f93dbc05eed147d6e3fa2415260b3965536dcd39cd1734234adcf8131a7bce5255a09b0567a6c6e54354c09 SHA512 ca72d6a347c5348bd62ab9731b09bf9b5f887df866419c7ac61106272ffa42746fc4c447c2a699e31b06b54e3df6d2786140b6750884782d971936b4a2ce888a
-DIST thunderbird-91.10.0-et.xpi 672171 BLAKE2B 73ac06f0a430e591c8c4bbb1e0563e01beca76aa59adba12b02b8bd984d4d7485f03eb5b966b1ccb1ddf6c466acefd09aa89b01402094b7b52f1a677558db5c7 SHA512 1ddff301c1bcbc83e34616d47fcb6b3b07e2b2471d9f816cdfc7a016f9d2479f9c6d806d8996929963ba7ae7ce45d42b9652e47263ace539087c020b9dbb23ef
-DIST thunderbird-91.10.0-eu.xpi 678264 BLAKE2B 7921fd2f681c45d6855494b605667c5a08f856c70197f38a78cf7a1a856a33e58bc359a442f9b0030159e2407f03c639547d832fbcd547a2d383b16f6ece25a4 SHA512 b599dfcd7768e398b0c7a40557336c34c55c890a41cdac0030bd1719fd5f48b57a45012be5fb7d2510298ba99dc7c5ab8f7944b6107934a1950b80c2d8562dc3
-DIST thunderbird-91.10.0-fi.xpi 676630 BLAKE2B 5edfcc3b4a6305ab31916fd7337a6e1869f506dd9a6e5f12f33140ab5a24b55f5130b5c9a6d9dba90ddb86f940321285233b9d77087a6192fd04105f35de28ae SHA512 ab029aba6acc6de4f12ede9cb4e2af7a3ebaf536bba2e8f3ada5dd63cb3d0e078f1e84338bfb8fde98d2b02fa1d8802d217356607844de56fe38169c4f53f362
-DIST thunderbird-91.10.0-fr.xpi 711454 BLAKE2B 8f4c3114b47dbdc9f8b3c9240f0b760e68ce7aec4c0f96cb69d3bdce639d1b94d4afc5c1af696498aadedf3ced23f751ef8645ff9ace562bb715ab6638576981 SHA512 1b7f292afcafaa13a906c7d475460905a202a87048b75c47f248f930920ec5fda3d8cd24b6fad4c3bd5b2b4989bd6df6a63279cce6a8509aaceeb40d11447dc9
-DIST thunderbird-91.10.0-fy-NL.xpi 691881 BLAKE2B ac4ab827df1f231c6b128abcfa605c9a827380906dc2e5f3b9ee55ff24ab3afa01596a01f7389bf9052e901d608adc70a8f2d7b1f7fdb535e605fb498cb9f132 SHA512 1d4249ef295ff1b075a617e2cdd61cfac1cdb29f4933f200e7ae469f8f1d093003c60035a58e0f73cc624460b572ae4c47bf6d59d2bc32b43da8ef2be5ab30a8
-DIST thunderbird-91.10.0-ga-IE.xpi 613124 BLAKE2B 9ea11ec8deca222482d8b8f890d1a29c3cfa0cf9e8c41336903b13ca0d1764ded7103a227cb950e08b3a428f82321f1a73d4b4edf69ad463145ebf422658a25d SHA512 62c769a4358f3587c1f22ac2904a8d5e03829211fddfe502c805ceaad1e5f74ae4b4d9cb7e6c26263f58bc5baeb1109d5a63f2559b02ebdb6b3bd47d5eaed837
-DIST thunderbird-91.10.0-gd.xpi 640649 BLAKE2B ccc5475c828f2857d5accea263c76c2d405f536337b35302a79814b6941deaacb472cd0c30727bcd9960ae0d2f862b5b1cfad1302ac4524182359252e44d4887 SHA512 1c552be998e15de68cf2f7ccfd409411d36f1372de41a7a94fbd43620bddee37c68f46bd5df24aea10d5613ad1b5748768ed06f584e5ca156debb34e77070834
-DIST thunderbird-91.10.0-gl.xpi 677790 BLAKE2B 5ba85b141bbefc4321b5c970473c3beb831f9326d605734265388cdad36b71c9f2812e86789e0d7e8a9f3882bc3d381981c0d576f0af2a65eaafe28765d9c364 SHA512 4282ca57d2067bacf63a8de759c319e5604004391f9a677b2d81caebaf46d0b2ed2c32076f3b0d810f88f30c966fee3f53d9373e0504f1cbdbaa562927c05bde
-DIST thunderbird-91.10.0-he.xpi 673190 BLAKE2B 9333306dd3a8addd514e701ef48b10360d21c87e483a91ddd88842cc1195b57a71d3692ac31772cbe23a0f841d6e7e8124b0cc0ab5357da40de6ad87fdc6ed32 SHA512 d1fa6ce68623f3df4aeafe693799777dd8a2017b8b44c15c2d6c329b9790ceaf345b6d5ccf7149146d594b14c5196d0ef25180c165f03fc31089f0d6a168104c
-DIST thunderbird-91.10.0-hr.xpi 653581 BLAKE2B 696676e83232aecef4111c9db38e617fa3230f013a449dd4cd1fb8103d1b39e90fef2d39ee0f0ab08fd2464bece56208cd4eaf7f5178493bc8a43766c0ea7425 SHA512 9fa4d256b8c9c1a0a03a340d0f36ffd6395ef3852c862d92b9cd340e990ee601dd79637e8a417d76877dde20262652e54a1afb1404484bcd79f4be8850b71d53
-DIST thunderbird-91.10.0-hsb.xpi 720811 BLAKE2B c8ed48f222803e6a4fddb79f6724a5f2abb3d9022086397897c30fa5f32e9a802d2342af93fa89078dfb36ad087b048b512cf651fbec7068847b09be18bb0b36 SHA512 1d97df0642cb0869400886564be83df6b6aedc3f873d6b37c25d56c6612da07b5edaebb585deb1343f7f73fc3c680c93f10582ed6164a46553bba3c929973917
-DIST thunderbird-91.10.0-hu.xpi 723401 BLAKE2B 0cc692bad0323c71446b2a9d286dfee00aefe61d532910f13b5cf69440910b57066db27b0f29ff01cec326345e16e347207392439d731f02d484d8278cab8804 SHA512 005a658cfc0ec507bc8f1eaf227450aa7597f2f1cc2f55f8430a2bda8ca691f074cbea8ae28810bda5358eee8433081aa2f6c590418b600ff04257d0829c062b
-DIST thunderbird-91.10.0-id.xpi 648251 BLAKE2B 9eb478d8721c34183ecf3ee252bb76474c9a8e656e01d9b9a7f5aee52ea605299d7e5c09b1e0f555043e9f9c2991209dd7f2e0845605e14251e8d1f2dae5c587 SHA512 ca209636dcb898cfa327778a2753b771e96f7a0734a517ccf5311a69f9e5d88ab9409af18ebc3b078dff48b5a7c9f5d5fed7490a8126e6975a3f014c1f6d68be
-DIST thunderbird-91.10.0-is.xpi 682262 BLAKE2B 89e9306c98962d0bf40d20b62d13563ecefe9593bf618306c3ea4fbc769b9eacb38ad359d8b86b94063216b12a20359c4c6c0b7354a49c45b09d2f9e5247b0cb SHA512 828e05386c851076bb2b5a983c668e5860087c42a601d415d808de2f9149189aec109bdbd69b89f13badd9b277eb21aa1dc41569ff93cc86a0038c91faf18138
-DIST thunderbird-91.10.0-it.xpi 613334 BLAKE2B e55eceb18bb9715ac3f4ee392844d2c0ecdadb7cf39ebe4563fc76641cb806b73cb52a2c016959e720830eb4b6b89d1717ab7ed8217863e24fb700d0ffa9a4d2 SHA512 6ae1a746d7700a614a98d34fb85445358791f32a31352dfd365d3189d31ccfa0804494ec17b9134db72d33d1b6554ef84c53f8866e1fcc1b1ce376c6114f337f
-DIST thunderbird-91.10.0-ja.xpi 756467 BLAKE2B 4911ee23364f5847a07afaabf8546c8977d68f67ce2c423a9b3f9ff0bb170c2f1da27021a8e5c4329a5ea69d5db368768c6da8dbf81eddfeecd7ab01ae57de0d SHA512 0253e9562171401c80d8b4b95910716bdd8a4b8daa5c538bc208a650b7aaeb44145ce6d9669f7ffde5e3fff3a63fba882dc1b724821a8edb92655b93b68e2fe6
-DIST thunderbird-91.10.0-ka.xpi 762629 BLAKE2B cb9c34616858e5ef5e35320aa2bffcd8642bc8e4ba2d33c59eba7c4e0ac9f41bdf736754a11617335b5edf05998d46985924f81775978b56f28e0595819a201a SHA512 3acc4df07cb48ab0d4d662f9b50e00fb858c232ed5d154ba53478232c7d39867bea02e20123789bba63ef9edb2f3ef7566edfb053996d2887dd110de7acf5802
-DIST thunderbird-91.10.0-kab.xpi 677085 BLAKE2B 973e5ac5f19cdcfa30df54011873ef6495d6832a0733d83198c068b875d6580b42e5f7d74ca821287c1ef54069d9f69c916c5d57481ae4edc2a241d9e6509214 SHA512 b5cd3ea29f877a82c8e89929d04c35eae462b9ca27302a7688c598133c73c97a2898d6087180fc53b9f395fef29da9b2e0f8d0b7f20346976ae4e5718d3b3117
-DIST thunderbird-91.10.0-kk.xpi 745524 BLAKE2B c45e234884599813b183efeafed3f81cbd13e4372fcd200c9660519309790989df3ce5b4d31755416cd35ef87931aec2fec1aaa834ebcdd4af7a6b96201b5489 SHA512 180399f26ccb7ec7b6880753bb856c07c428013124e7f83b60061ca26e8c3ac40a8348635e922745fcc0d1df2cc1c6e867c01bac8b719242b16c6aae6bc2338e
-DIST thunderbird-91.10.0-ko.xpi 704769 BLAKE2B f0e04ac758057db61e7f6b1f3b6c226620df0b38139d76ef5e40cd992015e281467093f07790e9a33d44e1b49651c6af280e7d4db4c46d657265d6b5d6ca23bf SHA512 656ae353da862335214d8fdc6b9a7c394a182cabee8ab74b9ee259cdeafa3978ef12d91602d23c5746ca780436137cb51cd23e6e2cbdc699c88916ecdb14c6c3
-DIST thunderbird-91.10.0-lt.xpi 696045 BLAKE2B 5d183e9a447f36fdb4255f6a71ad5acd6a95253ea3e92b7c75f9ad1e95ad142850e19e87c8ff7800d8780081f935edf30dd96206b683127fad089ad7e746f302 SHA512 069ac965f5c93321aa3052bb8b5679d273d6e96529d2fef1d384fe232c8fd82e62d7bbbfa65ae1f91e22bad5299de5b20d835a71a39be96dc520da23421a0c66
-DIST thunderbird-91.10.0-lv.xpi 618525 BLAKE2B 08a07e3a67a040f827c36d4dc16475c05d8231ef807d62fade51df3552256a0b831efecf698bc9cfc5dbba0da50810690dd4c74dddb76e4b8f84386e67d67f4f SHA512 f2e97a2da11ded1b3afe6fa08251fa14cc31ee220c73c399195daeac729a65e0782fb58ff27a86ed4c2b02192c50a92db849212fec07a13044d49090dd648a7d
-DIST thunderbird-91.10.0-ms.xpi 578081 BLAKE2B b8f956a39ae9b2fc3e63318518e76065930e8a4a02cca261d3fc1866264f487fb25886e18299c39159c264876df90ea04f62f4f2fa63cc054d448479eacf597e SHA512 17988c2b396ff3d38b087cab8134fd6c84320acbe77136428c3af9d4fc6cbe103303ae517994616bb0ee64c2db474ded04b154693e9f6b651e6cd973c929e078
-DIST thunderbird-91.10.0-nb-NO.xpi 653326 BLAKE2B f366db09eed8d0f972e2789dcac7dce7a970d195f6b00a7544b4e199b1486c25b42838c3e698cad795d18fb431c27281747d90333a0eca9fa741237dc50a417c SHA512 52482ea904b5ce1fe26cf9080604711b5a4b8549d6eedbe0c7ba0a422d3d2be617e0bc8c451c251a1f7bd6e6c400b699cbc44c27526dfaebccf1539875a444c4
-DIST thunderbird-91.10.0-nl.xpi 685342 BLAKE2B 36a8d0b356331047a6ea2d687cced2272551dda8cc8a592108d8c69c4c75d73bd114505c313e9db98f5c8596155388b4ecabef0b8f63176b61b1dd676511eb41 SHA512 39c6b71e4af3addf63de33318abc59e7126b410cefb9484790a6f513dd8b22fc77dbae97bbf7b2c1f665c1737d56c6116dc854b24069600b85e2705047baf4e7
-DIST thunderbird-91.10.0-nn-NO.xpi 658572 BLAKE2B 1da31a6ce744534da20e3089bcbcccabc22bac25483e004003777a3a0553daeb11038527d2d419485fd9ad69c6c47640d8c85fb11c4b644e2dcf81f9ab5462ba SHA512 44c54b1109234d7c6900bb260e98c736eb81d72a9c70f5871fb9063b9848dfecbc92d03d820498fdd94520bc5a386d8d2cd35f8fc1b308cbdb56394ff49d83ae
-DIST thunderbird-91.10.0-pa-IN.xpi 652336 BLAKE2B 51dbd06890e25461d29c8205fb0c65110f4dc000172cbac60d714e21767e6d869edebdf644fc177818975dc2e628cb4bd9fcbb430bbd8b1b640f9aa580d1ec0a SHA512 e93b16f15b1f4b8455e896633aca14dd93743dd6b81b9ebfc79edc6d36169b658219d97cf8b2945b7b5fe487e40896d40881a175ae2823ffdbc2079536ffc55c
-DIST thunderbird-91.10.0-pl.xpi 694112 BLAKE2B de8fc81f8e168399d9eb8bfe2222557fb19769c55033099a5da8e0b7b9645c1ca28e6f8bc3dc5b537498c7d1003cef07b73b08eb3c372a59a090ac7328ad5538 SHA512 3fe2639ee2d318f38c48aed73194a127264edafc3039e12014aba424016f7cb1aa65b3951f057d19b2f304c99ef94a8a861cb600842d1493bb0cdbc6b58a16b1
-DIST thunderbird-91.10.0-pt-BR.xpi 694133 BLAKE2B a5bb76a48ede988aa3479c7116ca9e6395c51aefaee4d70f51ff7d8dedb091626745fcd749a001be39820856674441a650203fb78af49d6f51926f4b2c393f1c SHA512 81d12c87cc1536fd0527fd5972d6342ae35888c046f2dcd69563f502f7029454769ac0d5d3ad1d97ad4fac741a1eee6ebafdf066403720bd22e113a6c20f028e
-DIST thunderbird-91.10.0-pt-PT.xpi 674674 BLAKE2B e8d97185e0d8b2a6f7e8e048392f13dec4ebe987130f9baf4bf1f4dfb23745e6fc37038cd6f170758de6990d11d29445c44a7e8679e9d8a0fd1a416d48911c00 SHA512 767bfac664aaa6fe1df648d7521b247d01fa5b573843038fa328dd160e3678bbb49be296aa8d4cef1a0743746dd0fe915c9c1c7b8d6b91b915385da0d261d0e7
-DIST thunderbird-91.10.0-rm.xpi 687616 BLAKE2B bb10d71ebacd5f863ce6bba3f15371b23d25ac699586351752a4ec81ed7bae872504277c988e0ebefceb6d44214ee88bc97e721cb9c0f90357e9e643e43cce05 SHA512 0536f6c47bf6d51c93ff055a83a8c48ab400010cf95893ef754686cd4742c0b168b9ffc8cfe78b51f7b3fc6a6305961463b8244b33f89ede66124e76a0efda72
-DIST thunderbird-91.10.0-ro.xpi 661347 BLAKE2B 2b3b2c1f157a46c8b42d6645449d20499bdcc383c1bb6047faed94925d6dce6d4cf15ae882b99a2ece9996d1dcef3be6c1cdcf7fc0b41da49c8d45fce60505e0 SHA512 73fe6d78a0e4cd4c18b31a9576deca4d996c743f199015054fe09b8bedce72b665dd7eb6f7eb60cf0d71aac7ea0f3639c1f34b06412ce376615ad7a05d7788de
-DIST thunderbird-91.10.0-ru.xpi 793375 BLAKE2B 3d172c48ad3fe74bb0dd9bb1f8444481ad1b6d875626ebed06913e0cdf221c06d096a19fd04e099071ab3765271616e7d4d059811689fc581875f9f406f919d5 SHA512 0e9ea75e343a1584f76a19614b8501c3e73ad903ae26f6d9194b25e611b55252312eda9739ef80cfae5ef66ee4a9161d92fa58a598c25524a41540b24a71a118
-DIST thunderbird-91.10.0-sk.xpi 721094 BLAKE2B fb06547cf3ee6f3a796ad90b787d77a00a2699c8e124b0f9aa81bbbca280471ca959444291cd15e438cd361dce3b7f1422ca23708338ff77b55132e79a9ed650 SHA512 84b840e71b4dcb4b45eb7b4f0cfb07dc5a176048a4a393d75b51f891eb8c911f3b9d917d75bcb313b7c37aaff34cf3db353b6d903b50c34f18af9632079750ce
-DIST thunderbird-91.10.0-sl.xpi 682544 BLAKE2B 6ba6ae8e4005b55aa7ebb6e88a75714e8bd969dba1e0fc7da1094c2bd653fb16f1068a545d66be2a7b14461edbe4553d2205785f184848055fad36ffde4579a0 SHA512 9198f4eae1c184f161e2af2870cd913561cba89a92758268c34a6b84511a8d5fedb6072ef5b21b6cc873792a58202d9e023389dbd6034e3e0e1cf7124bdf1aa6
-DIST thunderbird-91.10.0-sq.xpi 703626 BLAKE2B 084cb86545e897fbb416f920af9186687242df612c3b8c7ff553607cfc62a9fe3e219a3a8a86b4a27fbd7c6811a5d5cc7b1ed52ea5e1f4f59ac5e2846d6113b5 SHA512 eb4c04444e3a3a86e21e889f1e7cc5bcf9d814394a17e1db48965a017e632b13cfdef6d3187a8569200a682db21002be37b3a7dcc705d4d256e449089f693ea2
-DIST thunderbird-91.10.0-sr.xpi 710565 BLAKE2B 237688088c89fce7430af6a79ed36f0b128b3d5e6310f14d1f5e6f71857e20d0c730f33898767b891a1028209f01d7a0799f554a5b55c8e3617c42042526b8c9 SHA512 7fb1bcd61cbe25679c10d3fb982372b3d2b7b0648cebaa444c79b603fe52a2e7df9454d7b869cbc0e2579c3ba230087261ab71ac8fbc5b04e76d81cd95a75456
-DIST thunderbird-91.10.0-sv-SE.xpi 690969 BLAKE2B 271898d66b20670e207d2bd2ac2260496a844b7782f57d770408dacc34916479df058b621de007b2018f3868c7b27d84121f063bd67ff164f220bcdbc12ab4a3 SHA512 d06baffe34d9b0bdd39520a97a54bccf663fa9b422681bfb83c1e5e9d2d9514cb9af235b624b594fcb3cbfb12b6028c9636f6b7d9278cceeb48632636ee3a60a
-DIST thunderbird-91.10.0-th.xpi 748755 BLAKE2B 5067a0fea089bcb734cd1382acb692c321200ad044c5bb91c3883f7a071e1bbb3787a573453404d8951f70919e401316427b5a9340f7f9814e06c875b7ae287d SHA512 2b3857b007bf8bfa151779f13e92d37ca1cdf457b0a8e3c26597e1a25113a1167bd92ce067f830866c9fa9bb87dd5ed4eadb088ca41549c5595d35b1bfaa7636
-DIST thunderbird-91.10.0-tr.xpi 699654 BLAKE2B 22d9025e069257bd9cf23a4723eef6011a7cea18f86e75fb60428b0d3c801733e839b4f8be91149863dd0089d4ac711a5904cf580f1145c69d1be9b4a1cd368f SHA512 36ef7c7b6a4b03c0d2aa105bb8ff8a43f789a469cc99e3fca5c7b116d087001889c31fbdc4d953e907577ac5caa0e66eddb5ae4a1504917971a2b82864591395
-DIST thunderbird-91.10.0-uk.xpi 798483 BLAKE2B 6f4a41aa1b30cd5246bde51a9fad6d0449e23654161191d2cfacf7c6c33919c79570ba3989736354c96853d05466f6bcbe7672efde596e4a2f5b27294d2a319c SHA512 d4f111a0c73dbf9d008417aa322f22f6d151051821b156003e6319d258f676cef32dc3fe2cb369982f3c97cec2a2e174556971730dadb5ad3ec5c1e1d58ec16e
-DIST thunderbird-91.10.0-uz.xpi 595926 BLAKE2B 6f709ce5d58184b1a71e94234ac361b82f55dce55a33a94b344b054bfcd176e8949e31968e6ccc0c0570242f6a3d5e58b16a17bc533948e30b9b96c62950b040 SHA512 30f38ceb5bbfbda850f51c2ea5878e7019eb0457afbbc3e15d7912621906bb75c35cc280fe900d8a1176222904ec0dceff08361e79aff3e46f7aaf59db640d8b
-DIST thunderbird-91.10.0-vi.xpi 725528 BLAKE2B 884e4f8d480f78badb209ed579e6eb3021c9eb1497aa63b60b6b4758bd2eadfebe048dd5c441f7942095befeb573813f16fa9befed5714b82c1aacb4d9122611 SHA512 325add54c8b6f73d02efe86360982e391da3d057f4e7ff7bbd7aeaa3ad633652d8acc9c6b7c23e351339f697be5e2dd8803f2b41e0b4ae3db894c71161646d6d
-DIST thunderbird-91.10.0-zh-CN.xpi 730903 BLAKE2B 01a23c174e38fbd70c4812df869e1c4a4a617621281d691049e07aaabc1780a92472a5b3672f4f0a68faf6b86e77cacaf94b463561219d6e0cf9573e2eb04f10 SHA512 9aeea9dd0d6954b665a2149ccc7f2d92d64b3ae62c04e845ae87a015d03e7395827a62d83bebd087865051e1a9cfe56d209adcb86852636fb437bf87a4213d6d
-DIST thunderbird-91.10.0-zh-TW.xpi 731944 BLAKE2B 188f54a3870bfbba928447201d4543ffe1bcd9b3ca0d7343434b0a1d34c1834b3be8554bedcc7c37d740af919ea9d309a8e0a1aa383fb5c88d5f624cc205b5dc SHA512 2b55044ca105c79b6c5644445aa48a4cf00bd1ce7f4982033ed93edca098253736d2009277f732b404e30d59a6183202f65abb4286d402685ea3d6fd1eff6eb4
-DIST thunderbird-91.10.0.source.tar.xz 413952892 BLAKE2B b1b76a2ab0249e79f7b18cb572b1fff95422aee3df012104b8f588de0e30f528ae937da16210fd75878239125a406cdbbf878e3de23de75c3cf7818a13d65d24 SHA512 335d47e93d5fce4ff6e1ec0305cdaa86031f28289cc06f30ab3782bae484ad10ac4b9aa70911787627744277715edffd8ec8c3a2008f00b8b90ea02b0d79fcc8
 DIST thunderbird-91.11.0-af.xpi 561895 BLAKE2B 0f6a75b7ba17d99804f1384f1093412bc01c583907fc178b5adc6dc354382b87896f2e716e6f2ffe94337ef1bfd9823431ad6801b8209d0fafc5fa50c721f568 SHA512 af33a27ef12b50e179e929e05bd277484663e30daf156a73414ec811489b68052f671bfd57b79f7d9013706648408a223b2bb0791979caa76773db2ed2b0c670
 DIST thunderbird-91.11.0-ar.xpi 665731 BLAKE2B 9fa5d556e0fb83d2350543ad412e37dfa900a296ead57bb667efea550be5f7f58ddcaea30bd559f6bc1903cdf16cd35b551b8a96ee2d3f42b3123094aeb9c311 SHA512 1f6f1fa13ccd6f38dd33a311a5340bf9b02f8a443ab809e314e4801d5402b63c17f0248bb2dbd653ea30286f92ae71c37de5d9fddf5c1a563aca0c1b442b96c2
 DIST thunderbird-91.11.0-ast.xpi 580512 BLAKE2B 21005bd53c65fcafc4c0bdb1c3befb91f297543de2788cc4713ae07e844a04b3c1d1308174ddf0e032e71be2d1e992177b5159fc4acefeec09cc2b00a0350658 SHA512 a83833dc921104ef6524f4d3dd5a50eda34795a4653ca58a1073ee24fab967417a42aa976f740b2ece4247ace636ad6f18bbe704712085bd6c925ff6f71f45b8
@@ -134,6 +69,5 @@ DIST thunderbird-91.11.0-vi.xpi 725527 BLAKE2B 104190b96e95b5ced672b4eb25411ef3f
 DIST thunderbird-91.11.0-zh-CN.xpi 730900 BLAKE2B 72873985e276a600dcadb35ddc5548a3c21f3975bac03edf52629b7073d23baa7465f531109d7859ec312775ecc411a6a0a49a381adbf5e93528a4674761490e SHA512 41de80bc7367bf9e07b1eaf66bae1267b0085d5e1994f116f8536dfe826b9708f4d5b8b0ad54d5bbc00aac72f22461129223e8281a9e6f7c020f8582fcd9d27e
 DIST thunderbird-91.11.0-zh-TW.xpi 731944 BLAKE2B bdd33ee5058c0e16cd9701876ae68f095b54e4059cec630cb7b2a15428416714fa7dd0852fe15139d8f4c9cd628db8d6dbc4d20e22fc0ff4e476c4dda20fdceb SHA512 6450e341d72472846fd23aa65eb0a931c797f9c28fb5524b8fe4c1c3f4ab12921a57c750fe4877c98e893c2ed729d2ed32691ffab5dea4624acf6fab91f3d01e
 DIST thunderbird-91.11.0.source.tar.xz 408098564 BLAKE2B 01a0703438f51bfb8da1949b005df1a8bbb07d39b3d5e3d0ae92566ee84d13a111ffeccf8869faf58eef7161d6ffa91aa5d95e95ca6e7b2d7016fae709d010cb SHA512 26b9242259b71eb14ddadffb34a59d07d515bbbc0cb806eed965a73b001ee81b3b1128d06cfdf3e50d5da4ef97be21d11193be34a582d3c9f27f27d2f97d90d2
-EBUILD thunderbird-91.10.0.ebuild 32910 BLAKE2B 0871e34b12d504876b90d628d638f43c7e391b09cc7d4196bd814b5c2f252b4c6ecfa07e19c9558967b8a73cb934c164739487b26382a49a865a92da67b64bb8 SHA512 121908cac302f00efe255348c2cd7d424fc1410dbf4f53a5adc551fab62e41a26c0b607433865419d770034377c5ee63e9119ed3d3130209e01b8fedd0392d9b
-EBUILD thunderbird-91.11.0.ebuild 32912 BLAKE2B e0785dc0ecdc70f5f5210a37d28ecbb8165d65296085c8527d68d0d00b60fbc61b392c87c3fa1d9f37eb2f8d71fd5e5c43e1ac2e63b5a305f9cccc32d0c88515 SHA512 5bbc10a232b5048e1ba04607cbe3405b7be8046961298aa1cd9a9efe421513eedb4269baa337b2bf7b32dcd333428f9040ec16283c878fa90d3f3ac807f8a0de
+EBUILD thunderbird-91.11.0.ebuild 32910 BLAKE2B 83e1cff3a3bbe6cc083a9cf22233da7882e7b57e45e8b48df324c23707c9b32f8fc6b78f0c7671b4b999b1eed7b807951bd56ca555d336baf6907003a6613b54 SHA512 44261fbe7d9115d2bbb98c5b95028e1a6d410642c0e5564f71377c37581e536ced16d8509c4949efeaa9b4d9fb38ed078d8b734c7da0352a624a504b068904c5
 MISC metadata.xml 1952 BLAKE2B e6fdbdd02f7471c54e61a02580f791bce574cb8eb0fe3416f621d8e55d89c310325724975d70ef5bcd1f89225ab3c6017836103ea904540ae423b2c3df57c98b SHA512 5acdff9aa964c713b8ef9abf32e8e79b2cdc1f80cb68131e58ce8734c0d55417f1e17c8f51956595aa66562c8f16d58b2a50de2b8079f86df9106b24da78ae05
diff --git a/mail-client/thunderbird/thunderbird-91.10.0.ebuild b/mail-client/thunderbird/thunderbird-91.10.0.ebuild
deleted file mode 100644
index 1bd8475d018b..000000000000
--- a/mail-client/thunderbird/thunderbird-91.10.0.ebuild
+++ /dev/null
@@ -1,1139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-91esr-patches-09j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
-IUSE+=" wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-COMMON_DEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	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."
-	elif ! use system-av1; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "-system-av1 USE flag detected, removing 1.0.0 compat patch."
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ld.gold is known to fail:
-			# /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-client/thunderbird/thunderbird-91.11.0.ebuild b/mail-client/thunderbird/thunderbird-91.11.0.ebuild
index 2658c7c65528..4281a50e4e38 100644
--- a/mail-client/thunderbird/thunderbird-91.11.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-91.11.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.thunderbird.net/"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"