[gentoo-commits] repo/gentoo:master commit in: profiles/arch/alpha/, mail-client/thunderbird/files/icon/, ...

[Thomas Deutschmann]

commit:     30d0f6f5f6a97198040a99db02590416f24efa6e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 14:25:16 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 17:40:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d0f6f5

mail-client/thunderbird: security cleanup

Bug: https://bugs.gentoo.org/745432
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/thunderbird/Manifest                   | 130 ---
 .../files/1000_fix_gentoo_preferences.patch        |  25 -
 .../files/icon/thunderbird-unbranded.desktop       |  10 -
 .../thunderbird/files/icon/thunderbird.desktop     |   9 -
 .../files/thunderbird-gentoo-default-prefs.js-2    |  10 -
 mail-client/thunderbird/metadata.xml               |  10 -
 mail-client/thunderbird/thunderbird-68.12.0.ebuild | 810 -----------------
 mail-client/thunderbird/thunderbird-78.3.1.ebuild  | 984 ---------------------
 profiles/arch/alpha/package.use.mask               |   1 -
 profiles/arch/ia64/package.use.mask                |   1 -
 10 files changed, 1990 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 8cc9b553844..85098438bef 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,134 +1,4 @@
-DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
-DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
 DIST firefox-esr-78-patches-03.tar.xz 172416 BLAKE2B 2d67e793e4f4bde447a3a3f3296d1c5ea6c92843439f87e0ab08b51d2f0dd74f0d37762807a1f24853e56f7987e18af65f010027602e32d40a3444c7e418ef47 SHA512 86f35b89ad573c10b839b1631149c6fce3374943d101a6496c40a69a813525826cb2bac4926fc7813dca334c9dcca534e0a963b0725ac3f95fbd3a1c2bf8dc3e
-DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
-DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
-DIST thunderbird-68.12.0-ar.xpi 617167 BLAKE2B ba476e918fb2a0229ff75eb8daeb7823fe285e79088788fcb0c638c99e55feb79f78a4df0ea2b0dd837be8d12988330fdfc1117dfbdc65e6fb99676b94aae404 SHA512 05169e14a9c8a8bd5e36dd377d4ccc034d3603320298eea5ef2eb329ec3f72595bb6afd57930d3b04c1cfc6b99c122d98a78a9f6a258e6b78c14843e68652adc
-DIST thunderbird-68.12.0-ast.xpi 551299 BLAKE2B 5117f06a35ab88735295175ad900fde7c09d1f9563e96cdac087121e686f056722c939d65544d57b1637300d358ae50d8869973e9c17869bbfd6c42e3d843330 SHA512 54cce22c335e1361ce8e92d5174b0edfaf1b635be13b55acd505ecabb84e7a9dc0ebbb83168a10772a0e95b1906b1574b91b6f2f6e1901cf56e70fcf08bc16af
-DIST thunderbird-68.12.0-be.xpi 646280 BLAKE2B bad2e5dc2615457f62daa019e59083c0546db35d4eb95876abf4fcd6552731f318337af0cccad400bdc001c11ef306e7e736e56a1105f5234f12c5ead8c584e4 SHA512 1ee9e0b4dd0b8598aab1cd9efba5e454b6930dd6f564b7006576dde20ba71c344ff260d7595796061d8f8fbfd6aaf157abfbcb374415c293e3cc928e2e73ffa9
-DIST thunderbird-68.12.0-bg.xpi 646226 BLAKE2B 85a22c4f52cddd0f1f5d7f0c556b77b2d5d79c2be0d6f6fc870193a129bb202c069ac5ba15cf12e4481228db3dd3c445eb43c43c2db3b38f5dcb563492211ee7 SHA512 b7b87144ba2c1a2214b6452a5f571fb5c94029a72d6deb5beffec45c2382fabd00f025029c011726ef48a9aa423c1527f37991e19631a08f698981d6974281c4
-DIST thunderbird-68.12.0-br.xpi 574852 BLAKE2B d97715924e85f5a1b3d6bc97921db245f1cbad777eec89420ecf0ac90b8879cd8c8e7fb2a597e2021b76b84ac96edc680eadce8535f30e8aa880edbade038abb SHA512 6dae361254800caee67570de0a894cce70a8f379e7d71e788d18045bc52a5f7965460ae29c1ee28ca348f2a6d4ecccfe28314dac0f213e7d4855ac8fe670f849
-DIST thunderbird-68.12.0-ca.xpi 578439 BLAKE2B c4caba0b285ee619110e8ccae5bc8a9c53f3f83320bd2970961057e3718a47809a7c14f89444190f290eff642ca0d4b4502bb9ae789f574b5f98866dab24c7c1 SHA512 5992863563165e3ec4bde17c6f88f9e6237d7a09f4905ea4626eb24b470e413476f6eb2ce90081ead02913cf27d338965bf3d31fb42ad2294443f7cd7f75fc29
-DIST thunderbird-68.12.0-cak.xpi 602711 BLAKE2B 72ccca4545d820b9f317156df25849377a125a28b1b540c94a2830366b62423b0eedbb3ac4fc2d7e9b9e1412faf687b222b04e71fa7316c07b92ad5b7c64a572 SHA512 4c7780f33d6fe6549bf43ed4ab6d7e6c80e228032d8e759f8f40629a95c3d3d32e9cee847c7f221294550a2396b690239a05d8ead884dd4f01529e460a4df61e
-DIST thunderbird-68.12.0-cs.xpi 603043 BLAKE2B 1dd17b8abea3fe7bd31442895eb988f880f50aa729bafca6cef5aeace46e4a42e7cb47874ca244a606ac2db9481e5b06b28d327b3bd329a7c5d2c21609e5759a SHA512 5e972cb6c41603d122cf7e08b4403770513706ff748708e31a0b2c7148e7106ba1c3f175469d0152e6534dfb0414818ff565552ce65c7fe3ddbc59853024723f
-DIST thunderbird-68.12.0-cy.xpi 589903 BLAKE2B 9a232e7fb3fbb838b9fb9a16ffd688da7784a176df8bcfcabd41e0f21f3e51b10a1a5b1fa9ed453088949706056ca41a511bbea53ad192a53928cf554b1c2749 SHA512 ab0d2637f17a6c49dce83d80e229fe76f5187aa0ab160bf4c03a7d0678112149195105ed9b0b977af09f8efe29dacaf0846c7e5a8567cbeca1ace37d0a5224c6
-DIST thunderbird-68.12.0-da.xpi 588350 BLAKE2B 2a8a6e2ad4faea2ed9278b24d0035721bd651689ca4d6c638f11c696b1cbb666833162b6be3f586ced77b8ce8eb2e604b1bf788f1432c2914b2b9435814efe89 SHA512 04b0051c2a2d74bc0091e4f770537439284fcba936f283529abaea7818285739adf5ca979f0e843cae238fbae9f1c4d1ee9916a296224edb9945f0a4e357b0d8
-DIST thunderbird-68.12.0-de.xpi 597804 BLAKE2B 240bdcc509f5c7a79972b9be1bd333cd1c09e27ae216d19486c5cac0c59bde904088d8113101d26bd1c078dc29b89cbfd284a8187a98a6eebc649bba729bdbff SHA512 f7fc5eb9ea5f74c257ffcdcc1dd450f0cd0bf2a247e893ac251a26fe9c7a4e2b83df4b9fe71c3eadec8b86fa525c0a989ca76550718ed992e48e8e05f796751b
-DIST thunderbird-68.12.0-dsb.xpi 618835 BLAKE2B f79c9c1d53954d6d4b3fc6a384d7debf98be80835031d7d472b91cc0c7fd3a9ef03a1051a3a1e8f2943a90e9eaa87135c92dd2d7962e04ad4bb05ec39a8f668b SHA512 f6851ee32c2e80803488ebf390d345b495019b001ca1817ad994263f3f97a97fb6cd68e6cac0a885aef7a323384eff69b6a5cd752eea2173cc8a9cd0c39c8527
-DIST thunderbird-68.12.0-el.xpi 699222 BLAKE2B fab210e1541353bebb78d72d3d344f6cbfff67b42af3039dcd9c2eead44395befa51aa9128c62ebf7eaae196cc62807094b20b3c8f636e969db4871a03db6050 SHA512 323bdf6823e32efeb18962fbf4429e335b8301039bd821b7edb1f7278b939c3f54b1cc3765318570da69ba4e1da9bbbede6c870c9d17a607f3e77a3637d85319
-DIST thunderbird-68.12.0-en-GB.xpi 556404 BLAKE2B 44738d9782ada22595fd6df8239361a5c93c7f1886b9f682292c0e0fb6ef8242cb305b1a8838f1631d867a736639b0665edc69aac9106a9d389f63cd60720c5d SHA512 68915a4575043f54db65d6653889452b376cae01709605c7a9a176e96d44c259f9aa79fe40ffab62d697721f9ee1c24900b04ea6f8554be9834bc8ab11d3c612
-DIST thunderbird-68.12.0-es-AR.xpi 596552 BLAKE2B f1ab6b345d91388d41ced66b384c472fdc10c6d8f29c178499a97cdd03df022591f61b7614d12d6ba83c6bcc6d804dd93deefa5b1bd57685f76616996e12f0fb SHA512 e715bca3a5c8f50bc40d3236345a78fec93a5adaf0b87e301556ac4af0ffde6fc3aa484f5876430360872b4043fb1c54c5250a2d51281abba0d4bb1ce11d6c65
-DIST thunderbird-68.12.0-es-ES.xpi 518351 BLAKE2B ec0a48e5d1ccf00f2a526ad49dce5b05b4ae10ea00cc782ad0826bd721c855f4cddd7d9ae6ca3acb9f4387fd0e78145563089f782cb60408ea65dfadee1e14d7 SHA512 9bf65da2390d887f9d6f094c9d35d47714deaff7dbe2de84f2fa7d4096305b70e20664c2aada6411c4da5dc6f98cdb1c33c6e6b6c692565b8baa09cbd930ec72
-DIST thunderbird-68.12.0-et.xpi 573581 BLAKE2B a27d14f8f40fb3b43dee3f1bc50bf8cc5274e8bf8ea1f638787b72b43aca7caa7bb179a817c798e6ae3cc747bb167b6b6c6a1816f273f00cc31bf9d739821ba3 SHA512 5207357b4050788be11171104ce96e0825abcc759c03dc32d80bc96de0ddf2e480ecc27169d4cd82acc420e20d308c27a34deb215734cf401bcbf97e0f3a8df2
-DIST thunderbird-68.12.0-eu.xpi 579944 BLAKE2B bb9a4c87f07e50936908fbea490878ba268217454a26ae6f2dcec0e346da10ffdace85b26cf17309fecf47d971fd06651405ada674604859de6ab00a4609c3af SHA512 ddcdd5ea01dd5962e41dc575e3b2af2bc42142198817a6e24d1359f4788d5e666b4ad7888ea009b8b0c22da2312044003749caf8268b51574d853dfbf438037a
-DIST thunderbird-68.12.0-fi.xpi 578418 BLAKE2B 0621d3d063193e3a4d1317257223e8188f168f08fdfd051e34318de494fa5645e6f5bcf039619b539b0412119d3bf95aa40cd14dfcfe31c8c7ed324bce85a75d SHA512 65ba058bd9a45c27a60df4d7fe7c17b5d908d523f98a904f6e9aa0daaae40a21280f408af849e5badadfcf246d274cb3c4254ae31c59d27bdbcb6d283a9f15bd
-DIST thunderbird-68.12.0-fr.xpi 607810 BLAKE2B 7d43145d139c80131efe9926a874bec0ef443bc652697d657844b59954a6658794b2c98f49f97bf2de111bff5f9be62326cca69a9464b9dfe08ea78e6edf3683 SHA512 a9bd8838d6633453dd5aa2856335b3f0b506797207321426ab566161582793c597b7ca1f1747b25c34d8b6d465a4442c45eb287ecb7074fd922069617509c955
-DIST thunderbird-68.12.0-fy-NL.xpi 594467 BLAKE2B c9b55123ad37cd29142f8fcf17c8d74231cad02a87101cfde9966e76d7cbd532a35cd6b9f631af4221837be41b22579ec67547c4180f48c3e09ed08771ac6bef SHA512 46f48ae4a4164d5d3ab522036492f96321d636accc554f4c39ba518637f6c354c92d68015c1a3a899ece04d265787805427623f32c5eae08b5fc28fd2648fec3
-DIST thunderbird-68.12.0-ga-IE.xpi 588710 BLAKE2B 50e6ca57fa6f8bed26727e12ced047f251e3fc762e38802df45947ad0d39367c085e2ae305abd95cb4cb0217a05ab53a34cc52fad11ea3466d3b4fddfdfdf844 SHA512 c849c2f7b6f236a02daa6b49fa853b73e1166af8e0f5a809ad0e5431baee587ffc261126df768362ebf2edce94f5267bf947e0967324f416509fbbf637cf0024
-DIST thunderbird-68.12.0-gd.xpi 587109 BLAKE2B c7e2fb96e5e8b6dfa1d21f5dece3dbb5dc807e51f65ba810b9dc6cf32f359e3ee5396f35f41e89b2db7c475ae25927c76d3b29edb1e3e04f8c2ad6e44ca0b058 SHA512 70b4da18533019e5125fc180cd9488d8d140819d1358f12bdc335035903efd53340d09f2446b7170d2497d6b8d22bd3ea9318e9de0f0bee0dece0edc3abd6150
-DIST thunderbird-68.12.0-gl.xpi 568397 BLAKE2B 8db7da3d74147ec6c1c16af6664b8913963770c2b6f398187134efc1eebf0b500c5edd87a4ecf390ac5017347c062c95fd845d0cbb63eef31d219f042551956e SHA512 0217b33dcb2ca993b17dbd3f83ba49c0a197ea3a1452e8cdede89ce56ad5f18d18029baa6b9bafa2d731a49e17f248cdf526f05c90176eb165462343d6e17330
-DIST thunderbird-68.12.0-he.xpi 604788 BLAKE2B 72448fc91e8bd8b721e181e6fca0cc18dc83461e64571845c5e8d7b00a9125569ef9de5d03e38f9e611e9c65ed5362dc046d0c0d789e0a70b7c0e3a48b6b1f3d SHA512 eb3713132811e4e6e7fbf46962c7f413dcd063db69fd12cf1753e0cec776be6e94f080618ad2ea865f854aa5aad125e787abed4272df499f412a68560deae596
-DIST thunderbird-68.12.0-hr.xpi 583783 BLAKE2B fe6e1b4f52fa7cb62b26ff492a6720845cada25aa409dd24b00a6fd3aaf1c8eb4d7b35e83377ae1a83d8ed8a2e66c3660f171c86f65af222d402492660b56c7c SHA512 e45c6cca928833d9038fc92a1ae154726ed8dc7515c1584f79a9777d70582f57117e273778c8af00187f0fb067c97e2cf9588496b64a580854d60f71017d2186
-DIST thunderbird-68.12.0-hsb.xpi 616036 BLAKE2B 500020d637e8ec8019dce44d3b02334da1f7544403cdddfa0bf77fd39de75915ed70ebab928a329b1744796875b081db003c1b46b242f9dcc315069f95e4d07c SHA512 d6ac9354224f4460b69353865b6a3c175629c70099582ebc7f80ff06d14722f51157266d48a65418f56161151d93e7cf32002cf5f491909404a3526da78232d3
-DIST thunderbird-68.12.0-hu.xpi 618153 BLAKE2B 6116b03fc6ba21b82e85b2b958f44a297432dc84626ec51d9a236adabb52b1911d7e33046e808c186e69cd9e852e9d539f8c3e416dcad14d6f79359525b0d1d6 SHA512 be96a66e6bcbfa68975a936b14422a976a4fa0adc788ce41fc7bc8e94a19e12c1da631a35819f1c3e9955b1d71259578ea32c66cce602af92be6ff7488771621
-DIST thunderbird-68.12.0-hy-AM.xpi 631978 BLAKE2B 6c06758f90ef61dde88a75c2b6edde064d30ffefcf86822ecf4ea6cfe44437c34d783a0c0cac59d194abdaf00895c83bf8557197622e13159f64462fdf8a1a49 SHA512 6d21144aad495108bbe4ffc292a89ffedd19f562b69c7553a6a6df3ac20677f17f8f775f42e8ecaebca441902972eb171601aa205652bf6ca08fbbe3609e0dc7
-DIST thunderbird-68.12.0-id.xpi 567746 BLAKE2B 2b92005ee2cd07534d9c953057413bec21cc921b1d373736f63002f7827024fcbd718b3accd4f8e1152984d461ec116ee067b653b8aad30b3f424d7a432acf53 SHA512 dd98cac286338fc4850062a12f3339736d0d44da77456a066d72388b74c2de435347ebef550e060a3a77c3515997f2476559d8d9bd8a22756279ca6ad74658e9
-DIST thunderbird-68.12.0-is.xpi 575440 BLAKE2B c56bf3f8ea9a7b91f95d6efb56ee0bd96cd62f55a985dab3b8d213ff90e29c89e9be2d1f391e0a22420ff00504469ef76d48d1beb85c63061a58a534bf7a3753 SHA512 9410efb17bb67f6b515cb686a8fe56db7c9d7711f2a0804ca673def9902feddb156d6ae94e7676fb8eb995b7a580bc7355f0152898da0a0f4db42cd1a762b2be
-DIST thunderbird-68.12.0-it.xpi 489519 BLAKE2B 43e8189f8b7f6e45b27a417be13a27ad118f290cd5f88a1b7549918949056bc0c047219a8ba9d85f576424bd0f184e415db4cf8c57a79a185ca92a506f547e92 SHA512 3aeececfbbe840215723cbb887863b2ba1407c3ec6b13afd2ca7e689e4bdae322f390cf76ac4a3d2f1979f21d92c5e08e224ac6cc9893e29e0c6f959808a0098
-DIST thunderbird-68.12.0-ja.xpi 643575 BLAKE2B 1156894b9de9b86a76f84b2f48019c0ad7f3d449b7a2cbe97d0c8c6ea4482a477af12f17819370d29928925e01a19fda6aa6aa4c12246511c222da79ba58e8b5 SHA512 5866b6e26a7028f8e284387da77e13f6397c0967c8736a0a75674deac469cbab821988b9da088cc14029519e8b8bc1e5c1def3897226d302b143b7fc3c0cfdf1
-DIST thunderbird-68.12.0-ka.xpi 646012 BLAKE2B 3f79d74b427f9795e20790572fa6e0b760ba883ea869d4396611d7b898078878adb37369d56d1646bab03127534b6d822ce8eec7fdbea4ea49b7eb8ac6ab34ea SHA512 b10994c5c095b2c0d6d7154a132a4f8cb7378988e33de40e657acf4f8806d60db8eaf37917da08d7e2e84841815f5ee876820caca1595fe85dc89f433c765674
-DIST thunderbird-68.12.0-kab.xpi 589821 BLAKE2B 53f5c63463fd6adfe77e5f6663d0b301a449ac5dd9101d03f15ce850a0684fb1f922e895b95d52ab595b71cac08e0d51db82e1505a0e96aa471ca4424ccadb7e SHA512 6d4ef0d0faf885beb892ff71557a7b01e9266781a0f8cf0e525de8b2804c034ffc41e6310439d5908b2208079bb2832d4d761dee19ef0fd33a89c1e38126c258
-DIST thunderbird-68.12.0-kk.xpi 664807 BLAKE2B 24ad198ce5219775713c773c32f3bd92a98e185a703af9ad2289b59a4e9bc6ac6a857843434a7451da499033ec4fc42b2435e1c9e7e089e8ccc61c108bcb3c36 SHA512 e13a85108aaa96ed168537f1d372e210ed6ad15508a4daaaa6f1b22a60e5cbce1d8c281adcd1ec8dcb87564629e42406528cc5e7b8a64370ec213510485e9cc0
-DIST thunderbird-68.12.0-ko.xpi 620530 BLAKE2B 82472fa84b7d1867cf9126d261fca517b40aa6af008a23e6135a75884e9a06f0d67431249e4f0c4e24a817a2e3d6ba78fbff59cff2ac82fceb6b94809c7afd7e SHA512 e43da3733c87b634c9dc884373eab8a227c246eb7d37ce10576a04c1814ea7e427a0a89cc6c48770ee0b350aa6c2fb00034a6d9510585b9973ff41d8f927d3ab
-DIST thunderbird-68.12.0-lt.xpi 603846 BLAKE2B 651bcaf634b09317c20665f41a69f9f4b60083cf94c655dccfa5b63cdd0227dbf80e2c6c9ee6f0e9ca616e35da0f17166311c206b5b5b5381fd500b5ee07829b SHA512 9cae9bd9ee29912a57b26fe3c87d263b5619f2d7bf911fa46c0a483ae974a4d576a2ad38c3b2e23d9826c813659d9c8804aacbdff8dd1ab765cb6c59742d95a1
-DIST thunderbird-68.12.0-ms.xpi 559015 BLAKE2B 1e565a0b7adf4761bf59ed1214893afd4975504154d1f0f105ff1210fde077736cfc2d69abc769f27ba9cd1113a9c9e18eb8cad79f96ab9f1824690b7df718fa SHA512 6c31f73da033a65479d7e0caf93b7e316e2db64270d58a81686b2efe3ecf7dfc5e2534cabc83379142b5ae76d60d6f1ae5fe677a6df5379059c4756990f989ff
-DIST thunderbird-68.12.0-nb-NO.xpi 574021 BLAKE2B cd935c75f7f09f139daf9471263c3147892f1e26fa6bbff548c54abf079956efa132916ae8fd0c2714d1b76b7664ad8ee7b05452ad1f2efd9ba344ca436b952e SHA512 80d569870022fd3e9cc7ddbd9b748e9a2b88143f22505f07eea7d2240dd9b1dc162cae6f16489c19c6967126b9cecc3bebdc146ab1bf4ee28b05f40d57b3c3a4
-DIST thunderbird-68.12.0-nl.xpi 581354 BLAKE2B e9968de9cf447ff3d7b8a982e54ff5c925a9351c8b0fac23c2c985538d6a2866411e376a4f708c658060f8433a36f1b33360dcc2a97f9de1ae1797e0fe8281af SHA512 c7e82a61fa04912600f739c4864e0ab83040c73c28f3ad5ed5374d98663085d103670cb57baead8b0db8652af5b60d13ba654887275cf8ec9ea0feb8837e3197
-DIST thunderbird-68.12.0-nn-NO.xpi 574949 BLAKE2B ab075d0f7c8e88fd335a8084a608e7fce59eae9b9c7e8e9679f952607065984229e475b6a0e2df21f422fbd9b0297540deed7186e6ca9e7c1838a5cb0c294023 SHA512 442cd2e223339be3f09ddced160a957c46216fc2cebe314ab5c07f696ae565f08965b45a203cd9a0b7ef87f052664f2851a8c77e2451959daf4a891b0ae9bd1b
-DIST thunderbird-68.12.0-pl.xpi 576086 BLAKE2B 499e8cd7dadd6e571647c0effe9cba11cdac93c5c67b0e214930645f523a2a0a6aa196e10312719c532be758ca4a74f1979a37ae429909cd59934ee91ea7287c SHA512 0320e992271e00260acd183002a9881c9d1c7ea75842eb8d62243419f460b89e5e8abc4b34399431caf1fbbc8c43658b1be794eb3e52ab666154e5a013994fce
-DIST thunderbird-68.12.0-pt-BR.xpi 589837 BLAKE2B f16bfe8896665854c5da9744aaa05164ccbf15eb19f6e42c918b29873ddd46a47f4a1b90beebb20f9d022f03b208696a7cfcac5ab09c7f72bafc18c777cd601e SHA512 a19ddb968c2de6cf36bae15446568100d83e67ca8129df5762dee97937cf10809bc3ceeae724a79811cf5f526bf79b1b893e66babf9c73fe30746080db56d874
-DIST thunderbird-68.12.0-pt-PT.xpi 588103 BLAKE2B 503e42c95697beae15466e9f7221d61ae093215624d23aa97445137d457056f3046c7c02d6227564afe9e647c0e9634cd70de82155f7f4bcc9ba89ed93afba07 SHA512 e889bb7533b4dd8fda77ce44d4d57b323e89b8ddbda9de8e1d236e3f8ca4108bef5d44d357757dc03d03d7e3805557d896cea01856ae96b9bad6b6089bc88f53
-DIST thunderbird-68.12.0-rm.xpi 578050 BLAKE2B 256eb26ba22de7c8d71153cf3dbb68d155df647d77978179aa59b21c3912546d599b3bbab523171564d9f428de313e1a2da0a947519b687449546b9cad05b153 SHA512 cbc399b40b3de6c4154011e6574c540962623fe30e3c4874f5bce4bcb8990405fe04fe7c436d22258a102cc358a50becbb5f93ce206a880c395a707f78ad4bf7
-DIST thunderbird-68.12.0-ro.xpi 594841 BLAKE2B 97cece8b2ddff6d1bd8652ed8680aa36332fcf3303022aa1c7d3fe5f8786b52c44cb5dec474a85ba7efd9ab0c813c0f8ab16e6ad785448505a7b40f12d4da6b0 SHA512 da21338a677b5bc68a94eb92a7a03865108904818d7d1ff499c5e2f21aff52bf7cb219e8b0945d7efafdae58b4556ae8363d5f1a0974920206fb768236dab619
-DIST thunderbird-68.12.0-ru.xpi 683324 BLAKE2B 33ee0a6d363f2b39dcc50e6c6231cd4d9356bc72ebaf407bf0d1804f9d596e7e7d6f72aeffead806a1da9082962d21f9743e6169a5cc073319e737ca373e7e68 SHA512 51c60e425340b4445381be67d9b57112ccd612242f034aed113ee682f5f71f329760e0dedee63cb16471b4d2c0517a1ec5a1d0cc0074c8791049e7115580e16b
-DIST thunderbird-68.12.0-si.xpi 637405 BLAKE2B 660e2034150dc59c0309b1ea920d45d93422699f035aa839532f51ac016382ca72f09def2352a6ac8e87acdc3dcdab12e1edc21e8947ef456f4943c2cd70b8df SHA512 d9194f57d6d5df9986a30ddcef9d264a272b323ad54f39de68a3f034f67e63db54da20f2827dd324dfaa95a2471d55fc25887a7a05946d682bf0ba589c5f3275
-DIST thunderbird-68.12.0-sk.xpi 609752 BLAKE2B ce7ea87f231c67acb3e07fe15ab1202cfd0a7a7971425e6fb3a55a46c6d6addb395e3eb753601a28fd4d44fd6591598d9dce5ccee7546edcf5a094a620ff7eaf SHA512 56eecefe834810473a20a93b4170680a892cebafc948823a4c38b552485bd25d56049ff98def4ce21e261a0a5068f25c14ed76a065f76dfaa6e64a4d8dbd799d
-DIST thunderbird-68.12.0-sl.xpi 590627 BLAKE2B 97236877fec37b022f55a46a4dd945ca93a1847ada1dafa51678b7bba946795bfc039c6ed008fa4e6bbcc3b759a91dd6f8102dd9d8643536f6231c515537d0aa SHA512 d8f642226f1a4ad102f3817fb351104f942cfd2b713395ac1ae690b66c9073bf75abf48b7a91b80edd4f7f08a2f40b3628da729e88d94555dd8637ff952a9161
-DIST thunderbird-68.12.0-sq.xpi 598900 BLAKE2B e281ec52b5f575a3780d3c791cb7676e3fb6babafd165eaaa0e0e21d6440b0aec020b6aae7af9637a62b7e1a6b3a45878f74c09219e9442838778c38fd2082cf SHA512 12425897cb3bbce072210b6b9a23d06cda77eb6ae07a8c92f83e8b047a68ad3ff6530885f2d8d308225a6906f9616fecb33ec18918d4af25862f32e0ce164cfd
-DIST thunderbird-68.12.0-sr.xpi 624897 BLAKE2B 0ed713fee9f5ba3f646052795541f1e67c08fef60a6e1fa078ef89ef2f9f497e551d966170f8c01f629d3a19079aa33e90052b04b6cea4c91a8804511238766e SHA512 9e42eaef1fdf2bc68c8bbd1b53da36566b03de026757f1b215b3e23791b6cb9acb937f92d7ad76d37908ee035fc56a48a0598876a76c15c16034330ec470bcfa
-DIST thunderbird-68.12.0-sv-SE.xpi 591596 BLAKE2B a2eec3c8854567c04b5dac549ff62904ad4c4dad405cc05667222e004ff362be79d3ca90b02e7dfe9f219bdeebff2d80af74cca0098866262f734c9c97eb77b9 SHA512 2fb305dab393647d9d86d1418cee346b79278dbbff2f135763495a4e2d2fb6389c681571e4915a1884f89544bf4083715e618c6b1a5942924adfc2e151893363
-DIST thunderbird-68.12.0-tr.xpi 599706 BLAKE2B b93f904006a8ce06288369fc1891ef614d4a1a89c0ae0bc8b82aef0a6511f409d4196928e16843aa7d5e06e437d34db84b8a14b61eddbe02ea3650f0dce08ea8 SHA512 98d2bd580007c3dea0a269b3dc3c7c4d2920659ffe1d4ee03a6dce19922cbc37ef46af30d90c872225451551a4ab5a8d87d82b51eaf0b77f5dd33216469a3077
-DIST thunderbird-68.12.0-uk.xpi 671453 BLAKE2B 8a7b23e96f19bb4f2347de915b93769029c404538e453616c5f1d9c2e3fbaf18ab5dcba94a50d1b17113652d6e05ae4e71b1ea9eae7d915383ef13665c05518e SHA512 eefa89011245bbeaba891e4656489ed5fb12535c75f752f0da753f74c5db35f54de9149adc8a02477a48672b5895f3ee4309d634585227c00ba4f96e9a1a726c
-DIST thunderbird-68.12.0-uz.xpi 570418 BLAKE2B 85149773838e7223fd48bdc6839aef54f70aa559a20382757436a1df39b20ca0ae366656e773f37780acdb766d1b0bf8949291b555e3a99e5fa8415c046743b1 SHA512 40d1c39f3e5153049e0414c788c8ae670a8676990ffd171548064355a8d0f72784fdac6fa8ab518a309360195115f99b19735086d7b9f92c8304b0b779634076
-DIST thunderbird-68.12.0-vi.xpi 623422 BLAKE2B 4b66830b6c485ce2b8d004741ba9ae2e620e9b32642010d2a2c14f16242b96bf891acedb3b3bd90f03366f574ae0f398f8a5732d63ee618179ff6bdd56e51169 SHA512 2cdf993d65212b75cbb865c13beb22a86a4eedc129519e4d84031caf21eafa7a9657ba62e8f4f480e717db3311de1ed0a8f0e357f8c5d73d1aeaa202aa0ccbee
-DIST thunderbird-68.12.0-zh-CN.xpi 626820 BLAKE2B 301d3ad3413700879ff1d8f39c471d887ac250f3f1c0f4e47c755d7744aff322d6e71d19e5b62222569e839f4e354bf833e6a098b9d22e2039949a391b7234d9 SHA512 88fd1a6a69fbaa3636861cab50b6f2556b8bbc87f303e5e06285ce7cde51701998459fe6e7339578daad4acfba0d994ac7f2202ea266d6987c702a93d0588dce
-DIST thunderbird-68.12.0-zh-TW.xpi 627476 BLAKE2B d3f0ecd246e9834013494868303287403de78e67c028144f2cb7d4d929745728de5507a40b23dcd1fc04914fff9ff7fabfcbe080ca50768d48d12b61c147034e SHA512 b8104fc5bfdab328e0e9d3ccf373b43fdd15741fec5084da64ff5a8e6221d1b9b383de8ee71a89000e643be3b761921d3490579d6d12c9e88359a32ba8d3a2e6
-DIST thunderbird-68.12.0.source.tar.xz 331226160 BLAKE2B 2712dc52cb7ee2b2d75b08907f7dbf945e89f776d12550427134de7f03538f1f4b1c7e747c407becf9be4cd70c9506c5661a9d4fa0e4d19c2499f11384848dc0 SHA512 e7559536a9e024747e3ac7c20e4ffde5adf57657d02109ea32c39bf736ad03707fc7a14a0d3f1c91fa6fd69ead3c38d6c32ce78bd468834d9ba7f77f728332c6
-DIST thunderbird-78.3.1-af.xpi 548782 BLAKE2B 4dc5e65a284fb0ce87a0665040d86961e998340449b1d51125a5b29bc44607524e85e095f001d1b9b7b7c55b6b368022a563c1404ba16e63ab2706b5db442a99 SHA512 2589639eb44d2b33caf89dec6933218aa9959ed4b449be30f6761c2cd894da1909851fb60404c11c2aba45b9a45dd0710ddcb52a813380a012a53e1159be4dc1
-DIST thunderbird-78.3.1-ar.xpi 649063 BLAKE2B df72eaaa069d3740abdce0a360bbc1576500164b898539e37f4ea356414b47e6b150f60f84428b30f072b98115de772162ec1c062eeb904443dcb2db36887f71 SHA512 33a83d85e26a58dabfc93e1af7fece7e4a6eec1f637697be4e0b81cdc379d593f78f70f57178912cbbed7dfa8928b9f177ac54092d85d1ced4317e4827a44938
-DIST thunderbird-78.3.1-ast.xpi 561707 BLAKE2B 13d65d2e543bfc0c123bea1b2699f4fe5ef9fc095db49607096115eab485b8074530c689c2ec88689ae044f16d571416c108eefbc75d9bce37b8940f5e344f73 SHA512 7cf31eaf4333e35872bfb07876540ec2af44a7ac6d82eb34e873d97778cff5914000cc7fe8ed012c88747b539c5d11c65a50fba2cac2587a9dee7d1e49e76cbc
-DIST thunderbird-78.3.1-be.xpi 667138 BLAKE2B 4b5acf2045f3a10622de056a5a047994ec0d9897cbb586b78c971802a632f4d290336338f592c422857c742b7dac97d22ddd51334f8b4c29c219102a0f0414d1 SHA512 618c1ce0164a56b9ffe374f2e17f6c23a8cf8c8fc3e7feeb337a4a381b2a2c8098adf10ce677e322564c3358ffc8d8c0b71e093fde6e4284ceba318eedc7cfb4
-DIST thunderbird-78.3.1-bg.xpi 672894 BLAKE2B f4f0386c29332c4abedf76b100a7f91ad3b2eaad056700a7396ec837da7b9511248efb82c12ea10b80e900930cccd6a14daa9329f2210ce84ab52ba91b5e3dda SHA512 5f61710dbe5ffeb23d7d8af681324371c00d069c9eb90eebbefa3af06e9bb19d85b2db66980c385be4b4849183d247b7fe1b4da64b78e2af2fd6c40a8c0e264f
-DIST thunderbird-78.3.1-br.xpi 604955 BLAKE2B 12f35d2db76715824bfb614b9bec7c2dbd548db253439e90bbf98990888d9bee90f6862b55662f4c2ebf5167e80f6685ca0c2bbca3bdb761ab20abc16d1f947e SHA512 f43fecd3ea16ee18198da6af80236200d38c0cf7016e4db0e376d3ceff6dfc3f607398d0fec6ece764b36f5a1c7ce3322c9d07ddbd2a0a0b6bbbb826a8ea8925
-DIST thunderbird-78.3.1-ca.xpi 620862 BLAKE2B 995a8a5f8ab01d12b0bdeeafd411ee1fc9c675c51a3fb3f3eab3e763a761d72b5bd6811547ee68c3d1637bd316edfe584ed5e8f609b712704262a37f4bcf6109 SHA512 427f8a5481c56a3d651c777e675e3f963ddbce2853f3cc9e464fe951d779a51bc2fb7e09579de1dbd4638abf6e3496a54f1838452145b62f6dda2e9cd7f8922e
-DIST thunderbird-78.3.1-cak.xpi 636111 BLAKE2B e997193b02c5e3b2181449d1a9362c614f334012449b016fb010e51dca2b70ac2c018d716e9d74da8bf522501f577b983a40fea3ae5f2a13c227dfaabd1ba9e1 SHA512 7174bcbf8283612d5e02bbda2f17599728a40f80326c924680f2aa937a9b740c2971c06b928702b986ae6ee6cfce6c9b3142a3ee034bdad12b758dec12ab9ca2
-DIST thunderbird-78.3.1-cs.xpi 635782 BLAKE2B ffc9b07f3ab3e0b3c5893d6f8891ab18ec4b5c303ab248e20ce201e90228be04593ee0536bf1469e5ed38dbbc2a6f6eb048f92f90f595e655cb2c9e9e0374331 SHA512 acf70ac0e9917e26645c6c718471e957e57b522c845b9d96416a7bb852fceab225826a36022874f6bc32c2468420f5f95e4a8202b753070cde2e1de7b187f599
-DIST thunderbird-78.3.1-cy.xpi 646684 BLAKE2B 8fd3129d58954dc8bc615c659f4d257b6429f73f319996992ce66d7bf73237eee1b15f6077c98a4b68f7115ab6c4968d2136d04fe1fce4e0d847b24439047d11 SHA512 ade5c2bbc35120f7d7c9ee0c5ecec6848af49e69c5780460318d1e0e5d3499e455488c571ceab0e69870d0700ea28dd4d03c697fa5cfa22815e724285c096c2e
-DIST thunderbird-78.3.1-da.xpi 621423 BLAKE2B 6f7beb82d02a699f8bd8030ebd5deab9ceed2bfb3b71ae3f35cdd347c9750621de7881700d9af49e5284d1540c0ef828415586550d743d1d3b359790752bad54 SHA512 b2f0b03fd6ebd4c2e2574c33c3df2119b94c187091d00a8c3fc93ed77a64888c0e33b38f5fd17ae00a4a9aeb028e8a5e7e1c2fb084e6a41e6f4871047cb7ae0c
-DIST thunderbird-78.3.1-de.xpi 665616 BLAKE2B 95fc97e2aeea007b0246736fa9fdd049d73ecd07059a73b1302439985e2179e718121b624e7fd3ca9a8113b3300eff24ac41e4b17857aee2d77749ccf1103010 SHA512 6213f36d707e637fbe9a5c4962308363e682d99857a0f2ad7ec5043c8214f06b2da3a58f9ffc184fd120f99c569df6592287033267c2d71b376e366d096cd017
-DIST thunderbird-78.3.1-dsb.xpi 667214 BLAKE2B f9f4f28da04930d13ae4597b1b98f5a08d406228f4ff6ca81c8179a9ac2648e25885ebe58c82c075fe1e4ecfa98240b869d0db71af24096030d4a9f393034ccb SHA512 c2b127cec59a7d489fb68d014e96121c1836d24f69b5b4e9d36bba5ec967eb256681b82286534ad44d7ee542f184756d9cff2b2596e2a654e3d3094449eb21e7
-DIST thunderbird-78.3.1-el.xpi 774935 BLAKE2B 6de9247fa5c607619bef641e3498947ca814eba543da21e529cf44fe3051c14e666f9ec38cb36ffd4ffab617f2afc3c3635af138d20e4e37b653b5fd65950a83 SHA512 2c226faf878c2b719bae93e1a1cf497bfa5c6c4062d8264d7872027d0cc0f3f4cf31bd9e225c320375ee1f90248fa464844300258cb4f3d01105b12498b48cc5
-DIST thunderbird-78.3.1-en-CA.xpi 612236 BLAKE2B 7ae0e62ce467e400e42b7adc22fc2812ed54829eda0109b10a0c387e1a0ca52ce8cb2980988622d7319cfa8920b377cf443946d082783cdbd1d2b3d3ab89f706 SHA512 8242a669120be9e9e47aaf6bf266b1fc79b82529471acde533c71fc86e357d2efa90415843058ad0d2550cfab863412115e9acec0b467339bed3d278f75a6129
-DIST thunderbird-78.3.1-en-GB.xpi 611650 BLAKE2B 08a855964fb3f44498072edc0ccd10b8da6b52cdf9fda408e7d613a3b88dba61206a1923ed214533c8e8227d7c5cfa336080776f8fde429b12de03e2cb6ab633 SHA512 8741513f4e9c26a1550dd4124a315d1b17ecff9dd0c2abcd16337e61f431c53beca83e01db8725a2409d185d47917cea7a4fb9c4428c4c70457958b3924ec92c
-DIST thunderbird-78.3.1-es-AR.xpi 658242 BLAKE2B 38d2ba10e42e3c48a29b2f21680ff948f748ae96f7ffc5fc5efd347055fc03432090c0c74063b763d9fc10c00414c4ae668884cdccfe24fa1775a1f5d72a017d SHA512 119657565129f7529d48a313474c4e3ab4e163e7257c6e2ca571d68094bd9d66c8fae0b0e404960176dd116349c7b832f9aabdfbc3588cde0e02fd88be992508
-DIST thunderbird-78.3.1-es-ES.xpi 570250 BLAKE2B 90184b8c0e9a7e6a0dcf4d4ed47c012ef26c072639d701ba276144e335c797b3e3b6afcea49b7a4e1099858eb16cf0b1d25c5f10f13682d0ae545f33abd3ddf4 SHA512 46fcc62fb91452524c59cfc22ee440ba7d9b1c088d34792ad5ab53f1038f4fc08a17b38a4cce6cb190b2e1dc2922e9a0b75d7e2d96782edb1965b23d65067e4e
-DIST thunderbird-78.3.1-et.xpi 598159 BLAKE2B 524440339ddc0f749e9c48f1bdc6139e75d7788c298a72686e91240597432f18b2c0669553683aa3b551a827ee88b6f487f3bf16dcdbaaa3bf1f5b6272beba37 SHA512 059cff9a9033d43d19eafab739c7e886e1a6fbfde9be91a5826f025e34794c3f1372728974da701518fb9c81e1f694cbc979d3e50b3b97d6c70716299c041233
-DIST thunderbird-78.3.1-eu.xpi 633360 BLAKE2B c5b3315ec5a0995187dfaa52b6fe7047554bf40b1dfb85df00eee624b6f02b7416367fcc24a221fbbfb1962e6e8ffe897e225e191867c2851d6f9d5613727b8d SHA512 d7f7361e1d0bc4fea5613e1d3365272042e70e12a6a4da5f25681b3173b3ba681ae7280c739caf89ea8d762d32a70d70e8ab1abd39d26036576bfcee96f8d3d6
-DIST thunderbird-78.3.1-fa.xpi 640169 BLAKE2B 7a5ff7350ad93ab5350e60fc1ea7bad47b8300a04bb6cec0e9139f32e1393ae0cfeb83d1756f9617bae1e55f8d02343c5d0db209242e714d16e0ce5adf85b2fc SHA512 6b7a5f6f416b719f7dc1ef8419c60e87403ca81d95300530e2b6d95772cb922f75d619549a123c735e224e4db08b55b1c4c297b0de3a66585d65d363fb846a04
-DIST thunderbird-78.3.1-fi.xpi 642882 BLAKE2B fe3fbdb6488806441c58d822d1cce751eaa373a3df6fb042af17a5896004e6e59fdbf323349d509d83c7d604ca573b88e2d249be5fbad77a0c06ef690eed7ea7 SHA512 e7adadc00ec3616f68b90d3b48928025847c7691daed391c54b1155df389f8b1ca7644bce13b225e5977237ba7c47594e8a2c2c7b2fe9b0832ce716a2966a98f
-DIST thunderbird-78.3.1-fr.xpi 669932 BLAKE2B 697e4ddd6aa6209bec3755c2579d623708453c4764ea1d4485748387d61619772e9838657ca7998abefaec7764d2c61d836ec62b5e736d352800f4c5ecb0dcf9 SHA512 c3bc9ef32f22db6bedd41136b63a51e77e31d9886858c4df56e4044a63885fee21fbee164ecb53e03028cf37ca3cc8bd27c2603c1fb707f269a179faccae7549
-DIST thunderbird-78.3.1-fy-NL.xpi 653515 BLAKE2B 3a529efe3409e0a73408ff4a7b46571f1386d294b043828eb6985e259e12e165155bdadf239322fc671c4c5a565d674c1752ce2e66a54af72e8dba15cb083560 SHA512 e56584b69aa292b820c1c5fdddca4c2fb715d8e33b7e742ceac781152078847a1891f2b2d511d0188eeb86c2bc646376473e5382322ed4e2c317c2c67609cf0b
-DIST thunderbird-78.3.1-ga-IE.xpi 601172 BLAKE2B 1dbc1e10785a3d7bca215234aa85f8d16c03afa2c30e1c2d304903390836fae3e092f222984b0ae48c6bdc415128f88fb172671433cd028f97eda6aba312167f SHA512 61a595a25fbae0f87e318072b04423b5b88204439ae0713ce5d234fb2f6565fec79e32a8209288870a7b9e81771787339be4c4bcb039256536326f8485f68854
-DIST thunderbird-78.3.1-gd.xpi 609820 BLAKE2B 5a59a4b5bb9aa6765344890a967f5ea7322a5be57079393c6e8bc5a24bf41a3fd6111fc134b14c5335c47949d5ef2b2cee120dd2d9196a54aa0856147838c272 SHA512 bdf20675f57bf037c0003d480d8ccba7e06ee83412317c7229e70d29c0f9add266414ed539818175481d49d6444463495b0a0f9aec050a0ca0db8c143596cc10
-DIST thunderbird-78.3.1-gl.xpi 616197 BLAKE2B 50133bb1aea400e500dbbd34e0530d2965b81411d2726857dffe6d76f7c9c60fdde0adcd1af2b45578d536d8d508febe44efe3f1f74f8e1bc233f4aec50b8ed2 SHA512 454baabe2d5084ed8b9b57369711ec7924d77b8d5bd0ae740091ff15068892a0b89603f6ba6078da3fbd74712b8d0dae4facd302009463e14611f308eb3a1922
-DIST thunderbird-78.3.1-he.xpi 640978 BLAKE2B 58a4f377aa8ee88d4ec73bb7b67729bb35f7d013b2cb28dfe3b81103e1537faf7938e872e887fcd3e3699db2eee11179ba777a54e574cca7c753b40b6f65a423 SHA512 1b71d51a2a78f800b4e3c4e73ce8690499615f7f75975c6d159ae025c8751723ef2b1f3cc19967115d21f746f20576ee789c4b35776f5a980e95a6be64807ffe
-DIST thunderbird-78.3.1-hr.xpi 629425 BLAKE2B a02e62c2544a97bc506606529b8dd0171c1579868ff1ee3ebe780487def6fe4306ee6148f87aae591cba4bbad8aebdf7a0d70991adf26b7f9bc3c8a350dfb6c6 SHA512 c3cba6adb7b0119a0bde17ee6a0a9a4f5a42025359f6abfbdce9b596e18f20866eaae618ce123908c8178172fd7542ce906ad730c2f00182f22b757f4280f12c
-DIST thunderbird-78.3.1-hsb.xpi 669044 BLAKE2B 236ef3c424164c3b25af50b2832720a66fe9cba1afbe7e9e6c87e1a0e1277eb53e0473b8da4ac68c412e825b12e1b2510bc7d738bcd996a3b2b429f73bed8946 SHA512 c00827dc37274dfe7d59d18f15588d80dd31f62fe51c304fc035c10520d2d38d5d9c50f5ac8e8255d4c9db6bfc4cd4ffb9b3105b210a62a6207698a4de180f7f
-DIST thunderbird-78.3.1-hu.xpi 680276 BLAKE2B 63e5ae79a62b6e1f8495ce354f5550054373018f9537416b0b65132d8a9fee9cc7979ca73f1ae13aa2c6de4a51fbeaa5a3d0a0d9fa36246e0786cd7143e66e62 SHA512 7008a82af0366dfa206039da35ecace8d819459d475ff2f7fffc0d1c8ff81aa6ae8dd4c1b1970da86e4209ff9c6c7f1ae13ab5c85d96ac46a7f3edb5dd5a167e
-DIST thunderbird-78.3.1-hy-AM.xpi 713775 BLAKE2B 6f60d07c8b2395157e7295b82753a8d908ca30872f4d652db5f9d7e1f670874cb4e0eaf948b8e5b37e69faa9940526be2966d555cdc01e64ca4546e1e952956b SHA512 8881730a3f7c27dd4df5bbafdcc04907b8cbc7aa145bb0c8e044f00e6a4749bcaebff35573b40556a46463e920385c9e5ecd2814376c84fad58fd0101ace31e4
-DIST thunderbird-78.3.1-id.xpi 621070 BLAKE2B 7fa306b8dce3b384614f3051370ff675fc8c365577668df090c4efbf296eb80de5b8e9a8262d7789616882b077a59f7a91546b45fb55abb04cb3830deac4cbe1 SHA512 a3f81788c3f52f80bd912da95512829ed84043465b03228a2832d6d427ef4b1709c69582d4b76e1cefe3e2d90bbd558c0b6a91bb846010f3fbe89f40a4830153
-DIST thunderbird-78.3.1-is.xpi 582081 BLAKE2B 4c2eb7f2688d4dd69f7efe6af569550abb0b6ba635fa887afe13b28a4e4591311e1f7efefb2d650e32a16215fc9374b25a2b72da62805af9f175086ba99e215f SHA512 7f2e399743e3163c18fdb6728b164d66cb2ef40e67dc7fc63eede9ece19dc000cf31942f8594b14572d79eefd7ae913b7a82ebcb2ea9e48fac44709204d870a6
-DIST thunderbird-78.3.1-it.xpi 573401 BLAKE2B 422db414da26dc9df7e8f38f00d00e1127615ba6e0086bb75f88788f8aa4609e3cab7a5ed8cb239b156312fed090c622aa4b43f266f2c05739efab635c9e3dcf SHA512 69fa612c28224a6472a0ffbc1034003e8fd628eaf8c983932a530dde5e3049afb9de2cdd039b5a582de7e2a7080845577e627a253af1eb846163c0f6489025e8
-DIST thunderbird-78.3.1-ja.xpi 722921 BLAKE2B 825c4668dcbfe1e2223ceb46b61cd8d7db72e131bc37d85997c71263ea18044260dd5602a4295b97070b7c7e4dc778874731a9acaffaad64f9e97a98cf567ec7 SHA512 dfd831e9ccd4eef5f6028ef7cda086dc9a652c8febf613b35a87d3b5ff64736962c0b4824404f9f2146d3115fcb3489936a35c199d751b588880186570d4d79a
-DIST thunderbird-78.3.1-ka.xpi 717490 BLAKE2B c4c2d820262bb4cefd4b83a59e1ec684933229f496196d61c8b402c1360ae35d5eeae7a1d1fc2173f9d10a2790bf42ea79c92fb0f80a5cf69d1babc99ff5df2a SHA512 5489f8e470df550fc4d6cd83dda29e62d69819e6f539805bccb14a436213c834aad349ba600ead36153d142deaed9a7ec2b8ec6e5247d2e51adcb1f95a140baf
-DIST thunderbird-78.3.1-kab.xpi 652354 BLAKE2B f29a58957db51af566853e28aeeb3f33d31bb8c56b2705f1fbd263418e41c6acd49e8c8211ecda7fc8c29cde98161a84687fc2f22e327eb0905220b7d258957b SHA512 fd57398522951d615ff406130eb4f9320ec7c8bd6815530d83b857baa53bd55ae44c87652ecdbd93c6a74f6f28c503f7889cd8e7e92fd9493fa76266b0318e42
-DIST thunderbird-78.3.1-kk.xpi 720911 BLAKE2B df08f3625194041473bf2df8ee8efe6d0c0866976a283b2cdce469339a31a3665eb9d2096e035fa38713ffa8377af84b8a4883b4e821b7e4ed7d3f009a2faa82 SHA512 8b1697f76701616c6ccd30f5e3a93d2a506287dc8dc46051377ecf877875c712b5e92fb94ebbe690767dc23974d7d79fac2ccb1a3c6d0f5447582f5a4c278c9f
-DIST thunderbird-78.3.1-ko.xpi 688662 BLAKE2B 65f6fa0d16fb8d5dfd07664a8c57aecfcc0a21ae18c5dc3d5f2ac3a26e7dfe3c82a8cc64b5eb389701581de838fe0e11a9553078a12c3158ed3a03137029f2a6 SHA512 20e3b6672444323f8e2b7250a6e539d3e11fef6de3967b1c677c29457227a024e5db9dadfc1d713a59d6624b76cfc8a0fbeec4fd9cb85a5cde2be7061e23e6f5
-DIST thunderbird-78.3.1-lt.xpi 660723 BLAKE2B a411b460c32439edf00fca6746b5b72167db3b8c1d6cd6243b6de213d835b2110479e9478babd1cb40256d4223268971fc44041388e576a5a2736d3e4bafb56a SHA512 5941c8ba6f95bc6501e9844f3e73e52d96927531a53234c340eea63da6b8fc2a6dcb37f7ba89baf15b809311db91c5e5ee212578fe9fa4fc34b765242e6b5baf
-DIST thunderbird-78.3.1-ms.xpi 572598 BLAKE2B 99bfcb01d80352698272e4c00e18fd1448dd057c0496b4f81f208e693bcc67fe92880bfc1fa7a55065ca95794fa36f43859110ac7d1e6058d62e0ad36efa9adc SHA512 04a0f67fc24f21bc1108976a06ac663690e9ddbba68068a8fde267ad070310a695ba410c20ffa17e7a0745311c34f59cb4e939837c4c804c0386868f4e812736
-DIST thunderbird-78.3.1-nb-NO.xpi 637687 BLAKE2B da46540fe9570f04e254153df3a9b606e4a095236f7cd72b0976d0bd405368b7b6a1e703777bffac34d448c30256149a1aa3fa681f258fd50d9b4946efe9a732 SHA512 af76ee9f52ee23c4b50e47886232ad1ddab3b7e56e481239e2b61bc1b7b44185c30d13cc76157c0ca7bef2c8ed71c70cea7acda9d17c87f55180103cb2a8e6bc
-DIST thunderbird-78.3.1-nl.xpi 644785 BLAKE2B 030af1b512ba282402564c7ffaa5ebcfdf59feecf17f38800e068382362d482136ad0653b11c186572182ca97759f52080af1dfea7058627b97e220102cb719e SHA512 43572179ee12444378d0c82080d4d8ca78cd407eb5612fdc326f09330b8e5c9348cd033c8a808a3e47e8b232eba57dc02e6f7e5d3d66b2009790e31d036fc0c0
-DIST thunderbird-78.3.1-nn-NO.xpi 641129 BLAKE2B f0625a150b2f8ce8f2395060570e748b26fcea764abd4277302782ed9a36f1d01de9119a2e78ff3a6b1062bac14a31e3eb7eeb6ba07f6ec529a5589aedb0168e SHA512 2aabaffcb7a53254d14fa5e9b464f5c4e2f61c96a726f9da07aa5d7d676b313ca61859ff3e9332011413635660b2d816092713661e1250a19219d7955f5414dc
-DIST thunderbird-78.3.1-pa-IN.xpi 633700 BLAKE2B d395a8f9bfb9ffe050f1c32f36873c0e91d7b62984779145132d1989f7eb35ce8c602bc61d9c0072334526b68592c88d4b389f2c38e2520fe9cdfc4a54889e69 SHA512 c14c765fae3e704812589d86961f0829607a44ad5e27021981b67d5474e7049e009b32d7f66a9a1e0ebc9bf15d42e9cc2130a3fe678d7be13f9e123c15acfdd3
-DIST thunderbird-78.3.1-pl.xpi 637576 BLAKE2B f5443fa4e6b61e97914b97205930fde4332a2c5f7ad2fbe0b266a0ef5748d172ffc69674db2645b362bc707c93b0f129fe92045732a1aad60f273a62e2d15c03 SHA512 5b470814f52dea00f83828230e013f60f4f60cf29a3afc394ad056da875442d026c6df0cdc8f9a9260a1b476225f4585847daafffa7c67c23615059d3fb72719
-DIST thunderbird-78.3.1-pt-BR.xpi 649863 BLAKE2B dc64cdd0ba41588be1dbbe3f024d6b1a52633483523388cafa5da3e3aa0139716a485bf19ac87e9671634a2fe1cff622817b17e83f6317b70cea50c851f67aa5 SHA512 57170789cba1d3ea0f5293d5c3e89bb36408a7db5d8749f322b4e07f4273cb8bea1b3d21cd2d9a169fd1b9f1ac274714de2a340d8c5c0408892f85a09c584c12
-DIST thunderbird-78.3.1-pt-PT.xpi 655963 BLAKE2B dc0e8dd6353aa4c3fd6935818289bd812d8829732ed75b838669813fd36810ef7c3b520f10eb6de13a892a9e4cbeac2dc70e8fd6750e379c5af2321a2d13f6b2 SHA512 8eee29ede9b7a0dae952f56eb1b32c2dca2eb994a893010012f49dd8509ac57b3c681ecc107bacf828aea39d3c00ef2e17dbc6e7eaa7e64be963517978fbb834
-DIST thunderbird-78.3.1-rm.xpi 646970 BLAKE2B b82d1f6480f5dee6fb45c731ab3ba9a7d41cc1836ac016e6504332e06143658350a1d15b95701ec025235e48b99e2293422e48efabedbac05abae5bceb6aefea SHA512 7149edb2ae34646a921ec1bf17c0c7b738a5af69cb1cef0b85d65e0fcb06d027b7ae40606b3e8f3bf600eec26dcd23decf163f6e22f8c2fa8864478d8dfde9be
-DIST thunderbird-78.3.1-ro.xpi 663069 BLAKE2B 99680865354b7630b3dbf084380de27441e14a3476507663e8ea7d9beb42d8c5da4ed25c80cd8feeee40c4a10ad01c1edb4c42b3ce31b4edd86bced5b48e9d5b SHA512 05d987df713a6122ca040faba84b453646adf86c2821abf5ecf6148653ec6a0acf2f9dab004cc2079630879cd39e4fb9939fc6a7b6e67b520538b33d901c7c11
-DIST thunderbird-78.3.1-ru.xpi 756670 BLAKE2B 7d09c57855488b01f9979e2f6e99ec8db318f778ff183d4b6ef83eba84f24f438e923ce60f1a8860f11208db5a6429ec9ca0ff519d46e5f38b285d0519a3506c SHA512 6cb05d8fa9f856ffc9f7f85c8a02699421559b83c15c06a08c6c91f1afd64c7e5520536d7e09557f1e1d752f2137c83078f9573aff8e876e4b23cf8f73ac801d
-DIST thunderbird-78.3.1-si.xpi 651575 BLAKE2B 1121bb3cbffa8b7bb5ef3cbbe43afa1f2bbe859fa9449d052eafac03eda8e034f560559748a3e119cd35c04830156816c132f760868b64477be712c5866d8638 SHA512 bf911bf0cab1811c733a5dd0cf213511cf2a09dd792ae932ff4cfedab0e17de97ef3d6cb89812564cc87787dc66c564121ac205d56241439596fb758170546ec
-DIST thunderbird-78.3.1-sk.xpi 643646 BLAKE2B 5f125c4f2b8fef0c3ff05340cc0b42709a85e88eba74769d0445174cc11c1e67b99f5e63f5eeefb62f99e14ba71e851832c0cc11e870568fb3d72dae8a40a891 SHA512 5b03c9e7402307814c856b2522060705d2c69eb257065c3831c413156f75915ad0336dcaccc9916e566f4d97903de4be8e0bbf5fc91c6a432b25bfb076932f94
-DIST thunderbird-78.3.1-sl.xpi 632783 BLAKE2B ae517f5529e4c1f5fac4f9d3610627b2232af269614b00078c5bb81b9f1d1201f275ff81675145e80ebf8f8cbcb758382083c869f0ef15f9bf5f1c7df919ef1c SHA512 1af6cabae65d89b822fd4e47d750dbb492c6fd99ca03959fdc62411beb284c8f7fd21de9e3a2d24ea8d9b175aa173627a591d2d3807ba80d233a171217eec1a3
-DIST thunderbird-78.3.1-sq.xpi 658261 BLAKE2B d53fe15652b9ce481510ec29fc63e9e54ccffb6cdf24ae942a10240a2e83e833da53bdc294724a97f229a602cd2e35166122ebf3b64caf70335ded5404963b53 SHA512 0c7fdce68e8bee7dfe007c16488aab3e4fe72e5f08ffcb20d7042b911c8bd1190694341ea7e6aafa6bd079aa05fd10a6bf099552b6b89c9c7e0b82d5f224fe76
-DIST thunderbird-78.3.1-sr.xpi 683545 BLAKE2B 63b03414500ef514c3bb389528b8396cb800b8a0d21f27e82db30350f93f3a61dd5ef4e174b8121a974e05cec4145e5077990437782c6405fefe6fdf46a43186 SHA512 5d320b9d235125e5aeb30e9fc24e8f69e34f2d50ca9a9876b497e533af389c89da5a2dae501165f8d88ef6f91fbf16001fb2679292e9a06b8d06c8a40e6046fd
-DIST thunderbird-78.3.1-sv-SE.xpi 649319 BLAKE2B 7df7855f3e0929c54555be90c59c94913de0d8894d0e14192445c7343d0ea3f8ef76542dbddf2c0e6d18048cf501809363f5ed508724c1b6ec7d68aa477a7f7d SHA512 2fe6160b86f394ba1452a0c9329e4df36e642e6fea06a88a0eca3f546736128f70ad70567fb35e82570792046eac576a226a9f9bae5ff2833599d8c33740989f
-DIST thunderbird-78.3.1-th.xpi 712506 BLAKE2B 93caee49f04cc5510591daaa6783d951e3ef71122a01f360e2616f42d7e6566c7daf92792c93bb85e293b325e1c5d393ebf49d56ab1f3866d04ba7a8b40d6582 SHA512 d1a77b81cb85ed54b5ca2ae95a136497a5a4cb700b150811c4eaac73ff27292ee3d95ac1cb0afb7be49f1ffe4a22277420e514542812b142fb7ab73ac9c64039
-DIST thunderbird-78.3.1-tr.xpi 649516 BLAKE2B 2b75c653a1951836cc50c754e5b89765e1bd776e2334028f8156839af779b73651b85e58d698f419ca109c43ca9cc878e01c3fd68f48997361ed3cd89598d9e4 SHA512 df9433590f181530661f00312a88b44b6d5f2327f5c0d1e2f80e602b571bc620789936524a13e0784c398f47ee66ddb752d2e735d7404fd43fc4262c11410af5
-DIST thunderbird-78.3.1-uz.xpi 587044 BLAKE2B 42fc36748431c3b220a745018eb45a1259d11bafa72f0692c674e28fcfaab188eabb1ade199362a17c4f7f54923975645aa5b1d5368e94b07abf6948ed7dd1df SHA512 ad51facbefd36118cacbf4841a16aa7a8887774db423d0082c514ac750b2c3b772c1296f0c8cd07bbd061fd41076709f0c40b836594d4a7799d0726860e099f7
-DIST thunderbird-78.3.1-vi.xpi 675050 BLAKE2B ce2b4b590242dd840cad62ccbd5c146d26b5c7cee1e01437cc5fd1bed004241ddb458f18e72ebf168eb867fba19c7a04b7521a35527844712bce08d3a5a45b81 SHA512 36bb9da0979cf9f6661c9c295a90e8cd10c1abedc3b6693f6f5925555e71893a58ae3d0c6e27b8f3057977bc9cb4a450b419ac9981c75daa2c13b39edc55a93b
-DIST thunderbird-78.3.1-zh-CN.xpi 687634 BLAKE2B c5e3aa4419c8637630e9b030380d971b76a103f974c67b7778c789d11dec6192e36e868b6571ca10050e1b7d580edee10f5cf494a7c2235206c298dd1deeb0da SHA512 0a550fbd21cb3fb047b1965ab62d0ea68b58bd49907c16c603f5e202ea20c2dd621abafa8aa41c0f4c0eb08dd09ee0fe44e294d3ae003699b6d18efaea294e19
-DIST thunderbird-78.3.1-zh-TW.xpi 688074 BLAKE2B 5e12b4cbf2f142a8de23356712162df9d370df06a1172acd3e9272cb3717776c6747cfb4975524cc1ef8efc026cbdbbc251898d67e2fca38aa9f982af12ed497 SHA512 f47fc7545dad00baad3e7088ff6ba06865a3d24cacad274740c7efb16c47b36682c0c56a5d00f07614eb609b6dc140318396e5c3b14a6b316c501dcb2d72bb11
-DIST thunderbird-78.3.1.source.tar.xz 353920472 BLAKE2B 5afcec30c23480a239f3cfff56d67e403d300be00e1f374e9ee8a594d9845e9fba4262c410b552cc2ce9b529d8cb9221f81f2367d9c6ee0776d496af0ae88a58 SHA512 16b05e51776ba16503bc5fba02a6d0b5050a206e264a4707544354ad76af61902fd2dcf5d97b82b432dc69362ccd18543a0acccd80e06648e6c6f470886da450
 DIST thunderbird-78.3.2-af.xpi 548780 BLAKE2B 143522732016ad215d9d8531334b4aa6d2adcbb997b6ce499e429c336c119eebbb0ffa1acea5bc96d3f3bcacd956a126c4b4793cf2068de2c9735c47fa568e2e SHA512 f6e130943effc59150dee4d73d3cb92f1bc6fb4ec26cbef0692f971c549b43e440e695e8180a933714ad2b10dbdb9dd025685b0555ac4845f817360e89d93b9e
 DIST thunderbird-78.3.2-ar.xpi 649070 BLAKE2B 453b834df835f5f564739309b17a25465a6ad1d5a93c46132ea571b419d66763c72049f583300cf09bc61fdbc110a3037fc1fe926315b00772d2b3f1bee16437 SHA512 fc68874afc3856413ed1340e0c58631fed1f97af4b6d77a79ea7cbdb42785cf1dc6566b1a8a69fd1de88f3a36fd84124530f8f5eb710d441519b474525c3e079
 DIST thunderbird-78.3.2-ast.xpi 561706 BLAKE2B db0dda8009c0d629fe1c6270411b3a1f8d337012bf445edac609422fd11fbac42f4d0456e204a1a2bfaea616fa1ecd4099eb4e0580c0fd540699b4c8453e6023 SHA512 c5487b36ea471d0a08da8bb53d31a1bf4d80b80cd2858af2e96237e97bce7096f8fcd09d94f1089150919a5a0517570b8408fd5d6e4301753f5db233835126ae

diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
deleted file mode 100644
index 01542105e64..00000000000
--- a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jory A. Pratt <anarchy@g.o>
-
-Add the gentoo preferences for the omni.jar creation
-
-diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
---- a/mail/installer/package-manifest.in
-+++ b/mail/installer/package-manifest.in
-@@ -313,16 +313,17 @@
- @RESPATH@/components/devtools-startup.manifest
- @RESPATH@/components/devtools-startup.js
- 
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ; Default Profile Settings
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; default pref files
-+@RESPATH@/defaults/pref/all-gentoo.js
- @RESPATH@/defaults/pref/all-thunderbird.js
- @RESPATH@/defaults/pref/channel-prefs.js
- @RESPATH@/defaults/pref/composer.js
- @RESPATH@/defaults/pref/mailnews.js
- @RESPATH@/defaults/pref/mdn.js
- @RESPATH@/defaults/pref/smime.js
- @RESPATH@/defaults/pref/thunderbird-branding.js
- @RESPATH@/greprefs.js

diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
deleted file mode 100644
index 055bca45ef8..00000000000
--- a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon-unbranded
-Terminal=false
-Type=Application
-Categories=Office;Email;
-MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
-

diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop
deleted file mode 100644
index 3ab5826de9f..00000000000
--- a/mail-client/thunderbird/files/icon/thunderbird.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Thunderbird
-Comment=Mail & News Reader
-Exec=/usr/bin/thunderbird %u
-Icon=thunderbird-icon
-Terminal=false
-Type=Application
-Categories=Office;Email;
-MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;

diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
deleted file mode 100644
index 9770a1aca5a..00000000000
--- a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
+++ /dev/null
@@ -1,10 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors",   true);
-pref("intl.locale.matchOS", true);
-pref("intl.locale.requested", "");
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("mail.shell.checkDefaultClient", false);
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.autoDisableScopes", 0);

diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index ebca529ee30..ae7a481e18f 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -6,16 +6,8 @@
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
 <use>
-	<flag name="bindist">Disable official Firefox/Thunderbird branding (icons, name) which 
-		are not binary-redistributable according to upstream.</flag>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="custom-optimization">Build with user-specified compiler optimizations
-		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
-	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
-		downloaded and kept up-to-date in user profiles</flag>
-	<flag name="lightning">Enable app-global calendar support
-		(note 38.0 and above bundles calendar support when this flag is off)</flag>
 	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
 		or LDD linker when using Clang</flag>
 	<flag name="openh264">Use <pkg>media-libs/openh264</pkg> for H.264 support
@@ -34,8 +26,6 @@
 		instead of bundled.</flag>
 	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
 		instead of bundled.</flag>
-	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
-		installation with secure-delete enabled</flag>
 	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
 		instead of bundled.</flag>
 

diff --git a/mail-client/thunderbird/thunderbird-68.12.0.ebuild b/mail-client/thunderbird/thunderbird-68.12.0.ebuild
deleted file mode 100644
index 69386afec0e..00000000000
--- a/mail-client/thunderbird/thunderbird-68.12.0.ebuild
+++ /dev/null
@@ -1,810 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ar ast be bg br ca cak cs cy da de dsb el en en-GB en-US
-es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ka kab kk ko lt ms nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl
-sq sr sv-SE tr uk uz vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${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
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patches
-PATCHFF="firefox-68.0-patches-15"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=10
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 multiprocessing virtualx
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
-	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon
-	pgo pulseaudio selinux startup-notification +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-sqlite system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )
-	wifi? ( dbus )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.44.4
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=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
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	|| (
-		(
-			sys-devel/clang:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_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 || use test ; then
-			CHECKREQS_DISK_BUILD="8G"
-		else
-			CHECKREQS_DISK_BUILD="4500M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug || use test ; then
-			CHECKREQS_DISK_BUILD="8G"
-		else
-			CHECKREQS_DISK_BUILD="4500M"
-		fi
-
-		check-reqs_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 \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE \
-			XAUTHORITY
-
-		addpredict /proc/self/oom_score_adj
-
-		llvm_pkg_setup
-	fi
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply firefox patchset then apply thunderbird patches
-	rm "${WORKDIR}"/firefox/2016_set_CARGO_PROFILE_RELEASE_LTO.patch || die
-	eapply "${WORKDIR}/firefox"
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/toolchain.configure \
-		|| 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"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Bug 689358
-			append-cxxflags -flto
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang && ! use arm64; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}

diff --git a/mail-client/thunderbird/thunderbird-78.3.1.ebuild b/mail-client/thunderbird/thunderbird-78.3.1.ebuild
deleted file mode 100644
index b8242df5acf..00000000000
--- a/mail-client/thunderbird/thunderbird-78.3.1.ebuild
+++ /dev/null
@@ -1,984 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-esr-78-patches-02.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=
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${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
-
-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}"
-
-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
-	${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.19.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 "Will use LLVM slot ${LLVM_SLOT}!" >&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}-${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="13G"
-		else
-			CHECKREQS_DISK_BUILD="5400M"
-		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="13G"
-		else
-			CHECKREQS_DISK_BUILD="5400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		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 pgo && 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() {
-	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
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-	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
-
-	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
-		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*'
-
-	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
-
-	# 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 | ppc64)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold ; 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"
-
-	# 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}"
-
-	# 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/firefox \
-		"${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
-}

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 8102c07d8c0..ca60abe46b6 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -407,7 +407,6 @@ sys-apps/smartmontools caps
 
 # Raúl Porcel <armin76@g.o> (2010-06-26)
 # custom-optimization doesn't work on alpha
-mail-client/thunderbird custom-optimization
 www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization
 

diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 6fbce4a6d58..86a2ecc0c55 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -407,7 +407,6 @@ www-client/elinks javascript
 
 # Raúl Porcel <armin76@g.o> (2010-06-26)
 # custom-optimization doesn't work on ia64
-mail-client/thunderbird custom-optimization
 www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization