mail-client/thunderbird: security cleanup

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

2 files changed, 0 insertions, 1103 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index fbbefb314759..8c4378ab81d2 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,69 +1,4 @@
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST thunderbird-78.5.1-af.xpi 548317 BLAKE2B 80a469f883041bf82e0543fcff986c16e49256b95c7d51258136bb5f1ff48ce5932092f3e70c31ec99918fa30831e5175dc7d6015a652953fb872e0ae90fa115 SHA512 541cb5d81de551099a2807cf5b83d23a84e0d4eb421b85fb22dcfbf3b05289b7db1debc45b1e7a1bd502b7ca89f569b494cf72110db8192eb588e333b98411a9
-DIST thunderbird-78.5.1-ar.xpi 648570 BLAKE2B 15abd5bafd8b328a3391bb7f95305bc2c0df70f2ec723ca63be103cabd506433f145d541430d78c530be835801f01687849ecc124802056d649d28f4a37a67ad SHA512 95d8e1f46c9cc92a1097cd55f3bdcf6f685cb8294ecdc8c89520548789107579997364faed9be42e796e5845b86af2db72e5c6564d6635c061641a6c1275b1fb
-DIST thunderbird-78.5.1-ast.xpi 561220 BLAKE2B 34d5db5e6ffbcc6960d1e94eb53d4e99c7c56dd06a08b2737bd9782ca07c731de4b01e7d45bbf769043b7fd4530390e33e973c58937a36a40e9360ec02e1dac3 SHA512 fff1034b0d9859797c4a77b296a3f47cc3602d43a000bed91184b50b065321c96af0078a85617de1abe4a73aace498af3a8b9ee6941884ac306d2eadeda6d99e
-DIST thunderbird-78.5.1-be.xpi 666628 BLAKE2B 2c96c3383fe5218149e8097be028ab287ff447f3cde0792c9c498ac242f3f35faff34dfefa870a4dafdb46e1341c9f787d7cff76ecdd7f294c48b7354b38417a SHA512 431c4fc83d9784428f8120cb64cee8860f5f750178ffbd3f894a9c2bb3c8f58248ce0098fdaf8f6b18476ee54226749c0d224e9a32cd9bb8e42f427ecceb51e0
-DIST thunderbird-78.5.1-bg.xpi 672381 BLAKE2B e1f8d1338b45fd41ebdfbb46b746fe526a1e6e71fa62e1b8161e760da08d3c0e7724ea89802240b6ddc35f26514b36d92be3a63c1a5eba607fb5d41fd6cdae43 SHA512 2f8f47ed87d297957f7a8393fe37d879e1bbb265aea4731ea090511d01584be32f5edab71fe9241d6f3383e21a8cd04ac44577389e81ede7134dfe14e3d5bff4
-DIST thunderbird-78.5.1-br.xpi 604491 BLAKE2B 4daa0bae19200a217f46906fb17bf9543f0282a5135acbdcd45b04f1567039e97389541df1319b68593334fbf54b9a32d2a425befa46f062db7e6a2be79f39dd SHA512 2aca811de1943c192fc8997ede4678225ccec0a3b4e382f7ddbb88b37e80c363451a47a437be0f29f554a05564827bb12b17868db18dfb3fc4ab34e4959a2318
-DIST thunderbird-78.5.1-ca.xpi 620419 BLAKE2B bbf6566f0d123adf5d09fa1c21e40fda9ac5772789ebc64eb14a627a40cbe4725937b53875182457813edc14ff68d4431a659974291818303785e77fe4e6c534 SHA512 aa6c9c77429344cc5a8a284b55083d7732c6890248ef74101a3b44f4d6ea9cbd39b955b8e92fe53e8ad9db071864ca10d4a536d9181cfac3579e7c7117be5cd0
-DIST thunderbird-78.5.1-cak.xpi 635650 BLAKE2B 249198354c43236e301c80cef747967183065e20e0c9ca47a080f356520cad5a2f66a9bb5d03ced579be73ef7559241df4be01b73dabe84e1d28e7f5b6d22f0a SHA512 6c4a924ab6c469529f61a1ce05e5741c22da86c56be169e64c868ca5e101c55f89a38e8f4f3e83070454f6379dd42010eeefd7f986a68967a80a32cc72ca8cc9
-DIST thunderbird-78.5.1-cs.xpi 635315 BLAKE2B 7b51c43c4965ebeda4b7a9b214860162bd8ff24183a66803ef11810683d689661997a6d060322df3199ea4b85ab7c1297b513f95f3b13550a58b30bce9c9719c SHA512 ecf60ff8676a8688a796a90598a6a6a4c0b8796289bbed7e2a237ff7412ccd31546d894d0fff526bb2ce418f3046c0753faa22c488863a558c6764fe90751200
-DIST thunderbird-78.5.1-cy.xpi 646229 BLAKE2B 17a0db36aff61e5cba9732aa514e37fca3a9561a2f8543bc1020921eeb39147867248cb016660e6bf9dab7270ad76dda16615de58a643cf6e717f37a9926e2ca SHA512 69951b3986e34090a67434fdaa27cf7c71236bb3d152bf3cecde24e7e1222781e12936870af701e10736656554951dc856646468d0aaa30855a1dfec8e3a5eea
-DIST thunderbird-78.5.1-da.xpi 620984 BLAKE2B c24fe8be92f797bb11a8a994143598bcbdb316e1f02dc22e1c8faf8c8bd94b9b394085eb9fd0cc07d9a9cdbc448b05173150900f74b7ed8b9e1ebde93cb5c00b SHA512 f9c0f29c8af5a81df0ac5aad76b134757aceda4fc2bf6c849ba4f9952e6ff275ae1b7ea4e8f978b21ce2be1cc91fa97a005fbebc0f956ab8ad259b1cfa863615
-DIST thunderbird-78.5.1-de.xpi 665194 BLAKE2B ca9b5a4cbe98ef9cb2c8b08940cb6bbfe43128fca438b130a1716824543b43d51d2f4c8f88d8fc0db743e2a8ff4092cf03909b4d01b2127e31c28544d3a60153 SHA512 94626848abb600432922c860a7b272d1f1b19c60af8794ed657276dc35674e823e04c359fc159d7d370c97d6bf4e764b7a666ad891488345d78b8368138dfd62
-DIST thunderbird-78.5.1-dsb.xpi 666772 BLAKE2B d756bfbeee58fd3786fd027c5e52ebacbb743ae5058af2aac864d654bfcb9aae593f3c65cffce239b89fa66a3f03ea9893763f0f8a60754a301ff4829a00f0f6 SHA512 5b0fe19a94ee353743b6356b197fbba47218288670cf2077beb15d25dcfa85bbc1d9912eb2952f54b1cf4137fe2ad50388151757bd1645905711d5573bbbf9fd
-DIST thunderbird-78.5.1-el.xpi 774449 BLAKE2B 6280704e57d88a33f27213d1a5a86cd7435acaaf176dca004ccf60cd50e298c5182a685f808f4efeec3e8af6a9d21a68ef2834ea44d61cf316b3b79e5f7de4be SHA512 521b748687b439b1a5d870b27c11fba764ddd15abd049b59201c8cdb7827a9bfcd39148eba39d971c1f560430482bd73d3e813d82e87ba2484532acceea24b06
-DIST thunderbird-78.5.1-en-CA.xpi 611779 BLAKE2B 8fa12883317f2013327afaff0412553a452944743bbcd21ba1057061060af5e0cd948f94bdd839387925ba19b245d9e31f7c761df22f2b0f9ee1e2aedf513720 SHA512 65bad1f9fb111b6a7be3b5ce8277c910655c370a2f07e8b7db6049f14559c8c53f8f66528b250fd4d179ef8180a591494da3ae52b9cc818508d08d918e4596cf
-DIST thunderbird-78.5.1-en-GB.xpi 611182 BLAKE2B 3521e522f7a36f85a2a2a92427df577af173ecd30129678274d73d7dfcb9395de5854f3d349407cffa219e376439f36c0b2e210f3e1ec902d9a7822c64c548db SHA512 a3d94b14d7bdf12423178b9ee31a6c0339ae48add3505303ffc78a6e477afe66ee38acf787c928e77fd0aedc5616917117a6b5e121c36065d1da2e2cf0979ce8
-DIST thunderbird-78.5.1-es-AR.xpi 657798 BLAKE2B 920dd49f9d646adf3e35ea1dbf9c6c980e811bf0014a861e67ff551cb802ce3e582267cb1cd3ccba431b477da3426c352a5568ae6e5eff687dfc3e5db6a27e69 SHA512 019840c0bab36712b61ec2b499916c844f804ce2bddd41b8247edc538a75df82e3394a735936093b9b8ca5c4bf91db9282b4ae4f54e2790306a7e9163578a630
-DIST thunderbird-78.5.1-es-ES.xpi 569804 BLAKE2B 583210a4a75ba8ca886168aa36c3bb5db3b0551982f0f983a3ad2c71fe2a608bc29e882c0194f7bdbeccae6a9d7d6b992e8743270073cf3049d2935c8b5d6cf9 SHA512 7168318d7d1bf63d5bfc70c21b79962b19a7e0938a1636965130eb75caa33f7e861567e8654e1c0d71f206938a0971430379fefd290cd2d1d02fbd7427abb959
-DIST thunderbird-78.5.1-et.xpi 597700 BLAKE2B 0d872a5aaeb393c4747398990f86563461e7a2c772575a9a825c77437c2bce67b2c8a45d2ff4ec07288ef561bc9f4d052e934227c4010e36244a6278bf17dd8b SHA512 6ba39ed5b5704d0ca4dcddfd39f4ae2f181e1d3cc7fa329076a05308932337e17ead3174cdfc7bf7b1fc98ee321fdf6c7cc540aee66a41bbaf4e06f2de90a32f
-DIST thunderbird-78.5.1-eu.xpi 632925 BLAKE2B 2b731410f4f60bf3b7da7fcaacb55eadf4a8d69bfa4409d62287787e3b12e34eac3aafb85fd9075e7584be034bb2436ce7b7b867825bf5e3812e8eb0b67638a1 SHA512 ec6bef4a5a3c5a444c4d1b0f0844a630cb48dde0b3d3abbc8535c0f0fba5c24ae2de96cc81e679d88458d2d807d52ea12fce894d202ab46008fa87d9fd938ccf
-DIST thunderbird-78.5.1-fa.xpi 639719 BLAKE2B 45b06ca22fe853b945fdfe2de4dc677ed2316befdd616309dab0a549d92f696a6278c58f65b4e1b02ca99ccc0812d9e3e9cd08fa2a23b725450a60bfc8fdcf54 SHA512 46558a43f3ec608fd8bbf6fef2980ef836ecb220553b2d58531d3cce7ebb36e3980167e7fb0b26b1b2ae460a0bd119ff6bf68ff53287e6ce6d89c948184c3984
-DIST thunderbird-78.5.1-fi.xpi 642443 BLAKE2B 15d348ad03607202169233126afbfbcc585dc03df2e560c0aa9f3a54f996147c1de48ce5be79b044c154d3edb2bc3eeb3d7a19d045af6bc373c8eb4eca379cde SHA512 b666187d4544efabfbac80003cf858c105f03a75594c32ca96509dd6f16144d476855133323c7aaad1675d7eca237bb472a36b5f8687bae4255f54bceef233c9
-DIST thunderbird-78.5.1-fr.xpi 669494 BLAKE2B 522d8277d81e520c1e1089ab8dad5a0f892c13ff901bafcbf530b6df99f72f6840543ef690c0bf67874f0e968bd7ebb88e0bbf694148fad87ef048afa11876eb SHA512 c6631632d4588a5f9a5d750437835bcf1bb6b6506cb0f9c2eae431c1ba9003a190bf13258593085658e26c99129b3b75726e14365dc193c128231d2f1846ad57
-DIST thunderbird-78.5.1-fy-NL.xpi 653091 BLAKE2B 760d579c67f35a36fbad0b9d8fa4524f62c1f41a921bf341d32dd2c8794a767781270e620091ecdee9cc305f2873f3de3033bf783fe207acf3d5dc6a3e7aa79c SHA512 44547c1cfa39509bce6689f2757241da29d4a0f394890c05c62b9ca0e1674401c253a5038e36aaeed4209b4393c02051355cf7a6450fc458e6e4a73b2f26e66a
-DIST thunderbird-78.5.1-ga-IE.xpi 600677 BLAKE2B a9562455165498d23469da82ddf5924a705bcbc1a251363a290aac7467086d7fc3ded9c5f0b15dccc94cd1ae156fb0f490e3e89663393ab83de450941a96f42a SHA512 ff05174aa49f01370238209d8261e3b0d8e38b0c6175c6727b7def9a4d042aecd51207530bec92a7489959f3f3405c812686896d150faaee76991ab058dbdc20
-DIST thunderbird-78.5.1-gd.xpi 609349 BLAKE2B 5168ec9ba6945dfeca67621ac6954bedc092832276e6d2f7ed93f51745717edfe710017714f8ba41fe5a5df328e67dc9e6e19628dafa34eba86948bf029be578 SHA512 490a8901dd72f6eda9c368cccbad243436b13cacac3b79cfbc6c934d2f949739821ff7c64bb8ec76788c5f080a0b1dfb7eeeabdfd7e1438631eb1ff88e65f934
-DIST thunderbird-78.5.1-gl.xpi 615718 BLAKE2B e3c2b585a5512b161e1f439e8e914d12c0f7da095741b893f512a7c7d80a707c37b24bf93dbdcfb04fcdf21978120028322c4a7f91ca20c0045d924c4066b727 SHA512 724330f721f139147e92148fe8bc6f77d48fd0a3488bfeab1d708b858de121bbc19efbba405378bfd5b435dd50b17a6c9578f2085be6d283f91872f68325b0b1
-DIST thunderbird-78.5.1-he.xpi 640499 BLAKE2B 6b9e3f28de22fe93af930618fd6f1d8ed5b6f29d51384584ce771ee51211e7ce5dc6577259d689baceede0aff0257fcd4e905dc3f10e49e9d242040de0f24c57 SHA512 e66530728e25e06e32988abe513655bc1f3dd1dcb40a04b8788db28d9e8cb12a7eee07bef970cdc4f0a2f4d10518da17e704dae0fa528fa211a03153633a9699
-DIST thunderbird-78.5.1-hr.xpi 628987 BLAKE2B bb02af1159b9b014b2e6f3e781b431db5f95fb25f00d30704712d255c4bee3725be3b6edd58d1ac545d02202713044024ddd229fd6b98363d3d886193d0e6a17 SHA512 a51d8e229eb9125ab10d55abbb6a9e26698468f62aa093ec07fe998737c68de94922ac820ce74ff7221210e2c1e28711e5f11182fc986df4467a9bc3fddece5a
-DIST thunderbird-78.5.1-hsb.xpi 668606 BLAKE2B 608323c58f315b23f8ab4beeb6b1cc30bf775d9dedda2357e312f059da1ea328d3d50f9a267e1505a37180dd017b0bb400d5efcedc810f1a989d1e3d75ec4c93 SHA512 90bcc4f42ca6e9c0dfae09d46d410c1165c601920f1e1e772e6b80b1e17b18ef52461d037ebd51c40fd9b266ffbd2c8652ab3f851fe39139782c15d2043c1b0a
-DIST thunderbird-78.5.1-hu.xpi 679837 BLAKE2B c06f38a49a328354905b93fc7c7c747879d23af82aafa920d72b9e8b5637c5c6a32691e90036ab6a964bbb1b9de70a048240d0fc115fab7212a1bfa5a9ebefd8 SHA512 94df7445b5d86b0b6aa890d4d22f44074b59ae49ac10dd836fdd4e8d6d64f410ca6426af2a359686bee09bc8499a5c8b602e96a4c34e6ebb0ae759c42fab4588
-DIST thunderbird-78.5.1-hy-AM.xpi 713292 BLAKE2B 88fa195a1482fc58eb3df6c92099ff5b22dca080174642de9198efeb12ae2aaa9e78532edd05701821093ef67ea5e6a5363ffd5e79f58965ab987720a567db00 SHA512 5837992f34196d2fad2d248fc36a951404815d6a69896cd9dc5c2bac9fe3fe31ab59cb07fecc6a5a3ae4fd01648b3e7b8e6708a7e1fee03a18d435e1a33b510d
-DIST thunderbird-78.5.1-id.xpi 620643 BLAKE2B f3c832f88ce69ef9a4f59d2a92448cd82abc8062196c3625a48bf5f667024459e108be0bb5c8695f84c8e57b41409e209c7bea359888e2787a2e941128da967c SHA512 7fe96ea30a5f5ac5a73b257d27931cdbe3e2f2667e393191dc47b526b995f8873d33cab4dd942fc04010d439b372f0f9a852ac71946b03c65871d883adcf9d66
-DIST thunderbird-78.5.1-is.xpi 581612 BLAKE2B c2b11850b9198266feed8f31e5e135c80112bf3a18de4bb17c300874ccf403174069f116396158be0b3105ae5b901d4e6cbf8e09297bf0e0a19d62bc736f7d2e SHA512 fb64e17be001dc1a62e4a9718fc30088c9e7902db078959b3a2eca471decfc43bb5033324a5dcc887d24b5b6515ef7f403d0df4a6eb2b61596f498e192aaf203
-DIST thunderbird-78.5.1-it.xpi 572960 BLAKE2B a3183fbae41f1099492dbe84a8cbc7dba8465731377efe9210cbf8724a2eb851496bf10acefdca32c88bb505039bee2c8a3110c43382a12c2f136026ed56e192 SHA512 2b779384ac1ea2632b374ac40a9c124a336cab3fe8790fcee2ddfef38870abcb1e10a507680f17491fefed1a5463f5c2415a8cb085834ecc360183500076978e
-DIST thunderbird-78.5.1-ja.xpi 722456 BLAKE2B 16eb0e1fdfa62bc9aa7f79bc7bff160421c95ceda22dcbbdcffbe3c1671cf57dcaaa2e1d5e3a10da8a899e86ee63c2612c87c5a9f3722ed0d89cbb6e20ac0519 SHA512 9b241ddd26f63fed0d372499dbc98932b971463f32d16770b9027973e235d3ed70293ea92980ec7a66606365a6d51829577a24059dfc703f6542666dcadb86d9
-DIST thunderbird-78.5.1-ka.xpi 717015 BLAKE2B 83f25487af674b6844e850acb79bedbfef4c7704e5aa4204ebab8f08dcfa05482b8db58a90bf4c50ecf160667bb618616606adbfbe61ed85898c1ecbea5e6447 SHA512 33822ad70ecc12f63570efae6685e959ebd819eb4e27635c4bff2e25d2c369cbc9e83da99a3b3c62179cf292b498ee1e2b926afd0d38d0cf2e17d2913585c458
-DIST thunderbird-78.5.1-kab.xpi 651915 BLAKE2B 3e445f99eb3e14701020d17522c2499dd52ba2fdd9a81a9ace904a4788494f663d98b0f267f276fe3b31b327cb380aa24ed55348c951fc12cb0d80471e7185f2 SHA512 19829195a42390abc2a57ef6bdfe69ec16e17347f75effda816f60f6145bf8aa8be6e4771bc0ca3b89f88610b6950458531528b35838372841c696e546d55606
-DIST thunderbird-78.5.1-kk.xpi 720428 BLAKE2B 30d3955a004fa5477e2c984b0828754be2038d663421df0778e253a5ee4d9cc1390da2377b236f252be4c6aa25dd63870bceb71af4f3673c16f42dc73b727b67 SHA512 6a7133a31d65a87eb7382caded36e2ade4911370272c79cf347e096f6e0e21af4aa443b5302df31e73a4f3f083241b799786bb71136f156434efdc157e6bd59b
-DIST thunderbird-78.5.1-ko.xpi 688202 BLAKE2B 1681654ef4c23d8f01b8d9c88a1f297d1e5af9ad8ee3469eb725d13fce1b9435924bcf8b3140a884e82a5053a5ab0c1c5daa79e56a239033b44e39a3b0353e03 SHA512 18f013b59502cb78df9f4e28d97cb15d609da71d5947c3ed7e6fd38bf9741d7e276356352419537efb0b88eac6ba3f9b9cdfd7622aabdca3860629eea1a2fd88
-DIST thunderbird-78.5.1-lt.xpi 660289 BLAKE2B 366528af429b2aeea346794a239877a45c0d55dbd4289115186c3a2e8f12fbdc30be22f6986f8cabf8861f39e44906e6b4c08bca00a067b025964aa061fcad45 SHA512 4d8f80894781e85ed7baa74f084fb1c5188c9813d91a597bfc635dd8d1c6e330ba2ea2c543d51dd626e4c93011811987669aa71076452e82680a14f2f2f838c4
-DIST thunderbird-78.5.1-ms.xpi 572142 BLAKE2B 8dd6ac687d74f18bb3b8daafd0600367d15a721bc1db220fc3bdd7cb8fa0c3dc1c84eedbe77078459ce940e2069da7ae2a40b8b9d5cb80791d1cb9baeb7dffda SHA512 1eb5fb12e0b857b55dc83a9abf6ba55ca544e5ba621182bd236e22e136cae761f5de3c17766e655acc92b216e06ac3a8a95c6e6e08a2d9518182ffe8fdf7df1e
-DIST thunderbird-78.5.1-nb-NO.xpi 637238 BLAKE2B 7e8e02a580f7eff461380210312c879b5a07c60a5f51e6e9299e65e158151ef12a2f01ecc39913a455b2354049c561e33dd0ba517a3e99ccda7a0d5ec167c2e6 SHA512 ee3781417f8ebe2edbecce6960f37e01a9d1f57ea325255058221259edfec98da96783e6ba1c9342a11fe9fa5c50125d9c72d2c3555cf36c96a2011246671e6d
-DIST thunderbird-78.5.1-nl.xpi 644354 BLAKE2B 776033ca2fbed739fa2b00fd56f3e379f020bc663021204ad8600c629c82662c4154638050aa1097df7e5d5531907e89290047dc5166e758b80246ce37bb5bcd SHA512 df9145131d1365f4eaf4d0461e67134846b4076a9afb5a1b517364f52103ed97f216ab5ba62ffeafb56376bed4962476e95984714b0e0a6d06caf797b058a231
-DIST thunderbird-78.5.1-nn-NO.xpi 640682 BLAKE2B 487553ffa26848bee49f91877d02277946a12fb8a40e036aee75c8e3f37f703bf0e6f8fa8f784f3a320830c61959d42c671a9c0d95c9ca37a9b9884ff83929ab SHA512 dbf3264dfd82b1f32f2b88c5fd35377e8943a1b7177b9a4933d99b1936a881d5e97f1007354c7571dd9abc082f92116db85abaf802d1fdda649a8495bfb2a22f
-DIST thunderbird-78.5.1-pa-IN.xpi 633181 BLAKE2B 3a5d92d39440a0609240599313fb298d5a2b3c37bd54bedcb52cb0080883c9d762ddb3c382f4f7c233d84c3d9dbdcc99c2e7ac7b135f948165c3b77738f3fbc8 SHA512 284816bfba52c58e6d52064f7b5eef1427886995f19f040efb63ddbdf9d2cc49dd2faa7fbfd8fc5355742d99f030afb8e7df6d5a04c7f705798c9b5031f3e43a
-DIST thunderbird-78.5.1-pl.xpi 637129 BLAKE2B 263b8c50a9c1cff8c9f21623845be52f35b56b75dd5dbf86888ac378b12fcfe720e438aafbd079ef0b18f1c7e25cc5a0ae1648bc924dd0ff7f382aab3c311c9e SHA512 3746970c2d1325cbd178875497b397f778578b4088231e5077c4d2424faeed81e3342023241f2ecc92f4f512dba64f9e73f4643ed14b295929daf4f6377f006f
-DIST thunderbird-78.5.1-pt-BR.xpi 649416 BLAKE2B 4f2ab5a7208059f16c205f3af2cf96027c16b3e8ec032d9643523afd1020bae8e92ce19a30573c9c4a52de40a96c95299ed2008436f81376eb9dd0698aee4138 SHA512 1b8d9a94af244aaeb59af89f5b5cfcf72abcaadba040d026c128478615ad07aa67e05cfe153a97ba11883622da86402e0fe2d1b700260299771be5ad764982df
-DIST thunderbird-78.5.1-pt-PT.xpi 655491 BLAKE2B 7ae674d9a503a2ede7991589f24a2c480c32cbf2dd6b014345e98d6276264402c0c8d3f4507094f017c6961ad7744d77dbf6aa9412a975c18c47879ed97a44f4 SHA512 db621cfa2b4e1090950f13d237a1abfce0cdeb7db1dfc0fff530e6cfedc7570b718f45388df19da8b8b54724d7e5c4bdbf532c308ef9d61a85f006937023e507
-DIST thunderbird-78.5.1-rm.xpi 646538 BLAKE2B 70c60755d9fea5e48ddae057a044d2ff4ac4975b6c5df6b4ee5d5c806ebe53e0ff6c0bf66edb49909ff9c9a2544a9c60abe0ba9c2a132eb0ebb017f7e92e6f32 SHA512 6c9be6bd9e9a7bdc3dfde57825cb39b602b36fa79e52a8b3d9d023cfa03337b84b02eed9cc871859f747950be6d2e738b9f38161354c90dcd0fc3991b86ea350
-DIST thunderbird-78.5.1-ro.xpi 662627 BLAKE2B 1ac945d19cf012db593f6a557e1eaec5522fc8cb25ac4e38a561808836c545fb8a864391f3bca7d8d8ee379bf41f8726a43c405a90d30772a9c711f49e1d8b76 SHA512 3d73cf97e6c7ebfe771f69bd5b65181b48b98e431b6d9d9c094becd8619f42fba71e4a8c7310af592c50baa805d8202956f3da569678702cfdab85c64a1503d7
-DIST thunderbird-78.5.1-ru.xpi 756189 BLAKE2B c94b2e749a38e81b223af874e8988ebf4f631504dbfa234bdae70a998d3236259d28e720d4e75ea8b2f5634b806fb11f5b8c51090d2743c7cec1115025b358f8 SHA512 d9060cef57d7b875387c26b2cbe5e1573e441e453feea6182bccef7a05cb2593c1fb373f8d218dfc2d2123073b750ec30e0097a76af64ddcef0c6c4b5400aab6
-DIST thunderbird-78.5.1-si.xpi 651075 BLAKE2B ea9e7c7d2087616f615523e83c9675884d67457a438fe2e520b51b1cf9f5de169c48008ce8854738e22772c9a6b2c970a7293200bd4db55a75f858e844b2f0f0 SHA512 f6c4697d699a3006e40a2351c49dc64c743f83b625faa3b7bee850b60702e8ebb8cc61d170e76e339a7d219128c90f0cc71f1169547e3335da3221f359156cd8
-DIST thunderbird-78.5.1-sk.xpi 643191 BLAKE2B 7aff13b4c8b3c903daf636456c410e7089257324226e0b82fd9e205c8199b25a30acf89f00d0edfb0d7ec523af1b67f265b6748adef807b7a761cd927fb063dc SHA512 f6efe47ca5fb297d01138f7b3430b63804460809fb558ea7d2365739878b0f0a7fac78c4fcccfb5e3e5151583c814534abf953a807138d4813dffa76c20fb7ea
-DIST thunderbird-78.5.1-sl.xpi 632354 BLAKE2B 8406e6cad8efd51026a93134018e8f5f134f2f099787484a06e054236bcf3b1c84fe1317dbfeecc99147585648aa6355210087415c360061f5ec412c07acabc2 SHA512 20f231f49628e758b6754c4dd0b08a5f2632ec2cc0434845f55e3667106c422299543a1b510c726c37637ee4a7c22484f29f8838ea3e5b1c2f91dae341940aa4
-DIST thunderbird-78.5.1-sq.xpi 657818 BLAKE2B 5147802ea56857df2e05ff2c2445e67f089fcad270c33ef5578b02a540b91fe36c9f3b17dff1ad6ff5661399081bbbb1f9334c2787e85c8489b93fdbab184393 SHA512 e187a54689436f38a44a875ae60142b1294f23038b7b3506f2cd596255f95d697d53010d69bc9156684c7f8190e222d1a65902c36e227a0effdea9be1d567f41
-DIST thunderbird-78.5.1-sr.xpi 683075 BLAKE2B 0090896e671101bee5c2e9e183fab4cc498bdb728c92121e263430be26f3156e29af56564f7d8f69f6d7cbf7bb4a9e635e4c2d31e4bec89eeb7844637356ea37 SHA512 ecdc2e22af60c9d8ef48ea19f200b600ece88360285422f85582a2c1f3921c1f4d6c4707f308953ac5b9b723161893b0f45fdd10fb528889b2003a345f351ac1
-DIST thunderbird-78.5.1-sv-SE.xpi 648868 BLAKE2B 69106363eee6f6f72e8254bb6f0a9b000d959cc1e31c8f0181ce82472bc92acb5bf899d2e1ea6e39ec4b992e3c5055c6cdfb5f37b0907e9fd9c44567f3b3f07c SHA512 a156f0818d10d343099865f79eff559580469836a1f705033335768a6b9e214376f501a50248a80ea214ee06539d90584a1cb93fc6f4e74e8c26f34624f3c889
-DIST thunderbird-78.5.1-th.xpi 712036 BLAKE2B 392ed101a03eb78bfe75999000c14fb42b5647eceaf03868caacc19834f64654f4731090841b795e3ddb85ea1bbc424ddba23a849de94eb423b8447360bea664 SHA512 ab2d7e813c6f612211e5b3314f4eac7d64d8d54f46b623cad21aebd7e9e66e3ec0a956c5904a4571e1112f276318821006e7d3564a16d93cd94316c0a5dde57f
-DIST thunderbird-78.5.1-tr.xpi 649071 BLAKE2B 3a757f3f5621d2f2acfbd5cd6cf31efc4cfcc99355f8440150bf0ea5f8db74e3c60d066fb6e0c89a7574119026ade3946e9361eb61d71d5c3a10984fa2674eec SHA512 bd06af705b0b8a76c6895293fd008b47ce0d6cbbefcc41d600c9cd53cc741fa57aad42707cf190183323cb0a274ab2bef250c38b8c1cd814164f1e813848272d
-DIST thunderbird-78.5.1-uz.xpi 586572 BLAKE2B d88d9d5350b9c654fec7a384b94f0d83c6edf5fd4d15d2d05a4363ab843b711d41c8202f35306c81b37dd2e3cf824f9db793dc260606bd7b15779c26b9a69baa SHA512 be1ee1ab3bc06dd52f228e6d5e6c45dfec6b91d2469f2c5129a42a7481faee0a180b0a0b099837c645b2c62c0a5e1b51d604a6bfeac92bee4f7694a56249076c
-DIST thunderbird-78.5.1-vi.xpi 674603 BLAKE2B 47d7902b363d3f383d18be1446b83aa67be5065726b39bb67c06a8eca8b024c803867e396b85ef24ccd820227c19d45c18c5addbcd55c5ac087e907659ba6307 SHA512 f8245adddc5130c0559a345415d64a206a282f2bfac0777d97ccb96fee7f091982621a02df605e2fb9dbb1b1da6adeca7195384084b65e1ff9134c8e99e455fe
-DIST thunderbird-78.5.1-zh-CN.xpi 687173 BLAKE2B 559fe08784381491f4711200b8024a43a3a539b234aa8f4c4a0836899774a792805c1e5f74a77c33ea3d61392d2e7a6a3521903d1d776e8fe671d2667c6f5f32 SHA512 917ddc49e8603eed925678e57d9a00da85da42676ae7b0a9e567e84f8cb8daf8014b897cc9a651ce60a683d17cd9510400647e5621261ae483fd6634cbeaea36
-DIST thunderbird-78.5.1-zh-TW.xpi 687617 BLAKE2B 905f1290f151c44961c3052237b57732f1be545a60189e2fd1621b1b31d522cfc8cbb7e49fed1d8b8795d936a830c7f5dc33e0b27d8caff31309d09429397e76 SHA512 1bf9343592d4df3f5f091ae6fe63b58c2c43bec0581124db88e7c714877e364f0a97d252736dec6cf3522134a7eceb7ca00ffa00274e5690f39e6a4de1f05a8c
-DIST thunderbird-78.5.1.source.tar.xz 352743032 BLAKE2B b713b157e273a01ad215bfe751d79948884b9320b59689e0ae1916dee730b54f9147f7c895ec629f06cf4b6da7bff9045bece54704c5d683d9c1deaf41298e8d SHA512 3fb50ee1b5ec4bedaca0c68a86286f5141d3e350025b9d928348c55e57e07013124ef8b0315ee6cb16c08777ba8b0fb715ddc4b5fef2481e32f2b676090a2d80
 DIST thunderbird-78.6.0-af.xpi 548345 BLAKE2B d89ee0a52cbbdfe33efb93f5ad4d89523f486b18fe62f5292dbad19b2ac7f8134d83b9c40e9424318d40de4a8d9f745f61faf0614015ce6ae1ae8b42b9fd0be0 SHA512 273c352acfce808b97bad77f0b9a3b02296ea78e086baf7b2a3c5d6c980edcdc20e2f525aa24dfffaee74a027a8bb2d34ec09f221f76a67bbcb145c6d21ed417
 DIST thunderbird-78.6.0-ar.xpi 648600 BLAKE2B 274020f982e55bb6892153e3a19b55a6bf5a845e85fdf144f114ae2be4a4607fe3f140ea67e89ea2a3b921355f550b23e5eb88723a58803c4aac08af7f7b161d SHA512 b73e36dd0a086cdcda34757a0e30dd6aa82791862d60d7c0f87bd8687d52d71da81dc1684130182be07001a777512897dcf4f95e23db344f97991ff937aae5df
 DIST thunderbird-78.6.0-ast.xpi 561260 BLAKE2B f6eff5ea45de17a5b370539ab83de54a04d6afa603e122f2afc8875e3f2b3205fbbedff7c3df99532c7ffa8985167a1b124ca586376a3a8b3f84e6023123ee92 SHA512 a7ce5cfaf4c96bdc63dc99aa1e5a31eb5e4f90a45350b3bcae2fedf2925a2372fe0058754f490e5e0a114ee5d6341fe8b632f4e3c01924da3f79738a55201117
diff --git a/mail-client/thunderbird/thunderbird-78.5.1.ebuild b/mail-client/thunderbird/thunderbird-78.5.1.ebuild
deleted file mode 100644
index 9b17e420c8fa..000000000000
--- a/mail-client/thunderbird/thunderbird-78.5.1.ebuild
+++ /dev/null
@@ -1,1038 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-07.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 jack lto +openh264 pgo pulseaudio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-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!"
-
-			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"
-				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
-
-		# 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
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current CFLAGS:    ${CFLAGS}"
-	einfo "Current LDFLAGS:   ${LDFLAGS}"
-	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
-
-	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
-
-	# 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-location-service-api-keyfile="${S}/api-google.key" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google 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
-	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 CFLAGS:    ${CFLAGS}"
-	einfo "Build LDFLAGS:   ${LDFLAGS}"
-	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
-
-	# 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}"/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 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
-}