mail-client/thunderbird: security cleanup

Signed-off-by: Joonas Niilola <juippis@gentoo.org>

2 files changed, 0 insertions, 1204 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 036a180d64fd..4ec396e30952 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,4 +1,3 @@
-DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7
 DIST firefox-91esr-patches-07j.tar.xz 18900 BLAKE2B ace76bc00c3053e60c39186e460b0b422a24bb3393091324470045707dc18c631c41d5d4e61b67dca6dc2e881b7dcffce256f5b897766f994ad46b23df96b77a SHA512 2fca4a5fec8fb79541b9dddec5a632a9a88fca845cac15aa963ab686eb80e8e5ad23186166f97ed88327e6c5bd7bae6178b32760f26d560c0b685ef3b3f638f4
 DIST thunderbird-91.10.0-af.xpi 561895 BLAKE2B c794ce6b0e504f9d85ca954fa0d93cfd886e614ce6187f98555482297ebdc75132b3067f0e940fb4d2664a30aa71a74ff8d4bebb116df3706d48c290f213520b SHA512 465c30a199e6d9f85f3c2b2306d91cc07822dc57752e750c527aefbc5e8da13c91e1df03dbe37d72c377fa99c6472c682a9b7b94550b3b8088d7b49e9e82585c
 DIST thunderbird-91.10.0-ar.xpi 665731 BLAKE2B b450a3563929686946ce5c74f49f9976ca69e5995a13af19893f7ec25cb64236207f805e4c99b02387d4eda32c46ad1fdeebfb59f835954a9c9a55a7db1a0b79 SHA512 f039df005d4bf66ba38491ac9986d6543cc6c8c5d7d1d2eb30f286b8652e0948406b7a1fa85422ed1dc059e3ba99dcf7dca0f8d54a92a0e7b6fe00d2964b8414
@@ -64,67 +63,3 @@ DIST thunderbird-91.10.0-vi.xpi 725528 BLAKE2B 884e4f8d480f78badb209ed579e6eb302
 DIST thunderbird-91.10.0-zh-CN.xpi 730903 BLAKE2B 01a23c174e38fbd70c4812df869e1c4a4a617621281d691049e07aaabc1780a92472a5b3672f4f0a68faf6b86e77cacaf94b463561219d6e0cf9573e2eb04f10 SHA512 9aeea9dd0d6954b665a2149ccc7f2d92d64b3ae62c04e845ae87a015d03e7395827a62d83bebd087865051e1a9cfe56d209adcb86852636fb437bf87a4213d6d
 DIST thunderbird-91.10.0-zh-TW.xpi 731944 BLAKE2B 188f54a3870bfbba928447201d4543ffe1bcd9b3ca0d7343434b0a1d34c1834b3be8554bedcc7c37d740af919ea9d309a8e0a1aa383fb5c88d5f624cc205b5dc SHA512 2b55044ca105c79b6c5644445aa48a4cf00bd1ce7f4982033ed93edca098253736d2009277f732b404e30d59a6183202f65abb4286d402685ea3d6fd1eff6eb4
 DIST thunderbird-91.10.0.source.tar.xz 413952892 BLAKE2B b1b76a2ab0249e79f7b18cb572b1fff95422aee3df012104b8f588de0e30f528ae937da16210fd75878239125a406cdbbf878e3de23de75c3cf7818a13d65d24 SHA512 335d47e93d5fce4ff6e1ec0305cdaa86031f28289cc06f30ab3782bae484ad10ac4b9aa70911787627744277715edffd8ec8c3a2008f00b8b90ea02b0d79fcc8
-DIST thunderbird-91.9.1-af.xpi 561894 BLAKE2B c21ea02150f66d06be8751bf0064d6c4410c21f0d8c86a32423037ffa1c1045598f0cf8026a8d640cd13911d2508b2e33a2ea72beaf81516d4e99e019984b525 SHA512 385d5fdd3cdd86b5ece192d912d662e0f0e4e7b9a90e623841f6dfc80c0f361f7e9256894150ce571db387e76f5e4661c1ac14bdac287c8856fba45c131f7f30
-DIST thunderbird-91.9.1-ar.xpi 665730 BLAKE2B 5a459f8c7f52cbc1299f4da6bcd5596bcbe7364a60c741523c4d7dc191d0830185cbeaac5d34fa9c577d0fccda52c96d1d20f800071a85aa184d55c4c467cc64 SHA512 7b9a8eb206062ec4393a72d8b3f5e0f36791f69a13ff0fab42ff190b4b2fda52d9f106fe23a3e40cee0c4f0796e5d3546bf8b6306316371998f57ec8c28644cb
-DIST thunderbird-91.9.1-ast.xpi 580511 BLAKE2B 5c3299a9037df6727de7640fde336b52ee23d291acfe6e35dd2c34aab3b29321643a5f2449d12b04628101c5a1528d41aecaa339ea8e54d94a96de4cff0e534b SHA512 9565939eba6df79c91f01d6c1f2243c9c5e8a70653eb035050e037d8e2eae79ab92a1dc272cab2d76f4617366c616b5f58b4e7a16ff3918cdb5ba7783f75a025
-DIST thunderbird-91.9.1-be.xpi 695197 BLAKE2B 2976a25ed9802371311fa4a87d970f7e8ddf1d5f077e91307eb6d03535f199716889070db59828f493f823692aa787d5b5ef630f5ddedb5406647a68c6f3232b SHA512 71163e8bfc9666a517c18e92cb18d232e4aa3f6a09669081b74cdb8fec9302749f26fd18f554f079fbcdc4426268a502bdcd3f5051955dec95edcf913d48671c
-DIST thunderbird-91.9.1-bg.xpi 690996 BLAKE2B ddc9b5bcc21c43326494496f56c4d39c175c96e2b499bf918fb670572ca572ed415dd97aab2958d0601416e1c26133cc3c7ab285d993276480126aa185e70bbf SHA512 c2405e0405bc6209063f9bf079dce4b3a322968eed0e9ef5d476ed3b498bc933e96d35d307bea5aa8ed6733c946798abcaf278f5bb1fa0df968adc0b32467b84
-DIST thunderbird-91.9.1-br.xpi 620588 BLAKE2B 007c0da113df15cc7e88ed8858d74d11292da9052994ccc47dcb330f77ffd13170b8e6e94bb87efba0f6e3bc070548f7524ccd81875c66ef9332614c6a24f4a9 SHA512 1f668bf485cd342aa5b339211458e15d620c360e06efd088c74b3a3d26f21d9ec3af7bfefdddccae2f076d55788a6f0262c64eeec050ca293c4cee7ae0bfe593
-DIST thunderbird-91.9.1-ca.xpi 645973 BLAKE2B 35893e4cab7e27ba44aca550ffb6192fd8582e5e0374e5688e0638f8c96c99ab1cb31a9717362dbb6fa59bb00a0f5491fdf4e707c00b6852e4a2936007ed4ed2 SHA512 fd795bf9697a2f002f6b5c4d86bc4c5cb066d316abed4b2bca30592e9b811dbdb39b94ef15d7f8a64df957398618abce675039a3603ef283c2dc2504c4b6f651
-DIST thunderbird-91.9.1-cak.xpi 652066 BLAKE2B 7988d686df9031bb8d699bd4bd1764857d647831ee7fcb0e58f45dc699f43f8a03b143e2791141c4e8e63f9ea1f5774fe6ef6965a9c11d2c01ab21d9f002c3ec SHA512 aa19c3b22989cc6e82979d99c2a447915fcb0e6a99fc3613232988aa3b1c41109a3daafb4b5fc92c1cd9428b444ea50bdf982960d799bffcb61575820a2b80d3
-DIST thunderbird-91.9.1-cs.xpi 711938 BLAKE2B 53fa14c360b1e756c37b9d9ec33b877368a5ea62b85864b40c4b604bfc9d798352ce92de3658aa9293259d513b79d6e830b040dff0c99a0f23ccf75ca2c4cbc2 SHA512 75dd853af0c8d8fd79fd668b17b6ee217a4577d62297002c251ff109fa6e548026971fe1ef0ad8288c357b7f5a4a3c56b758b8330aea8520b6f10e171096dacd
-DIST thunderbird-91.9.1-cy.xpi 688888 BLAKE2B 3ef54472c448e04d73a9356c955b58aedcb628c1c686cea5e0259e846f855864db620c9f6fada507ce130650a0071db027b63b435ae7224984d7eac65f4fd347 SHA512 31ad1017dfbb6eef93a32230b668d9af36224a4582a88ea228398b4e355f04187dc330fe8f4477a5cdf29a0e8816a7c36cf2d83b45b87bb6c0416b6b02dcfe65
-DIST thunderbird-91.9.1-da.xpi 674442 BLAKE2B 876405a699e57ff724f2eefc6658ff328f7e0f4ba71c03ad5c96babe19fb15bcb4acfc6ab6e8170ca17ef5c66436ec7c7bacb7200a56ffe304761c800e3183cf SHA512 27da057c3321f520dde1bad74250892f6fddbf1759eef8366b24fac69bd8c9adc4ec93fb9ae68e95e77f3fb7f3bd9a1c5f93d4c5a886878639443486f6a63603
-DIST thunderbird-91.9.1-de.xpi 697526 BLAKE2B 8dd19a07b176e6d1758a9fc0b36257c825e2c3ebb20592e2273409b64d30d1877dfb90a1bf7e3bad5df9cb8d0feb4100d18f79376ec9b2bb0bcca23d2fd48388 SHA512 be2298bbe647ef2f62df3a1536f100188b42791debbf41e7e9b5dc852550e999fa2b03fae1a5c0ec2093d1aa91775f0fa993e3cff055fff2c83873100f8dd0ab
-DIST thunderbird-91.9.1-dsb.xpi 723999 BLAKE2B 2bad48f9dd619bcfc872c7526cdcd84842551dac8a614a0e57d695e42fdabd406104f586e4dd9726a8d13e90a84ea5870fee7bbc6dff675c0aa8a487e63638ef SHA512 9acdf60b776758744991d7041fcfc6ba8472779135938b87959413dabcb652d8bfa25c990d729dc86f1bdba7d63d97440a468ed7d623512077acc6a5c766437e
-DIST thunderbird-91.9.1-el.xpi 821180 BLAKE2B 7b24257e4660ded391488066bae5af1585629eb1036c9b9423c019021471ebbe6bbe9fdd3be8a09ea2a1cb451f62a5797a9d13d70d581c2e7acf4e77652ea895 SHA512 b7772f786376988e434c0c3066804889618ac5f74ab06fe24bae7b0fa754910650d27ebe188d9201838e6ab1378b378b67559fb456dbabdd138040112eb357da
-DIST thunderbird-91.9.1-en-CA.xpi 647814 BLAKE2B e02d9461199128073b306314ef4fb71c2fef7986e5410d87e266907dac215913ec7573438817966353a6ce98ef3013f9fa7b11315b3d0a4f840152158a3c76bf SHA512 3974b4fc1c98abee89511e9184cbb6cf48527096b94967043045e3dec96dec997ceb450faa287e11b898670f76ed902469436cea8d8a81ff9910b15eea07242a
-DIST thunderbird-91.9.1-en-GB.xpi 650552 BLAKE2B 142501888a90d7c623028e51595155bd39d64c21b0ba9153e27405bb6b9c39afe783993014c63281af66d0935c3a474047b4d19a8daabc2c6df9c2a02d464b37 SHA512 b1c5aa23ebdf2e0ec0d2c8be7bac9887099ae0a40694f295edc0581aa932903113f0ca21c6417738339556650ba506c83fca7a04e025f4856743af6fa3be22c5
-DIST thunderbird-91.9.1-es-AR.xpi 700496 BLAKE2B 0d21b130cceca7920080e1f105a0b78a62c5897159576c2fc8815bb271e8f4fb2e28d607634fe6c2d989b9d5d21cf469051f5b076a7a82f7eab403ee323b0492 SHA512 b24726a669ad477561a13cf395bb465967949aafadb109dfa35f67dc4cea28b5d59c8786f80b141310b58821dd35a58d6bf4cc796200f53d654ecd437a04f2fc
-DIST thunderbird-91.9.1-es-ES.xpi 630919 BLAKE2B 671d1e2cb855c0926aae44e0cf7ac07f176a2e19de432b1ef675c34f999802fb68fc0a07f3e5706ea489b34c71f1fb4b2603256111177efa577f5a6fd55dd46c SHA512 8513e63b9e0b94072330a85406fb98a339339b14415be2c16f1ad03fd8066d8a63b9725bd4487f6b82821f81c539b1bcb3b1c8e737b7921070d37f1423a65998
-DIST thunderbird-91.9.1-et.xpi 672169 BLAKE2B f2e14bf82e76c04483ff42be20caaf72cb96aead21aafbab085c54b2f7c9b8418adbbdcb14fbe997637e67314f8c35c6e14411b7896bac351aac46fc5dadcd39 SHA512 a15037f342aa0778b4e57b194eecb70c660b81293eb773ffddc4b21177f255c585e9d9c21605f7535e9dd89340a85e9f7754bb518c80364046f0e3f64dcc786b
-DIST thunderbird-91.9.1-eu.xpi 678263 BLAKE2B 2475d5abaef80d226aa6cd1869db83e7de38d28661275bac74d3f375babac86c71f451e0c19dc9575e6f4e174798b73c2642f6d2ae61f8482a198da289dcebe5 SHA512 3c61329a917f19d9939bb6020864b6fa457b45c95268b350ac39880295d01d034b7f196bc1628dc216a94d7f333035039315b0fcecab0a801b4c26fbc29ab6b2
-DIST thunderbird-91.9.1-fi.xpi 676629 BLAKE2B 1d2249ac86e51bd70ff0e7168353f107901414e5e2b853dbc34874d121b840a47dffc082ab54d0ddbd73e81134634a1b5b1723af6fa7748cc7e5c375b4f448ec SHA512 98e396ea2b3cb59eb937d4c60b01a91fec6c4909f79fa7daaa44dc335e81b976dc935e278de6171ac696b4724fe5abb641c8369b0ff9084a470ab40f63d129b0
-DIST thunderbird-91.9.1-fr.xpi 711453 BLAKE2B 0af319cd60f6828fbe270418e6a387441064e7fee5691f1b228e81810ad163e57f77a3e0595ad9866e0607e3d4792e4ff26469bc61af1debf98968caad176b2b SHA512 7bdb65bab847e02ae18ea922af2495ee61a4da4e1e57da8595ce230edb6315a84ceb1c322ff1027c11062bcaf4535d7cb150cffe47397eb1025a67d5b25d456a
-DIST thunderbird-91.9.1-fy-NL.xpi 691879 BLAKE2B dce95e0c76fed2493c75afa89d67ad48c9f2d277965a054bc89529cea5d77eb0337c51d31e9260f6b64eb0ff7dfb739614827c877eda0b73b211229850874b59 SHA512 c76eff115b1cfc49ec41562e9e55909f68e8af06896e9923280be54bf8edab5d724785acf919e3b2485755a2ee1b3ae3a1cefeb698f879779da9abf357b49021
-DIST thunderbird-91.9.1-ga-IE.xpi 613123 BLAKE2B 7c5d283f4710755e3e462f0776ca978334a80000de3e01cce53307c51ad5b997378aa59be1cbf22609d013945ca566947fe10a3e8df97ebcec25f71ba66d1843 SHA512 17cb8a170b47dde90aebf6ff8c20035ef3bffa55a4df753967fb502976e657ac76b66a7ba62dbc33c90941edfe93914fffee15c7483bfb59ab7d092d85b85af0
-DIST thunderbird-91.9.1-gd.xpi 640648 BLAKE2B 1c1a2282ff44db876d862079ab4924b7ea8573ff3cf549230435c1d99339bf3453a80e4b8d68ff35acfde154b4770454cbc06cb8e68043ec9f54bea3fe95a332 SHA512 9ea0aa90c5665a5cd04f84df2ea807c920edce845ed9d95ff1807abf0611a0e7996ea5d5a64bafed692d2dc5afe5a3800c33c2bd61ee48a1dba7c36ba79f807f
-DIST thunderbird-91.9.1-gl.xpi 677789 BLAKE2B cf8ba081707abb2a595816f238b4c2ad7e4dc03ced18cc523fe21da33817c77dd13831355980907ac4d763eb91fda704ecff801190ac7a7ae160d6a2fccd2e64 SHA512 db35938996f5e6237de1225c36a3ef9fba539157caab84dedd0549606bcd57bfcf5365a05306d1882631b27681ee2e3050af6ca149934759a9ab359c17507e55
-DIST thunderbird-91.9.1-he.xpi 673190 BLAKE2B e2124d028f8619316bbaeb19bdf3f988124286dd772e02155ac3afe8fecae22c62a18de89b5a0706a2a2a59ca4572087f406d0feb93cdf9d20571ba703621135 SHA512 e1370e1033648a19152d77881e62fbbc9544665069729257df0ad393bab9db4365063b15f424372b6b3ea4b235276b94c52c309d43500345f6e667349d51ebc8
-DIST thunderbird-91.9.1-hr.xpi 653580 BLAKE2B 3a0fef13b0f0a9417520fc70e5f0a5e1224bfb0e7938df4146254cf0c54961dc410e15e970d37db7c91a69fab43d0e5ccf43446e85a51cae884daf79f92832b6 SHA512 2b4fc0dad676165a64e641f4ed5f381363559ca878d265ea3c490c35a493b659ce0e8b4ece983262264721830561acb7b5322e313cdbda625182e7f5fabf6788
-DIST thunderbird-91.9.1-hsb.xpi 720811 BLAKE2B 8a06e2d53247e2300cf05671c939c557a199e9ed23e8d3b9380224f3e2a402880b7075eadf3f9ca6003000226b58f4c154c60a05689bd6ac4916133689536eeb SHA512 3ddf1ef864415fb60550b7f86cee89d52f8f6e825b38a8d7a83b5803dbda572f885b26f7f153328c7140e4f5d93f7373a4c69797c1430ab466aafc1997cfcb0f
-DIST thunderbird-91.9.1-hu.xpi 723400 BLAKE2B e72ddf71d65265d502c8749e431cfb3993d1e9636abe2257bf00986d53fabcb34c3b6a91e828c605087317b9d2042910fa3653cf023765038e06ae291edcbcf2 SHA512 d4660cfc2994c35c37e98d5cab8e48ea5504dbc89786abc1d854b33ce24cc89c5f3b3833cb1562ea184d5b49ba71c618418487d752c2e91e7159b36d6c91a5fc
-DIST thunderbird-91.9.1-id.xpi 648249 BLAKE2B 25ccca1b06cf0a70b95440edcbdbb9e7967cd9a89b8f84c7e3db9cf7f4db2d993462c0e3c3823cccaffbd10025220f0b3628704cb38bb6cecc78d66135a9295e SHA512 80ecf20682a1cc04f3f288a9a1afd834fd542e592ec6558ba0c28b39e15c7b59b1e462d485f48b03e850ccba84151a6afecc87bce35ea3958e663956ef94c1ff
-DIST thunderbird-91.9.1-is.xpi 682261 BLAKE2B 4b6de059c11f0067e597a782e8fd295c91314e62eb033211faab3664389adfd43ac46f6d92971bd62098b25cf6457de490c43a503614d23148edabf16c61ec8d SHA512 f5f675f914e3ba43a112412e3842de9874e3cd88975768ea1b20559f4f2729281d27286b91a6690c5d2c61e2bb04b721ec5970b597313c6f3e6d9ff98221c783
-DIST thunderbird-91.9.1-it.xpi 613333 BLAKE2B f29657a0c398cce629cb4968d90076060ca94fd5773401d12a0715a3bbd21c4066f1cbbad2062d42384cc3337d914f96f289f5adbe875b92fc1a46e0e6b2b13e SHA512 a63b3825150e98f2e82b521f7a21f5ea8d47a5a9a85af9ffb712c2e6dac5da343f57644253bedf20d7a09452725d68ba61bff7423b7a3adffebde22a4d5aecf2
-DIST thunderbird-91.9.1-ja.xpi 756467 BLAKE2B add8c280f78bbfcc9d316e1534506735453e18ccfa56f6a929de9efaff969d0ce524397a101460e02db07fa1a9ebc48b270c96b40409713d8d8d3cc740a9358e SHA512 15f06c7088e84bb2c770ddf4335efabc6c2e76990bf3b326778d110a9e9d83450acd4514f762724ec5d1f0e2345263c7b2bee536e0f88e38d905377f4101f55d
-DIST thunderbird-91.9.1-ka.xpi 762628 BLAKE2B 0c17b62b8ff88a4d1af7b342b34312b70f106323fac33b303295d0bde4af168229f8f2b09544704641ca9dc69b58df93b8133b3b099957bd878be38c470ac826 SHA512 59d4accc8815d4817cb782174506f542a19ba80631cad3f3f638c2d87449ddcbeda9a2ec83b2df895d2b26495e708250b7e4d4b514326f614d65adbe2b69e9f1
-DIST thunderbird-91.9.1-kab.xpi 677085 BLAKE2B 72cf12683632449cdfe3f59e07d7753b45e6724fe209912bfcc282b6a5dbf1e097aa4f409fdf5b641e49faf0043ba7856a700272716719a6e13cc0288dbaf0c3 SHA512 342b5d39c5ea517b4eb97b5fbf84f2454e9d098ff75c368ae051b7902b6421b74b07715c2a807534efbfb2da7268cb74631aafe7be3d41bf09a11276c7824b03
-DIST thunderbird-91.9.1-kk.xpi 745523 BLAKE2B ba139f9f1fbe8eb0821e030b20eeb57cec12d52034b704883d01348687a18e9ccfca5c86dff869fc01d1d0bf9b97f6eed44b1a455572393b621a54e7ea1beccf SHA512 77c97845d2d1d41fb5b58fe875eabf48c7946003408a9d67d4b85424fda9c3337e9d26facc785fd88916b2fc03a51a3447412273d47ac9b271af66a9934fe68a
-DIST thunderbird-91.9.1-ko.xpi 704768 BLAKE2B ab4880cda103fe2279f71f86d519afd78fa70e314ff20ee6431cdecf5d30f2e1f98b2713756d381ac64d72cbaaf3959b813b54c0d1bc53aec02f9f33d265bed3 SHA512 8cc73fc0d8da4cd8b896786dafb467fdd30d291cd1553d1557b5a809df077945137df83e7bfd93ba7f5be6cf2ec7f17fc06eae6a207aa4fba6f16066973df23b
-DIST thunderbird-91.9.1-lt.xpi 696043 BLAKE2B ef094170c3f0223c48de84270175fcd375ef4915fdbcc8a9f756cbe310d6383b4587b387a33b621d2151082fedfd0ca6de6e75f2a56903d8ad42635f6289c17f SHA512 9296cbbe8e73c3c88acb7b02f076e7dd2733eaf47a2485601278251cf11a625a38e347f72a4e4c2ab11d8ea97fb5efa8523cd2d90a6cfe9bbe344611dfcc9acd
-DIST thunderbird-91.9.1-lv.xpi 618524 BLAKE2B e2c9a589b7c7547b60e944b076647cab47cd68724319d179f465e97c8d052bcd4465f32236f0495d8af1228a08cf6b0ff9c15c50b62859f740a4f8e932a1b17c SHA512 38421e1105d4ab67eaffaff17176f9ee46e697329fb696228a1fe84da7eb3cdd6c3c7aed1dadc18a1b1a56bd2a189ae7be36cc6e803e52e3aa7f6ba6be3bf4d7
-DIST thunderbird-91.9.1-ms.xpi 578080 BLAKE2B b0f5a3f78d19fa16058047d43b8d67910e4bffe838eb83b4a128ecaab884e1379c565bd5cf38ede2639860751fd1d61db8456f880f484bc9fc157db24d050aa4 SHA512 406322e6b6237a82887976247e3b4d24438b63effb7130dc2cad38435b49117082b2cd0ed70ced012826a97a81b3d4ace7a2b14907d442cb1ae71b5f71a37d6d
-DIST thunderbird-91.9.1-nb-NO.xpi 653326 BLAKE2B 1b97423998639ac0890639c4d73c6771954076348f553b66bcdd23c096eb56bbc4b823962ac5e4b700dbedfb0627206804ffaf84e9bafe70a7b21b14c13b22b4 SHA512 72d22e6b761c049c7430b6dc2f069bcb7b3f29a7b7bcf4199bcce1555922de6434ab09e5af679d85d83746f074b5e33f746013957e8bd2fa467e7cb0fe76687e
-DIST thunderbird-91.9.1-nl.xpi 685342 BLAKE2B 4706325f39f054eb2a1bb366fdda0a145f48575f3f66b7edfcb691b0cfc42ad3d61448efd13b750d13bb8efef95c9030606c028cde50b8218a8bf9cf550eb57b SHA512 bc6845ca9012aefdc07b305306576cf136801e51518d4f8b1283469c9f11cfa855dd50fdbf527725eb9fb030aeda157336406c6847dac23b50bbb0d4d57e6bc7
-DIST thunderbird-91.9.1-nn-NO.xpi 658571 BLAKE2B 7bc75bd40698b0d248b11333fed674aa3fe9e3b190a298af44717560c47f12161ed7b18ca0c8d75ef7fadf7c1ccdb58017dcea002c6311dc0b9d0063fb53ade6 SHA512 c9f40334bf1b222d3e4c8c4e48a6e5ea70e1fcf111df1724d63b11761d5570212b2ca66a670275e48feaa472eaeafb00ecae07752e0e1731ded2f6c7911323be
-DIST thunderbird-91.9.1-pa-IN.xpi 652334 BLAKE2B ef3c21c048f6cb9ec55202354ae6862a51bd1ae2306e5fa7420e09e1678f4ccec36d9eb552ed0da024cd8495b87cb30c34f32a871bfe08576a4c789c4bc3085d SHA512 65f3c15d07a6e6bdfa8bf335d965dc530916447e2f90f64244e6d0f8960533c951d5cb2009a9f325b4a8cc44aafb10dafb0bd1309a771198e6c3b6db3dadf7b7
-DIST thunderbird-91.9.1-pl.xpi 694111 BLAKE2B 381c4ccdc286985159c3db9dcd53be5981eb526de6be9e677e0f7478d6296f75b3fd9f716008f36766d8dc97c93966af6f6520c6093d928a8dc33ffbea106514 SHA512 9cf348d63b7098472bc8e577c9aad903e89341dd3827d8a82fd56fe4afdfe91eded4a147fe28c3b5cc2b9685db42f76fbcfe7a86deec7ab0fd638362747b08e7
-DIST thunderbird-91.9.1-pt-BR.xpi 694132 BLAKE2B 6279d33e28bf69f8af06001fc485912613ed03dcec729a4eb12c66719c68dc36f869e7f7b45ea21207242cbdaa33c80585d3daf9c936a9f9c9c6178777219912 SHA512 fde6f143ea678fee61413c6c93e1e3902675ff1ab2352b0006ee4b251a152b06efc4e1e55b99dbeea61b5073f14ca37dbddb156f7c3d30e9a431cd2ad4b6f779
-DIST thunderbird-91.9.1-pt-PT.xpi 674673 BLAKE2B 8f4ae08f997a574bc0ac2819a7fd5cb8f41b4e3d46bd678ed694118c69c2186008fb3d8f98d568d6fdb6b6542935f687c20dad54af699410dae877cd394ca059 SHA512 12e23beb7b43410cb2869efb14cd7d9fa4fc2e3c4560f51a26b14e694af21198c168e17ffce17b0d2ff68b0fe8cc83ad5057db30cbd312c6f240ddac779a2cea
-DIST thunderbird-91.9.1-rm.xpi 687614 BLAKE2B 6a825037d7401990b62527d3c93802f7c0a4d02960af500717093bcfb46058d7f557d45019bacc53798fcba1ee1c26bf80bf83e3e84115568e2cc25d28c3e00a SHA512 e300eb471a72fd3a0482b71f8590b77fb8a07727788a3924cc9a8be76aae44d3acdc35bef7d0a50303c5fde7c8c0586d3d2b08e1bc624afec01cd502f3b07be5
-DIST thunderbird-91.9.1-ro.xpi 661346 BLAKE2B 32824e74e385e8d19c36f5f83f311f7d0e53e1cd956965721a0c2c3bce8f24a6d6e700213d0404d6a8d84d91fd0c5918dab670038765022124be9157c32c0c60 SHA512 535bc341179a2f18c1b646b426a2dde88a102a79fe8587c7ab7464d881f91c382e3bbf01046a48b1dd4f40772c4e305de43ce7e545bd64b16abd80c788b78643
-DIST thunderbird-91.9.1-ru.xpi 793374 BLAKE2B 10cb3af0f6a18314f47a2bb7434fdc645da35abab05abba7f87caf0af5f0a0232461730152d8c070cb768b9910ee63529e536b0e80976112f83e5409a7df3964 SHA512 8ffd9ba79d42de23c7110f3bc21d89111d34be945431cf780fedb09b58d6160cf3f3e6ce06a73628048b8852e594fdf5a7c64008d83aab36dcedf3317de035d4
-DIST thunderbird-91.9.1-sk.xpi 721093 BLAKE2B 34abbc4b0b3fcd44b64988de28d41236a9d5ea18579b3fc0658f9c24c336d412b26aa32eac251d91a2ad1a0ac03a12b616c7c44df144105e96977fbcfd07101a SHA512 84bd3b264395b1116edf9ddbbd5d76632ae8351dd5826b84632cd65e5350813a3e56cef41ff818729d6a19ad0883b57b03f9adaa81376d6055f1d76d705fa6fe
-DIST thunderbird-91.9.1-sl.xpi 682543 BLAKE2B 551281b45ab2eabc25a9dbf6ce89b8d3572f260c30ffec055baace1114079e49dddb2290f92171f5a8b053a9ff9283e2a2c4c4be985151cf38fad4f2208670ae SHA512 05043cdb08f166fc63f689e934c77636bc8d434a5ec73620efb0a4bc660b2fa440a42291572d59aa9dc508e2217e5108f755261591e7f7657fdbae598d8238bd
-DIST thunderbird-91.9.1-sq.xpi 703626 BLAKE2B d8fac74228d56b24365071d75ddc91de3108292c1294567b80f15d95cb5824a3e3d5c26271129db4b8bca826df4a990a98d1d0bcea1b556a838b081da29d14ce SHA512 77a04271a25e0369c28f6f02572c048d18046f6e82da715c98416b2b1c4f80830bbb610b59133bcc6612081fc156034b05e6b6800b81e3ec526844b20a87e9f1
-DIST thunderbird-91.9.1-sr.xpi 710562 BLAKE2B ae31751f66f49642c0bdb31eb5045f53015b37947ec284f9b85af56810b287d947a0ab26214fc997f78688c779b08f320e7620ee14c3914624b4befa34c5f600 SHA512 2ca0721d1e07f5fc760df49fd85179fe78ecbcf70e050fc275cdb6b294cc1fc65b05eff1602ad1dc72d39e138e1e7f0e84bcbe94ed8d9996614463f0bb6c2d85
-DIST thunderbird-91.9.1-sv-SE.xpi 690967 BLAKE2B 6c5e66ef6456dafb3fb8beea69e1f349e0a498af55fb2b3f96c5d58890e71ef6058a9eeedc4c5a3ab5ced5e9287b0c06e6749362e382f210de8eb35a62a965ce SHA512 a968fc6c2906ba3d78b6c0d991bc057d1f317de4fe93e5f6195769c3f4d918828a0d1caa848cc42743475489fd325c98d42e587ef13dddf5b2820ef009be8065
-DIST thunderbird-91.9.1-th.xpi 748755 BLAKE2B 7e85a135fde5ab35a294bf0b6b6b2d055e17ee2e998a650f79f700ceaa3c1e0ffafc4ace76cc45b8b6b6170e6852299196b14ba1ff296b5807b9f173a8471cd7 SHA512 bea02a251dc77b7768fc543af1b0991f80b9a4b70bb682ce0383e2648c35afc2e1ef575d679f01997deca4213ac0e3fdbcec4e3b18bf40098a2e9745f9fc2c48
-DIST thunderbird-91.9.1-tr.xpi 699653 BLAKE2B 84fdfde91dcc083b0bd6ce79b967f51a0de9812a4cfbe7aee4019291e6aa42c6a110c3d30686ec57fec3f114510ddf39ca28cb2f82e39c888317690d35fdae08 SHA512 8020a0f816545730a3ddc462efd64152fa911c0f88d778bb45a7b96d7514e62193875512323acf31db97abdccbe5165ff1d6b12e63172ef9286b31c557ba79fa
-DIST thunderbird-91.9.1-uk.xpi 798482 BLAKE2B a05c668ad27ec2f050c0021b2654c21540b193675dbe4ca1fc794d153b09d1890ed5cd63273fd44eaa87bcb508f28439ee44409217bd279ba2e3cf2a3ec49b3f SHA512 00377f433cb9ae5a0d715ba2e3bcff8316107e05695013fd9939f92c210d49fdfde489f7641ddac8d351996961dbf1798eef7d7fee9b5c041cf3c1ac8a293048
-DIST thunderbird-91.9.1-uz.xpi 595924 BLAKE2B 739b75e3c553f1fa4db1a20dffa5f3135ac4f8f0221d02baeef07ab30ba98f631b1449a22682a5ec4e9a58ebd569ceb4b323515426bc63009911ec8fae5c3f47 SHA512 0bfaba54cb6a1605046ccfaa08e0899a75ef2ac36ca28af6ac2de198722faadaf60cfa38585a2464f8efbb8ff02a1ff37f64d398cfcd9db85092e6832a7b78c7
-DIST thunderbird-91.9.1-vi.xpi 725526 BLAKE2B 8f839f3885ae8fe487155a1c85d47a52e4d5998d3916b9df0cd6e00b5df0a36d70359687fbf85242668a1af921d428857bf7f08c00fe6f41e34fe03195d96e1b SHA512 f135a19434b91ed6fa244dc475d55589c7de578470a492737caf189efd653b40316dfd1aca77d94c9086363ff2624ae9d34cb87f346bd86c63aa6be8865a5547
-DIST thunderbird-91.9.1-zh-CN.xpi 730901 BLAKE2B 862935aa5a92152228b12859e78cfc8ebcdbc7353d8709dfb708232ad68bca5e65f3de3fa93697135902e5badb43e895e4075b8c6325fa0fbac21917e433c802 SHA512 64d5693bd3e16aa75b8ddf3ae6ab7a0467f49ab956c3e94e14a049f7bfaa250faeda0d141019a177605159aa24ecfa959ee2d37335cd4e32c098801db7cc6255
-DIST thunderbird-91.9.1-zh-TW.xpi 731944 BLAKE2B 3b6783f2f89ac75942f3e866e1f78955c4ae3e877dcf6b4caf60490039775a8eb8b06eb0a4f2f51534a3cc750891a71aac676ceeaea8f60bcd28fe2ccf8d7829 SHA512 5cdc661cf55268f77e462df6dd0465de87753e078ee67d8afbe8ed1ffffeb18aff3aa225fa8a053acba6957fc4f54eaf4f350ad008c5e2094d413391a223e675
-DIST thunderbird-91.9.1.source.tar.xz 402851656 BLAKE2B e938b8d6c28e1b3b43a7c7d08ebb96564adb1b790672c94070eba75910f5a3d18623f4ee08c7e6ca267d4f013d242bf6343cd06ff4fc20977b65b5b520c277a7 SHA512 997751056ad44367a128aef13ddd55f80798f262644253f814e6e607b3bfc3e33070ed072fa7062586378234cabc7ad106efa26befc3ecb843c5dd02c1498f0f
diff --git a/mail-client/thunderbird/thunderbird-91.9.1.ebuild b/mail-client/thunderbird/thunderbird-91.9.1.ebuild
deleted file mode 100644
index 08dcd4fecb8e..000000000000
--- a/mail-client/thunderbird/thunderbird-91.9.1.ebuild
+++ /dev/null
@@ -1,1139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
-IUSE+=" wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-COMMON_DEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	if use system-av1 && has_version "<media-libs/dav1d-1.0.0"; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "<media-libs/dav1d-1.0.0 detected, removing 1.0.0 compat patch."
-	elif ! use system-av1; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "-system-av1 USE flag detected, removing 1.0.0 compat patch."
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_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-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ld.gold is known to fail:
-			# /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}