[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     82e7cbe788d39d935fe420a1321ed0508fe89247
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 12:39:30 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 12:39:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e7cbe7

mail-client/thunderbird: security cleanup

Bug: https://bugs.gentoo.org/772287
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-client/thunderbird/Manifest                   |   66 --
 .../thunderbird/thunderbird-78.7.1-r1.ebuild       | 1108 --------------------
 2 files changed, 1174 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9249b115bec..31880af8c5e 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,70 +1,4 @@
-DIST firefox-78esr-patches-09.tar.xz 67480 BLAKE2B dde764add31a755765df996aeb50bc647881f9956c9b18c87ccc1c79325ec6f4c3a7ae3a8be1a64c5d80a9aece90d05697a8920912a7a37fd62d62bf2e03a536 SHA512 aa0eb6183ead7efe231ecb2922f22d5028a9edb656e65bfebfbb175af868f8c8ae05668e4bc2a982befcd04698cca43d3abb5b261aa2931bc7d8c7808a8495f4
 DIST firefox-78esr-patches-10.tar.xz 66396 BLAKE2B c29b723e47c58b10885b220080568aba751e1b73c58e28fce62a2da4c4c3ba8c71b63e60448d17599a3df4446dbd9f9387b4b2b75da5ed1e545591aafe8ec83c SHA512 6bb9caf1f6867b894ab315a73f8ae6f381b5c80c90539f38e786ee653c72c0df055aade854faa23f22cab2253f54abaf918a756945b76ed88f5a224ba8a8f12f
-DIST thunderbird-78.7.1-af.xpi 548331 BLAKE2B cce90f640602a186d4ff62ca183bf324d0f0a7f439932c12b20422ed19c1c810017317e7f35ab84eb45f0fcea08e2a227c24aa8a90c4dd313b415e98eaeffee6 SHA512 65937e5eb081588e9297cc4cb1f273248b83d50f1d4f41b460943ffba316bb05f8d369271718fd568ce110c5aeb4af081943a30465ea2d916d83a65c9fc4376b
-DIST thunderbird-78.7.1-ar.xpi 648602 BLAKE2B c2f8a333b25b271794194e98036d5b7bb9c33b3e126a5c13f0e9b1a11afd1ce5e443c01ba1425201376b17158fe72e8550410db08da25a174ad49a4e3c47e22f SHA512 34a430b789c0032b5f093d206ac3cfb7b63c59d0e08fd439f0793790475eb1691932b8babac5a067d48c381e497127e9d11f9abdecd8e70f953320142403f539
-DIST thunderbird-78.7.1-ast.xpi 561255 BLAKE2B 72a927b2b7914cd30bdf5fd787c9c73bbc7b31c496b3980b07db0d7945df33ecd53fdd21e8742f48bbdd906c4ea7d03f2c95d599bf2345be37cf8ae424e90f8f SHA512 dfe810e362fa0947d4a44445f491b0899def9e9da463f39af4335634dc843172a3a296a49dc0d13e5d8a25fce6acb608b7ab82b8a32236eb52815a05372231af
-DIST thunderbird-78.7.1-be.xpi 666669 BLAKE2B 9ccd4f6c325bda38a624c46e8067102e4ef31bd9c6cfa299c57508b2afbd0166bf074b2fddc16997a26b154e43c0aa90e9ac23dcc690d29fdab6af8deed8dbe6 SHA512 e1f51aeb93111b8123c07318859fd66950f31f6582b61164680fd7fc7f3a217f35bcba4d0341be77e1167b71006e3275169a2e50e546622389e77c2256cddd19
-DIST thunderbird-78.7.1-bg.xpi 672414 BLAKE2B bff0be6ce4ef303009fb175518cf3f59cd65fdf44fcc8f8d0ec1fc8a975c5d6196c3bc0b1e9a8b940ac118326a73e21f5970b3df4014a1aec449ca239bbf39c8 SHA512 b1e15994104e05897222308b9fe519813492be5da6166e793cc0d91e90c61678c7d4c1b82a1027f33dfa19f7bb69aaa13be61525ddb0460396ff1ccac545b07a
-DIST thunderbird-78.7.1-br.xpi 604528 BLAKE2B 1881e2885745c691f409ebf4f00aac87ac3900d501823c3d80ec364be328072b7019d613965844faccd1fe08c48807729f92278412033f1cf936ab598d415e5a SHA512 961d6d6aea6eed4eac787e2b443bf465d041221e8e1387ccc96de79da8a057ac26a3337cdcc4c328f792aa5a56298ad53c3db37426730ad6dd2784bdd2cc2a7c
-DIST thunderbird-78.7.1-ca.xpi 620448 BLAKE2B 2376b2a191774246e93abdabff96db50d37b6ba644ff2f4856da6069afdc795510659837308ec0ee15708ff4a66f3a0dd32a17f66f0a6083be91a79c15e21632 SHA512 7e002f78f84acb130d8d5542451c8fe7168e8994c00413da912e789b096b4c1fe325158d727b2044d316568b4ed058d071752b014df68b369a6b36b8dfb4cb73
-DIST thunderbird-78.7.1-cak.xpi 635641 BLAKE2B b565f3cffef6dda31a0cd87412792ad09ce756bd9cc1d3065dba6d378192749a6c478b5d1fdb619858ad7fb294206210afa5660ede80d951e45064d4a46abf38 SHA512 553e9000defcbb557bc6259c054afb4d38d237b8e9ef11bec113d245e1f37a262e1c329040243963fb3f1f413062c61c2dde4be435ede7f276fca8a68231e348
-DIST thunderbird-78.7.1-cs.xpi 635348 BLAKE2B a812546a6749522fe62f7dcc0e30bccafae61a237d6225400edccba1bc287e533bd13e095bdd1c35d7e6f7284af35c634050625770f4992ca68c74d9566228b5 SHA512 cfbf99ab4fde04aae64f0d100d2c567fad4db3853b9fc6635bceed6dd1d86cb5fe692ea27ee8fdd6ae67c6001fc47e7315107787944734a011804d9834c579dc
-DIST thunderbird-78.7.1-cy.xpi 646241 BLAKE2B 0e152e892d645ac327b73618d21eafc6e7e838a67d674c4b61351e937b70eb870e7f33aae41bd222b708f5e951418626cfcd3efd1c95c94012d4910d23f1e1a3 SHA512 02f7be6a3b77c5b0db4fb6b50958d91564d1069fe797195943d5302316e289d8da792acedac2d5a110e914e46ac7220423b055d3380d7f00e4350fc674cb3e2b
-DIST thunderbird-78.7.1-da.xpi 620992 BLAKE2B 085be356ea53d223137aa75803ff6a5ede2cdcf5af9888943978c37ec9a03d7228ad2f22be1121e84ebb77d2efa8566316a4bd1b6db26de294ac0503e1582f82 SHA512 c9df0d22d1fce230e89fdf29b7c3d9a825002e7928b5bf30489974c77040d085ce25db488cfeba8ea61aa5d263f8b625cf4edf0e7440a0fa5bf8423124fd7e68
-DIST thunderbird-78.7.1-de.xpi 665189 BLAKE2B 83b63e60d919dc50dd7c13b3b7822033f3f9cbd9f05b4113c72515b56e7f87e9dfbae0f414babd1de1af839fc2bdcda7efdb5ef4f5bb12a0007c65997b39cd85 SHA512 5bc1c5f59a64e483ecf11ddd42e70143cd130ff314ff7fd73867ef8a830bcab74ff1b1674393b332103804c040f10b3bf6ce851c3e5c44ec75daaecc1deb9e5c
-DIST thunderbird-78.7.1-dsb.xpi 666776 BLAKE2B b2485d1e787ac8bf13f4d5e6e64a7f10291b24a638b2bedb838e9837976307a417ae95ae44b6cef6257f7e76fbd1b9020dbedf3cd8b00a2b6762fc292298364d SHA512 9db0ca9433077fa26de4e6a973cbe20e9a2ec41ee9d3e74c531e7c88ecae7e8ba50259cca0494ad63042050a0465eb51e40244f61f513134fa32e879f2710230
-DIST thunderbird-78.7.1-el.xpi 774455 BLAKE2B 1cee967b7f9278ecc6a736a6d2cf8c669c1bd2d5a20ca2f978bdd53dc606ec3f6e485879fae6e6604721ff9c9e452c40e1ad5061a085e529621d78eb725cfdd9 SHA512 868d0ebfc82678c7aa10042789054dfe9ae4fe7a5ae0b67ebd18be029053ec1f74f25edce5704d9ba05664e77c365b71335399e56bf5b6670364c03f05393fd0
-DIST thunderbird-78.7.1-en-CA.xpi 611774 BLAKE2B fd296eafa4da35df28568c5b62fad9d617fb63d48232808d56ec34606eed3955bf3c42e43d406493c21b15df00252845e226d5906b8d4eae7e893148a53b5c53 SHA512 22ce03ac87ae25fa209e14a1a79db625192d04916994011e75efcf6f200e50ace6d8a76f107cfea8915180d5693952797df17d24aa52c79a7abd3b67dad50329
-DIST thunderbird-78.7.1-en-GB.xpi 611181 BLAKE2B a3aea6f0dd25b4530a95bbaef28a004c95b72092891dbf9ac985ab4785b82cc1067503415356eee1a7a10ddab5fa82919e715253c0b0b35e26820b34d35d18eb SHA512 794bb8e10f5c24b98cf15ba2475043a14d1ee9a1df1881ae5036ee62c323e001ade87d0eeead597a2064a3034db748b54198db8be5b405844a118c48b18e1fe6
-DIST thunderbird-78.7.1-es-AR.xpi 657787 BLAKE2B 8010574824d0f65cad768382b519a545b58a885ed3ce872a6ec13b02a972c7d93cbc4b297c147beb3b91d76233d571c7b059cc8863160ac31ac72130c37b3205 SHA512 e57066af4cb8d84c081eb22517e1fb7ac5977dae801eebb3aa4f97cb4b839a239cf345deab21c8818e022f74e5a4f2b92e8359d6c1106c80660225c15587f279
-DIST thunderbird-78.7.1-es-ES.xpi 569808 BLAKE2B 41dcd411bef5d5a0c67a82dcd8536c86e00e897974d74eef6b8934c92399f2dc052a3e8b35deb6f78ed05677be4e1cd1d27d397a082551ceb571aac999529885 SHA512 8aece81c6a4f62299f645e96ed40218bd25b946131292b1d5e9d19ef0b7b73bcece2af6230871fb2efff16ad4726a7bff8718706e58b990794d505b8f5cb5103
-DIST thunderbird-78.7.1-et.xpi 597730 BLAKE2B 54e516226d85bc8d6290bdf048ebc4bda2363c25e39389f377736e2a9bc18d50d342f540824fe668e36eacdde1f0ea52dc6a67fe82671a3000372ec347bafef2 SHA512 af732a1ddca07237c80ce69190e208125dac124a7843a11cafd96876810b6144cd3d9793ce7c87856cb4145648f5b201a2096f51e75d86a3f5457730a2942072
-DIST thunderbird-78.7.1-eu.xpi 632966 BLAKE2B 438a59e7a36f53b7808e0de7a6cf12beb0ac6e455d9f7eaa4af3b57a524e352228823667b27b3e6b62cedfcd63791763645156e825dd7ddd60eab170835cac88 SHA512 ad8ca0510d0c809a11fd4785cf06bf7aa0d9599a5b3f39688bf92ba690fdbdc27c4e0eeb01c33d916683fae25780114c8f917c2691a22effd9f370dbfc80a930
-DIST thunderbird-78.7.1-fa.xpi 639750 BLAKE2B b6b44660321ba43ee7bb5733270775506913d738be34ecebeddd192ceacbf31f4290680871d7f7726abb0ea49ea3620dc64645e6db09c2a699aa48e1f44a69d3 SHA512 c0acda56255ac259509220fa2a25bdcab84cd02474b20159065fe64d5b828e5e0fa7eae056cbac7ae661fa375cd8f5a2aa716ee8696d95ab2c422584bc5dfa26
-DIST thunderbird-78.7.1-fi.xpi 642448 BLAKE2B 7c2aced4427af74bb60fec5e17949bcb4e2a85eeddf11d0fa268f7ca2aebc80ae68980aa1f8fc50254da222d90270a11e901df9398c47fb68caa31d965c0ee92 SHA512 ba397c237bf936196e06c233a682a36fb8769fc73277bb46e8950545854ca6048fbdd56b418cac12964be4bf10c68a5a0dbacd928955a091741dfb3a65b8d341
-DIST thunderbird-78.7.1-fr.xpi 669484 BLAKE2B be4fa6342c9c75fa6b5018de3f060cd0018747d21ec5af614e677ed542d339ed6479c1b6ca7f18a6e5e5c2c90fac1256dc69692c6f6e742ed6043c31403d71d5 SHA512 24b49b86e7582d67d70b24667fd94a301eef6af835136c2adbbebe412d9dde8f63e0e2dde43f4f37096da38d0e6d886a89b28e0138d6311fae69d34b4fb3f128
-DIST thunderbird-78.7.1-fy-NL.xpi 653081 BLAKE2B bbd3ad8cf5e71f1f6741702782f1274e6607e6a89bfc52726da42e237f003758d27d9a65f4334c629e3cddb2dc55d7740033c50e75c2549127e4aad9506bb907 SHA512 7aa34efeb70d0900b2f51932e8509c5a5b980c557c7fc27997db8273a4899289ddc964ab96d901854aaf8da2b343cbb2c8ca4c92f0c5fe650968f6c3033696d3
-DIST thunderbird-78.7.1-ga-IE.xpi 600708 BLAKE2B 35f0dc040b960bb1f21904a424185aa9515f532004924c899ccd880cb6a6dee0374f99e14cab64a621fec5c29cc218fbd6e18356269a6ff3cc813ba6cf38d787 SHA512 ecf380c370a24182d1403cf8ae14faa18bbb5f1ca435e360f12d8bba845c7e4b800425d882756e451e0264f0f52829c1c384f24005631b48f77a11bb45c4d61f
-DIST thunderbird-78.7.1-gd.xpi 609376 BLAKE2B 6dc39607cf2799982e73c81986f16540b469233e88c0b56e5074c2f84351f96e03c2a480d90c587a23e1eecdf77ae8c52932c77e3adbba2fb0c3f1762a6ff7d5 SHA512 9fb3e2aa5bb7e0ef449a61a80e0169adc48a92232440d29b605e201cbc83b3fa99659528488e8ce9a44df67d5a7d5a6072c991dc401d3b98d4cf973556436d6a
-DIST thunderbird-78.7.1-gl.xpi 615734 BLAKE2B 26dac66ad0bca8b698b5149712cb9815303ca1a283a63e94831f2d62a7e9ec640ae3c5c41bd3a6904ed10331250073f37967ba53813fd962c18a6c327d6864d3 SHA512 2a9b6061502d7e5a2880d00b89dcc56005578015cf151180351e10665b71b93ba478a5acf6345f1071ec7d64e5e6cd8495ac460524d3d18879117a38c38afa69
-DIST thunderbird-78.7.1-he.xpi 640493 BLAKE2B 48933d44e15a8905f5b2271f6a70d09b7cb32977c198a79002b065f78ffa01049235f792674d15fba364f3560752080f5c4cc6683663b1759a670f149b536698 SHA512 8cc5d1d5c775dfd55bb952fde2ea9340c076f0cbbf40ca12650104cf5afc6c7c651dcfd9a7216ff269e9df081cadf1aa709db0b461410aca938ed4e7a475bf25
-DIST thunderbird-78.7.1-hr.xpi 629036 BLAKE2B 77f114535945c4bd11a0debb82c6a304ebc73abcc95eb2f50058d458820609303d4e9bee7b966075a49372281ff183bd8286e5fb4ac5711263676d0492e2a3d5 SHA512 efb1e006ce71797035876249e7bfb8be1a3761341daff24d8b479cd174070deb8635711a1510539a447925a3efe9e58605091c2e3eacb303a34fe785fc089a40
-DIST thunderbird-78.7.1-hsb.xpi 668606 BLAKE2B 1b73023460dac3c194973c1f6866d6ddef10d9281bba8f501e50c537e396c6d9024c61bc60f8f4e4533592eb6d36ca974bed5f0d94ca9d7f160bacdb9bea38c9 SHA512 17f10bf78a84bd0466d8fc4a6777cb2189ca0438a7d36c7cc7a6b34b3d2d7217ee95829b35bc762a3fef6a27e3e9c23f17926dadef0cd63be7381d974c7976dd
-DIST thunderbird-78.7.1-hu.xpi 679833 BLAKE2B 395741a3883fe327e2f86b574d9380019b0f8a1563b8efc921420bab2fef7643e79c5698c983587941acb299a349b985b9b789e8b3ceae6e6d325e5e9364dcf6 SHA512 196be3d4dda0ec9eba59bc084bb79e175054578bc1fca566d50f557ccdecc1719ebee86c9028490cb801fb7d10acf9379362615f0386a089f0619cf33a4ee6d4
-DIST thunderbird-78.7.1-hy-AM.xpi 713333 BLAKE2B e0b1bb83311b5f3aa0400857e87f850400fbae0c5a260c6225afe5436e30684b99673a40a5588aeda8557b107afe5c1ebd3a3007f5dcbae4311e509fa402150d SHA512 37f1c1353f2574bc2d627f4d3414e9e5178be19d3cc3c21a26acc9960d80a54e32692e7ffb8440a96f484177dc3daedb690d1a5f5e979efb72c2894e08f42703
-DIST thunderbird-78.7.1-id.xpi 620681 BLAKE2B 2d5d552ed77af4be911274d95c2d6d5c56850eed59c5bd6d9bf92cad8c35861fe69900e671914aafc57cce35c6790d0835473b12b5b8d6e8e8a93c9e4e240e2c SHA512 df18ee1a241c2c4116ad9239c7d82a714b8bc9215731dceab5e17622fcbc1ba9ebf70aeba1ba6d035cefd8142cb230196279a7109582e03dec782bb26b5d8e9e
-DIST thunderbird-78.7.1-is.xpi 581641 BLAKE2B 76f0558421c98422c9b9d3ca511d6b46f0e22ab1d93d9d5d7be9dde7ed61caa72b26ac3afab965e2bcfc38059df8e97e28b64d7709bb6792a56057c232145028 SHA512 8ef05fb92582d37b03a054dcce3c2dc275e320aa21b7a0362e58d8b28eae135b099274a777649fb342d0d9aeff14a8ea6c9bf6c967efe9d2d2469b1eb7128d0c
-DIST thunderbird-78.7.1-it.xpi 572957 BLAKE2B 4ec382d69d893f577ae8d392417eac8ee5558ccd355dd6b43910e81175bd59caf8416955d4d23c584cbaf41f67343c1889b31d0ae7f23dad5b2b98a82b5d3f4f SHA512 6845c8f28362c3b02c93b13136c2f4d58aa5abf444d37ec05a654557a67bc0195959c95d631a3fd7b4830e35580f8b6fee030c2c8f0243bdb163278d5bf18463
-DIST thunderbird-78.7.1-ja.xpi 722453 BLAKE2B 3f8347b2c442f053ee2661eb1e7b8b312526223cec7b13b7792ff81ff94038a20dc5febeae5dc1bab2037f00e082793af5eff8117cb709e11c9d981d05aed75e SHA512 5cc4837d2415f1d9a5f1dfb8a7cdff31e361778823b323f8967b25844e4f14521fea761c9e814c66d9ff11f976e9ebb89dd043eb4dc8f4997a392235ddaef4fd
-DIST thunderbird-78.7.1-ka.xpi 717020 BLAKE2B 1f5d26f7f64a33ce9d426b0596ab407673824be38778c76780b92bb95efc5371e5d9984735ae664e2cbd3b882674e1fa7a4da001c4e8079add262f506b74a780 SHA512 fbeb06a99b732501722e94b71eee89f242ec3335f144d2ec996e15aff942c7939501260161824383237024f89180e58f89a64b8f5d573d3feec410bd53c4a695
-DIST thunderbird-78.7.1-kab.xpi 651920 BLAKE2B 5d9d8e7b2b4bda1f02f26a6e07f898c9a833e8d33b65dc14cabe051483e1e093bf3f203baac33de5a86a3fa7d9dcf54a00ce6cda3b3c70ceafebf9eed1adc847 SHA512 cf54e992bd34eea44120993fa5ccaf974b1b881d5bbd9a31bfc94d91274e6ba7ab0fd38be813ba2541dfd7c93cee8f09f66968d6f84ec065f527f777ea300a25
-DIST thunderbird-78.7.1-kk.xpi 720468 BLAKE2B 7423d001a75295fea425e0d6277f07014b101d7244a952f717196b98482b71f4b340144018647ad89021ce5f7e5a736944b92c369456cc96bd2c069774d87c5f SHA512 152c2b51d5f88d27fbe8a91d247154fcc8a045efbedf94b7665f41389f2007d05f96142b8817456db61c1d7d099f3d6bbe01fe84537a79643da1e51d9c6fd8bb
-DIST thunderbird-78.7.1-ko.xpi 688208 BLAKE2B 2bea5704aae0ec5af0a8304b9770209e328ac22db445b5544805d85c33aeeefa3b3a9291b5812aad2f67e55ed5b4370449ecde26058ce50b2c08fa579840e5ee SHA512 ecd1a4019a0e0eee95f337b9cd736632a5795e833b2c838d33d3eaf908bc2e46befa53754956705ca572d68711cda24873267803eca221a92813c9e3ec9f9822
-DIST thunderbird-78.7.1-lt.xpi 660300 BLAKE2B bfb641c5186f4924099b7a78377be81c3e8237e56c804988af177639bb0bc3215919ca564cb41d5ae4e737d608ea9f9056281f1084375735d5f64568fdb583a2 SHA512 9f22f0aafc7e2161fc25c83e5e7ab0f465d83efa83c7142a28781e86802846b97dfc1b414e27277bd9f372cfe2d9ea8e55d25ed9abc0922de305a19dcac14dba
-DIST thunderbird-78.7.1-ms.xpi 572168 BLAKE2B 37c501548f69833ffee72fb21ea21302c04ce360e014b641225cae0a9fd612c78899327984157a4fb0fcfccb13af0c5e8a25241e07a609c4f09bc04020bdb39b SHA512 71a64ca8da63b6b79a3e76e1512ad6e80e024fa41d13b48bd9b8a75421f6183970311a99d8f40116be2ea1b8dae47bba7cd32d066db767eb6b404b679276846c
-DIST thunderbird-78.7.1-nb-NO.xpi 637238 BLAKE2B d2857157c7a2526398087137d243f5107e5e219f9a0835bdc429c890399eedb4ba6b6cda5c8a463da29bb69532747f6e01d675e2200519da49b8d688ffcd7c48 SHA512 5b4571d11a889ccaf009b832b4298acb481e2bb6986a78807b6316c5ad37721243a4ba1927c7c445661c68e992251b7a3573a254c77360ede5f4ccdfb55cd895
-DIST thunderbird-78.7.1-nl.xpi 644351 BLAKE2B 44037f21b0c0a137f8d6ebb38fe10e24a2a0f1825e2b7fb1b5eac0f0c4e283af81398dc139aa35c6abb453afae524dcf6483bd3159dc01206cf839c29f6bd033 SHA512 8189ab4077117d2023463158ecfbcc9d429a2b69bb29a768037fb886c048d333399247c64d4a4718e05ad0f4212527bc7efc9edb306ff7e880536736027de5a8
-DIST thunderbird-78.7.1-nn-NO.xpi 640689 BLAKE2B 056bc2217df6d3642df851ac7858bc2ddf2010b28e03416e46e77bfee5be5f791bb4f206939d546684f703fdf79bd659825488a97baed72042911db74e0e301a SHA512 91e25c62d13c84c130fe7eb9c5c1fa44bb1f0b18c5a7c989bd1f572beb9f369bcde46251e326102644871403f0d87813aab88fa3d4a975558e95c555d0d0d44b
-DIST thunderbird-78.7.1-pa-IN.xpi 633217 BLAKE2B 922d9e8088c8097531a78000abddb02b5c09c78f15a73992d7cb40fe177861c066d9495a1ebeb76c788b648edb73fa61a2eb70e72e9a9612233e3e03cc2235ae SHA512 1d442fcdccf0f29054ec8779fcb5ddc070795be974616fd01d191bdf14782c4f8737ea9c32480753a8c2b19b5936cf0bb59dbedf1c3f931c05830278e8512d02
-DIST thunderbird-78.7.1-pl.xpi 637119 BLAKE2B f6ee9810d7894ea0060e87b7602f1868892e40c0acd0d5fc7b8af7b4c43568f19f6ee1fea9ae43d051c51c633f804526864e6266e177cf2cea41fc193537c251 SHA512 66eefff7f14b46efd1d36935e7f103af64906411acaa7b04aa1fe2b52743dbafc35e9df169d386e6396a644ba195ae9f36d899ccb6c563feeefa748d0d69b926
-DIST thunderbird-78.7.1-pt-BR.xpi 649425 BLAKE2B d273765eec06334a510432c2cd9400af06d900768613767ce81146aba51046f5792f9c95b20b270bda348c96ab968a16d30079a33cb641f864c85218499c59fc SHA512 a8e68b939a4d9408664979af43a4f4d4d3d8742f742635f14b124b58e36438c52f6cebbd888c343d628a7ddca630ee1dbd3db7c031090695ec24bb7f5e448cc3
-DIST thunderbird-78.7.1-pt-PT.xpi 655497 BLAKE2B 096ed9eb201b9b9e1a3f315ea40be11cbbd6ecfd27df7caf72680db50d156b890b3cc604e5a6f1374c185ba904e5d5500f2716400962737a71365dcb4192631d SHA512 ab6fdb6b89a22e2cb95a957749480b346b789625311768f9ec76af8b21b69709a07256dd9fbbb8215dbefbcea6e2d27ce4307cde646be9b1bde6b8e09cc921ba
-DIST thunderbird-78.7.1-rm.xpi 646521 BLAKE2B 3c6f8ab99bf8934b1fd95e72b4ccc9584b8ad3f92e099f98439c5e16eb1d489348743c2f68d82dbe38fe482882e7cf3955ee460996728dfa854876711f24d13f SHA512 55b2d7ca443ee785c6189f0774e86027abd489394b061d4328c5fc7b9cec069dae02f3921d4ff5195ea864083325fe635e87184d6eb0c8eab1e2096452ae7774
-DIST thunderbird-78.7.1-ro.xpi 662631 BLAKE2B 0fb99fbeebde1d30e0b7431a7312d1b0d20884639b99cd87b88d33b126e29ad017f875b4eda240e8d71e36c28392fdd7adc2283535d8036e4363c6057a4a7cc7 SHA512 239d9f6a02cf14949cb621e19d7a29dd065ebeb64b8efe4b7d7eb4d725798d554579fd3781242162a911f2962b59178c3100f6ef679381f19a894f3400bb4ef3
-DIST thunderbird-78.7.1-ru.xpi 756186 BLAKE2B 5edb386de9187fa02eb4581e68b1d429d9879319ca19f510cfb0c2c7546230753946e1b442e65628d82d6804ad021ca88fcd2806b56f2e03196952963a9e9638 SHA512 18f0b7a5ab507bfb1ed2de4f55a9fc3957cf8fd4922732f634c16033222d3d15566d37a2c9bf4d6867aaa27c8e8dd373ae06c21448ac3022d3d8d131f0d29062
-DIST thunderbird-78.7.1-si.xpi 651093 BLAKE2B 96b386fc6fbdbd086e5ed46aeedf3ea77fdaf6ed84c8afe3b022f2e9c34e683c2fb0c403f30fa01f6ef3bb14a1c916b6f726c2871cd9e98e34cfb0fcd13bc70f SHA512 7f0a78581d9c53b79cd1e91738233e9539de7fa7bc42fc581c61d0f50d06737900b7b04fe8696a9f5fdfea50ef586e9dc0b4648148a4fe91e843f001076d6b0b
-DIST thunderbird-78.7.1-sk.xpi 643225 BLAKE2B 50d8204f2da30d7df8622ea16d34232987beb34e93060b86c89513b59310b38439debc7b207739fe6133ae481b8c7ce40cd8536ee9de1740ddd25b6896bb197d SHA512 4bb180beba717cefa559199af4060cafad5341492ca3bcbeb986a963b694764a44ede400680f22eb1465bb419ae657df0add60cb2ac9099b1f1e045882212178
-DIST thunderbird-78.7.1-sl.xpi 632384 BLAKE2B a32a6473427ea5c256f5875cef2495a52d686f5d0355222745f4ab399386560a162ded20b6c8985a08549acc655edec4435558ffb4e5687dc9d60deb95493c14 SHA512 f7b8c65fcdcc68c60853ca2b598e6b2d3c4aa025165745ba7a6c790ea33cee0fc9657824f8750b3784a1d4cf76d8ddc28f3b83183c9df391e71f1e9c12e9515b
-DIST thunderbird-78.7.1-sq.xpi 657818 BLAKE2B ea1f16a82fff0cd0c3cced4c63c4b014ca9ad8925fb516861cdd8bfc638ec4fa4031a222f09ae7fc9003802b04c080388315bb78e768289c15382214a758f1c7 SHA512 d318d60fb9c4ea8c434b3dc31c9abb588e897e3b1e8fa651b70a65cc9854dc70f61863f64836ee7f2f297d63ab6b5955f239e7ac8fea6b313616d86ad1692213
-DIST thunderbird-78.7.1-sr.xpi 683120 BLAKE2B ce7bc68be627ed02847513e3bc8b68795158c75c1d2f593ccddb9413f49388fbaa3bc3f5829afb825b63ae439133661803adf9f26a3a5bd86fec829299b01bc1 SHA512 6d6261487c625abd5c2738ae4b6ddb62673e042dfedfb8890e59d799cbc015cd4e2c729791dd60c6e33026a9682af529de9936d32643bd6667c364eeab5136d9
-DIST thunderbird-78.7.1-sv-SE.xpi 648866 BLAKE2B 7a807067338614d54a3f9e179812ab8af64fe1794f6f91c3bba4799ebd77b0a2a18eff9ac65f0cd4f277ef6dbac88d4fa9ad61ab06203e1de67c3d25e0a6f692 SHA512 e053347d503c5bf8eb9f991e47b5e4a2769ffb7065432e17035f3ad762354265dc1355701027255d66fc232bb2160c8bb18b31db33496ec552b304675f0f468a
-DIST thunderbird-78.7.1-th.xpi 712032 BLAKE2B 3ec6941268be2f4faa52195b8fdc37ed04b0c7b37e7c5d67aa6d2271a8146c805fad0e1d8a341a3de06ed697fc9488c9a79718a08d2e3c82fb201773b0196481 SHA512 540801ef1f6813b3f537819cbc8258d1b1df56fc3c17ab840a5fb65f0ce06a8a7ba65b4797d26540b0f15e806fdbd14a5585a00c895829b4d534cf6c993481f3
-DIST thunderbird-78.7.1-tr.xpi 649073 BLAKE2B fa30974c9c090574bff1c247aecb5cac6016927e86bab258abf92cd379eccbcf75d4722f74f0344ef7e625b12b955ad36a6094136438937d3e4f70ddaaa6fc0a SHA512 00334c3555edb39d0f015ec2bb1a5238367496bb40133f2cfda8393a5ee493261bab57f2d27f5a2e1e01cc2bc0aee23e55e960354426e63649d745745c58a0a3
-DIST thunderbird-78.7.1-uz.xpi 586594 BLAKE2B f99102dfe91198a423a98af0deb56589765669d503ff542bb1e3662102e47b0fbd67254d67c893420eabc98427ed6d9bc8b5015df37f89207978005493aebb3b SHA512 fe97f644bcb676558f10f627b6709b062225cc17a70171eaabd064750a479f595d16487f3d89ecaa49d2ba6d8ecf6ab4030ea7dc6621e3f894e500a209bc794b
-DIST thunderbird-78.7.1-vi.xpi 674614 BLAKE2B 50c7c2280b2e804813286f32752196db4fe8ad2c24f51a76800ea503c231cbf88a9e5c12dd1c916ba7e9db5995c4b101deebf1c1f6a2cfc41445f0ef33ee4334 SHA512 8670bf8ade9dcdb95941e5f2f345d51ddf86d40e8d4aedd1b25f879820d83e146c211c1300ce1542ccabb5e6db3087ea7663a98290a88e1fe7edc1b79b4dc30b
-DIST thunderbird-78.7.1-zh-CN.xpi 687176 BLAKE2B 0848a228e62a77160f8667c6fa0baffa03c039ddf165421e88f49e736859499874e57cc7978956e5f0da7ae383fb5d31ca25b0d2f84464e3dda9c414ba731963 SHA512 abf954d65768e9598534232d74da8ea44bf9491453d71bf17ad64a4deacb3572985abbca16bfb9047b64f3b2e33f379a6ee50a29eb470006f8f442bb05d6a597
-DIST thunderbird-78.7.1-zh-TW.xpi 687622 BLAKE2B e9ba2b698c944c33d080e7522bffce093b74494b480ccfe0df9942b93b7ad16347a65e9bdccc5b67953dae032310c70c6bac5f192b5d44dfeaedc707318ba79a SHA512 871fe27f95cc17e29145039f52d4fbbb126d231a7bdd27fcb11a2e5d1925631a708e49c3fa8c8d08f0f2fee838f3ca929c1e7619761d0444843f8c8d47611c7a
-DIST thunderbird-78.7.1.source.tar.xz 361610852 BLAKE2B 71b6ec2aa5e99d8c5114f66ff670d2930f246c57c461cddcc6c61b4beb8c629d5269197de62fe10cb0bde1be796312e4cc316b63e5c75d28cb9e6bbe9298dbbd SHA512 fe5635eda67ea356cc83e8e5ced4ca3c4555a964192c3e77fa0095a26a8e7366c6520604283bb9f3a5f529fee18baf54ca169bdcb7b402bd3752157b95848bc4
 DIST thunderbird-78.8.0-af.xpi 548342 BLAKE2B 4165c5723013c15bab04013dc316f6c7574acdbdcac676d9971b35d6eadd13ed0cbeb2d4425faaa0d0b73b543920c7a2b4d569bc8ebc5f3502030dd85950c3f4 SHA512 6919ddf5549197a398a75ea9ec0e8074bd521772e9b1a0977f9322e4967fcf4db09ea708e07c73badd3ffddf351443719d0010b80edaead75cb3b75f8eb1b0a7
 DIST thunderbird-78.8.0-ar.xpi 648607 BLAKE2B aa6a845c9fee67edde83c77864bcefd4987d6e0de7bbe74dd393d04a29b3ab13d1063c5c05700e8f9aec4ed272d2dbc75c0b90977fa92047cef1abedf7cfac7f SHA512 6a607ca466ba05bbe439b3188a470782e3f5bdd1346c4d24eafd7ca7127c4f456d26de006208affda019a010e4290e1e6940943764ee03af6b4c0933153601ae
 DIST thunderbird-78.8.0-ast.xpi 561254 BLAKE2B 86b08175ae6aff2d3c32068cda3a814d6a7a004032f9998b5876a0c6c75ca619effd7c4b647d5dc92110f82da4c78e86dc38dfc180353a2eca5ba5119029ae8e SHA512 009df4311c18d408211bbd40179cc566dc248a9ff38eeabf7373b8a5551493c92486aeee114a09ca831f759e1ba321b56ce370f7f4be7eed82f0e90e6af5e449

diff --git a/mail-client/thunderbird/thunderbird-78.7.1-r1.ebuild b/mail-client/thunderbird/thunderbird-78.7.1-r1.ebuild
deleted file mode 100644
index 4df8bff90d5..00000000000
--- a/mail-client/thunderbird/thunderbird-78.7.1-r1.ebuild
+++ /dev/null
@@ -1,1108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-09.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-PYTHON_COMPAT=( python3_{7..9} )
-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/~{axs,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.mozilla.org/thunderbird"
-
-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 jack lto +openh264 pgo pulseaudio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			sys-devel/llvm:9
-			clang? (
-				=sys-devel/lld-9*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	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
-	>=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/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.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.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 )"
-
-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}
-	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
-		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 -b "=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 -b "=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 "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 fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr 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
-
-		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 ! 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 MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-	mozconfig_add_options_ac '' --enable-calendar
-
-	# 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-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 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
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		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
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		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
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk '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 menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		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
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		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}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-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
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	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
-}