mail-client/thunderbird: move package into a safe space

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

16 files changed, 1507 insertions, 904 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 1f43f71d..1632b291 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,58 +1,65 @@
-DIST 2013_update_libvpx_esr.patch 14356080 BLAKE2B e54473e9d70c7beb85762ceb39e02d8542e7b33c5f81ba4faab9a3762673fbe65868d2130ade3503f17c02c7890731748682e86aeb31369f6deca8ce9ee814eb SHA512 d8ca55023b22516461275f4be96e22d7c0a4acc299f23e2db5e15f1eec09e4f08a2e10d2b3d10c697219d70dba948751c5be5ec0ba6ef85122c419bfb805a472
-DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
-DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
-DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-68.7.0-ar.xpi 617169 BLAKE2B 383913959eb715b75e048d3244c00676af99e043f575a168eab698b49fe165fb2ae1258f8d991b3710fb3c8fbd7737118e5fa0f960ab14139902a2b0dd6a1042 SHA512 303669b6a8e27d08ce40bd6c5d70b9516110caf4012559263166b890ac37c94873a4377deacb1a888f2e2407ef7cda75c16e06df70e95323557061a2035ade22
-DIST thunderbird-68.7.0-ast.xpi 551299 BLAKE2B d1512027a8ea3f390d4e9aec3c431a5a015c32e9df1140102c63d4405e8629d8196f6557a4f777385a8185dd68c0f7d15b42d2de026a13723cbe65f986ad883b SHA512 0ce499f794fdd0543f8d45c3caca50202f87edde1accc6b82d2f560fc7559772eede3700242040597af7cfee8252a9b23d5c2aa534a53cfc2a634a9608081c0e
-DIST thunderbird-68.7.0-be.xpi 646280 BLAKE2B 5f841fe907361dcf0e9379a81b65453a8d0cae84e13f45b45572d91dcc0e5b3281419ec99eb8a8442e6c06e9fc17f17f0202556151ecb8b91360bca23cb6da61 SHA512 4504169a324374be237b0ea42eb40582f29f076e852a052ad340b43df0c1bf63bf5eddc513e3b53bb56d064af814a6ce142210cb605ec57040b2878d5c2b1b52
-DIST thunderbird-68.7.0-bg.xpi 646228 BLAKE2B 73957e2d15489daf1781eb97367f93bacce048d8f748db46600e9f5f586ed8ecff8b08a1f895e9f2bed7a6caf781a0ce327e767f292a7614254d80826433ca4e SHA512 1dbd035eef08f2f0ab040d1211c74cd7206f41eca2ec390554624c2f0041eb4fc525b0596693fe46ffbbfd31b1527cfa94ec83c9d70ad44c22c241cec10fd890
-DIST thunderbird-68.7.0-br.xpi 574853 BLAKE2B 7c0d1fe819bc233126eb0ac71aae83d0d2d6ff6d8bdc41f878c8a523fcea789fdb9a804fa7d8675fe15ac3fbb551c2f5e10c720095d56b6f237f7ab03461aed9 SHA512 28bebfd4afc5cdef8c8dfdabf54ac92a460438c9689f7f50296374f429cf2974a8d7eb2317d0961181774bdbe88f6683999d76879b673191f3d66772e66a3b3e
-DIST thunderbird-68.7.0-ca.xpi 578441 BLAKE2B 09223b64c8ea237984ac59f4f92edeb8f77e3cf2fe40f13630f6b94e6e72e797ebf3a898040ae0837ecafaaceca8978608da8d03d3a9968ed00d5d7d8603a07f SHA512 152452db3a828f9a28c44b23ada822d6f7728aebe5c18ff906fa00db9f32270409365709e8596eee6d7ac2a7ab4248678f8ed143aed4c4b1091ef8b81a82b7a3
-DIST thunderbird-68.7.0-cs.xpi 603042 BLAKE2B 98eca34d952fadd7d612d6abd375f56e1bb70de9a0fa96d9303b977c0d2a0aa88f76020c91f64391b8b0101346daaed2e4d8bd2eb3d128e57c566ed3e2bdf4f3 SHA512 90ecaef1083a9e8e281ccfc52325da1fa6ead8b3128df7af9faeb8b5138e0b587769bf87328c3a7080a2c45b8981242b2431ae70a90abb76dbe7462cb2cc4c0a
-DIST thunderbird-68.7.0-cy.xpi 589902 BLAKE2B 8bb88ec9b2c0f6092703213ca9f819efa85675736f9255fba688e45e109223773df677e9584c37008ae943dd8b6feaf659795c2ded92c8441e4074c01530d177 SHA512 ed35da50a58e4d5ed1855f1c3d904384e52c41cdb9a434a9d1e27664aaa4598d52ac11b0dc2761d6c286edf3896fc0ea0ef390c17681bc48a8abfd87a20dc79b
-DIST thunderbird-68.7.0-da.xpi 588349 BLAKE2B f155e219653dc67b56a565fa5a3c8ab6303f871d121a08295626abd3120238440f0be74b58155b9a001b050aacc37fa0202e7dca86d54c18f942f736bc4bcb99 SHA512 68ebd94aa90938eaff18354d03384ba09e54f8a1e7a4482ccf274c38b1e1722304bb22a4cbb809f97a1d272e229cfe08f3cd905ef2c340400dd23feb24d587d6
-DIST thunderbird-68.7.0-de.xpi 597805 BLAKE2B 8e6003b3578498b4be564557e6fc8666cc99be8bf4b0b31a355ab1d3aa8b70c1426204bc7bf9694d0e9d4075da709bc6734dbafb10f0bb13c212d491951b6ebc SHA512 f8dbc7074ba0e4190003096b597ebfe2bbfead4132b3bb05ff705705af99c25dd1ccb6ff5248b28f7f278b1893dffe83fc595d3b6c68c197ce8d5aad6e8eac95
-DIST thunderbird-68.7.0-el.xpi 699224 BLAKE2B 69161e102c21df01382ad06acad4969568733e0554765bc063303c1dd0b1782cbc7dd8db1d042261287a39a7adb6e25f7c7bf6aecb156f898ae9811a5f76d888 SHA512 b88817e31d3dbe019194be3b3445eb8630437e7fa3b23c499d984a04a3119ff2da681a51c73984032eff6e82210ee9e04c298ab55d01501631380abe3dd36707
-DIST thunderbird-68.7.0-en-GB.xpi 556403 BLAKE2B 36655a3c6486f2fa5dc521c8bb2f14555445823c36e2b2cfd39c2c8a5ba8c184144f8c9383dff21fed4138e81004f17749f61a3e4ee26227a5741f52c1dc29e0 SHA512 648a5ddfc43af5a701040a3adb91af7cae43ead51fd1f86c8d219b2cfa59a6180221765f6e7c6b78f94360fd5442b27a02e17e6c474fdebcf5beda8370aeea46
-DIST thunderbird-68.7.0-es-AR.xpi 596552 BLAKE2B 108cdc80d7f6f493d22287616df821e62527cf95733a510f74569380d5be3bb0918369ff2ae01a673eaa57ef1da4f93c44e0d075ab6879c4cdf1ef183205e380 SHA512 63b90cc2e7c68209bc914d286b1abaf95d91ce5b47ef4e521a8e6a6ce540f864c55cc981552fa9e5621b496d10737a47060eb3963822268561de9edffeb84381
-DIST thunderbird-68.7.0-es-ES.xpi 518352 BLAKE2B fd5e86b23cb86d537d5cb32498402e25117e7be0cda2035f4ee13d8c0455c3ebf7542ddf4306a62f9065376dda1d16b200474bbd851cd36da1aebedf5ff806e8 SHA512 be8e52ae697e51a76d39460b7753b499424c47877aeff7916cf876df609c3594223286c93ff71c4386a49838d394c757c63162eecc8b7a915736ca45c86fad6a
-DIST thunderbird-68.7.0-et.xpi 573581 BLAKE2B b78846ec81eeace3f40eb370c3a4c0390f5ad8782b9253e49cc2a99a16bad0b3cc7b16e57180a28664e51c48dfb6da6f045075a985d619961b0eca113acd2413 SHA512 df1f5837f1e75587ce7c1f3c5e09c9433e6e75ebecc2c1399cb781cc85e256b79a9e8c26a006229fb570483d638991aad4741aac030ab6d51289386578b248da
-DIST thunderbird-68.7.0-eu.xpi 579946 BLAKE2B 8fd0cd9ca322c0bd7b95fe76e86029cb639d6ab49a986dce444c75bb22699980091559557e506c49b75b0ea48b0cc8b66cecc203c46270968bb7c2cd5b31d311 SHA512 a3561476e47105ab6d8b36e2375903ffc37515c805de7d75c26af7e59e6ba28df0374df660c51b4d59930df055de3e9bd8e5c3ec991b2895f86647fae3d0f54d
-DIST thunderbird-68.7.0-fi.xpi 578419 BLAKE2B 49ebb583f2aa14761dfd0035a7dd1f9eb20acdaf475ef0241375d035bffe6994e65161b533509edc25d052111eb5fb3fd6f3c2fc107c7f257f96bfae3b30f48f SHA512 f9f103d5351ca49cd3bb071feaa0042d52a8728125a1a5029f97056506d6a41ef7089ce51c9fb5e900201e99a11ef1a12af857e4d69d1fd45330b79c9d272f07
-DIST thunderbird-68.7.0-fr.xpi 607811 BLAKE2B 13c042a29efab204db5874400cadcdb369653fdfd8021270f1f0c1b53866b8e48cbc6802d7c12a6230e6d6cc3ffa7f8f5fecb9be4d210dd331f1784806e68d4a SHA512 9283139da4ed518b3120b28cdebcd80df31c886053fb38c27926d8c437c606bf1be7e6107585317630b2b077f95bfe19813108b71abde64f9ffa7793a2c18907
-DIST thunderbird-68.7.0-fy-NL.xpi 594468 BLAKE2B b7ea1bc4ce24b8b5d91775e3adc95d5126c51e1dd0b8c5c318f99e3ac690d31ac775a60f4ebc5bdabd2a16ec0eb9a6db95cf970af433da40946826bbf1ab4fe9 SHA512 c0a463274b8a70f5f2dae080db829c1db77236e274d4c912b5961d12b65dc70952eb38ed9a69cb46639cb5021019c512e158f1c6183ded58da368226e3ed2aa8
-DIST thunderbird-68.7.0-ga-IE.xpi 588711 BLAKE2B 090f84287955a76d30ea9144eea50fbb7265ad972aeb53db6246216c6b3258a4de20f7505f373b5f5baaf173235943d4324beab802f85c556f526d7a809c2a48 SHA512 6a70d8cb62e3f9eddacb2720c7c8f3839c408f2801507c60d069bc9c4070b2c0be8f848c55fde5faaf56fe4ffee259fbc8e80f3f6cf41a95a4ab7ffeb46d9937
-DIST thunderbird-68.7.0-gd.xpi 587110 BLAKE2B 4ebe3f6f0fd7a1ac465dbbfc6d49dd5c15138cb8128e7b9c5b8dbc39a45f1f42b1373d08cb3558097c75ae3823d9fad1411c4ed06c809a5ee6d1c3609501d485 SHA512 5f485eebf995a788978113bea428c20bb205aeb573b56de5a020b28e757e0c921e1b5349d03b858abc6531e8b596d362f219ada8dc04840d2c29f94c853f8b5c
-DIST thunderbird-68.7.0-gl.xpi 568397 BLAKE2B 8c35adedd9db20d0ce89ee316a241ef13358e9e701dbb2ee96aafe96e1e985fb78fd0c7535c2c11402286399ef2655fe23c5818c17cd7f2f3aec0b24aa2083dd SHA512 1b595ddbfa0e775f7b1e2b0d271c9bfa790647a7cbfd0e5fc8d93c07dc0d75c6860477c69874a32d635f68ffaf8fe4718684368712aec3241cbd995456571ba3
-DIST thunderbird-68.7.0-he.xpi 604788 BLAKE2B b1e01dced005983eab6a55cddd71429918b2e60b2632341f3f17267dd6ef582d6c2e54d385025ab89e5a9c834b5ac4d73c3a88fc0cb4b022bc2b83f83fbc425c SHA512 2d528981a6a697d15ff2fb6ac47e195bdb5ea0f29bb32e10dd0c8c5b67473aaaf6adfd039b90eaa52970caf38ef3195ac4254818ab588ef2faca82772beb9c63
-DIST thunderbird-68.7.0-hr.xpi 583784 BLAKE2B e7b9c1d22e6d6903874798c86ff469b5dd27953fee697cbf2ea4c37051f6a0f5ee4c7f933f5b2a59e3cd493114605813beeaf536f73806a36313461c82543932 SHA512 693678b62e93b90635fe8532759cda9a743d87f29e458eb91045a7ffefca9c3f10b6ebe7974902cc6d3ae3a05c4cae622f7a3fba25fcc91e10942b9fe4f94b06
-DIST thunderbird-68.7.0-hsb.xpi 616035 BLAKE2B 75fcb69367e7bb3edd2c43dafdbd0af33e2ce62ce9f65feb7669abf55d38368c777fd399c23516546f3be62fe7e579e7fd746fbd5d79273f8396287a1d2013b9 SHA512 8a889f989d0692bc0d0db23058dec395295fe380d575c3c67d1f903eb9d6e07dc405634d9951b1184df4b6fc235c38dcc4dc23521787bbee33ecde2b86c35aab
-DIST thunderbird-68.7.0-hu.xpi 618155 BLAKE2B 16f535b17fbf5a2a78897be9a627d0a84ed54eef5ee4a78830177aa8efe25327e6cd1b7f592c69753ce233eb5534ef8bd45beab8d95f63a131a63f0610816526 SHA512 e46a50e75a07d42cd8b46d42970434e55ec738668fe32bffc1da5fb01fe988d843ac8b61520cc5ce34568f2aeff4030f4d04656cee2871febc7d2f984ff94349
-DIST thunderbird-68.7.0-hy-AM.xpi 631979 BLAKE2B 4dc8b6ccbbe19c9f86edbc2f124952ee9f18fd48b49726d95a3f82a8e46eb03ef8d4d058e4a2ca7a7548e3c791d0172a5112498f88f75fd5f491e78a9ff72849 SHA512 a7d4ff58bcd83b59025df990042883b3aae0fc1a7e7e36047105f174dd2cf56db2c58151eabb4e0de94d456195aff26bc36a277bda4f9e75be51939346e96c11
-DIST thunderbird-68.7.0-id.xpi 567747 BLAKE2B 4c0f562866a2691183f89c5e2bc836e29ae2f0edb050fe91a3488eedf98101c31a686e6aae892c526665aeb9e2c49dc5fef5870e813d1f7a895f14756ee4e96f SHA512 6e752e11f0a96923358600f51cc43481e58c147e3059e9d08a8b07ffc60a72f4c8371d9d6ba660a91bd7cadec904d9610d4a1cd98e60f3965da3139bc998b038
-DIST thunderbird-68.7.0-is.xpi 575441 BLAKE2B 14cb4ba32988824c22547a549c67d57c467800b14b2c36d51e711bd74df2da247068ce0fcaaa31ed4749e71f91524591d28c46c077121ef5891bf06060b8c53b SHA512 16b943516b5769aef029051538a911c8e09c142af2d466547ee533457edb1d6f1ae65a903e570940636014cd021adcf1bcf8b60dff7be5a48212c708b772eee9
-DIST thunderbird-68.7.0-it.xpi 489520 BLAKE2B 223d0195574dbe9ff6e432ccbffca4135204290b277e5870dff3ee9992ed5f346049424ef57bd6fa7c894d03886bb0f6f675db532b78793e4534d4132dd836c5 SHA512 9358697499a0fde859cb72d27bfbbb2a039fe1c121690673bd71a9624adc50858b7930da6e6c672c5f1808196ac36b93cd650fe69ebea1f0c8e12af9fbf635e0
-DIST thunderbird-68.7.0-ja.xpi 643575 BLAKE2B 24ad0f9dcc2b338381a55b19a0d29feff794fb8a369e52539af150181b6a88b71699edc95cec2e4b7e194e52b1c0abb7069361990efcf66ca3e3876c5ec14e49 SHA512 3e22160ed91c6ca601133f387dd8862de3f3ad5e22fe50e3b2409efe97f0e3cafa089faf78511300fc3cf9afbefcbec8848f1be6dd4e2eb9800c8067f3b6e6a4
-DIST thunderbird-68.7.0-ko.xpi 620529 BLAKE2B 4afdd5746a9796e46ccf5f5b833d5d1b3915e35832c8a51f7ad1e19e7c1521afdb677f3766251d5300da40ea8066c8085a79da341f15594270bdedb931cd9b78 SHA512 659cd141d31cd1049582df95241b6c021a1fc1966cab8b08042cfbd29489c9875e320285c4a302d8b79b7b9ad1ef3b3cfd32fdd17529ec129c6776a136a735a3
-DIST thunderbird-68.7.0-lt.xpi 603847 BLAKE2B 12b947e4aa0864b7578ce61afcc3c0b23c58e82d20ad255d23dc64c020dc19443ee240f54974f54739c906e9077c7ef8375dae413a5d1faaae16d7adfa96dfec SHA512 067a8ca0cb87d77972da0f398f5abd5ee29e0fb9debc7f117f227770ee14ba4613b5e4866918a0138dac18d5ae5956778e98771c89cad9fbdbbe8a226962db5d
-DIST thunderbird-68.7.0-nb-NO.xpi 574022 BLAKE2B 8bcfab22775e00f76c8f90073bcaea5200faa837b0d48329cb5a7d8ef9471527e3e3f910e8b422e6a1e770eda53df0a8e953283db67c5cfe6672ea552542ae1c SHA512 c3e00abe1b293c3d041d58f59a1aa169a751ec78203665a45e062ca9e567b37d3eec1c9964040015a0d95453c9d634f2b4e1a6b3d9e66b67fc39d9454fda296a
-DIST thunderbird-68.7.0-nl.xpi 581354 BLAKE2B 803e282695ce3b0727a3115f89fba8a162364e42c23c8fdadc1db67f683fd5cab79fa0c6a76e06512b2c20551a2388fead320ba14759a2379ab4004f2437ced0 SHA512 142c7615d50b5366bf287670f1cb041696ace347613c921c93543d288e38d35f8d85650e1df19e61e60d4d4615aa259981ff8afb5c9989f803fd2db93d0ac864
-DIST thunderbird-68.7.0-nn-NO.xpi 574949 BLAKE2B 73a724316c54ba7ec31c043507eca0467c1e4fbbd822463a17910932f2dc6b1ba2ce7c26ffcff277ef80e4224b6ece728c7885aacd4d08e923b9ee2e9366a26e SHA512 d9217e334ee225b851d2fb1654d1885e861176aab9cc59d2e5fa2b7151dd6e984b19c2186eadb91f0f817cd05fcff472dabb14113074e7ab5933ca3530efd062
-DIST thunderbird-68.7.0-pl.xpi 576086 BLAKE2B ff4b026a333bf2b96011fc296ae82547c0efd5751e0461d60e645b4cf2c36782e8dc262ca9d6009362fe284e54eff898f765dfdf33517e45b2aaeef45eaa830c SHA512 2a49ff18711c3ec0b9da481f7470fb458ab4acafbc3f7780fd6f2c0527eb95a82d3de052bd179d8b35bd783ed4a882087efd49cbdff9609df6f3c09f2d95f790
-DIST thunderbird-68.7.0-pt-BR.xpi 589837 BLAKE2B b362d6de0fa75935496aa9275d874bd5ea86fcd8e57df1b9556d7126349bfee07900a230f4bb08cbfec8b3964c901e7db8e6a09dcc8b201f8d070e3c406897c9 SHA512 f50109c7f248d8fcc217fc7e1bebcd67a4d0b040c36484d08df6e39854af074c59b1a5b8bde720ec4f965330659ba24e61752f0363181df8f6b0735f00bdd863
-DIST thunderbird-68.7.0-pt-PT.xpi 588103 BLAKE2B 014ea181b57c6a602ed598a265d6564a882a3221f7bb85fa6f91d8a6b378769d249cb1b9a2abf0c2658bd977bb546d76ed6aca9cf93804706d83eb34de2c67e5 SHA512 c087572e999364e469aad4b9b2855c23d25a8074bd2faa9367ceb6ef6af7c07381d31af2226014ba15d2ad87151581a626c3f3ad4c7b2441ceacce3ea6bbea42
-DIST thunderbird-68.7.0-rm.xpi 578050 BLAKE2B 098f2b646bf34b4cbff0f65867480a8ee05da38791d11eda852e46a23271ecc71cf32171255c7a1360f4cee1a42a15c09fee9f69ea0f71b091cb3360336531c8 SHA512 f9e203d01a22ba71e09e49cad625f6989907b18a0ff65539b0495276c3a1242313ec3361f84be9f804017e98282dd61e086ae0fc1ee0532afc6fedd71a7820ab
-DIST thunderbird-68.7.0-ro.xpi 594841 BLAKE2B 3d4341a0e3bb2b63ce986b938cd696308bca36d683f85c966725a0596fa593328ad72bf61186939eb35c8137e992a52012078058d316a010d78ed4e3be60dd65 SHA512 ca361550ffee692082c720d0383df19f8a69295274ecc63b2d67b5273e107930c322a0409a9cfd3f12d2afc3bd26cf15d2e9f60130f63de8477d97ddf747a276
-DIST thunderbird-68.7.0-ru.xpi 683326 BLAKE2B 12ce976f3ea5d4633691949fb56bea0153150854cf7b033b4b23d5c95b39ea7b5b325b14581ec1ca8a3288b4ce7f621916cde8195da54c3a7fa3c0adbc84fce6 SHA512 c13d850fd1d7729ebd0a9fa49de2047e8545fbdee6b0ba743a62f03768852f5d600014f51f6f703a34abb0b83bc640a08b12df7246da73ab6146f123342d5d49
-DIST thunderbird-68.7.0-si.xpi 637405 BLAKE2B 0d902ad99e077179bcb512a3951264c1c0ef9e45c6649fe8a5da7331c92665b25a56fb2a49cde13c37a34355bac316a8b64dfa15a8532ce2119edfa474cb4ed8 SHA512 184f3e5ac869339579c87679e58c8866ba58695d15fd9f01900250cf0302c7e3f0033542aad9ab81b278d64f1926e30a1e3f05728f157306eb193702aa153f7f
-DIST thunderbird-68.7.0-sk.xpi 609752 BLAKE2B a548e73b2fd874a613c2de04fb61608b60aace364701cd03ca79a5cba5f284bf15b39ba78a0fdb9fd99c61c749d03118a8ff927fab216177a41c87ca08c068d2 SHA512 90bc8bdc8b4787dc69eba196a42f848410541f5370566e3c26c8398b64b2bae41af98d613eb44947fbc361fb73b4dc96fd3a30b03fd8feca1274f05202bf812b
-DIST thunderbird-68.7.0-sl.xpi 590628 BLAKE2B 7576fae4ca0fc4977f109b24fd27f0164d20a744f55c0dba778686df1c1b631a26ab4c78c2e3210897c9da185400de1939421d613531790277e5a317c2aa860d SHA512 8b949a9e7d80800daccf0984b0e735cce00023a31120a217b96561209c5c559407a89983507d43b9348440c650a80e622ae3f52e974bf0d2c6c1ad7f044add1e
-DIST thunderbird-68.7.0-sq.xpi 598901 BLAKE2B 5417a0c71092e91b1cc89f53849da92609046d36ddd4c0d61009109c861c2240a9b4d2ddf8b9a5117a6338a1bcbb82b2b55219dc4c95f0b56b8fdfadc2916185 SHA512 daa2af4736bdbe6640096a86034a9b1a5959b75830f107beec915b43331472e9760d6f55292715338505f89b03084927981dbd9f81360d083614c9b7ed0580a2
-DIST thunderbird-68.7.0-sr.xpi 624897 BLAKE2B 00c6a5eacb81d918f52d8070d39d429f999e297e459d3548c696f6147bd4ff65a237867b1ca260b75933f4cb14db6cfc6f8fd3b0b47bc3e10f1990ae32823a7c SHA512 2d52efb1106fed0df969131a85c907de14bc6deea79f30cb2b65bf68e22143a9311a5b64d3153df51034df5ad0ae434b9b9f4ad3b27b3c10d4a81acc7961cac4
-DIST thunderbird-68.7.0-sv-SE.xpi 591595 BLAKE2B 390f4aa0e620288d2db563c65e8cf812ffae3f2fb195df7a37afc03df302320af90a09a93e3106bfa2d49f7cb81705333f2dcaa2295282cbe574cb07a7be12eb SHA512 4c37b052ddb922a23d6e1c82b7b5767445c22b77fae64a2e7c85d19d4cbd4d0696a43d9085a396aff8bc594f2de28705ed97c8d06e6f1d29a8d6a30fa18bd264
-DIST thunderbird-68.7.0-tr.xpi 599707 BLAKE2B 9b5296d5a9cd03b387f468daf7f79b66761ae405ca15075be49bae21a64366831b5b937824a4b9ce52ef6f2aefef571b09af735a1511962cf8a0c9fa3c021b5e SHA512 4e4ce67c43a636579f68ef7e13e01bbe870faaaa21b91f263ac02459c81882e2897979856750e1753e3e2b02202319c5b6f3c4e90e4e5f45efa3dd217bf6d3c1
-DIST thunderbird-68.7.0-uk.xpi 671454 BLAKE2B 5cac851136f44492865f64d741bfdcb3488e9e4ca431d9f7624eae6385dc1df9f953af0734ed8e676e1d409ec4a9de1ad79ae6b5ea835a625679d8d63e58f16a SHA512 0967f17ae34fa75693c8e963865208c776dfd5a384d14f19ddd5956deae69c0ebc497bac5f95e3fa1a27bf7c7f68c6efe5a1b77b0d9e7fd4933031c924b1608a
-DIST thunderbird-68.7.0-vi.xpi 623423 BLAKE2B 220b6fc90ef1dc7e04aef9dccc70328e2f9ce04f06736e81076ace17363430248b22e5449d234265add455a4fd875f7056c5c7b1c64ea22a09f11dd9420efd5b SHA512 08cfbe2ddaba990cd4b714e2ba51a6c472f26c7ecb4ac2a81b595de23533cea686f4ad03f7bcf408d0ba8b6b867fb21ab08d5b753ba3add253d4efd0af676724
-DIST thunderbird-68.7.0-zh-CN.xpi 626820 BLAKE2B 4cc9ff32c4ad28a8204d2efa2af7e7c0b895dd99234d32fe7b7da297bedd7170dca4dc4bfc83b262410bde28266d729163ed23d069538f3d234532ae51b2a6ee SHA512 3c3f16b0d9514be3ad53832ebef7770d9bda8d700a99aa636355fa48a7bcf5f73f544087a8e8820a3a1de1a645c02dbf2e345a3729a42c67f8dc885874204e17
-DIST thunderbird-68.7.0-zh-TW.xpi 627476 BLAKE2B 691aeae9654c206a74c91cfa046a9c00836dba6ab22bd5c6f2baa320d9935adf65d40407bc3092c14b72244a75f61bad880c938468f48b3008c22e9f24b8a17b SHA512 f1f94129f28eda53327a49b509fc76cf950fe0cf75976cc4ad83bce064b0002156d5002474fe3244f6723e8addf446448d36828dfa3aef9e55abc031859518a5
-DIST thunderbird-68.7.0.source.tar.xz 339588604 BLAKE2B a623374aa00b577110d01b1c2c77064b16afc6d283150b81367eae74d33c7ecee9ebdb7866e5d9d69e9d28d9ec503ef1890ffaaac8835954e6b7591e0a3e473f SHA512 fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f
+DIST firefox-91esr-patches-03.tar.xz 17204 BLAKE2B 6ef1aa70708f9e5a5926f712d449bb40c86d449389a5d4c1730ada065d4af252b08cd17eafaee7cc01ea0c50c53b272c38a047760d3cf94ba34375ff77af534c SHA512 2c02a6ba36934f796a7b2d3ded0b68689ce4b21f21396004e829102bcc56e302c89357d18c4f353c62f45865dccde27230cdb016d99c42b3ae12b4e5a6a02e6d
+DIST thunderbird-91.4.0-af.xpi 560247 BLAKE2B af3a2fc1920244ebd4de83b4f074fbf203ccc59343c74bc7ec2cc3dc3d4e1ca6ac72f821e32be8ec1805dd34ebc20d532791de938ad92a467c7af4e8e1224b7b SHA512 e32b3261ad097a0633fe4a5f36f1d9d8f547f5da737ef84248a439093cc4817d67ee66781552ee63a0cfbb4c6096a155dbd9a348a8033dbc32b2b1ee36cded21
+DIST thunderbird-91.4.0-ar.xpi 660313 BLAKE2B 70411d5ee7732b1be976e91fb3c7244e5c06c111d3f5eb26fee548d5cfd4b66f97eeaa50d67580e58ea0bff08eee5deaafacf6b5ac6a89ce315c5834c6822e31 SHA512 007c9cddb50ef8dbbed6e118b607cd48eb5e93be60953d121adb3d6f0b358d6aed5db9cc17d7236d88f531c93ee84a56be23a98a2b23a5aed58cf8ef58c41fbe
+DIST thunderbird-91.4.0-ast.xpi 577052 BLAKE2B 3b8b5d0f23080dd8fa894af8e20508d1d6eb8d48b7ddaa8f22a58c54b30557e78a8d8d70499c338219c5b3c759aa2e9ff25c6ed2058d00d6dd032a7be5283634 SHA512 2b48118251da81317f3555ce03b1af928a8e6415331b7fdcd64f33ab28f3782f81ad26c21aeebb6a91ae2db37a29329b85b4a2305b794b3c0503487f5bfbf4b0
+DIST thunderbird-91.4.0-be.xpi 687228 BLAKE2B cbac83707cc31b67f7bd1dfb78630182273d4de0a038fdfc6687d5f9e4bbee2c0f6ed178b8c443046eb974e1f25123480277cba5eea37948d2b64619447f2f12 SHA512 7575fb577ad7d7ccaed3d593c3453c057e8b702b7726e5a57a0f86bf43013ec3f784db882c834aa36f49c1f4f8fec475a5c8614240d284cbeb5a90c451c32a4c
+DIST thunderbird-91.4.0-bg.xpi 686416 BLAKE2B d513ddc6ca618466c5ad10096bb5f971db7e3191c86a5dbb1dcb2f701e55f6c58f0f2cde7d9f92254ef76a35ab540e9bd248222edb44cea3af5cfd1a05576b0e SHA512 6179c248bf149260816bc095c86ed5520f6d0eda6da6b44b30e0709aee63b76e2ef9ba66fefc7671d9be1c52a3113c77dfeb29647752c00b12d56cfe82f633ff
+DIST thunderbird-91.4.0-br.xpi 616018 BLAKE2B 1d9e436ef4c9753de14b139c9125e207d39aaf0a008d408589e79bcf416467e8d8114930274f1595a7dceb12eb36a4070952dc273429873fa7639413f732dbea SHA512 bb1753fe3fe58d556571be0175c76e49c0e27bbccaa7dd25001253f33d126d4a254e7000cea0085c9ad31f86863794179295adc4512b0f3060625a7e4ba0aa6d
+DIST thunderbird-91.4.0-ca.xpi 641158 BLAKE2B 9fdb1da8796e3f3949df80e3f707a30fb8214d696728e8726cab414c4b123aa16aa3482471657a10bf9c930dd8c66a9b5b42a6c41470094ccaef4315dc63baa3 SHA512 f77552682e332fee6ae9a25fa1357ff4ed37c718d7b795a0d5660ae8d29ea5f918dbe3e86ae0fd5cd1914ea183db67bc6ada7f5f250fc292460c158f8ef20635
+DIST thunderbird-91.4.0-cak.xpi 647216 BLAKE2B 306e4b471bcff4735ff2f4376b879aa2311b42b71b9246ee4e119257a83255df31ff816c2483a1221fb72a36dca7165067a224e5d8edbfdc22d2aa63304f2116 SHA512 26af8ff785c84eea0022bba873d30e00f09058203a7530d6a7f8bd999fd1350a9be48a517d6c227b10a3e42e205e1125d0ec05c935506f8278e4ea3163c81ede
+DIST thunderbird-91.4.0-cs.xpi 698288 BLAKE2B da6652fac4e8b751aaad8b97ace06fb0c5d8fa6200e36742005f6d304ed002f6855df9cc9bb5dd2e19907562bf489998a2de1ad46cae790042d6d1e54405e091 SHA512 3f66c6ee4fdc4d0749e89026664dcca01f2afd48c4633a08d9cd7cd8005f7c55f8b0e88c0bec6a91be1a0a3d67e26a9cf2f6f031f32aa6066a7e7cafc1b22417
+DIST thunderbird-91.4.0-cy.xpi 673997 BLAKE2B 8f9ff9e51e4e013658630267c28450af2783af39f663a5317d1676f93322d0c53d6dfaafed9e27e25f035babeb323c0a9405504922ce61a22c4f3112ac0516a7 SHA512 4f8c31c7a9fa10830022d9154c89046eebf6bbbe171a1e9e163a6994a75f10cfbdeeefe5fa7e156189d38a4df9e563b0afaaf32cda130b3570c833d849a7ede4
+DIST thunderbird-91.4.0-da.xpi 655952 BLAKE2B 7b4068cfcd45cfc34eaa26767787b649ee6cfd57539aa5763ae92b69ad759ed076793de1825ff2b2a71f0db6119116b3db7c54481cd14349452c3d3a32b12451 SHA512 4fbac163911ca6208c056cfc6659bbc8931c97fc08782ebbfb603297bcd061359f7a93526b604c0f939f9d48e63cb9834326c026db1ef5be3a45725050cb9006
+DIST thunderbird-91.4.0-de.xpi 687004 BLAKE2B 35e0de30d41356e0ddbb01d0889d6abf2bbb2c119f7b82a01c3d36409da1d53cc62342633f222cd22228762fb6da9547848c72a8932fa452d189bdebb4c8118d SHA512 2ffac5512986d18ec276450b30d00e56e8d8bc208ac2fc5538b4e18997c8195306a6178b99c8870fbd4e2f16a773fff4aa0c6f73cb1e7e36c8774fadb3e1d789
+DIST thunderbird-91.4.0-dsb.xpi 707237 BLAKE2B 12f030ecfc089c574f8fb775c7328e91ff02dcefa97b20f4638a1ca34d9501ea9ab96d7dece9fae7eb8180f914b815101f3517cceb7fbd8c665239d6ee0a7d87 SHA512 b5dc7ec349848e5c66449580f2bf512542c9166e93605fbe19eb87f84d1f8a70119b9afd5b1d857e2d77de735c48dae0e2e2dbab38d19094afe6bc089109a004
+DIST thunderbird-91.4.0-el.xpi 803555 BLAKE2B 226643a67a4eceb46d2a92020827f656109d9c7e20d552f76a948896b84f484a9897cd86d5a36cfae4a75079b5bc437374519efa3f9c6b4fe9fcb20bf3f4685a SHA512 3c548310ff19ca126722bb1588e57c8911a6e2b62a96cb3dcfb9e287ce13c98076bdf0ea1d5f83385633c61424c719b636284686564d7d6eac9d584ca23327ec
+DIST thunderbird-91.4.0-en-CA.xpi 634127 BLAKE2B 56faf8c950e440b9a84a845a6b73a4f173e09dd8815fa12ad9172e2ea6c2106624df676b149dba259dfce4572d48fd07b105921fd76e0f84e53ae1cf05470790 SHA512 8a2559caecb056ad639ced0d986e58324ab178cf0eaf90e8674f8f563a5f494e614230dc21e52befd775548a95d45db08aa74d9f1992d409d36ad15dde3137c0
+DIST thunderbird-91.4.0-en-GB.xpi 636516 BLAKE2B f4a8fbaf29520ed2298ebafee8dc4a84281ab4174c1d637ba22290dd51876ebec05dced290d29f35c35ce86c030753be8f588d4fc1f40dd03d66dd3a796b31c9 SHA512 47b3099763bd293d878b8d5cb55bbf30918b377ef3599c61c658cb71c03fa276dd31343a8b1beef87b52a9151d5d98ccc9f92cc6a3a9a397e72ea54dc830cd99
+DIST thunderbird-91.4.0-es-AR.xpi 685106 BLAKE2B 766e77a21b7cfd6b30bc0a9612404506435f5c301435e9adb537c12cf2c16fd5ed5028bb2f2ea5f724073fd309e897d45b29adac91aa8ac219b34bcc6cfd3320 SHA512 d3d81eb473f8b24d0cfaad80041925d90e5c85766300d3fcc4c3970a89925c8f707988e2d40673c325dfabde4d9b26ac278b094c336b27c03c3e7f4085467156
+DIST thunderbird-91.4.0-es-ES.xpi 573863 BLAKE2B a6d202fb115a1f4dd7b62f9566462a4f79a5deee9c2ed9f53f34a0dc33fd2ce60097fa5fb9bff680e1fecb58b8c2a515d9a4d0db4f3c74102c19228d907c24b6 SHA512 05705793ac561acaed3a238ebe96c4c5111d8aef813ce1bbcc0a80bd6174d856afd18640e3258387b7cfa3375b9856321775bbe72e2b4bb5f5e6956af7ff775f
+DIST thunderbird-91.4.0-et.xpi 598833 BLAKE2B f88503e48e86d8e840ac8897b435103dd227709f72abdef1f75f1c0b675e8c976e8d3efe01efad0464867782c1737332130a15112085c0569765dfb10b2d8ec4 SHA512 fa41244a4be92eba72cc7b47f5f3855098b472b19df28d67d388857e5a37d734e6e283118706d3d1ef68989e26c3d56afcec38d3c8b88d5c114e3139a2c88494
+DIST thunderbird-91.4.0-eu.xpi 666125 BLAKE2B 905ae9b2ffab6f212da2d7abc31da8316227ab55e964ba2be0621c4df07bd6d8945ee2d3a7195d08bfe59ff4cde6bf65d9f42635653bcfa6f2fdb37259935275 SHA512 c772ada54afda94d65f35fd3364e2cf47f5e07a242ec84eb6bc92356a5021bb59a0625be73af5fe3f16e78ef816b046273994175a9c8e71a6639abd08f368779
+DIST thunderbird-91.4.0-fi.xpi 664679 BLAKE2B a60586a6539a7f447b09d79116cf2c872b495e2a2b7356ccae5046fc37d2b8bf16626d42a5e34bc7f02e108c863883922c1293c7c26f9ea7c07fc440e9df11b8 SHA512 67dc54a22be92a848b4af9b27dcde56ed1a6d0d1e93e86c6b6958f1d5c68d8d6e3403229d3f5211d2c4db8d66c8c51fbd623029a539d56c314eb322b3a6f355a
+DIST thunderbird-91.4.0-fr.xpi 697506 BLAKE2B 18114b25ed2eb7081974ec545e187028b0a75b5d45535892170988ed75cf448a1299376fd45861638cea923a7af41cc2f46f98ed193b68445c529bfab7d70cb3 SHA512 d750dd7fb3eec0d85add501da205d64b9e42a3fb1a7098a4cf3cc610cf41dc3ae0ec9c973fd10c60bd173ee223a17ab3131381683279a87011437d3a89caf9c5
+DIST thunderbird-91.4.0-fy-NL.xpi 680172 BLAKE2B beaa2c1d6d43bd084cf5ddb8445f30b31b95639a86721d80e65b35cfc9d0312d4f484411fff6d847f2d0d8b319338f955c2bccc582a17ec87589cf7839dc0530 SHA512 c921cd0b5f7d2107a629f8e5e82088fb403f82639295e70eb17bda95c31724347c96d60db8a698da22f3c7047bc2cf2b1e7d88ac021188544986990c994faba5
+DIST thunderbird-91.4.0-ga-IE.xpi 601908 BLAKE2B 525228639a93a321029da8a25164bb727e8fd489f6048c8bb964d69381b33f506cb5572a54ae1093f286835fc9841dfe9cbf78f36a4c4dcac4652dd903c3fd42 SHA512 6f741034ff9464ef145c2e95dbc51b9a82795ebeede013faff93dca56cf3b52e3928699ede76ca8e1ec5040abb69f8d02ab77d3e10b25bd3d6a84693f797d8ca
+DIST thunderbird-91.4.0-gd.xpi 635777 BLAKE2B 3203a024cd4fd37e0f14e037cf78e6d9296dc123b220964803e667bbf08c3968758a730e19fd75138053306db695f8fe451a0a11c3656cc09cba66ceefe333bb SHA512 38779e347f9c56d2a0c2cc6a22f2a155811a95fabfab215a8e41977a5b178559139c76cb194780b5b2992190b86c1f57c632c35b4761abbeed253dcedd7695ef
+DIST thunderbird-91.4.0-gl.xpi 671075 BLAKE2B f8700ad84b3c76fc7b64fd78435b3b335c2f30dd98f8cb547adff57c2d1467bceb9495b7461628489bbe899d1e742c3160b1c4ba3e764e255f7896ea3aeb3d07 SHA512 d4c18bd12bb46224df346a814178561e384d94ba1d151f4f765ae7f316ad420c38a43152e0a8cdff06ddaa069367427cfdd29a7843256a15b0f91cbc2f85391e
+DIST thunderbird-91.4.0-he.xpi 665956 BLAKE2B 5380296583f4b7bbeeb1b37681975a722b692dcc39be39dc79b1d825b680e2fd0e9bafe19d24fece0b69386a232d6c9429eb6af95205baaf241d7d029edd2059 SHA512 9dfe492f520e127c6330b892b8d813f168e075375a26d382f6391596db8b434b2893048cd22e9d3c110259f2b07bf8f1975bdba37d58368a4a29a672649db68d
+DIST thunderbird-91.4.0-hr.xpi 641172 BLAKE2B 851e478915f698fbad37c44dfcbdc4f703b4d49dad237fa9ace722ff5b26b39472acc592364e7ebc5a873c277e8b22a8909e7f6bb725cdaa792ac21d1bf92783 SHA512 accf62283c46dcc1afb389425bf87a161f45107fb6218f8e59ac7cced567be7575ef24f80c735807ff16b87cb21cc9495845fe5fc5db1fe083ae09b2d70479b3
+DIST thunderbird-91.4.0-hsb.xpi 704706 BLAKE2B 0791e696a38c05e53b20cbe9ceafc641c980d652e71652f7620b96fbef64b9d42b43ae73691f09214a9f367030ecd422ec88b5f36834dbe50aef59fc81389d5e SHA512 26dfe083d6a1de9cee918763ac755b463fa86bb07cc5025a9cf50829d0465adb544d0c9c4fad2c760e7b49cd57de67bf4980b99879096179b57814575a13f1d0
+DIST thunderbird-91.4.0-hu.xpi 707539 BLAKE2B a6743d63fa58f170090c4eb504a7b4d2cf6ae6267c327e912762bd33fcab60192fe86652eb08417917d6fdbf31cd064de7b4c8a422b3b0a7e75ef08f0cabf678 SHA512 28d8576a610005bb2b96e08a2e0ecbe0fb2caf25a5de11fb5d813e0c0c91de87bb53df4682cb9b2d9bcde62845d21a6c7c015c388bf1f68e295b37a843afdf15
+DIST thunderbird-91.4.0-id.xpi 639035 BLAKE2B dbbe1483680b153d750a11e33fc1fc600e6c1db120d900b8eb70c5921cc74e6063dd8742f791808677dc1430459452e9061743433d9bb229333725ab12906e9f SHA512 6ea05d30403eb211a9538afacfbbaa521a0542e8c2d9db75376328674c8d6dc33c7cc9f8c612a53b36793202a27e32898757d18b44fd593ac05df9e0618f8aea
+DIST thunderbird-91.4.0-is.xpi 575007 BLAKE2B 47a401b43f9ed93ea044b09c3619b8b1f3a0b318983a882230db4d0930731bda39046d682d84f806a9086e323ea582b73edb13464f10a22e5b9a07ba5e760353 SHA512 982371d419fb59a5d84f194f35af85c0bcfcecc2e7417ee96ee404c06f9ff275caab1dcbfe02225ed992248f2ab976cd107acccbb76c8ae9d32353932ec0eb65
+DIST thunderbird-91.4.0-it.xpi 600160 BLAKE2B 54619aac4242820735c90224ec21925b17539088dd9e7dccafe96f96300e9cbee36f22b1abca6391849947d0870a3b8c11b83fd65213d42a0e204a6e58d6874b SHA512 b73a157fe2b1cbc3d301274b4f8a8740afc49ad759f70ba4a83a7df429663ecaf5af2cd9eefb99cf03235040d20b9a747b81b4548e9ac843300ce44b80a2778e
+DIST thunderbird-91.4.0-ja.xpi 741230 BLAKE2B db1de7dad0530d74683a5b805997eddf382657aa84db42782af8cc2e3546baf056978daa27ad85b7e8218bf90a721c2b206eecfd6859e30b0e00925313b4b16c SHA512 afbe3496f056b47a66a8f901bdf6455fffbc814bdf13b3765cdf5533f84cb64399a3c5940416cd3e69aa487c8382563be74354a14928b3596d810c78e02c531b
+DIST thunderbird-91.4.0-ka.xpi 746752 BLAKE2B 01b9be8b14b23ede9434bd92f765ab40eda2a026b4221ec3eee65ae5a9bd576d9feed0145893fa10aa209164f7986c8a0f440cc50e433526445b8bdbd19bd529 SHA512 5583981f8965b8f7e6ce2a250a10090e15aa6fc1deec78fc75e9568cd114568e4859ca848a04ac99e28dacef883b962650f0e91243451890202372eaaf0e7c49
+DIST thunderbird-91.4.0-kab.xpi 672041 BLAKE2B 0271be826e403d0f7da4b7b2828f23a8f5251ef720bd8b65dcc701bb54dfc5f1c19c51a072a458aa322a66fde1600d469c3baf9c0a7c9099ea2be94bf4d9fe0d SHA512 4e150ba287f4669104999a8144723f17778f811b521010d3cebb9fce5f20b22b356049fe250f7b5baefa7d6b6a8a6aa9f4b3f9f6509ea48d20755e6f32a8a018
+DIST thunderbird-91.4.0-kk.xpi 731349 BLAKE2B 0069d271461a4025eeb9610a31403348aeaac4a50c20370b986c8faeed44910965fcb6af8414cc58e8d0cebc9e0feca9a7d7fcebc10db00182fc13157f8fd2c9 SHA512 00e54934878fd5c6bb29257ede0eaaed924fc363678d9e4e2954becebfa9b85f91e6dc8d76989386a5184d41043f42c70e5900e2e58eb2db3de5d9fae153b674
+DIST thunderbird-91.4.0-ko.xpi 695482 BLAKE2B dbb69639f18545ca8d031f3d09b772f61ffac4221c224b0975ccd383724708207109940b33c5cf43a654429e104d87b28171022667fc27fd3902e03dc30b85d4 SHA512 5d47f4547fe94bcf6aaa250b17da956d6bf967de0dd1225f205f1106e4de4eb08256406662f7d2a3d1af1f02a62c4b9c11cd23da3fcffce18fa5d685b354728b
+DIST thunderbird-91.4.0-lt.xpi 688960 BLAKE2B 12216aa87055c33242070a1938ee62a804c7753de56d26ffde5b51fddee588603baefddc8b011d1dda7ff9da958f5b27f6e0d320811c575ec659ab7871f5399f SHA512 3037767d0adca248bba9b85e6c9e01b537bfb8d46f3ac5cc42f77aa42c3f18791437d9213d16c76b8d24899b6467b2aae1406a6bc2adaee26186dcb9b9405d82
+DIST thunderbird-91.4.0-lv.xpi 614286 BLAKE2B f66a8767eda30c70a66b52f84a7c74c8d80dcd7b917ab35d258dd1f5d2aa504028032a54a9ac8ab0c1af4048e1b084285b340103ee69464d5c0ba0c17763677a SHA512 6ad096a5f0724477c5a4ee3167dd0d7210893771bc69bc530876d328e1a83ed64328d8f8de6ed4009e605c70519df0c6d4c5655ecc6c9a3296f6f64900c2f9e1
+DIST thunderbird-91.4.0-ms.xpi 574046 BLAKE2B 47b1c2f9e2c505df965b5cb91a8d6281ad28d23642b99e47a1e246060982a2c1e09c7942b9c189d7eef5a6afe537c9932f4ee33b7577f78b38f3c3fc7fe8e2d8 SHA512 09ee35feffe74182190a43aa64b5bbf626c940171045f2c7e4f582c4bb0df1577bbd1de48d1b364c5da105ff55b00c780d07ec0414b6b5ea6c2f77c7f866bff0
+DIST thunderbird-91.4.0-nb-NO.xpi 645841 BLAKE2B c2019676062fb2c1267d86bbd299e1d478d2890dc4b53503bc8a6d7b754eff75d528c4b7e69c0b5cee553b119e7ec1bf93b9b78691924ccfa95f519d21f73f4b SHA512 217230a5f8c74226e4f6b1f81480924c50ec368c7e6ec6fe04a4845dc49753deaed459d0d35698182e447774255eb8a46fb66781b286dcc9a0e67958eb2830ce
+DIST thunderbird-91.4.0-nl.xpi 671291 BLAKE2B 58abebfe5765235492452563cf2135f7f85f29b55176493762d52f27b8a7b25764bc6eb195adfde5f00999ab8418eb0e873bf9edd90bab2aa3790872e12e96a1 SHA512 4d144724b5d336e97e50448bf3f4d4fd789bc8cbb80018842875fb4c2ac05ad1a69a4b9c39a2b0ff49f01d714e0455b497082e37d97be32e8ed42f36ffc2af2f
+DIST thunderbird-91.4.0-nn-NO.xpi 649227 BLAKE2B db56f303655f88a3ef8c9cbdc2b06b480ff2a152bdfb6f874625129e825645a56dcc8267843669e0936af21f642aaa210778f8bd742d65adc2b4e796076718fa SHA512 32f70b8395907f01bb1cbb344adecf89cfe81ede688d7e6e97104f0480b19ea688c7a4b1a0156cbfa00dfbb3c94ee6376c6f4c94e2ee0593e05b6db6e148b298
+DIST thunderbird-91.4.0-pa-IN.xpi 647736 BLAKE2B 902c4bd73d82c7f92caf44cec2a122ca85adb9a1be9eb9b8f323ae578bcce02580fb8dd0ada7d18c548a10f4dcd011bd587f282fce2c2a60bbc7818bee46e666 SHA512 320b217e50e6129774fc9149de0d52561c7638122b96e9583e3e1e366fddf9d32cb05459ff1f92b8a0abc4035915db858173ea7f72eb907581d98543c186b1a8
+DIST thunderbird-91.4.0-pl.xpi 680304 BLAKE2B 4d371fff351316df90a0d089aa5713127a1e6ae130d3ea3dc86afcc7bd452540e92ae1931e57be995da832898e6dcb19f0793f487d01dd294f47a2a590d5b0aa SHA512 cdaf3521609fb616f8e46cb88f04e669c5d9bc4ea7faf234ecdfbff796be5f86fdc76752567f0a06d4a511fc38849aa02af7bfb66f8409de68b8691b56fd62ea
+DIST thunderbird-91.4.0-pt-BR.xpi 678981 BLAKE2B 048c079dd09d880071848ff8b2b86c6aeef475fa83f2b05936b051039225ee098600d37711b374735828a66f562ffeed632d58a8a2ece3d90a2a1853b2b6b646 SHA512 b61fd7ea4de5211dbed27a31b78362aedc4244b6a18034b1e75df6bb831ad85adcbb0c0e2a7e6ec73a7a8c18419f11e02e1a28e8840c866ffa210efd4ad6a7ff
+DIST thunderbird-91.4.0-pt-PT.xpi 665709 BLAKE2B 61dca40025bded1483e2ebecef0e347fb614e17fb140472254d55f72cd67fa0f68ad49937dfa982c51d02c3844e1c0bdbf4d32b44af2c85372bb54ba4fdd768c SHA512 f0bbfa6bd9ce3ffd544d7188a154b7d5d35420af63ec8d20a36c4cca87236bf5dc33ef914292cbb6bfbb03cb6d3c30e1762059b9243a53a912e5eaca9754ba59
+DIST thunderbird-91.4.0-rm.xpi 671677 BLAKE2B 46a3c73b8d1a5c4ba09a462d3e4001ddd4badb00a8ed160bcbe67b18f2d2f6b1a6898d960a48b7b0b08b8817123b7e1b90142289dd8178cdfb29d31ffbf29927 SHA512 5e82c9597f40cd6f806a52e21eb47c5761c0576d55a1716865d3f754fa742ecc2534567ae42d6caf9ffb5ae374d82a59781b5a0d56e188a0d63650af469c2f33
+DIST thunderbird-91.4.0-ro.xpi 656465 BLAKE2B 78da27e033edf943c89c1e6c8b05a5535f08fcf074aaee84ce2b6ed9044df56696741b308b2ca2bd7e839e757eacaccdcc7f3be1a6ebb56055fdcccb76468f10 SHA512 16cab9f67a31a3af594d29d8592d651c68a97af7c76059237bdae473a41e7abd37ec26ed6e98fbb48cee496d4a25a75184e9896553dec562da17e124783415d0
+DIST thunderbird-91.4.0-ru.xpi 783359 BLAKE2B a5de711488c7c92e34323aba2b598a5438e9f72a559c10a35753c4d17fe923e07d577a7e9fcc603a6dce57605b679620f98c174b6f0f349e46276a75128d6231 SHA512 3459e8474e0858f46a8a7b995a7023ad30b1fc79cd6995709a0a67c251ff45e7ee507f1f54f1b4d2e9cefde26108477e164c2a1d589e3534f4d47279a5bed762
+DIST thunderbird-91.4.0-sk.xpi 707732 BLAKE2B 0cefdbf1020120b32b0dcb63ebbab7c94caa219695931739d2d2dc82c0600ddfa3e7dfe482a6617a26e44cc6274007b59228043315d7ebb618af25f2182a42f4 SHA512 be07a2d684ea49f5980fc1d04f0e71dceac6eb7cc568a4954d7d979d7f369b1fecd4eb8c63c3e914fd89edbcabc243306ccde03c53036fa70876059dd45c48ff
+DIST thunderbird-91.4.0-sl.xpi 660446 BLAKE2B 128c6545ea636b7d4cbc2dcbbc4140800cb3975cac00a69f3b8cdeeacee36b9b279234bebef646d65ceb680ce26743a69c042568c15e98d47a938158cb8e9bdb SHA512 8d4f878311a07ca28e479f1e9804bc344b618a8bab40fcad3f91df405ce18455d69f0af13d774a602dc95e36c276e1339e61c40f507f9ee1c289d3bf10e71264
+DIST thunderbird-91.4.0-sq.xpi 693389 BLAKE2B a2f0e289f5f6a47d1f9ac8b8aaafa7e15de097c1090812fff24437dd048fb495613c673cf4e299fd248f531fa3b0804e8cbdd3cb93a1aaaaedd7b0b3633125a0 SHA512 8b526fd2e9032d6c79536bd49883db84324bf123ef2a5189e187633403dd181d6f61e26962f129a91a2c4e496f6a70ad5cf277636c73d7fff0dfa79d6d18e47e
+DIST thunderbird-91.4.0-sr.xpi 703327 BLAKE2B 744ad88bc46541c67cde475fdb2608eb47e936be9e69c908fcaa7d490b466be82ace0963aa897b85a58bf9f659a8ce20584dda6fa477afb4dba4a49e1522a968 SHA512 9c2afeb7d7520ebe60233d713bc383ba3f766bc76a05930866c2ef751b3c8ba726bcb8c692cc664f7ce238ce1527475de70789b0e0f15535fcf19938da8b2571
+DIST thunderbird-91.4.0-sv-SE.xpi 675812 BLAKE2B d0582bd52440802004327af9dc519c1d9d837719ec05245f032144edd9b02543be800d583f7e27590e4715f9be135c676557e70f7ef9d66f673e115e1e5104e9 SHA512 41c6a62eb9b07f22f90e129a6bd90c73b231a91b50ba9f9d710ae1844371b50766b1f1f92ca7b3f57b1e8a05c6a33d0b04205106f5f810d84f5013a9086dfbf7
+DIST thunderbird-91.4.0-th.xpi 741243 BLAKE2B 023aa24a1017ef8026cd54b01cec48beabbd72f721ab8367f6c4952effd8097d62bd1ec8a27a80b924fa29ffe5a0e87a7693be3617fe040cf0d5537115028fe9 SHA512 a067a9826e1be2c1dd17e4e943f1d763acc139a279f818262b08eba039aa4b509771abf217a7c9120264552d9fc42555d71a472f718d67e511ffe3ab9f6c9469
+DIST thunderbird-91.4.0-tr.xpi 685073 BLAKE2B 42927bcb6da28318651934f52b79e116765ca53230de8dec4cf7ecce90499c8a8241ce74bdc0133fbf7329b9cbb1061fb6049af9f2196e2c7e3ca1fefffa5f95 SHA512 0b9dd7379990fc9440c0f3ffe2d906ff11d68d634f1e38f24d2c76947be03330b39683a3f8b7c32e07747cc0dfb1b07dff08ab70c27ceaff38883e34a66af2d6
+DIST thunderbird-91.4.0-uk.xpi 780971 BLAKE2B e9319daf674623ef06f8a9f8a519b1c6827971bc5c3cb022fb4fee7d11f4d04192a90f7a5cd69a2c92f920a7163f18c4442429cc69791269fcc65e98bed64047 SHA512 37c18d77047810117897f387dc8208cdb3ff9510b5a75e99074f3d9bca5508af636b860a966b0052a3066422039e9a36ae3e88951b49b1ae90d878f00915871b
+DIST thunderbird-91.4.0-uz.xpi 588120 BLAKE2B be8b6d70dc0012476f7c5effd31a479d1be43d140878a2476b7da6a658cc9d0b28f63d0eb881beb333d7524c5d659cae2b3994e327246ad69384b6539d966586 SHA512 493ec625b71440d69085cd2e07463d663d87b2950b03e7e639b238a91a3b53e7ba2bc93a1484f6867e96148d7df6af09eb9f668c9aa6fb19e0e01cb07275511a
+DIST thunderbird-91.4.0-vi.xpi 706359 BLAKE2B e94cab57c25110b0d7ad38d98bfe24d4d48f2a33f146fd42ecb47417ab1487835569258547680a354c51b0b2faf1bffb3e0ea1b923cf13dc0bc3f4d51ae47ccc SHA512 7ee48c4d598f7d13d133aca3ddb73f603d4be39fda4296a77efe04490c88fb8e197f6f3bb78a70963432c3e130e503689db7d304d77d416255d67aec5bd17514
+DIST thunderbird-91.4.0-zh-CN.xpi 714608 BLAKE2B d1932a4b0cd1698291d1838973d8ea677a2084359fa3ebfc6f6fa4100d61e4f4ab747cb5cdf55b59d0d4a8e5015240bc3b2044dad35ab67231fbcc117afd9495 SHA512 d91f7d7ac2cd9ef3f57d446354c15a9a828167bcca4c574aa910b80bb2c1d4ad24b5f38fc5629bd43412bf8e6bc0ab704272ba6221d0ab55a4ee11880d1be06c
+DIST thunderbird-91.4.0-zh-TW.xpi 715957 BLAKE2B 0bfc3b3cbc415e429feaee7564b8b948db81a717eef8c738648bab7ad9ed04d996c284fbd1ef40013c39955d49502a1e23b6764e0866ae60d082ccefd0633a6e SHA512 e146d14ecfb96ee85e38680bbcdec34ad13228ebe5dc10128992280905a216ad1028171a6d7b289285c3dbc943dbea6db46533db93906134a1ad4a28373f95bc
+DIST thunderbird-91.4.0.source.tar.xz 401512224 BLAKE2B c3daf5e0d4d916b0d5f258599a5866a0d4f0b272ca15a083d4a5533546aa6033a7b076da77b74f8698b2828b6b3f786469017ef51e313fb55753e59cb8bbf974 SHA512 f19eba17b8018d11358258f6c9fbe4b2d20858f5afdf82ad5a81de5f6191f833ecf01ee4631297b0880dfa8b76baa1f9cd09a976cab2d2206ca5a902283fa102
diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
deleted file mode 100644
index 01542105..00000000
--- a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jory A. Pratt <anarchy@gentoo.org>
-
-Add the gentoo preferences for the omni.jar creation
-
-diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
---- a/mail/installer/package-manifest.in
-+++ b/mail/installer/package-manifest.in
-@@ -313,16 +313,17 @@
- @RESPATH@/components/devtools-startup.manifest
- @RESPATH@/components/devtools-startup.js
- 
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ; Default Profile Settings
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; default pref files
-+@RESPATH@/defaults/pref/all-gentoo.js
- @RESPATH@/defaults/pref/all-thunderbird.js
- @RESPATH@/defaults/pref/channel-prefs.js
- @RESPATH@/defaults/pref/composer.js
- @RESPATH@/defaults/pref/mailnews.js
- @RESPATH@/defaults/pref/mdn.js
- @RESPATH@/defaults/pref/smime.js
- @RESPATH@/defaults/pref/thunderbird-branding.js
- @RESPATH@/greprefs.js
diff --git a/mail-client/thunderbird/files/distribution.ini b/mail-client/thunderbird/files/distribution.ini
new file mode 100644
index 00000000..ab0d1491
--- /dev/null
+++ b/mail-client/thunderbird/files/distribution.ini
@@ -0,0 +1,9 @@
+[Global]
+id=gentoo
+version=1.0
+about=Mozilla Thunderbird for Gentoo
+about.de=Mozilla Thunderbird für Gentoo
+
+[Preferences]
+app.distributor="gentoo"
+app.distributor.channel="gentoo"
diff --git a/mail-client/thunderbird/files/gentoo-default-prefs.js b/mail-client/thunderbird/files/gentoo-default-prefs.js
new file mode 100644
index 00000000..4b5121a8
--- /dev/null
+++ b/mail-client/thunderbird/files/gentoo-default-prefs.js
@@ -0,0 +1,7 @@
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("general.useragent.locale",           "chrome://global/locale/intl.properties");
+pref("mail.shell.checkDefaultClient",      false);
+pref("intl.locale.requested",              "");
+/* Disable DoH by default */
+pref("network.trr.mode",                   5);
diff --git a/mail-client/thunderbird/files/gentoo-hwaccel-prefs.js b/mail-client/thunderbird/files/gentoo-hwaccel-prefs.js
new file mode 100644
index 00000000..a00144a7
--- /dev/null
+++ b/mail-client/thunderbird/files/gentoo-hwaccel-prefs.js
@@ -0,0 +1,3 @@
+/* Force hardware accelerated rendering due to USE=hwaccel */
+pref("layers.acceleration.force-enabled",  true);
+pref("webgl.force-enabled",                true);
diff --git a/mail-client/thunderbird/files/icon/thunderbird-r2.desktop b/mail-client/thunderbird/files/icon/thunderbird-r2.desktop
new file mode 100644
index 00000000..9bcd414e
--- /dev/null
+++ b/mail-client/thunderbird/files/icon/thunderbird-r2.desktop
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Version=1.0
+Name=@NAME@
+GenericName=Email
+Comment=Send and Receive Email
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[de]=Emails lesen und verfassen
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[it]=Leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Ler e escrever suas mensagens
+Comment[sv]=Läs och skriv e-post
+Exec=@EXEC@ %u
+Icon=@ICON@
+Terminal=false
+Type=Application
+MimeType=message/rfc822;text/calendar;x-scheme-handler/mailto;
+StartupNotify=true
+Categories=Network;Email;Calendar;
+Keywords=email;messages;calendar
+Actions=profile-manager-window;
+
+[Desktop Action profile-manager-window]
+Name=Open the Profile Manager
+Name[de]=Profilverwaltung öffnen
+Name[cs]=Správa profilů
+Exec=@EXEC@ --ProfileManager
diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
deleted file mode 100644
index 055bca45..00000000
--- a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon-unbranded
-Terminal=false
-Type=Application
-Categories=Office;Email;
-MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
-
diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop
deleted file mode 100644
index 3ab5826d..00000000
--- a/mail-client/thunderbird/files/icon/thunderbird.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon
-Terminal=false
-Type=Application
-Categories=Office;Email;
-MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
deleted file mode 100644
index 9770a1ac..00000000
--- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
+++ /dev/null
@@ -1,10 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors",   true);
-pref("intl.locale.matchOS", true);
-pref("intl.locale.requested", "");
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("mail.shell.checkDefaultClient", false);
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.autoDisableScopes", 0);
diff --git a/mail-client/thunderbird/files/thunderbird-r1.sh b/mail-client/thunderbird/files/thunderbird-r1.sh
new file mode 100644
index 00000000..a433ee33
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-r1.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+##
+## Usage:
+##
+## $ thunderbird
+##
+## This script is meant to run Mozilla Thunderbird in Gentoo.
+
+cmdname=$(basename "$0")
+
+##
+## Variables
+##
+MOZ_ARCH=$(uname -m)
+case ${MOZ_ARCH} in
+	x86_64|s390x|sparc64)
+		MOZ_LIB_DIR="@PREFIX@/lib64"
+		SECONDARY_LIB_DIR="@PREFIX@/lib"
+		;;
+	*)
+		MOZ_LIB_DIR="@PREFIX@/lib"
+		SECONDARY_LIB_DIR="@PREFIX@/lib64"
+		;;
+esac
+
+MOZ_THUNDERBIRD_FILE="thunderbird"
+
+if [[ ! -r ${MOZ_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} ]]; then
+	if [[ ! -r ${SECONDARY_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} ]]; then
+		echo "Error: ${MOZ_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} not found" >&2
+		if [[ -d ${SECONDARY_LIB_DIR} ]]; then
+			echo "       ${SECONDARY_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} not found" >&2
+		fi
+		exit 1
+	fi
+	MOZ_LIB_DIR="${SECONDARY_LIB_DIR}"
+fi
+MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/thunderbird"
+MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_THUNDERBIRD_FILE}"
+
+##
+## Enable Wayland backend?
+##
+if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
+	if [[ -n "${WAYLAND_DISPLAY}" ]]; then
+		export MOZ_ENABLE_WAYLAND=1
+	fi
+fi
+
+##
+## Use D-Bus remote exclusively when there's Wayland display.
+##
+if [[ -n "${WAYLAND_DISPLAY}" ]]; then
+	export MOZ_DBUS_REMOTE=1
+fi
+
+##
+## Make sure that we set the plugin path
+##
+MOZ_PLUGIN_DIR="plugins"
+
+if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
+	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
+else
+	MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
+fi
+
+if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
+	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
+fi
+
+export MOZ_PLUGIN_PATH
+
+##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
+
+##
+## Disable the GNOME crash dialog, Mozilla has its own
+##
+if [[ "${XDG_CURRENT_DESKTOP}" == "GNOME" ]]; then
+	GNOME_DISABLE_CRASH_DIALOG=1
+	export GNOME_DISABLE_CRASH_DIALOG
+fi
+
+##
+## Enable Xinput2 (#617344)
+##
+
+# respect user settings
+MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
+
+if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
+	# enabling XINPUT2 should be safe for all wayland users
+	MOZ_USE_XINPUT2=1
+elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
+	# XINPUT2 is known to cause problems for KWin users
+	MOZ_USE_XINPUT2=0
+elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
+	# LXQt uses KWin
+	MOZ_USE_XINPUT2=0
+elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
+	# should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
+	MOZ_USE_XINPUT2=1
+fi
+
+[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
+
+# Don't throw "old profile" dialog box.
+export MOZ_ALLOW_DOWNGRADE=1
+
+# Run the mail client
+exec ${MOZ_PROGRAM} "${@}"
diff --git a/mail-client/thunderbird/files/thunderbird-wayland.sh b/mail-client/thunderbird/files/thunderbird-wayland.sh
new file mode 100644
index 00000000..2cfdc5e1
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-wayland.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# Run Mozilla Thunderbird under Wayland
+#
+export MOZ_ENABLE_WAYLAND=1
+exec @PREFIX@/bin/thunderbird "$@"
diff --git a/mail-client/thunderbird/files/thunderbird-x11.sh b/mail-client/thunderbird/files/thunderbird-x11.sh
new file mode 100644
index 00000000..2f4e410c
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-x11.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# Run Mozilla Thunderbird on X11
+#
+export MOZ_DISABLE_WAYLAND=1
+exec @PREFIX@/bin/thunderbird "$@"
diff --git a/mail-client/thunderbird/files/thunderbird.sh b/mail-client/thunderbird/files/thunderbird.sh
new file mode 100644
index 00000000..7345cfcd
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+##
+## Usage:
+##
+## $ thunderbird
+##
+## This script is meant to run Mozilla Thunderbird in Gentoo.
+
+cmdname=$(basename "$0")
+
+##
+## Variables
+##
+MOZ_ARCH=$(uname -m)
+case ${MOZ_ARCH} in
+	x86_64|s390x|sparc64)
+		MOZ_LIB_DIR="@PREFIX@/lib64"
+		SECONDARY_LIB_DIR="@PREFIX@/lib"
+		;;
+	*)
+		MOZ_LIB_DIR="@PREFIX@/lib"
+		SECONDARY_LIB_DIR="@PREFIX@/lib64"
+		;;
+esac
+
+MOZ_THUNDERBIRD_FILE="thunderbird"
+
+if [[ ! -r ${MOZ_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} ]]; then
+	if [[ ! -r ${SECONDARY_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} ]]; then
+		echo "Error: ${MOZ_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} not found" >&2
+		if [[ -d $SECONDARY_LIB_DIR ]]; then
+			echo "       ${SECONDARY_LIB_DIR}/thunderbird/${MOZ_THUNDERBIRD_FILE} not found" >&2
+		fi
+		exit 1
+	fi
+	MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
+fi
+MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/thunderbird"
+MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_THUNDERBIRD_FILE}"
+DESKTOP_FILE="thunderbird"
+
+##
+## Enable Wayland backend?
+##
+if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
+	if [[ -n "$WAYLAND_DISPLAY" ]]; then
+		DESKTOP_FILE="thunderbird-wayland"
+		export MOZ_ENABLE_WAYLAND=1
+	fi
+elif [[ -n ${MOZ_DISABLE_WAYLAND} ]]; then
+	DESKTOP_FILE="thunderbird-x11"
+fi
+
+##
+## Use D-Bus remote exclusively when there's Wayland display.
+##
+if [[ -n "${WAYLAND_DISPLAY}" ]]; then
+	export MOZ_DBUS_REMOTE=1
+fi
+
+##
+## Make sure that we set the plugin path
+##
+MOZ_PLUGIN_DIR="plugins"
+
+if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
+	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
+else
+	MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
+fi
+
+if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
+	MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
+fi
+
+export MOZ_PLUGIN_PATH
+
+##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
+
+##
+## Disable the GNOME crash dialog, Mozilla has its own
+##
+if [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]]; then
+	GNOME_DISABLE_CRASH_DIALOG=1
+	export GNOME_DISABLE_CRASH_DIALOG
+fi
+
+##
+## Enable Xinput2 (#617344)
+##
+
+# respect user settings
+MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
+
+if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
+	# enabling XINPUT2 should be safe for all wayland users
+	MOZ_USE_XINPUT2=1
+elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
+	# XINPUT2 is known to cause problems for KWin users
+	MOZ_USE_XINPUT2=0
+elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
+	# LXQt uses KWin
+	MOZ_USE_XINPUT2=0
+elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
+	# should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
+	MOZ_USE_XINPUT2=1
+fi
+
+[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
+
+# Don't throw "old profile" dialog box.
+export MOZ_ALLOW_DOWNGRADE=1
+
+##
+## Route to the correct .desktop file to get proper
+## name and actions
+##
+if [[ $@ != *"--name "* ]]; then
+	set -- --name "${DESKTOP_FILE}" "$@"
+fi
+
+# Run the mail client
+exec ${MOZ_PROGRAM} "$@"
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 9011712e..a3fd831c 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>mozilla@gentoo.org</email>
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
 <use>
-	<flag name="bindist">Disable official Firefox branding (icons, name) which 
-		are not binary-redistributable according to upstream.</flag>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="custom-optimization">Build with user-specified compiler optimizations
-		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
-	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
-		downloaded and kept up-to-date in user profiles</flag>
-	<flag name="lightning">Enable app-global calendar support
-		(note 38.0 and above bundles calendar support when this flag is off)</flag>
+	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
 		or LDD linker when using Clang</flag>
+	<flag name="openh264">Use <pkg>media-libs/openh264</pkg> for H.264 support
+		instead of downloading binary blob from Mozilla at runtime</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
 		for faster binaries. This option will double the compile time.</flag>
+	<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 	<flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
 		and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
@@ -32,11 +28,7 @@
 		instead of bundled.</flag>
 	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
 		instead of bundled.</flag>
-	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-		installation with secure-delete enabled</flag>
 	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
 		instead of bundled.</flag>
-
-
 </use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-68.7.0.ebuild b/mail-client/thunderbird/thunderbird-68.7.0.ebuild
deleted file mode 100644
index fc0b7ad3..00000000
--- a/mail-client/thunderbird/thunderbird-68.7.0.ebuild
+++ /dev/null
@@ -1,779 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-68.0-patches-12"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=10
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
-	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo
-	pulseaudio selinux startup-notification +system-av1 +system-harfbuzz
-	+system-icu +system-jpeg +system-libevent +system-sqlite
-	+system-libvpx +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	system-libvpx? ( https://dev.gentoo.org/~anarchy/patches/2013_update_libvpx_esr.patch )
-	${PATCH_URIS[@]}"
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx multiprocessing
-
-CDEPEND="
-	>=dev-libs/nss-3.44.1
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=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
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.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-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/rust-1.34.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-REQUIRED_USE="wifi? ( dbus )
-	pgo? ( lto )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			die "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	# 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 \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use lto || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply firefox patchset then apply thunderbird patches
-	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
-	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
-	eapply "${WORKDIR}/firefox"
-	use system-libvpx && eapply "${DISTDIR}/2013_update_libvpx_esr.patch"
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local n_jobs=$(makeopts_jobs)
-	if [[ ${n_jobs} == 1 ]]; then
-		einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
-		export MAKEOPTS=-j2
-	fi
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# 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.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Bug 689358
-			append-cxxflags -flto
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	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-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; 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_desktop_database_update
-	xdg_icon_cache_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; 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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-91.4.0-r2.ebuild b/mail-client/thunderbird/thunderbird-91.4.0-r2.ebuild
new file mode 100644
index 00000000..785fc691
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-91.4.0-r2.ebuild
@@ -0,0 +1,1130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-91esr-patches-03.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{7..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 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/~{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/$(ver_cut 1)"
+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-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.19.0
+	>=net-libs/nodejs-10.23.1
+	virtual/pkgconfig
+	>=virtual/rust-1.51.0
+	|| (
+		(
+			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] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+	)
+	amd64? ( >=dev-lang/nasm-2.13 )
+	x86? ( >=dev-lang/nasm-2.13 )"
+
+CDEPEND="
+	>=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
+	>=media-libs/libpng-1.6.35:0=[apng(+)]
+	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-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="${CDEPEND}
+	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="${CDEPEND}
+	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!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				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!"
+			fi
+
+			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"
+				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() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# 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_src_prepare
+}
+
+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-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/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 "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	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
+}