From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 22 Jan 2021 20:28:19 +0000
Subject: gentoo resync : 22.01.2021

---
 mail-client/Manifest.gz                            |  Bin 4392 -> 4388 bytes
 mail-client/aerc/Manifest                          |   16 +
 mail-client/aerc/aerc-0.5.2.ebuild                 |  199 ++++
 mail-client/alpine/Manifest                        |    5 +-
 mail-client/alpine/alpine-2.23.ebuild              |   89 --
 mail-client/alpine/alpine-2.24.ebuild              |    2 +-
 mail-client/evolution/Manifest                     |    2 +
 mail-client/evolution/evolution-3.38.3.ebuild      |  152 +++
 mail-client/mutt-wizard/Manifest                   |    6 +-
 .../mutt-wizard/mutt-wizard-0_pre20200808.ebuild   |   48 -
 mail-client/mutt-wizard/mutt-wizard-3.1.1.ebuild   |   46 +
 mail-client/mutt-wizard/mutt-wizard-9999.ebuild    |    6 +-
 mail-client/mutt/Manifest                          |   10 +-
 mail-client/mutt/mutt-2.0.3.ebuild                 |  265 -----
 mail-client/mutt/mutt-2.0.4-r1.ebuild              |  265 +++++
 mail-client/mutt/mutt-2.0.4.ebuild                 |  265 -----
 mail-client/mutt/mutt-2.0.5.ebuild                 |  265 +++++
 mail-client/roundcube/Manifest                     |    4 +-
 mail-client/roundcube/roundcube-1.4.8.ebuild       |    4 +-
 mail-client/roundcube/roundcube-9999.ebuild        |    4 +-
 mail-client/thunderbird-bin/Manifest               |  134 +--
 .../thunderbird-bin/thunderbird-bin-78.6.0.ebuild  |  378 -------
 .../thunderbird-bin/thunderbird-bin-78.6.1.ebuild  |  378 +++++++
 mail-client/thunderbird/Manifest                   |  132 +--
 mail-client/thunderbird/thunderbird-78.6.0.ebuild  | 1053 -------------------
 mail-client/thunderbird/thunderbird-78.6.1.ebuild  | 1056 ++++++++++++++++++++
 26 files changed, 2530 insertions(+), 2254 deletions(-)
 create mode 100644 mail-client/aerc/aerc-0.5.2.ebuild
 delete mode 100644 mail-client/alpine/alpine-2.23.ebuild
 create mode 100644 mail-client/evolution/evolution-3.38.3.ebuild
 delete mode 100644 mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
 create mode 100644 mail-client/mutt-wizard/mutt-wizard-3.1.1.ebuild
 delete mode 100644 mail-client/mutt/mutt-2.0.3.ebuild
 create mode 100644 mail-client/mutt/mutt-2.0.4-r1.ebuild
 delete mode 100644 mail-client/mutt/mutt-2.0.4.ebuild
 create mode 100644 mail-client/mutt/mutt-2.0.5.ebuild
 delete mode 100644 mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild
 create mode 100644 mail-client/thunderbird-bin/thunderbird-bin-78.6.1.ebuild
 delete mode 100644 mail-client/thunderbird/thunderbird-78.6.0.ebuild
 create mode 100644 mail-client/thunderbird/thunderbird-78.6.1.ebuild

(limited to 'mail-client')

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a4f4b11d28cd..f470065a82e9 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index c2fab6cf98bd..8bfa43be96eb 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -1,4 +1,5 @@
 DIST aerc-0.4.0.tar.gz 128549 BLAKE2B 29b87306775b0a8dffeb2d9fc03dfbd589dbf382d26f3586c7c13ee64bfae8a25a86015a3660d2a4e6d2d6b4e5aa0b60bc14a9d1d7f22a650a8c1ed9a68d0d94 SHA512 5017d483a589cfc15a81782e75174d38a0b82ebadfe91c0f8b7aec9ec93174029fe7ddf35200187481389b2e4051c42fb7c3b35ad834ca62e230cdb5a73b4449
+DIST aerc-0.5.2.tar.gz 142415 BLAKE2B 05079e67fe0cdae84dc622fa40ec0e96a57153467afbcd436d5fafe7920263604559fcd923fd6d3164de3346271cacccb80321a49d322712b5c5048d4493d928 SHA512 f5b4d997f191a9819e4e8c3d0e13e8258006760db915ea568731eda16b1ce13c1083275b063bd06b3d690370ff364dbd2d1d51123d3222e0b1e05a9a8e8e3739
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST git.sr.ht%2F~sircmpwn%2Fgetopt%2F@v%2Fv0.0.0-20190808004552-daaf1274538b.mod 78 BLAKE2B 01c5d4bbdb9ddf4d3e7435a993e873bde3241c4136c6988358dce0d2ec79a4850dadd8e13ea99e35996c3082a54b9a13409f2a85f7a2ba118f9c20e074d797f3 SHA512 c521cf971e4d6882a73b0596d1ab31ad59292672b263a1554ce9e32a57e3c1ecafa8e758b8c9b4efef31a875b74e147cb84f59b0479de2d85184b8d9252a9fbd
 DIST git.sr.ht%2F~sircmpwn%2Fgetopt%2F@v%2Fv0.0.0-20190808004552-daaf1274538b.zip 15118 BLAKE2B 57c55c5eab998bfa60ee82dbb17668186b0235ce1a6f2b2ff27e92b33a9b0592d31aa9fa767b6d6ecabcaecbe309680fcf2b0c717422629d409356fcb78a1cde SHA512 5d05c9eb7b235155e33a1cac0b422f48727df06e96e08b03a507a04fcb376b090e713d2dbe8603804520cddd4b1a02f26691c1ebb49ae34294e834a1afaf3a1d
@@ -16,19 +17,30 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fddevault%2Fgo-libvterm%2F@v%2Fv0.0.0-20190526194226-b7d861da3810.mod 192 BLAKE2B 5ba2a1b252bb85acb7c7f7029c80b9e3c803821787bd5636b18c7db1980f6c133a5b998963f10d997416fad2832cef46004051862767af270e621b5b320c98ab SHA512 f31c60644af4aa9dad0d22d9a57f18dd48381b6defde511174e6b4b881ad16a9001a7d310030cb63243a34bf01f77abbb1af66e33ee93f37a8980c20e1274d99
 DIST github.com%2Fddevault%2Fgo-libvterm%2F@v%2Fv0.0.0-20190526194226-b7d861da3810.zip 146408 BLAKE2B 70777cc6261b4b983deb8e23ae989f07bf935b3589e18b219d95e3f0983efc0b6901134479799eba115cf8f01f13183810c539e9427406742fa9034b0c5a7545 SHA512 981dd1d533981cf6047f44a3131da0d0b8c926f870d0c9285eeaaf93b46e648970381d204786e1c961284896f720163c77439140473cff5ed8629c5083f27cbf
+DIST github.com%2Femersion%2Fgo-imap%2F@v%2Fv1.0.0.mod 208 BLAKE2B 5957e5bafcd49e94a9dfe609ee82ec7b5228290131bc337616d8f1fa564bd03357e25b76ecccd15a3accd3563d065a93a542fe219f689aa73dd8897d21ad36ac SHA512 b3400e9e85223c321332c57841dda8e4fad7184ff7a842e43490636a701efdfbe336b662a8944790db2682682c44fb05e81f09de7e9697f8de5f6fab8286d44e
 DIST github.com%2Femersion%2Fgo-imap%2F@v%2Fv1.0.4.mod 187 BLAKE2B 68dfc1a850099b9eb724b9e60c83da0cf58c225ce2f4835eec30ab152a901fcfb942842a82ac89a1ae13e27ca070df017f8b513d41e99f8dd9239de5c43e60c1 SHA512 0c24e87c7e7258f4f481e89eabcf93609ec86214d0912f2e98bdd2af327af3c43e5bd045c1f6c98e156ff0b3f7413c57757f357af938c7cadcd3b220a0674b5b
 DIST github.com%2Femersion%2Fgo-imap%2F@v%2Fv1.0.4.zip 144851 BLAKE2B 46e8ef396f146cd4626210c2b665333854704b4b7a96cc6c82670fdbc2eefb51cb18005b0387bbee5e07afbb89e1b4c636194cbe2304ba16f2158780d925c88d SHA512 45258b76225d9722247cd3552af5c14f90242cbe8f41f5562d5959978407b33f4fc33145410f7ba9a492e1e2bb7910ed3ae43a7810e5f7fb1a814f58a32f2a3d
+DIST github.com%2Femersion%2Fgo-imap%2F@v%2Fv1.0.6-0.20201014170015-5a03a09eba6d.mod 187 BLAKE2B 68dfc1a850099b9eb724b9e60c83da0cf58c225ce2f4835eec30ab152a901fcfb942842a82ac89a1ae13e27ca070df017f8b513d41e99f8dd9239de5c43e60c1 SHA512 0c24e87c7e7258f4f481e89eabcf93609ec86214d0912f2e98bdd2af327af3c43e5bd045c1f6c98e156ff0b3f7413c57757f357af938c7cadcd3b220a0674b5b
+DIST github.com%2Femersion%2Fgo-imap%2F@v%2Fv1.0.6-0.20201014170015-5a03a09eba6d.zip 154213 BLAKE2B 6c66995d89022d6166f7d3d398d4ca267f052afb8c9e67c6b2dac4315d04169d695bb71bd23b0d49b69bea81bd401aeb0a03ad9aecb91ff571e0ed93fdb5c5be SHA512 d460ca652dfc5f6bbed2c798c1c3d32dd2c52cc1f1b23a8b615711f262f3124c6e35b541a66b7b2ed161489ffb38ed96ed29e20a098f9ea9c886b3a255cc5fc2
 DIST github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20190519112320-2704abd7050e.mod 40 BLAKE2B 5fcc3e02ae5e6a171ffdccd6ace3373d25e6b96bbee1eace5f6c8ae75c48dc5d16958abb24c02e5cbbebb28f12cdd985da7178e0459d5414289bff1c9ced0f08 SHA512 a9b2e6cbdd919063151672a6da7e8b1ccebcabc378b197edc8ba7e433baed90fb712426919e1b9284aa9879174361a9c6da35c92ca19993870abf6e7bab741cd
 DIST github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20190519112320-2704abd7050e.zip 6390 BLAKE2B d83382fe19779647ae3ce787b67a061a92e390cda5213cf072dc6a9ce81f0f0b10eba647d9df02006802160fbc01bef947340faf9a9d35f43a489079f4bc2469 SHA512 573463fdd7753988b915d0475a704c0716ec9419839b54be3d84c5af24c95909e91c0c0105440946e30872da113737ee8ba45453df4ff46efac714d9c42d16c6
+DIST github.com%2Femersion%2Fgo-imap-sortthread%2F@v%2Fv1.1.1-0.20201009054724-d020d96306b3.mod 180 BLAKE2B d3b9a852fd5e2cdb9cef11ab72155242227a91a00e3fa3994e3508472c84fce5c2e1670d41b068a0e3a2e73b25154b582efde13b3158e54301db0c49d32a70b9 SHA512 99050d4fde4de40e53073552f431aa500700a36e0ac6a2103090eb14b288d6441d26dcf39b2e2b539ac61428bf71276b2311c36953c5ff01a4913f9650b969c1
+DIST github.com%2Femersion%2Fgo-imap-sortthread%2F@v%2Fv1.1.1-0.20201009054724-d020d96306b3.zip 11750 BLAKE2B cda393dcd21412740ee2f2b2a3ddcec20cda07e866cc9482d1d3e3c39be0a77ab991943fd047a8ef0513a70acf8d744b42a6af00c51fb5a0ab61c3f5c6f49483 SHA512 985cd588410735ffcd17f114f5ada26885f85b614929130ccb443239693def1e0cff91b5d9096d667a80b79f8734faeb87b2dfedfa81528c7c7b41d937ad190d
 DIST github.com%2Femersion%2Fgo-maildir%2F@v%2Fv0.2.0.mod 47 BLAKE2B 65f1852cd2154d71394b5072109a47291ed310859fdea9df61aaf4b664ba16fa8e9504db9eb01b50479e6da81231fb4df2c81dc310868bcc36cc0c9166dac066 SHA512 007f90e861cfa8eb32f0b344acd3a97dcc85c10176aade304712e92fde1df4727895636ec065db37ef6cc3114a22bd92ccdf6124200675caf36b1a96bd22d290
 DIST github.com%2Femersion%2Fgo-maildir%2F@v%2Fv0.2.0.zip 8089 BLAKE2B 0ed3a2aa7b5372957a4ce9287e259c36064d700a211319ce4ad046ae462832575fbbad0406bfbca22c1cc220480bd4a2c5687d75dd69e77e0d50bb66a7c935bc SHA512 107c93650b4f684d07d9646633bf17ee05d9376f496826457f3fec0b71cafc84907c89fab4e53dcf9e58b6434ed35f9506daa94c59343aa445e6c78b6b57a75a
+DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.10.4-0.20190609165112-592ace5bc1ca.mod 224 BLAKE2B 64052723717150bd75a73cc815f9c6563fdae6fdd2e890cfda8e66a2d0f8417090d51015ba1ee6b0ad45fc7834ef8cd3efc59c5e9b8b2425f982a1b32292bac6 SHA512 15d6532f55e39be84923c98c14619f7996e49532b9a9ddec28a3c7612561cbd895054928b966d40b03a4f078700e5073a53f87920908aaab93e7c2f1115d25e4
 DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.11.1.mod 291 BLAKE2B 373e583c6fdaa6a85a8573fec5d9d5a3a05a8b39750fccae817af24fe1aa262bc8d90e12eca21115db2dabb97b782720f2d124a23542c12e18a24f40ad242256 SHA512 04ca68ca4a3cd526e5cb3526364add529369752d32433ae3ff3f394e7dab90efd3666f39eabc7e5a956522ba22d060680a6ff3b631a034721fc95d036f8d720e
 DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.11.1.zip 44798 BLAKE2B b47234b50ee3a8ea0ade6c734ae888aa8f0cd0f49fc0be2ebea488f4246bf7fb307e7d17a8400b8e548839935d2e479e00e716f8d2b609011430f3d229768aa9 SHA512 cffaab79371b3b4c5161bd0296342987865a13c59a53d6ebc3f103ecacce0e48d90850ddf8baf37d1d3286e52dc9adeb9bae59a2513d280d0626319881b21371
+DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20200824204225-9094bd0b8bc0.mod 291 BLAKE2B 373e583c6fdaa6a85a8573fec5d9d5a3a05a8b39750fccae817af24fe1aa262bc8d90e12eca21115db2dabb97b782720f2d124a23542c12e18a24f40ad242256 SHA512 04ca68ca4a3cd526e5cb3526364add529369752d32433ae3ff3f394e7dab90efd3666f39eabc7e5a956522ba22d060680a6ff3b631a034721fc95d036f8d720e
+DIST github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20200824204225-9094bd0b8bc0.zip 58192 BLAKE2B b794d3df348086352a8915360b2997adf0367872185d4f237b1e93fb1f006c87593827496a324cf506fb39fa6f03e86796559d7f4999030125430b4346383536 SHA512 3bf2362a984d83d42062cc6424042972f22106a8823c4d02c99d7c10c790fb712ee94c3402aa83afd60c5df07543be1ba066831e42debffb64a2590ee4a3918b
 DIST github.com%2Femersion%2Fgo-pgpmail%2F@v%2Fv0.0.0-20200303213726-db035a3a4139.mod 182 BLAKE2B 7869daa8626a611f5421764ee584ec5bfb58cac65d46db6c0c4c6df47233f1380c36835082d960ac542958423790b55d98e4c71ee1bbb62e12f7f72400f8e718 SHA512 1e0cbbef7a14b9102a1d6e1558213a1522c7ed19c2b4332487c4ba81629a2f93a8d9efc76bb176b4900c98ce6a59c1e9cb3558457a1c31af052f0a0803394976
 DIST github.com%2Femersion%2Fgo-pgpmail%2F@v%2Fv0.0.0-20200303213726-db035a3a4139.zip 17035 BLAKE2B 85280f012b4966da11138706406bfbfdb81ade8b1dba3afd534029632f66f26c87f4beccbc7ef6eb9113150b45a07ef75c7e81babad49413c771346483d84d27 SHA512 c5a89d2b37d7169c6d896f87baa167a981ca32246039d9dac00c20b508c72443071ae52fc5e41fb6c8e7708c4d842352a725da36bd9c286860398a71926e28b0
+DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20190520160400-47d427600317.mod 35 BLAKE2B 799f10c57b01f6e1e3ce5d22560a69a2dbca09b9e02bff279ef9429580e50c2ea83c9a368e1f45184038cfadd5a076d1c109a85591dbc34963578bdd7e07bd6f SHA512 82ac89c3b9b31f812ba28d55ac3c9fd2b2d15f884978125dab501cdd1b48fcc7b1fd9c641ba48b2c6dbbd7e821b9f32ff84427bd83c5338b4be45a77852282b8
 DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20190817083125-240c8404624e.mod 35 BLAKE2B 799f10c57b01f6e1e3ce5d22560a69a2dbca09b9e02bff279ef9429580e50c2ea83c9a368e1f45184038cfadd5a076d1c109a85591dbc34963578bdd7e07bd6f SHA512 82ac89c3b9b31f812ba28d55ac3c9fd2b2d15f884978125dab501cdd1b48fcc7b1fd9c641ba48b2c6dbbd7e821b9f32ff84427bd83c5338b4be45a77852282b8
 DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20191210011802-430746ea8b9b.mod 35 BLAKE2B 799f10c57b01f6e1e3ce5d22560a69a2dbca09b9e02bff279ef9429580e50c2ea83c9a368e1f45184038cfadd5a076d1c109a85591dbc34963578bdd7e07bd6f SHA512 82ac89c3b9b31f812ba28d55ac3c9fd2b2d15f884978125dab501cdd1b48fcc7b1fd9c641ba48b2c6dbbd7e821b9f32ff84427bd83c5338b4be45a77852282b8
 DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20191210011802-430746ea8b9b.zip 11251 BLAKE2B 2bb68a5e00aad3aa162b77b9c7b4104ccd0c72207e4b71ee8b531c0d938028f79a389983f9f49def6dfd2ed4f7755aacb8c95fead58fbc793da8f8dac0a5e79b SHA512 65b9fe072cdbc75e49aeeaae7080281c64acbfbfb91dd9280da4a73511b5e3ab172c25c943908bcc6292ee1ec049515cf028493d15188372f4c9ea6602bb37f8
+DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.mod 44 BLAKE2B 2e367a91b21bcb6f7a108430ded05aaeb212e470a3858a20afb921ec9d4164341d4dd8cfe8ab5cbaedb67b2060800f1e999b9cc26b660d4c5edf8a5e4396a651 SHA512 85778e27f712ed2f65c649c3f197873eea94c761fe7d8b2cd4d275208bf4072ccfbe28d883a4c93a39b4fc7b1138cc2eb7345fa08c7870aa45ba19089214d9fc
+DIST github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.zip 12511 BLAKE2B 714871c1c420af28dc38c38edb2db87f6ce6506165d4a33c578aeef0be650c5ef6e0a354a28fce6f3b70dacb66041d153601f118b41bf6a3389150d9d3adc870 SHA512 c3993fab8ca6069b13388bb51544f79b24b5db49a9f6e80de6ed2ffbb7a0ce4962a3848aac622d9e01b4cf9d7bb8f12e673300801f9be6c4af9b39f93e614c14
 DIST github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.12.1.mod 116 BLAKE2B 6bd6a331f59b392a6089ef8f7cb2e4b0529811babaa1abeab65659fcd016f8e49b95cb18243985055b033c30f5a7943bf79f0c997846a43c7c6e7ac71f155a1f SHA512 c64e091a5fced52e66163b9437af56705342ab1bfe9edaa6c76297d98b412a7f382448c0ed8eba279eed8fa02c0b99cc670c137b61fa57729b64b5feca035315
 DIST github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.12.1.zip 38762 BLAKE2B 0d68ad6614c6beffc9f08e314759269cbcaaa9d00456b7b560e1aa01f233be0c25dccd722f0e53835fcc464599a027634dce45b08305259ef6f3655b0664e959 SHA512 d2b4b0f7697e4f5c744e03afd8b19e3e6f78197b9b0144d4b1a32bcc9d44032222f4a2f0b283b32e1f179005bc2e3d63156586a91adb3bd7477bf9998b8ef21b
 DIST github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20160606182133-d0e65e56babe.mod 42 BLAKE2B 971265b4be173c1f78232e0e4b55768a868d740861472ce2532fd7383c8cc03350a94dba1e3061f2bd660666070faeeef364dcae3e77301ddbff0ba92e8d37ef SHA512 d239ac014c9813008f37876b672316ecb1fd4c710fd6bc58c0f5f957e2a6ea2301618ce02275225d2af375b0dcf84a2f64d9c378745a515b915d959b385740fe
@@ -57,6 +69,7 @@ DIST github.com%2Fkyoh86%2Fxdg%2F@v%2Fv1.2.0.zip 14003 BLAKE2B 715715bd69e1cf506
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
+DIST github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv0.0.0-20190418230009-7c6542dfbb41.mod 38 BLAKE2B b51b3bdeaebd91c808d6c1dfc4cf124b01c2eda9d60c14e84d482e1202e848d2eb07efc6e455c60aab8e548a4d9e4d3dd91323947a1381775811b62e6e1c07a4 SHA512 2a3f54e7c5ce76b905e7985188a2aeef722633139000b54d8e7c418e7d865aea70bde856b4b888deac3f2dc3b39ae90a7ac3160c1197632af8e17e77a2be7831
 DIST github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.0.0.mod 38 BLAKE2B b51b3bdeaebd91c808d6c1dfc4cf124b01c2eda9d60c14e84d482e1202e848d2eb07efc6e455c60aab8e548a4d9e4d3dd91323947a1381775811b62e6e1c07a4 SHA512 2a3f54e7c5ce76b905e7985188a2aeef722633139000b54d8e7c418e7d865aea70bde856b4b888deac3f2dc3b39ae90a7ac3160c1197632af8e17e77a2be7831
 DIST github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.0.0.zip 4452 BLAKE2B cee6f4d01eb9f25f7851112db4630b9017c586fe5e89f840e9a2c2adebe2ffba2abf5b0bf7264f85bd9750f19f71b3be6b9f7d542e48fdfc061ee2c1ab185d84 SHA512 a7fd86b763df190e8137d984e3272d4b96021a862e39cb10d69c826deb694ee4cc9492fae9fa189819ada8ac2cddd310bd845117c1919cd4df0787f50ebfaab3
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
@@ -107,6 +120,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.zip 1462438
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
@@ -119,5 +134,6 @@ DIST gopkg.in%2Fini.v1%2F@v%2Fv1.44.0.zip 49597 BLAKE2B a96191fd0d39899d229b5bae
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 EBUILD aerc-0.4.0.ebuild 8020 BLAKE2B 6558aa75ae8eece47276364621e863b011c643ec7121d212fabbe95eecb4a80a9276398f7fb21eb90f686cdecdff807c66decc7076ea5106820f3fa6117b3dce SHA512 ec9f1609e4f1623d8860922f34f17ffa2977eb689965dbc39aa586a6fb9b9bf8535444640bdf4cbf24ae072ae947a6e9f2cb6cee4448ade6c7dea86ab25d40e2
+EBUILD aerc-0.5.2.ebuild 8680 BLAKE2B f43013f5de30ee3af0d6d1fa19aa1edbf9932ffca3ca37522b508c6a89ed90f610a7c2ce18a0dc569a8552541d10e621ea5b5dfcec0462cada85fefa89fc0cc8 SHA512 52df4645066cdf02da923188817aeb5bc56a4223bae0fc9e4193c77333442f59a8d06e8c69868dff66f84a2ae64f5d0f35181f44e1023176b8ad53ea1779e7fe
 EBUILD aerc-9999.ebuild 1546 BLAKE2B f80489c12bde3fb6647c4920b345ba69d16c666fe8459f9eaec2a10fa314d697e6c4472326095f231feb05ddb2290747250ea7d99416c8a2dc10af10b5a336e2 SHA512 a75aaf95487df6dcecac7996b7f0b9d60d9088fe14267c554b48e060c64a29adb2eb17753600b72ac929c209c02eead3ce923e025944b1643c75beb1a28ed1d4
 MISC metadata.xml 591 BLAKE2B 25f76b2d3d719ec13557251098d7ca60bf5295fae15a270e8b2c0ba1a3f58ade0f84796b350c07014d731ae1a42cafd84aa1c513e205507379fcbd3a05b66bb3 SHA512 3c21ba82a426809e525af55ce361bd948d0a3b044bf48887ba0986ccbad98c9ae1c2530096c12a0fd0176d1f6d5e25210db4b77c3505d21486cf78b84e7f6e32
diff --git a/mail-client/aerc/aerc-0.5.2.ebuild b/mail-client/aerc/aerc-0.5.2.ebuild
new file mode 100644
index 000000000000..57707f93ce51
--- /dev/null
+++ b/mail-client/aerc/aerc-0.5.2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="Email client for your terminal"
+HOMEPAGE="https://aerc-mail.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/aerc"
+else
+
+EGO_SUM=(
+	"cloud.google.com/go v0.34.0/go.mod"
+	"git.sr.ht/~sircmpwn/getopt v0.0.0-20190808004552-daaf1274538b"
+	"git.sr.ht/~sircmpwn/getopt v0.0.0-20190808004552-daaf1274538b/go.mod"
+	"git.sr.ht/~sircmpwn/tcell v0.0.0-20190807054800-3fdb6bc01a50"
+	"git.sr.ht/~sircmpwn/tcell v0.0.0-20190807054800-3fdb6bc01a50/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/ProtonMail/crypto v0.0.0-20200420072808-71bec3603bf3"
+	"github.com/ProtonMail/crypto v0.0.0-20200420072808-71bec3603bf3/go.mod"
+	"github.com/creack/pty v1.1.10"
+	"github.com/creack/pty v1.1.10/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/ddevault/go-libvterm v0.0.0-20190526194226-b7d861da3810"
+	"github.com/ddevault/go-libvterm v0.0.0-20190526194226-b7d861da3810/go.mod"
+	"github.com/emersion/go-imap v1.0.0/go.mod"
+	"github.com/emersion/go-imap v1.0.6-0.20201014170015-5a03a09eba6d"
+	"github.com/emersion/go-imap v1.0.6-0.20201014170015-5a03a09eba6d/go.mod"
+	"github.com/emersion/go-imap-idle v0.0.0-20190519112320-2704abd7050e"
+	"github.com/emersion/go-imap-idle v0.0.0-20190519112320-2704abd7050e/go.mod"
+	"github.com/emersion/go-imap-sortthread v1.1.1-0.20201009054724-d020d96306b3"
+	"github.com/emersion/go-imap-sortthread v1.1.1-0.20201009054724-d020d96306b3/go.mod"
+	"github.com/emersion/go-maildir v0.2.0"
+	"github.com/emersion/go-maildir v0.2.0/go.mod"
+	"github.com/emersion/go-message v0.10.4-0.20190609165112-592ace5bc1ca/go.mod"
+	"github.com/emersion/go-message v0.11.1/go.mod"
+	"github.com/emersion/go-message v0.12.1-0.20200824204225-9094bd0b8bc0"
+	"github.com/emersion/go-message v0.12.1-0.20200824204225-9094bd0b8bc0/go.mod"
+	"github.com/emersion/go-pgpmail v0.0.0-20200303213726-db035a3a4139"
+	"github.com/emersion/go-pgpmail v0.0.0-20200303213726-db035a3a4139/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20190520160400-47d427600317/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20190817083125-240c8404624e/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b"
+	"github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21"
+	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod"
+	"github.com/emersion/go-smtp v0.12.1"
+	"github.com/emersion/go-smtp v0.12.1/go.mod"
+	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe"
+	"github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/go-ini/ini v1.52.0"
+	"github.com/go-ini/ini v1.52.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.4"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kyoh86/xdg v1.2.0"
+	"github.com/kyoh86/xdg v1.2.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/martinlindhe/base36 v0.0.0-20190418230009-7c6542dfbb41/go.mod"
+	"github.com/martinlindhe/base36 v1.0.0"
+	"github.com/martinlindhe/base36 v1.0.0/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-pointer v0.0.0-20180825124634-49522c3f3791/go.mod"
+	"github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f"
+	"github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.8"
+	"github.com/mattn/go-runewidth v0.0.8/go.mod"
+	"github.com/miolini/datacounter v1.0.2"
+	"github.com/miolini/datacounter v1.0.2/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6"
+	"github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v1.0.1"
+	"github.com/smartystreets/assertions v1.0.1/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190710185942-9d28bd7c0945"
+	"github.com/smartystreets/goconvey v0.0.0-20190710185942-9d28bd7c0945/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/zenhack/go.notmuch v0.0.0-20190821052706-5a1961965cfb"
+	"github.com/zenhack/go.notmuch v0.0.0-20190821052706-5a1961965cfb/go.mod"
+	"golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/ini.v1 v1.44.0"
+	"gopkg.in/ini.v1 v1.44.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	)
+go-module_set_globals
+	SRC_URI="https://git.sr.ht/~sircmpwn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+IUSE="notmuch"
+
+DEPEND="notmuch? ( net-mail/notmuch:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=app-text/scdoc-1.9.7
+	>=dev-lang/go-1.13
+"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	use notmuch && export GOFLAGS="-tags=notmuch"
+	emake PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you want to allow your users to activate html email"
+		elog "processing via w3m as shown in the tutorial, make sure you"
+		elog "emerge net-proxy/dante and www-client/w3m"
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test $v -lt 0.3.0-r1; then
+			elog "The dependencies on net-proxy/dante and www-client/w3m"
+			elog "have been removed since they are optional."
+			elog "Please emerge them before the next --depclean if you"
+			elog "need to use them."
+		fi
+	done
+}
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index bab24066241b..74247ec2170a 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,7 +1,4 @@
-DIST alpine-2.23-chappa.patch.gz 172604 BLAKE2B f814a269fe316dd42e73f98b09a67b26f8d0c5db9bc83ebcc6145f7f3373f14a5fa9f7991f60a4186c0f078428fa0a38bc81b0459998045ea433438f730f05a8 SHA512 5195db336651da161b3d94afeab8f46fd6bd3d1953db72b8f453355b46eafe8afe26eccb2466024f077fc3e40ff52e1a14a126ce3cc33fdcfcaeded67f9422d0
-DIST alpine-2.23.tar.xz 6330784 BLAKE2B e7be73dc0ccf04cfbd8712e70f8b114063983b971c1d967765b41ab0bf86369815d954e85fc4d9622539b1e3a6324ffda635a2808b9439a123302e7f9c9f421d SHA512 abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b
 DIST alpine-2.24-chappa.patch.gz 172010 BLAKE2B 39f5336ead355a4b78bcdd5b44dc398888bf93f3c3efa95b3ad8a86f3a0dda13f03164a03fbed898150864130648a204a6b5d9e32c3437138878516d014c8bbe SHA512 7152a8e4a79a530345448267204a96bc2585b4fccb23f011fd4dc97bc713696b8eb7ca9563655d8da33570ef14bf29577f82fe0f104c80590a43b0e74ec89e81
 DIST alpine-2.24.tar.xz 7341676 BLAKE2B 63e2d9387f1a369f9a4623625524f25eec64c600672092608256fd2827c094fae1384b35da84ec5f5865295744982ede533551dc47b6f0c80f2405ed16cad546 SHA512 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5
-EBUILD alpine-2.23.ebuild 2227 BLAKE2B 0dc55e814c736e2381e1ccc05b3b67e5b7f1ed065d8b854569bc4ec8e5db4028cf427fe1e24aa6ec8d07b792790402ee3a946811f2722b79e1cc498aff356dfe SHA512 b1ab7041333db6b69b4378a4f4f76e6309f460a2507bad2d5b2b2e509b2df2f8dd56a9e4020687f3bb5614796e676ea94bc28b3b749e97d838451a995990554e
-EBUILD alpine-2.24.ebuild 2219 BLAKE2B d9519cd31b87eccc98cf32730ec58b62288ff098dc51358945d0914f7f89828a32c5c0db571e6c2d00ec4b886bd5ac7356f2e55f8d082e71d5f62ab032d2cda7 SHA512 085a6c972d695aa1850d9e364fdef423d353a0b000328aa66f51474092a7d0847a31c04010e15ea9788c8409aebec43f2f71904b84ed58a17628dd1541d877b5
+EBUILD alpine-2.24.ebuild 2218 BLAKE2B 526c1d347fc5a67b99cac7fab0cc2e3863801359455d613b26ae99e1525602207e4d4a619edb3f92b1f6d51b691763d2cb7812825bd645ffdd7df43595f7d20e SHA512 5127654fa45563faa21e5bb5e3930c1b1ff648f777544458ec7cde18136bccc87cf9d6cf841aae49e9a68a8b0262a49e7df47e8d036de6066cbd2fe821ea4ff7
 MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
diff --git a/mail-client/alpine/alpine-2.23.ebuild b/mail-client/alpine/alpine-2.23.ebuild
deleted file mode 100644
index 24bf8ef8ae89..000000000000
--- a/mail-client/alpine/alpine-2.23.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-CHAPPA_PATCH_NAME="${P}-chappa.patch"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
-	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
-
-DEPEND=">=sys-libs/ncurses-5.1:0=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	spell? ( app-text/aspell )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-src_prepare() {
-	default
-	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_configure() {
-	myconf=(
-		--without-tcl
-		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
-		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
-		$(use_with ldap)
-		$(use_with ssl)
-		$(use_with passfile passfile .pinepwd)
-		$(use_with kerberos krb5)
-		$(use_with threads pthread)
-		$(use_with spell interactive-spellcheck /usr/bin/aspell)
-		$(use_enable nls)
-		$(use_with ipv6)
-		$(use_with smime)
-	)
-
-	if use ssl; then
-		myconf+=(
-			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
-			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
-			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
-		)
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 AR=$(tc-getAR)
-}
-
-src_install() {
-	if use onlyalpine ; then
-		dobin alpine/alpine
-		doman doc/man1/alpine.1
-	else
-		emake -j1 DESTDIR="${D}" install
-		doman doc/man1/*.1
-	fi
-
-	dodoc NOTICE README*
-
-	if use doc ; then
-		dodoc doc/brochure.txt
-
-		dodoc -r doc/tech-notes/
-		newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
-		newdoc "${S}/doc/mime.types" mime.types.sample
-		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
-	fi
-}
diff --git a/mail-client/alpine/alpine-2.24.ebuild b/mail-client/alpine/alpine-2.24.ebuild
index 87ccc42fe858..8fcc089167fa 100644
--- a/mail-client/alpine/alpine-2.24.ebuild
+++ b/mail-client/alpine/alpine-2.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND="sys-libs/ncurses
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index c8c41f3187b6..758276d3230e 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-3.36.5.tar.xz 12137312 BLAKE2B dcd7785fabeda0b8daeadcf5858ac6ae9d11fa21ef4ff3f7b880f0b0c22ff2e8ba6dd25ef983ddf7d6c7c0d060613fea8f0f01a67b0641159cff908d0b2c8c9d SHA512 4f3a7e891f6e0bb8f3d44f838ecf0f373ad1133f465af3a0ab68e9ec9220e67025dc4e657c73bb8c212d958669e5285050234fb43b6bf0596bcd662de1ef9fd0
 DIST evolution-3.38.2.tar.xz 12159172 BLAKE2B 9690428c05f985a73c2ae4d02a1d6fcc71aa02a6d10b8dec938ed65c48bde0e0c873bd0e65040ec90c0136346d76989a0758f59e29eb8526b6953fecaf11177e SHA512 30d40e9e8934afa2a8b602bccf740a055423892cc435b54e2cb116d0a8f24a369975f90a253da0c3554fd315a378c014a26c5b85af5b588c2afd9e8ad4698f3e
+DIST evolution-3.38.3.tar.xz 12159492 BLAKE2B 95fab6e01ae357437c834bc3651a5d599523004e9ca33ab07c552b99dd4119f0ec4cadea11a2e51ecfe61b2329454a866a211f99d35d912690288651f51134c8 SHA512 aaf30f95485939b3715803a46b484fd72d1a2e3d02a2cc0aabea1ee56a20babcea47804badb52219cecb2806c1ebf711ffb14f36918619fb62bf16a031623508
 EBUILD evolution-3.36.5.ebuild 4369 BLAKE2B bde99ca123b65c59f2a990a4143b878951dc029798842696c138d99d3691f4ba653ccd06fe89d5ddbf53287849397d9a61c6c310fb5b56b502ce96776032bb83 SHA512 f6245aa174e4a8cc20d3b330ab3cc49a45fd5e25dd12502f190ec48c3fc7b442c3a580133f314f41b6e8176a83ce99f483f9a0cd7f1e083d36b3f8e1ba0feaa4
 EBUILD evolution-3.38.2.ebuild 4168 BLAKE2B 7d8d15474ddbeb25f537b08e8f4b6b2c912396f237ac0385cf706a28e5440b7a63958362c8fcdbd7aac92c3bc55169fa638cc9bb12ff4c372469d05799ca9729 SHA512 bc007c937dfe6b69afb8f90630f8a00afde0e92df3175a5549506bffe4e16b401d842219ccc9e1a0a087aac366e0e137b7a936f61ef21bc54a77b7dd0607c35b
+EBUILD evolution-3.38.3.ebuild 4176 BLAKE2B b36bfa565223b60fce12875c4cb20c4ccd26c4a9fe64920904423542face265afca3251d96df7b30b9255f38c7da0a16411074e7244d0bb7425313796a3adcf6 SHA512 c8eace659a40e443d1f99b31bcabe74edb7f9182bab1aa4ecd9c02bb64d2f6d9856593d42121eb564139a4bf5b71a770514ce87ade0ce601e09e65ab9270ecab
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.38.3.ebuild b/mail-client/evolution/evolution-3.38.3.ebuild
new file mode 100644
index 000000000000..d84609add550
--- /dev/null
+++ b/mail-client/evolution/evolution-3.38.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.46:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/mutt-wizard/Manifest b/mail-client/mutt-wizard/Manifest
index c5b233bc7369..89a58c99c5d2 100644
--- a/mail-client/mutt-wizard/Manifest
+++ b/mail-client/mutt-wizard/Manifest
@@ -1,4 +1,4 @@
-DIST mutt-wizard-0_pre20200808.tar.gz 30797 BLAKE2B 90b7382b6d2a687fa2ce5b267a00ee582c1ea89169185eb556f7e3aab4bbc822068fd691fbdaa843df0c525ec737a34acb39bc8a09d3c608837487825e57344b SHA512 e49de65658d4222d8932b1dd117631fffcd08493dc6e20a5157f8a3e336e179bf754ef64387f2b538c70898183a0413c99425a2751debb4b8d7cea5465076f57
-EBUILD mutt-wizard-0_pre20200808.ebuild 1285 BLAKE2B 05f38d864706447c3872b833c17ae035481909aa6812f1bd2665d7cb0b7ee86b140b2d084eade79c561126c9a469218ecd85002d69ee0f23394ec13ba4e01b5f SHA512 16d4f645dc71e25d28fc22f59b5176bea979a7b731f68273bbdf4b9750601c9b11a2f64b4ae6f5270ceef2f82320247587f62ec7030e61c43a5ca9e62f93caec
-EBUILD mutt-wizard-9999.ebuild 1285 BLAKE2B b07c2c86360c549302cabcfa808209f1084777fa7f8fe5db9e7b775edb781e85aeb9e5e5a66f7055a84369a39ef43961fe37eb9a59de8862c36e308c32cec4f4 SHA512 48b7746b840244d184949a108ce3a3123399cc82c3538cb2f597b41ba9c575198c0659bff952aec5a6136824cf785b0622864d2ceafd1aa4ac9f5c3b5488b485
+DIST mutt-wizard-3.1.1.tar.gz 33346 BLAKE2B 0f4d8e973fedc0d102242a06922627039f4244ad9fc901d6e3d7235089164c3a7f255587978c95762242146441d8a48f57401e9ec86754194b531d38f0074652 SHA512 b385bab603eff561bca8aade49f3d11a4ac031cbceb4a64d80be9b591dc34757a05bb3c56c23ec9f1942392833725872d4871bf34964c4503bc01d5223286ddb
+EBUILD mutt-wizard-3.1.1.ebuild 1201 BLAKE2B c3feccca682feb4f6c58b7c7ec1849c0b0b09672d265973cdf364c89d6b1c3f7767a16fd8f42b739a34c712837ce9c333506d3ff3a321f7b9cc819e22f6bc1be SHA512 e6d2b7bc60f2e2d0ed45186b7ec1b1b11c8fba521fff93939871751b6f9ef6daeba1412eb7a2db06906642e5ca1f521b07c8744b0ecc493459e783c3dd762f87
+EBUILD mutt-wizard-9999.ebuild 1201 BLAKE2B c3feccca682feb4f6c58b7c7ec1849c0b0b09672d265973cdf364c89d6b1c3f7767a16fd8f42b739a34c712837ce9c333506d3ff3a321f7b9cc819e22f6bc1be SHA512 e6d2b7bc60f2e2d0ed45186b7ec1b1b11c8fba521fff93939871751b6f9ef6daeba1412eb7a2db06906642e5ca1f521b07c8744b0ecc493459e783c3dd762f87
 MISC metadata.xml 661 BLAKE2B 0fb12b65b9bec3fdede05001ac566f826aab3eac22e38985c2b408133b575923aa8a6cd53ac0a118f8f6d546b7f11a4a87209147cbd4ab0f299e9f33f169787b SHA512 05597986d8114f3fcb752f2ae5ed7dcc8eb23bafa67f67db6c1fdb8d3cf404762c7929d0fb1837a1a5f7c971c539d0d277897892f3ac43530276912d64a4cfe7
diff --git a/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild b/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
deleted file mode 100644
index 7dacc0557672..000000000000
--- a/mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="A system for automatically configuring neomutt and isync"
-HOMEPAGE="https://github.com/LukeSmithxyz/mutt-wizard"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/LukeSmithxyz/mutt-wizard.git"
-else
-	COMMIT=1492a11b3ee0a1c3f5544a351089ff154521b68b
-	SRC_URI="https://github.com/LukeSmithxyz/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	app-admin/pass
-	mail-client/neomutt[notmuch]
-	mail-mta/msmtp
-	net-mail/isync[ssl]
-"
-
-# needed because there is no 'all' target defined in MAKEFILE
-src_compile() {
-	return 0;
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "enable viewing html mails" www-client/lynx
-	optfeature "enable periodic syncing of mails" virtual/cron
-	optfeature "enable viewing of simple images" media-gfx/imagemagick
-	optfeature "enable notifications when syncing using mailsync" x11-libs/libnotify
-	optfeature "enable command line address book" app-misc/abook
-	optfeature "enable use of gpg for signing and verifying" app-crypt/gnupg
-}
diff --git a/mail-client/mutt-wizard/mutt-wizard-3.1.1.ebuild b/mail-client/mutt-wizard/mutt-wizard-3.1.1.ebuild
new file mode 100644
index 000000000000..dc33b5c31681
--- /dev/null
+++ b/mail-client/mutt-wizard/mutt-wizard-3.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="A system for automatically configuring neomutt and isync"
+HOMEPAGE="https://github.com/LukeSmithxyz/mutt-wizard"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/LukeSmithxyz/mutt-wizard.git"
+else
+	SRC_URI="https://github.com/LukeSmithxyz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	app-admin/pass
+	mail-client/neomutt[notmuch]
+	mail-mta/msmtp
+	net-mail/isync[ssl]
+"
+
+# needed because there is no 'all' target defined in MAKEFILE
+src_compile() {
+	return 0;
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "enable viewing html mails" www-client/lynx
+	optfeature "enable periodic syncing of mails" virtual/cron
+	optfeature "enable viewing of simple images" media-gfx/imagemagick
+	optfeature "enable notifications when syncing using mailsync" x11-libs/libnotify
+	optfeature "enable command line address book" app-misc/abook
+	optfeature "enable use of gpg for signing and verifying" app-crypt/gnupg
+}
diff --git a/mail-client/mutt-wizard/mutt-wizard-9999.ebuild b/mail-client/mutt-wizard/mutt-wizard-9999.ebuild
index 995d3d16cda8..dc33b5c31681 100644
--- a/mail-client/mutt-wizard/mutt-wizard-9999.ebuild
+++ b/mail-client/mutt-wizard/mutt-wizard-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/LukeSmithxyz/mutt-wizard.git"
 else
-	COMMIT=9ec2a49af03cf542c7db82bc0dd0ccdde81922d4
-	SRC_URI="https://github.com/LukeSmithxyz/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/LukeSmithxyz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT}"
 fi
 
 LICENSE="GPL-3"
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 21c0d15ccd29..b72baec5bbe3 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,12 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
-DIST mutt-2.0.3.tar.gz 5292808 BLAKE2B 323a63b1b4ece774674b6f207ae51ffb58e57fd90fa2a44d8a69bb5311bf66318f8d6e8ca20b333bb7e3bea1ef995ab84f1f6cd8486ee91fbfdb90e2d64444b9 SHA512 6511f6690137f2cd8798a6c76a6f1a6305b2ddaad9bf339ec7144f6c249fe9cbcfb5bfbbdd308fcc6829b7fa12132b14d555dd3a9ef9e9b46c9748e2f31be852
 DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
+DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
 DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
-DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
-DIST mutt-gentoo-2.0.4-patches-r0.tar.xz 26448 BLAKE2B 7f2e2730e18def7281cf59bc783ebc4047e459ebb8796810507ff11f5e99b78c2d6914be154251f1a279b4963156825931e22cd727e86eb40c15637736be457e SHA512 16025a790fba20ba1e693b1b826bf86bd2697d0d3ab5ceaf08b1692902235ef40866daec80862c7082a82a58fa4f9631889688f1d06b864cb29c613725fe5024
+DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
+DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
 EBUILD mutt-2.0.2.ebuild 8030 BLAKE2B c4c0be2976d82764751382bb3ee8f752eb0a4e7dc1a8a08c7628baff56c35609f6cc38c0fc680856c4fd8b08c36dd0c349c5f8259f399911f981d3354e8f9570 SHA512 943d41ce9e79a04a8e01cffd3e09c0ec22302f580c5a33e2a3568597e8973f1bb7ec967d598729221ddb570bb45d3b17aeb4732a416892edc1adc0d7a681b034
-EBUILD mutt-2.0.3.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
-EBUILD mutt-2.0.4.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
+EBUILD mutt-2.0.4-r1.ebuild 8036 BLAKE2B 49a6ade204d7ea7b43be989c75635eac33c16f5f97ef5e8bb0858258a13d43affcb8938db6040ac47ea2e19c02091cf91244be4b1c05e1da72bbea111eef1cb3 SHA512 69a929fdcbc851265e5f886680e6c79a4e7a389acb99e128c798714747326d0b3321789eaf7fff07e9b1c79bd072dba16f1f06953edebf81e0259c9a21a27251
+EBUILD mutt-2.0.5.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.3.ebuild b/mail-client/mutt/mutt-2.0.3.ebuild
deleted file mode 100644
index c9a2e340a3c6..000000000000
--- a/mail-client/mutt/mutt-2.0.3.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
-	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	smime-classic?    ( ssl !gnutls )
-	smtp?             ( ssl sasl )
-	sasl?             ( || ( imap pop smtp ) )
-	kerberos?         ( || ( imap pop smtp ) )
-	autocrypt?        ( gpgme )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
-	app-misc/mime-types
-	virtual/libiconv
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn2 )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	autocrypt?     ( >=dev-db/sqlite-3 )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	pgp-classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
-		$(use_enable pgp-classic pgp)
-		$(use_enable smime-classic smime)
-		$(use_enable gpgme)
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-iconv"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--without-bundled-regex"     # use the implementation from libc
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# note: REQUIRED_USE should have selected only one of these, but for
-	# bug #607360 we're forced to allow multiple.  For that reason, this
-	# list is ordered to preference, and only the first is taken.
-	local hcaches=(
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-		"gdbm"
-		"berkdb:bdb"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /etc/${PN}
-	if use mbox; then
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# include attachment settings, it's mandatory and shouldn't harm
-	# when not being referenced (index_format using %X)
-	{
-		echo
-		echo "# mandatory attachments settings, not setting these is a BUG!"
-		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
-		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
-	} >> "${ED}"/etc/${PN}/Muttrc
-
-	# add setting to actually enable gpgme usage
-	if use gpgme || use autocrypt ; then
-		{
-		echo
-		echo "# this setting enables the gpgme backend (via USE=gpgme)"
-		# https is broken due to a certificate mismatch :(
-		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
-		echo "set crypt_use_gpgme = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# similar for autocrypt
-	if use autocrypt ; then
-		{
-			echo
-			echo "# enables autocrypt (via USE=autocrypt)"
-			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
-			echo "set autocrypt = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym ../mime.types /etc/${PN}/mime.types
-
-	# nuke manpages that should be provided by an MTA, bug #177605
-	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-		|| ewarn "failed to remove files, please file a bug"
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	fi
-}
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..5131f8871a13
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r1"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+}
diff --git a/mail-client/mutt/mutt-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
deleted file mode 100644
index c9a2e340a3c6..000000000000
--- a/mail-client/mutt/mutt-2.0.4.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
-	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	smime-classic?    ( ssl !gnutls )
-	smtp?             ( ssl sasl )
-	sasl?             ( || ( imap pop smtp ) )
-	kerberos?         ( || ( imap pop smtp ) )
-	autocrypt?        ( gpgme )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
-	app-misc/mime-types
-	virtual/libiconv
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn2 )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	autocrypt?     ( >=dev-db/sqlite-3 )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	pgp-classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
-		$(use_enable pgp-classic pgp)
-		$(use_enable smime-classic smime)
-		$(use_enable gpgme)
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-iconv"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--without-bundled-regex"     # use the implementation from libc
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# note: REQUIRED_USE should have selected only one of these, but for
-	# bug #607360 we're forced to allow multiple.  For that reason, this
-	# list is ordered to preference, and only the first is taken.
-	local hcaches=(
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-		"gdbm"
-		"berkdb:bdb"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /etc/${PN}
-	if use mbox; then
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# include attachment settings, it's mandatory and shouldn't harm
-	# when not being referenced (index_format using %X)
-	{
-		echo
-		echo "# mandatory attachments settings, not setting these is a BUG!"
-		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
-		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
-	} >> "${ED}"/etc/${PN}/Muttrc
-
-	# add setting to actually enable gpgme usage
-	if use gpgme || use autocrypt ; then
-		{
-		echo
-		echo "# this setting enables the gpgme backend (via USE=gpgme)"
-		# https is broken due to a certificate mismatch :(
-		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
-		echo "set crypt_use_gpgme = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# similar for autocrypt
-	if use autocrypt ; then
-		{
-			echo
-			echo "# enables autocrypt (via USE=autocrypt)"
-			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
-			echo "set autocrypt = yes"
-		} >> "${ED}"/etc/${PN}/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym ../mime.types /etc/${PN}/mime.types
-
-	# nuke manpages that should be provided by an MTA, bug #177605
-	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-		|| ewarn "failed to remove files, please file a bug"
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	fi
-}
diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.5.ebuild
new file mode 100644
index 000000000000..c9a2e340a3c6
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.5.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 9c31437d891d..c648bda2e0b9 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -2,6 +2,6 @@ AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce
 DIST roundcubemail-1.4.10-complete.tar.gz 7043181 BLAKE2B aa442c9e4fb4d31bc9ddd77d888637d9d7afb8ac6c264ca5d378bd7bfc160f2f31379fae208638b2f79e6127add83f0254d1526e22c2ca24656b31ee75dc695e SHA512 e0a661ae5b928ce2c93129775d32a679ad2512ca4af21e8dd1711d38a62818ff9ee1e1fc922aae68e0a8bca034ca780fc3e3e988731a2ce9b2190b2c1d8e08a6
 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
 EBUILD roundcube-1.4.10.ebuild 2274 BLAKE2B 19056b64fd44f1dc2bbe30105b022ee28852dc0413b5aa2c759c5563446a2838b46aa0ecd039621b07f43f425529edd6896b3e4193cc9d2c9777216cb05b05b2 SHA512 4a59ffc29e7ab69dec776ccca749dab9ac839b9cfbad63aa2a5d986c9f30e59a1d618d1f44cbbacc6572b143544835af55e0ba11a9295aecea75c0d3ba5b4592
-EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862
-EBUILD roundcube-9999.ebuild 2280 BLAKE2B 58c1e1ae779e5df8a48263227ea5e675809653f7070ecd12250fb4224089d9689a7096b73682fe89e70a87190b2bbfaf3729d8ce5d49c0bd7464efa24b91e8d3 SHA512 06035fda968d1e94d19207e9d040805e7fbd61edf93bc36e3a72895c0a3c5e41ae1ef463dd97847554dcb26239ddff362efc370c28ce34cbce1f87b03279b73a
+EBUILD roundcube-1.4.8.ebuild 1790 BLAKE2B f0a5eee97457dd146f29c07d36b5208993d7afda3b9962cdd80bf1d457ca04cb3350f4af52a25477a44a9ff3c4c9ba8c8fd69c126ae2d81a306b0c0e4fc38cfa SHA512 451278b41b88d8b5f100187d9d95cd123cb6ea04a00a4e4f7d19b06ac92775972035d06e9bf0f3c85ae18baff50641f7c4e06be3f9f17d8b30570e1c21a9d989
+EBUILD roundcube-9999.ebuild 2278 BLAKE2B b24a78ee7af91a78d4f9083634444e6f7a5d85d730862a23a76b68b9cb4d34f0ab991c031a5a3df5fc3e500ce24f778904c3e9bec73d177b19050231f97564db SHA512 3b53bc1aee8b1521ac094cc3421b8a92b1e295fcaf1edcd6b40f3fda4d67c765ac4a52a4e6b5fbc59c6f5097a51ae1ae61fa8f1f2de24fbb2508e1fefe8143be
 MISC metadata.xml 997 BLAKE2B 60bf23d71ef0014f432b1f09779263618f12eb2de5adb51e14b6c491d69c7a6b15d92f050d145d83d6ba0a6fc04b67906477ff1b6ce34d69c0ccf90cc2aaff1f SHA512 ed338883744882344de018e49854eaf1e6fdaf4af5a15cde8baabea5f315ff2904c1d161499ba68ba988e355336b962c1d6dcc64b550f2ef8875ece77f97ae83
diff --git a/mail-client/roundcube/roundcube-1.4.8.ebuild b/mail-client/roundcube/roundcube-1.4.8.ebuild
index f39bfa3d9793..2086798cf418 100644
--- a/mail-client/roundcube/roundcube-1.4.8.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,6 +68,6 @@ pkg_postinst() {
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
 	fi
 }
diff --git a/mail-client/roundcube/roundcube-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
index 54ae74d1e868..ad0082bc0ecb 100644
--- a/mail-client/roundcube/roundcube-9999.ebuild
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -91,6 +91,6 @@ pkg_postinst() {
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
 	fi
 }
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index fced420fcab8..997722ff0167 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,71 +4,71 @@ AUX icon/thunderbird-bin-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f5
 AUX thunderbird-bin-wayland.sh 128 BLAKE2B 015511404f636845d7248fd3cec02eb9a4ec70567da442bfa5ca8f2168634347cb478c63161c422facbf47c8d5a6b7358ce7ee9cdbd48c4e555460248287e06e SHA512 9df7306d7046a9f51e60e70572e6e8e22d42e6065900416fd407dce5c083dab3212877ee9dfc7f5af7337996951577e7b7c75e583ab811d6ceaadf6e6c903a7b
 AUX thunderbird-bin-x11.sh 122 BLAKE2B 40fdde93db7c5c27174e22295b946834ebe37763b0499f710e4aa7030941654bdab714c886d4bc4ef4c8623e54819ca2ce6d6786901e8f5ce29213ec59228472 SHA512 907d34b5e67b8806dd3f546f67ab3818dc0fe5d487aa8706046feaf68e23ef69be6e0ead0a31c89c559151854f8837bda93fbeb336bf73d96839656ae649d1d3
 AUX thunderbird-bin.sh 2972 BLAKE2B f9cdb961ae34636c178df29094ef8e42ec29fd5f70d9aa830cfa4113b32c69aa5a47bed083e0923d2315b5b7a0ea72aabb298695b3457968a3338e28bd2c8159 SHA512 ce4afc6834268d3a42deea5da2173548fde02a4ea4a6ff69595f07af41886e7e31e1c8514abac1c52bdedf23e40a9366df83bbe8c2a00d9cb23fd2958dbf9fb0
-DIST thunderbird-78.6.0-af.xpi 548345 BLAKE2B d89ee0a52cbbdfe33efb93f5ad4d89523f486b18fe62f5292dbad19b2ac7f8134d83b9c40e9424318d40de4a8d9f745f61faf0614015ce6ae1ae8b42b9fd0be0 SHA512 273c352acfce808b97bad77f0b9a3b02296ea78e086baf7b2a3c5d6c980edcdc20e2f525aa24dfffaee74a027a8bb2d34ec09f221f76a67bbcb145c6d21ed417
-DIST thunderbird-78.6.0-ar.xpi 648600 BLAKE2B 274020f982e55bb6892153e3a19b55a6bf5a845e85fdf144f114ae2be4a4607fe3f140ea67e89ea2a3b921355f550b23e5eb88723a58803c4aac08af7f7b161d SHA512 b73e36dd0a086cdcda34757a0e30dd6aa82791862d60d7c0f87bd8687d52d71da81dc1684130182be07001a777512897dcf4f95e23db344f97991ff937aae5df
-DIST thunderbird-78.6.0-ast.xpi 561260 BLAKE2B f6eff5ea45de17a5b370539ab83de54a04d6afa603e122f2afc8875e3f2b3205fbbedff7c3df99532c7ffa8985167a1b124ca586376a3a8b3f84e6023123ee92 SHA512 a7ce5cfaf4c96bdc63dc99aa1e5a31eb5e4f90a45350b3bcae2fedf2925a2372fe0058754f490e5e0a114ee5d6341fe8b632f4e3c01924da3f79738a55201117
-DIST thunderbird-78.6.0-be.xpi 666670 BLAKE2B 13402ba59c35c3d20c25cb18f8786c0a0b83088e8ee46a0b3c0fd86f0069c3848e966a9ef7c2546e0d665d01e16ee7372d1c920be902f18a0efa36d0ccacd8da SHA512 4ca4be8284f64132c99c11e4428fa7e4638b8a970eb31f61b5368a18425b7736622ff21b38907450361b943b680d50b2f0b293f6dc943cc8b665ff8af8cdbe8b
-DIST thunderbird-78.6.0-bg.xpi 672417 BLAKE2B f2fef6a49108146a3f4d0c4feb36cf199a5043a85544f4e0d8cee271f180126ad0f035f34bf4978071be3f7f7bbd15b25f9bb6addc5bc05aa7e8a22eae3c6c9e SHA512 aa18a8bf86ffdd83f292942f338e4ae6085ee50e0b573f95bf0c9fa99e257719e934e48d6347c99b39c7aa128a34cd6986154cfd8cea8e5c50a023a8b669a861
-DIST thunderbird-78.6.0-br.xpi 604528 BLAKE2B 4c1a1159eb3c2433ba2334833799cbd321b43165331cf4cd3fbc6f0e29f543aecd8755632938151220a30d69f6f9e503d22a1656d0488a1d57b36a7b982ae148 SHA512 85c9c83e535c87faeb98e2adb7b7ce41752d913e23cb7a92bcc3f5b7af412c184a3995bc0956872c9474dc45b00f6db00058f485a7ff202d478179b8b34af656
-DIST thunderbird-78.6.0-ca.xpi 620436 BLAKE2B 0124303d8e022da4a2a67df03e18d3c64559966c952a9df14a2d09de954467954cc9231904c649c09b40a4956752156b6eeafc4d904fdd9866a0e8bfb01aac6c SHA512 9d6debedb42e0d314dd4a8f14eba786ee32afb582791e2568a3a528cedef414c01a3df40bee44514ce8cb3e498a49998430b52b1cb3db3bda78989f1775b7a01
-DIST thunderbird-78.6.0-cak.xpi 635657 BLAKE2B 095934912bf56eeffdbb66c782a32ed30a3f1d940eafa086a69e385a2d913c38510eb5e3522c4df8d25e6d97e9bb4ac5bf5552ce096d7b92f14da2fe68676777 SHA512 b998c8972f193a57e0a601f0a6d51130567fd5a74d7d31fdca03cb2ae0d716196bcc36718ce936c15f92d24a2035e19479546dec618685505b4a3ba59ec00653
-DIST thunderbird-78.6.0-cs.xpi 635346 BLAKE2B 58d56bef182faa2996db3a66909e4daa113a66193b2bb1bed629e772792c2933ca7983062ab2828aed9957bb0303074d02c0729650939153deb0646eb47d71d0 SHA512 317573845d2d470a5466dd0863e2c462ad2357b3f6ce422ad74f9db53ceb6876095452bed13cf83cb46ec78c47145d2168b51c600fc17ec1bf0c8e458e15eb0a
-DIST thunderbird-78.6.0-cy.xpi 646243 BLAKE2B c02bbe1a26c4c295d04750adb393a786fda6acdfdac420c155f57ca90470ad2ff07f4bed50819bedf1739c0b14b5facd8223a68fb358b832ec683a970a058593 SHA512 836171f65ce69d61c0f2043c18db13f2fdf8e38b28982b89bb547de07930c1dd807f710efeb50b61c203c5f91648499dd58488dd6e41b050aaf78f5f1560deec
-DIST thunderbird-78.6.0-da.xpi 620993 BLAKE2B 089edb401b604309848a8c45ada0e048a76670d2ae85138b60d798afdee0597f8a3cf9d7344755a207c381cd74444f55e0c634c72b01863dbc6d547838d894b8 SHA512 e5d19b04b314dc29ba822ea6ccaa77ec54ee526838ca4b565ab74b63a8b521e7060af8d416a285b56db91631284b34941bce7e664643042440528e8165a01c65
-DIST thunderbird-78.6.0-de.xpi 665191 BLAKE2B 8236d20a297bb3f0b9ef0b9f7cd8eb49877aeb8d12b38a3de7204fbeaf544b109ab4d420c1792277dd4570d94a564ed13617287f6b3f9331404b213acca097bc SHA512 0ef3ba13a9feeb3496d295553f6908a0329f426b8b0fb1646a2f0c7638c4557765da5a39b58e4269dfe593a43909aa712024e16e0450df7c4db5a938172b855a
-DIST thunderbird-78.6.0-dsb.xpi 666771 BLAKE2B e1c15e7a2c5eca6630a5ff739c40dbc095903326ea324e8c2fd6356603737d18cc837cc511c0fcad0c322bc007b7c6d7f706f2062e8a8ceafa92ceb04fd952f6 SHA512 a831c73ead0e13ab05ae95b972055a3b329092b622c19cba1bf4fd917e85514b55d4fe1c31b1af51173f855f36b4a9bcc631bcf1081fda74d2bdde7a9584526e
-DIST thunderbird-78.6.0-el.xpi 774448 BLAKE2B 6f6044403442a9375eb42f9b6731a014aa2d008f713666a8caab5dcd6260ede83a7292ab2ca1920fa33fbe87c5e07c66b56feebbe7c8ec580db7624df45f317c SHA512 63264d5332a089e838f4a968f2c804d3e8411a68639caea65b7d6a13cb0569f5e44b2ade846032bb79f13499e9565ce231ccb55ba48ca3a2502c92e0f40adedb
-DIST thunderbird-78.6.0-en-CA.xpi 611773 BLAKE2B 1b608542c77d41edb37c583cbd74ff1932dd21e36954678161c57f6820ceba4c14408dc7d79a8d7a86bfd4d493ff45028fe520abff79719db025442de6d88b65 SHA512 0077c9b65b56e8b1c5f7dfedf2bb2d45896b4a02b5c6ace9e8e03d6499c96cf4a9ed1dc9eaa85a71357f9a1a5a60b5f8f6e21a92992ac5544c3d1992815204f0
-DIST thunderbird-78.6.0-en-GB.xpi 611183 BLAKE2B 9bc2ea427279866563e421c6ca7efb739b96a9d5aa11591b3595cb54a9293bd1876290e385f64206142d833ab3339321af6ebe30f234472cca48affbd5ee0127 SHA512 12761b4b100bd845f2f55c2b724b2bd350a0290ff821df84c4f732d5947e2cb974368ca0063f98e3e8ab264da4e2acda7499255dd82e96bf30b7e7e32b4fb1c3
-DIST thunderbird-78.6.0-es-AR.xpi 657788 BLAKE2B 2d14ebb13dbdd93d4f095d1c9a1345b68e9e6d488059e88bc3643695fa31cc46e8edd76aaeb8beb10c1fd7a1dbab313b0c693a68d46322159781e6efd199ac3c SHA512 0417c7c47a22c9e548120202d35b52fd4bf7bd6b08e4c9771cc027348bec1fa8db3cd551f41726cc61a830397738274d0483d1cbd507b90c501b53495f22f6e7
-DIST thunderbird-78.6.0-es-ES.xpi 569804 BLAKE2B 33bb8080008ef53e82cfb7f36c4ab8e21691f9fbe43c1691ffac98dfde64c707415bf8e0d8488a058c8e35813ae910dcd4e82126779ae2259dd9450c4bb87a21 SHA512 7c6cce31958b93afbbe4fcf99a62c4a73f2e37eaf51a54945d0ce2190df635eb53498d3d455e7b53fff035f9dd76b92b4478cf44594d67d293a5ca549ca43e36
-DIST thunderbird-78.6.0-et.xpi 597728 BLAKE2B d0aebfc5fe1335eed6dbe6e42015d59b4aedbf45f91f44950f125ffb8952395119f8427c83c0749b1d682fcff553e556ae41d2ea8ff011a2d3931bc78a05d285 SHA512 5381bb92715ad132cd8c68d9781c4c975a59df64000a6ea71a0113cfda54ddcacebfca8b90bd030128110c915293df26a2c34a10f9ebc2ffdf0a5b24eb39d18e
-DIST thunderbird-78.6.0-eu.xpi 632962 BLAKE2B c97291230b26dc72d0113af0f4cc8d8d4bf5be645bc784b8802852f6c58ef9e691bd73a15843b974ad9b2eb5ff48b291a35c774e3fdcfc54af492aa9f9f02e22 SHA512 3f38183f140aa30e7b947f47a9da01454722ceb69c75819c0a8831938faba084b3b2398ae5136dd3c72b8a504df78bae6948b6491b8ff8ff9f3a675b934d2a60
-DIST thunderbird-78.6.0-fa.xpi 639756 BLAKE2B e61f2625fdb7cfa1d3276b5f0a1fe13d89a7632e1437f7c32262dd0df994b41868094f57915d4b389d1277a0a7c8692203da82381a1b809178084b80e6deb391 SHA512 d8e4488007f6dcee3b499e8306086860d3d2d2e4031c0a03022402d1eac2dc7f35a77ed49d2de8ad0e1ce50450152c3f8e1a685f416c2b4aa14239b05e4b0d94
-DIST thunderbird-78.6.0-fi.xpi 642454 BLAKE2B b29324602268c3b347f8876f1c0e27de28b04c49b862bb93a614bcca40250c79f644887261468f2b110b6d71a1ad5da0d45bdf40301ea24a159bdce5da914273 SHA512 9b69c8a1ae2e04aa9282066cdde5831960d34bfee69188aa8fe0be69db799b79c3ea11f55d1c084b4d3376974c667d8dec57592937c4988617d1cf1dc81690ac
-DIST thunderbird-78.6.0-fr.xpi 669493 BLAKE2B fa3b3bfceed1852a3500b3804679d57f897a017d195f011fd79b9476f73d385f15ce3316cfc349d31c9fb03635aa5286e212343cf9b6b45be5532bd9eb698996 SHA512 bfbf57fe957bad0043b51950354cf1619a497c224ee3c84893f888d6ad72e695fc6a20a9c44c8cfe48d64f89f80304a8d814a600371708415c2671f28b9b7d50
-DIST thunderbird-78.6.0-fy-NL.xpi 653072 BLAKE2B 468c42637d99472415f5ab81d3126fcbcf2eab5e67803e16b7d0d0117fa039983e1d43d2c7ebbec0acff9d6dd20047c558d583ea2c7104b277e68989da90d9c4 SHA512 c4e4999c76af1c94cbf5009f23d500f2e5351fc38ce18c45c06dc85d6e548be411632b3c3cdd84f37a476cc391bf9000de7c0f4331bfad445b8e13aa153b2951
-DIST thunderbird-78.6.0-ga-IE.xpi 600703 BLAKE2B 7692232fdea4a106ec0c47c20f170ba0ed021438e41893159038bf9fdf5e00f7dd6e67bb53ab515c9d3bdfe540c5b65e29e2ebfd81506e48e9920b60128b32ee SHA512 d16ee32e21c3cfa354e34b74864f732b2edeb63177ab0ad19731f12ec724f4c59a684e013f0ca083edec9335039419e53b7c86cdcf01cf5bdb02896f7ac7acbe
-DIST thunderbird-78.6.0-gd.xpi 609381 BLAKE2B 7813fc3edc1080148a59eda5ceb3b2cc0fa47f734c18dde4412398169746fd037c364f7159b1ad1877cf7a2a0bc590b53df552ab2f00fdde0aac83eddf40cdee SHA512 a775f12c9a85c4be2ff7777e3cef7f921e6d70be3e1439c363007d383773b56657600eb816299035d959d97708e786319f927410dd83758c5b605c17447418c1
-DIST thunderbird-78.6.0-gl.xpi 615720 BLAKE2B 766c20db8418c07016c8acf90adfec3a64c86e6fa4f6f37b51fc92a36e4af9a588d4456177acd7ecf207e7d076f1ba4159eb00c94179a0082759d9ee1fceef4e SHA512 ea9003203e13a5beeac91b691e1fad55eadd83113a586943330e58bcfa00451acea801d374064d98e6649650545392b6bb5ff69d2cdcdf08c223dfad25058a32
-DIST thunderbird-78.6.0-he.xpi 640498 BLAKE2B 8b372d45238bf88182a53c2129e856c2c4ae59406bcb3f22740d5e8fdd941b351df58baef25e9857eeb42583fca4b99e1153bd5239f6ebdbadb9ff8d12c139d8 SHA512 586869e7648df55872fc824d13bf279cfb0ea2f133fabb235ba6230619a2ca7f0dd505cfe71b8788a2e965f3657aa98fbe5b79acd1995576d2507e56e0398c45
-DIST thunderbird-78.6.0-hr.xpi 629032 BLAKE2B 7f7410f9a10c348db7c605e485cd90ec0b88e028ff13577c10017e27c91a3f182edf2a5121febfe97ac849529b47f395aaac8b18bc0e705f28d4d5f6b5a7b27c SHA512 950c929465b15e13f06b065f967d58ab51b741cf788b58f3e54c15f7917b6dfa372213e4e685310c08e76274237f113b8edb457c29a1beb93e7643cbfd724558
-DIST thunderbird-78.6.0-hsb.xpi 668602 BLAKE2B de71c85a194402ec9e5f7e80e51cda8b25237c47354990da6ad187638d7e4a76ca49a7ef6bf84d24737669dfeda31ef26afbd57d09633a3d16d56c619a9baba3 SHA512 e2d20a2c3eae77227587b3f90621bd84a3b4c5fe289b97a03b3951c0a050a85faff3f2d4cd51f0e644ec073706e2249e304a5ccd00072ff70d37fcff902c14d0
-DIST thunderbird-78.6.0-hu.xpi 679831 BLAKE2B a5597ac70728c3d89c4af989b31dfb73e1dcdce1b6426b1eba03dacb17881d818b5f1e146ab808199e07f3f81bf6e31b0e5a89519d79ef5040cfba3a58843000 SHA512 df8a66b3907adda26bfc55eebcd463fcb2c93fd907c6c72a133a66a2848a9fca7cc1d78e25b745d750bbd5c8a47354a225891095d9d036ffd8f529eac4078b0b
-DIST thunderbird-78.6.0-hy-AM.xpi 713334 BLAKE2B d3fe1317a7bb149a60ffc85786c37b4b53a6b2ec41d4099357ee3e7d7a5d48aa477f4212a2419f94cbba117ce7e773c7f04467edd38ced72867545fa6c3aca9a SHA512 9c7a3b685d60f1ef899a0e61752740f1f15c8ff6d1f156d6b1dd1b90ea69f3c319a0fc5fbfdabad954f20b87c712bcf4a7d1010de7b8fe06618c24a4ae0dec51
-DIST thunderbird-78.6.0-id.xpi 620680 BLAKE2B e09060c821c4ec6c2fd047bf2fc01cc161fc984807d2fda7d571483029d5ab9be28b1f2950d279e8ba3aa86443e3eb7774dc15b377a048a75d0dfd8fd6541bdd SHA512 ea81176725de1a79cd6bebda2e41f01a852db5b8d3b2466919e77afe31335255a3fabd9d88bde684c5bd4fac447f106a183e217e72a15f436a92bc7f064d0acb
-DIST thunderbird-78.6.0-is.xpi 581641 BLAKE2B 0debf74e2280b2a1f0d733a6845f5d71c46f1ad0c3cb771e382247369d1d6529e410b98515019f7bbfc2ad4ddb600cb4f0922bb5f9f043d77a0c285e82c7ba94 SHA512 bb9a1144afe77eba866d03bc0eaa507e7e12fe785af4a7d0d61be2257511d48c83569fadaa7b71c71b3d74796296f34424c10ad6c6735d401542be23d97e27b9
-DIST thunderbird-78.6.0-it.xpi 572959 BLAKE2B 00f7fe1681a7e79acfbec06877732c1603263fc58ff1e8a595c672f8dc6e7368f0b028b7eecc2988dea2249a4b35db806c1b9e08e8effc67347c2f1572dc7342 SHA512 de3c634a4763a0efa48dfa921986f12dbdb5d8890628996a8b26f10e35dbff833851381a2b3846328e52d702d33eebaa0aa6859ed3c61dc19ffcededb99b1cc9
-DIST thunderbird-78.6.0-ja.xpi 722456 BLAKE2B 122ebc20541bd219124b2241e90401067a4c58a1b00e171827a95df43781b875703fd8e4b5388327b8f883da8fc87839d13c02883c284333947036da6e183a46 SHA512 70d5b3aa1efe0c6ad54c7b15599f6c63b0deaecd0f46cc20ccb16201d24a081f45f62f73907defc6d5b73d2bd3e3e8f959ddb5744d0f94b880403595802ba856
-DIST thunderbird-78.6.0-ka.xpi 717013 BLAKE2B 0733225b0cd6852aaa15f24fb99659e622f40894ad81dde4119d1e3b536038d310280f5edef41257355e6485e17e5db56a7532a20c6ba7f498b272f725a9d61b SHA512 2c4ecf76f42b2e0421a08d7825b8fed3a02f340634ea5136024dc4bd4833b93f5079ea31911db0af26472ea2fc1ba8ab0b47e5debaed8345533f1f1ef37fb7b1
-DIST thunderbird-78.6.0-kab.xpi 651911 BLAKE2B ae8db244f9b001eb84d463dfc20e032471c956164f366e9eadfa309f79879e7f52f3edc4436db2d4f0e41e76cfa8865f3debec2aa9f7eb4fad156d3c01bf551a SHA512 8ea02eb64f8852929b5a48c5616140ba24dd0d056e5371c6489fe080a8c4604108ec2b38ae6ed937304889aa58608a9815813f3bd1a1149940ce994528a1594a
-DIST thunderbird-78.6.0-kk.xpi 720467 BLAKE2B 6ebbff20d3d5182cc605f16ba98d99559f84b0e7db007e2a8bd7808eb71697b4d60d0ebeb4d2e738b41f546eb1c026d9d827579f566dfc5dae0e984cf73f729c SHA512 41e5fb9a5c03114b465ea1f7d1d7d41a9bb1a8147ce89ebf043a96ace293321c6a933b166637ff750bf3bfbb7722b39d589910d1e88680e18871f1c473b475ab
-DIST thunderbird-78.6.0-ko.xpi 688206 BLAKE2B d3d98362817d725aa1d69a1a7c0b8d84d517108b72a1bd37d8d43a647aac22032b7a3c6f1783913176fee64c501f55ed00ed6e1fabfd33e9d51963777d81fc33 SHA512 f7db483586c0d2f562316b63324a996355572177d83cc664db34048e4e613f2302f007cddb356381f93cf3526a33ee5a5b516fb9469775a99b634f5712651979
-DIST thunderbird-78.6.0-lt.xpi 660294 BLAKE2B a8fb815d4ce796391acc4f4eab4dc75c943b7b0814aa056d85d8fb687903a5bd11b7ddb839100b3a183ea027ef934f0fdf635956ca83885fee302f8270f5012a SHA512 f31729b94c20292a88deacf4e44a19fb9e3843334f87a062d1e0f482f1b7b2c81cb61c96ffc2a9e71f90823c0571c51ea5c3b6e1df83b7194cee00e93a200560
-DIST thunderbird-78.6.0-ms.xpi 572178 BLAKE2B 434711867a334f60871e013b10ef6b0cd5df01df9a254f80922db1fd4399ff367112595e6a04645274fd18b679c4536ba9f71d66108a2a1a8550458601b6fc34 SHA512 98b1db595979d635fd83013b878a91c7a54459755fa60db97f080d98328cbf967b4a4d6e12f47229d7162cfe06697b6adf87bd6a1b76bb151af0a45f2241fde1
-DIST thunderbird-78.6.0-nb-NO.xpi 637238 BLAKE2B c245f36cecd8416110390f9d654fc2b03fbb89a54e2f04cdc56771b72f88fbece43e78833c8d178ef733e1a1748e691ecca7e18858520cde82ebf310ae1570aa SHA512 5790635192abd36c6649af9024498a1830a6dcbfa4f830b54ab9940e908ad0184c696acfca3f07856f507b22793f7c401f914ad179c9d02ddfb278a4ce9e558c
-DIST thunderbird-78.6.0-nl.xpi 644358 BLAKE2B 1e6ef2483d2f7aea4645dffc6180b5bfada30e7eaeae017d25c62428e599549c9d7c7c6a1440d0456b52bf0fece5a3e3b04f015c685e37b05329e4d88a1c50fe SHA512 40cdb1860ff159c6929523278e2e08c0701333e76b15fd27689e424450363c4ee0f85088f3963fef3cc1dde891a886b31b48316eebe8c4f4c6cbeec4c35d603f
-DIST thunderbird-78.6.0-nn-NO.xpi 640689 BLAKE2B 9d7b6894ca31a9ce1d85ae57bc368b9d1c8ba7af2a98255e2e57253b6c5867e3657a5ba12b632fdc52985a4242fffe21bce69f4c085859454c3f1e6d6d58b24d SHA512 cc37e910819df0245d9b69364eec7c95bd5753fc4513188e8793c5e6e44ce7732261fe22fed4683e535dc68bfd047c4aec9d106a3e0912911bc9a522bb83335d
-DIST thunderbird-78.6.0-pa-IN.xpi 633216 BLAKE2B 689f49261d4d87262bc6b25e69dbbe97cb9d1c70124c67e0f48e8476ccb1d43875695f48276db8295296cf79fa8c9be404253a590c348c182d872bdf4e4ba7a8 SHA512 21a6c9e18e089c57541b827449b51d2591a7d4b815398faf36f727eedf17c8b97923687a6ac6947e89aebb1ecf4f10effb3aab39798a8ff3d2e99b0f2939984f
-DIST thunderbird-78.6.0-pl.xpi 637127 BLAKE2B 80440ea54e6135d51b34db18b5f1848fbdc0f0adb04aaccd8ace85c2d7521af9b3c0d33abc81b36c631db77b95663ad5dd4ac19364e8300183c6f6a82adea037 SHA512 e0a35f5a5fc44e3ad0150eb93e6e542c4676b02e16b797c04ddeed551bba191750f58dd743431350af3fe44d318483a6b823767a3a9ebc5a75483d0706a407dd
-DIST thunderbird-78.6.0-pt-BR.xpi 649417 BLAKE2B c4f22032da235c6f3828205dea272020d198ea6211d595900c9bdeacb890ac4e3e3b162f5cdc2cd163ce3be698bb8df56c7bfcba1d45709567c5e2eeae2e3494 SHA512 5223246ab5c33ecf43d6b81f1c26eebdb25d667726bb7ba5eadf7c4d8c774207543f098c049893b42965b8495f2162f00cf2abccf85ea6e7f141a9a0169eedb2
-DIST thunderbird-78.6.0-pt-PT.xpi 655498 BLAKE2B 256ce12702391fd3c9fb8de6e4f0257032d41679b2bdf9e43e7a96adf281722a714bf60004b4dfec4b210f7c7b64913114686f76d3d10af26e83573e45f09ccf SHA512 5a81abf08b6115480573e729bfb5c00bb1c8449b35b6b8ab8523e9c84c9d00e53973e4072a99a736c9d6a44afcfc4d5587df9e1b5036966d18cb5393d3523eb3
-DIST thunderbird-78.6.0-rm.xpi 646529 BLAKE2B eac9273aab4ee9fa46880e0f92d0041c1fc003523fa191918f34bc7219d6e4a5075bb815047881a07b8522a212d76a75c838ba0ced3c8af3cef5466d5aee8a40 SHA512 5b56d907789c926e92344ddbeae276e6879ac7d9171d52f235ef1a319422ba6f6b2c0d905d1e43eb28a65153ca8869fb69a3592a16a308a6fc0e3a7df981f79c
-DIST thunderbird-78.6.0-ro.xpi 662631 BLAKE2B 026ef09f7d7d489e30a28fd0f65a48a3cf0188812b3e34aa5768ade6a8638fd7e49c006ad8c7140c227e9cfd03a451c6206c0ffd55619834b6a735e5cc50f72d SHA512 4912ba964500b233b4caf08c004d69623d2fb864bdaf4ae46f0fc65c2552fb75d7da5c20815e471971457ef5a98661e3424218f78f88fa63077f542ae8bff312
-DIST thunderbird-78.6.0-ru.xpi 756183 BLAKE2B 8051edc385f5c9bc6263fdbafeb777a1c168a4f54f577867d965f5aa91e2b454b8734a64e4a2aeff91447676461d15c815c9a73b10213d60843c8da8e086a413 SHA512 d3f60e3b8efc6dc4fc1fc390dc3afa29f74e71df0efc553e2011f2bef341cce0522c861ac3f131ed4adf9f172d8390597de0aa094670e0a1e34e36afddcc0ad9
-DIST thunderbird-78.6.0-si.xpi 651097 BLAKE2B 70b48d07ddabec8fbf9257f8d3eca281ad35b262abb189445990b628efbb59af527135e873e96c5072c71b7b18325ed656b7873f98121660922b3e19c24ac2d7 SHA512 4c5769c720616276f900f21afbd580ad2bc97f86522eff3b75a09f69f2146f9510742c2d83f4080e7a23b97caafd0d30a40e6a6bebd819d1d67a1412831f6e4a
-DIST thunderbird-78.6.0-sk.xpi 643224 BLAKE2B efebcbcc0fdb45cb68a392837a893b8c6efac3ffa578024698834b3c4b6a1991ded082368d780832719c6d64cc049a4d989614d6d0cfe8b3f9450d1f9d763616 SHA512 2b3c748650b642e7790b854f897cae928197914feb95cab8003c0b33a3dbea050bc60fbdffc32327c458e052a8db8f7e670c4caed8fe5895b2033851215d9484
-DIST thunderbird-78.6.0-sl.xpi 632386 BLAKE2B 703614849ff79d90dcbdada61cd90f493e5bb1747465c4e037a5e5c668e5e0129d03a19fe9e5161c83ec64e9f5f23a134a1b8d7cfb7d3bfd40bb6ab4dec140b9 SHA512 73a5584dd6b27905c64ad3f4a20f089ced5f7987865b316145d8d7160e863381eafeed10918ca18bb58dbce4d9d302c72b511996aea9ec789d90e1e0e5137683
-DIST thunderbird-78.6.0-sq.xpi 657824 BLAKE2B 37c210e46f0865db3feb8fc05e0baf0fbbe5d0c7e2e40248b915cbca82e6f96f3ff1cd968a0979571fcb036fa06e155ce7e118c6ceea962bce28dc9b18201dc3 SHA512 d90f97a383602752adecdbff4c76e50cb5c5ce31589d2d1165bea6c5fe30d80382fc9294f7c7d1df6c33327f99ec87e7ab797645e5ea4ebd89acfeb2bc0a8e7a
-DIST thunderbird-78.6.0-sr.xpi 683113 BLAKE2B f3dbfd42ccb3d7476af6861e1e8650507240b179ee4d6b356797e95436fe43875c8e239facbcf75884a3c1cccdc2224d1da46cf142b571f6e6d24a49d5bd2c7c SHA512 7a3201573cba6949ccba92a5d6801e61775e8dc2e1dd1f5e5f64806559081c84364f974e93de032845fba12e469add4ed731975bc0490dbed03d928b65ae8783
-DIST thunderbird-78.6.0-sv-SE.xpi 648865 BLAKE2B 2682a73db0092415272cf1b99409f282b7b39538f018d697483b6b4a13b81182916f76f1fcfb608dd91e50a239e11e0d973333b5972f3d926322372118940043 SHA512 9509af73ae1efd8f7aeea319c736d962d81c0ab4708b4be5c5637d73c7fa804cd3a30b507f3d18c365f8ca1cee78ebe9a1797cbe4db7c91bd220fd82ef4a5be6
-DIST thunderbird-78.6.0-th.xpi 712032 BLAKE2B 0945fefe03f853e36e2d48b0991b0fc48e2c5a63c18405844ae0c225d302925a81ac3eb30221aeb16e68902aaa099669f961002f917663271c0c8de39c5402e2 SHA512 8e26902e33bb940ceb7e23ddbecd3991caf08ce3e9aa9049a02fdeff377d741ca69aff8e412c0f87329f67d92e7fb77f6a652fd05e3ae5422972776394f4bab8
-DIST thunderbird-78.6.0-tr.xpi 649077 BLAKE2B 0cb4d4ca9cc747f9d430873f4801d0c019701f07fcdf6846263437fc9c072251f0d957eed792fd51df02b80493742d22b24bfa3da2bed358fc7023fd23d4a99b SHA512 a98868cf4efd6fcbd0d52278b7d5a35ea0db4b0d8fcb4b0bc449fa73771f1f80d5b542521450f755c09cd509b0a806716b527ff5b36ff6c87ca1aa8dde654951
-DIST thunderbird-78.6.0-uz.xpi 586592 BLAKE2B 00ade31247f6aebdbb7c3d1dbe4913646ea752041cdd83e6c67779c764ce2f2530e9dc38125d92d9930cf5b5f4615a67b8ec1261e887412f00fdb54f502e553f SHA512 a5d20d2910e70535da06ce1a52d28190934834b609af2c689f6695e2c4b4e0fb20f438ebd4d8ddb4ef7f327acc845144ffbad4965840e72d069662a345d980fb
-DIST thunderbird-78.6.0-vi.xpi 674599 BLAKE2B dcc41dcfcb211f9362b92dde02fffecc83c53e279e97e6620247e617a9da03d641301ddfcb244f6977e932cd3a5e97528fb6d66c098e41394b9b8e2600cb9f52 SHA512 a73b25e4fcb1d110ae79fc14e000bc4f2fcf0870d521f4d2c98bb8774c889ba308aedc5a200f4b344aa12bca954d829abc4bfb4fabf1d14d15af2fb9e0a77eec
-DIST thunderbird-78.6.0-zh-CN.xpi 687180 BLAKE2B 4b662680445032e207b21136af182358b4d353d487baa42022f42b4ce0a9d413fcf7ddfd7b5a0ec6418c38d6979eb8adfbe5c435632873642f9f25a8614b9c90 SHA512 4655c5b71b75a483779b1ee974961f2f11f70d4f3ff60e0d7422681a6fc14ef7b44c7e1ac409c319081b88bdf4a76fa6dc3ca51fe19a0ec87b0df8716674439d
-DIST thunderbird-78.6.0-zh-TW.xpi 687618 BLAKE2B 56a70374a090c6e8118d513dc3f55e7b8b4dc51853cf8a243f369de3f5449a311d9da6b789d4ea326b36db4f386a0926964a3d3d8f64656a2a037dc3e8b45221 SHA512 26ae0da18bd99aa0bbb32fcc5a8e5cb2e22cf60bdef93be2805174c85a1372f59b3099fed24ee5d88c754ada0293fcac8d3ad2d029a622240d583ddfaca87da2
-DIST thunderbird-bin_i686-78.6.0.tar.bz2 68162116 BLAKE2B 7d134c1d290522517d72d9cbeb92b54e0b636b630ef574b41468b181471938b08f753aa2908b7f3ff9e4f0e5d6869a2e0234f2a1f46f8644f534b85a8431e168 SHA512 9be21f8aca07ab8823493f14b55561421e61f9a5277770129c8594301c402e6bf29a267729d4577799fd3dad4ffae38d9711a12af1ef9daf385424ff22298163
-DIST thunderbird-bin_x86_64-78.6.0.tar.bz2 65170034 BLAKE2B ab2008010bab25eeb6377230616dc1a77f99944ff2ecf2528848b77f01756fefb2e9a769dbd70fba3a1fd39e1a9e0ba8574142f639518bba143f2138d9f0012a SHA512 a4cb67ff69363e89ffcd9b35a292b20a9351b8a817710dd82b2fdbb8e057ab8d71d6c371d60ea5ea8d42707c3484cc3ff7cbd0e004aefbc178ddf2ae7a0e697e
-EBUILD thunderbird-bin-78.6.0.ebuild 10244 BLAKE2B fa13396fac7f04ad1bbe22c8e04114048a2694e48609f063191b6c502b967e98da85ac4bf0e29ee15acf867611465eee2d79043693f99a42d932c6ed1f5c618a SHA512 ef68593e9528d6a61a5c06a2e58deb8ac7a6bfa62dc14a4506ec7e52a2d74308b243b9f53d00befa0ebb6aa663442ef703d1ef2038e36d13244bd2ab4f42200e
+DIST thunderbird-78.6.1-af.xpi 548339 BLAKE2B 0702395342f4e20246550d4cbdf0a4733879f1f72f7ab430f4c6998ca8e827219d27e825f989f4534be0984d25deb736756855de02187f9cf9f6356cd9eb14dc SHA512 bfc97747475389b26dbe18bea983b0d211b98cfeaeaa8ebce2719b6d2da50a7b84d8741bd9df5902a0adcca95a9091b9b75c1069455627d6f2cb350b84e00000
+DIST thunderbird-78.6.1-ar.xpi 648611 BLAKE2B a05ef5bed6f66a1ecba92c7de0f192f43378313bfa2d59d54506f5fb80ee8ac5fe1d0b119a23f26a3769d8a29c06f1deb849728a7d18b04733223aab23090332 SHA512 fb6f5c18cff61b7ca52743425efeab85bc7573c21193ca8e16558cb91bf7b6e8b8be5fcd56700fffe55dce1239dd0829e55e0916399cb79b686526d58b0dfbbb
+DIST thunderbird-78.6.1-ast.xpi 561254 BLAKE2B 3936ea67b3466e7ad2e09880b85ceaf424523673fddf30bfa7526521e23461fe93bdc25b477c98a3887eb309372fd0361b7561c6272536859d18807d312f3256 SHA512 ad82892abe2e30ccaad2cc9b54bafdd245f5b6214f6f2aa854e3b40019e81ee25c945ec66fbe29ce8f737dde4e6b7ed8bc45d409c62ad9cdea0d0358803c2870
+DIST thunderbird-78.6.1-be.xpi 666677 BLAKE2B 336a83cdf448e47919b71ef1086e0b37b05612797f469c93314e74223e4b3d9cf6530e7bf3786e16cf19476529bafd6afddcc236a05785a94c6dff2f7742e494 SHA512 bf29d3d562b22123a11d0347786a3f2e7da7dc8bf2d2b1a299eca48e309adc6deabc7684f1b8a7d436d91cac151dc4290adf2850e95cf47c349d4427f303ce38
+DIST thunderbird-78.6.1-bg.xpi 672420 BLAKE2B a5809108c9939fc1104b93bc48d8365e35cc30d6478873968b23217deffb004830a76860bf3a37737fe3c883d37af99c39c7077cc6f8b0f8efb96c757d0aec3a SHA512 8b9af3134954b8c47d11fee37274011588a337ffbc3fde3148dd67794bab93da80d9814cacaadbbd5149f2337c4bb1ff1b94590ae7f7638a0a641c8688cc214e
+DIST thunderbird-78.6.1-br.xpi 604516 BLAKE2B 54c32341dd8d4e6379dbb5400acde2259968fcde2b6095beedbf0ff36ba832dc9159ffd0c08c43bc39576d7b3d8512c6641133feda67e82235e5523bd6ac422d SHA512 a387b40d6cd90e790cd20ab2a57ce5614fc43eae1027c54fb83bc205c42445edbc0d237d253c853c58e2cea8c28035f4063e16a6aa9de0d3e27a57e87b181b61
+DIST thunderbird-78.6.1-ca.xpi 620452 BLAKE2B 5ac11dde1bccd137f370d3c51a80dd2949d52cd0e39ab1d5738a7588e746782f18168bc58ecc702a48d911cdd54e088a1e6e71a75fc84effc9a0d85528186bad SHA512 f5897c4e70ab96a2939c663db2b74aaf868b242b9792b3c479c6cafeb0730f98a590689c9c17cdfd127116099b27386e876d7713c9450cfd6d52287611922404
+DIST thunderbird-78.6.1-cak.xpi 635652 BLAKE2B adeab0e29b19555a93e433095e574d370835d6c53667862193d7dbf2e2be2bd3c775f646f161cab68d0eaf7730dd1b4c11acea1c72b368bdeed586ea84a1f550 SHA512 328cd44e49c13e301a59434fcad9aff773dbda187b0f4614494d28bc937ff9173df313d183265348efbc236bfa965d49b4fd1493a99435aa441bb0bef4d5a720
+DIST thunderbird-78.6.1-cs.xpi 635338 BLAKE2B 56d68b02b75d09db0f191736a543bbbcc7ea219ac247dad89ddf4242be97074ed3078c90970d574a35230803acb01de67cd4cc98f3b482a97d948ce4353ce0d4 SHA512 da8d60da7bd9d8e84cdbd9aeb071568c28bd0e963b4dc011e94e08480dfab320de859bc95a2e91b48517b0dfde67177382f528a421da045c487f309323f8b338
+DIST thunderbird-78.6.1-cy.xpi 646247 BLAKE2B 5513c77cb0a4b1b024a657abcbd6b5b83b9c448910618ddda61be6092fcf4e34b935d877c68cfdeab8f7d716a15ccf183c697c8dd17679e813f996f641561f60 SHA512 ce4c63649e81062bd060e2376167b1dfc8b2e453aa66e458f43c6c535ed510b2ccd084358eda25e78394b76d6fe14dcc3bf260ddaffee099f8f4a510811c79f9
+DIST thunderbird-78.6.1-da.xpi 620995 BLAKE2B 1abd5047f1d881464e5cd79bae249f3b72d7b37fc56c4533cc8a69c2dcefce87bb0828563b2133a1ea75cbb20b7c66b007ff7b87f0352831f27878335e118d8e SHA512 ff925fa534badd6114d97be8baa18df9907c998424f0a9bccd6b7363a060d815899357bdd71915e18eb34bcf9ab4700d97b4dbb6c35c751009a173eee9817e8b
+DIST thunderbird-78.6.1-de.xpi 665196 BLAKE2B 07a2d1b063fe37c04bbd9fec2b759b2176ab799979e18eef291c2d8880873a489b14ace271869f5e937bdc37824c7c166df7f544ff8d36f2234f5d188590a086 SHA512 efce8574a66d6e90b8487fd3283559502829b5710dcfaed6468026f96a2dacd9e41e1658c11183a662f8196d5e0489ca5d46d7fd7fa3dd8be8201c1fbbcc2806
+DIST thunderbird-78.6.1-dsb.xpi 666775 BLAKE2B 61427ca4c8aca1481a864a793bdf7c71bd06ac9e248efcfea5edd78727c2e0fde9990c2403ecfb3a2a2425d0c9dc4a540cd36f5fdcbdd5b754dcac3e7718a951 SHA512 66ed6a2d26271aa2adcc5f04ec45bfdd4bacde86cb74020be185a88acce4bd5fb31f366d9f34d3f5007dbae3041bdf7560ad7efa1b43ea323deff225cfc584b3
+DIST thunderbird-78.6.1-el.xpi 774453 BLAKE2B 1d73f2d543f149e96ec6892140136a472647ac4bd8b4030d319a7618655dfd155f006ad1e89d39de25575be9dc559f3d81c0ed767f080e28aaee075471179c12 SHA512 0e779010192f96f7dfb260fdbae942048a15a635682354c58e9f7ea88d4a5b9ab7fc89b891e9b83f0cf5542318a16fa37bf6c823bc0f55ab1f4d9a0423fa05eb
+DIST thunderbird-78.6.1-en-CA.xpi 611775 BLAKE2B 4809d1d9dc86fcba7082fd4bb888c924ecb6bc70a707d1b31c9582d5eec3e56b9722e2387c5ffea7f929bfec915f5eff9e22f0c6b1695143e0e112895b771e1e SHA512 ac602e248abbdfe66858b544fb53d6c38d11988682617b6b21de0aee1c582cb9e5c7b4c7fa735087d29a857ea8e794501cd96118aa68dccf2960c7aa2e7d77a5
+DIST thunderbird-78.6.1-en-GB.xpi 611185 BLAKE2B e7547970744420a2cb241476b85434a84bb221be6956c8583c2dae687e938176ba299bc27fdeed8a97484beb1ca84cbce6b823e2dade43fc862f9a1dcc05ae83 SHA512 d8f914252e7e8d9f3267d1b85f8c798ca42e1c9eceb695eaf3d6b71bba7794ebb12e30ea15523cdace33ad55758f504ae6f4ac91571d7bd95f6bee67eea96824
+DIST thunderbird-78.6.1-es-AR.xpi 657784 BLAKE2B e29522355346bfde7bf7bb43014f85a39dd94623e5709db7a9fdd2248f4b160162acb17ebb5251585f5992c6b9d938e69b3f749b4331526efafc21d0efa79caa SHA512 8459f2c6fd57dd4109b5d41b412f95e2caf3f76b7005a2e45803139d16d0c99301ae123fbb8ce391cd8c9055e5aacac1189698ff8b9ad05e0d67eafbc7dc467c
+DIST thunderbird-78.6.1-es-ES.xpi 569804 BLAKE2B bd3148312fc5d2f44ae80a337dc55beac789d3982e15eff889df368992995aeb6de0220fe59caca85cba9cbf941563331918e4ba4b1dae4194863290cf22f425 SHA512 940ad9cd539159b6f4a15213274e2dc202ca8291883c8f7cfcd99a4c057d704c87061ea43a3d05ed82cdf6cb15aecc232befafc922829e0060c5579c9d07711b
+DIST thunderbird-78.6.1-et.xpi 597719 BLAKE2B 95572389dad231e701d890f4e59b450ee629ba99375e2764763fc87cb9e8aa035bc7566537db92f6f0b5518a77155614d4f4f0ab72eb685c0cb58e1f86b0efcf SHA512 aedb8a69cd9ada611df998fd1ecccfd680673f55be6b67f145680b53d0ff579ec8e5c59c04ce2380723ebe8159521c32f93cfaaa66467757faec2e2e60a58bd8
+DIST thunderbird-78.6.1-eu.xpi 632967 BLAKE2B 00eb014ea22a8862cec1033ae6dc047b4a0f08251703119f0fcef6efcea1758f25aeb33271565c6ffe19edfb2c06215251c9244b595bb1a54463ee3d15b47055 SHA512 f201053409332ddf4795c6a120c8b501975b8b56d40de724384630d48fbdd5cd2963285c34a434046f35814ceb3935088e51b3be002bd6ae6f9fdd16a3978330
+DIST thunderbird-78.6.1-fa.xpi 639744 BLAKE2B 9e671dc6a7b93fcd3a7e00ea73d7e8627b93576184c9deb0ca942fdc0dd5d6acbfd1a4dcda365b5f8d0e56334a8c51ed2fac48c83a78fc57e535cb30df5ae8d3 SHA512 397b97dd85009fbbf97a3ccb963f92f06bf63248d6c32b078165f9ea0a1484ae3c202b899542f4556f25775c24ea2302465a31d6e93d4349f1b75c74ba81b510
+DIST thunderbird-78.6.1-fi.xpi 642451 BLAKE2B b6ddead26dfa2baa47cd86bf755299e1540f824e2f81feb0d401c9340371a770b8f632361f92cb89d991ae576ecc6be03c37aceb1b754c987c7f858efb9cfc87 SHA512 0ea8297cef463ac11069212bdbfb4dfa44789e282b4b1c54ce152786aeb3f92c72196c4f376fa0c59045136e224e27bfc44ab06b6b45259c2d2a2f7085e83510
+DIST thunderbird-78.6.1-fr.xpi 669501 BLAKE2B 6465f98d2acd0a178a419e10b80a89be4eb58904776d914677afb8f08c33f7e56ce3cb2775977a484570f685d675b660bcf505eca0dfb9a27ebcd279ad95c3b4 SHA512 a389bd39e1ee0d0bddb96e542b3bfcd3ba708b32b9a38d95ef6a076f0f2abbaa504c243d46abeb71ac2aba28a45864b8fb1c24cfc6fbbac84d124f6b7a52d09d
+DIST thunderbird-78.6.1-fy-NL.xpi 653079 BLAKE2B 7c1d759ca0a088585a0d4d1cbdbe8c0e429ddfaca5c299788741f3f79dddf40c0aaa1e398df76e3768f61315def9c2911e020dc9093ad4f8f080c64f9cbed62d SHA512 11cca649f12a27e54749342cbebbfb8919ef30a28e1e78672650b7efb45224f23b7b0c1af3c5341934b6cdaf27bc4fca9e44252ef3eb6688bf403c15946505fb
+DIST thunderbird-78.6.1-ga-IE.xpi 600706 BLAKE2B 5c4441b31c77e8654f4e11dcda00ad4c95a6b630196d8a10e69d729ff4a65b33c213ffdcc7a447020df5696bafa03e11e998aebf459a93b48ab115855fba2655 SHA512 fa88b6d97c4a210f040c6defa1c834af6ff49912ac5b5b38f908809e8bff59c1a1cb1f91f80feead7e66b6035a6e8e98c220f1de84fb3a782cfe4fa28120c4c3
+DIST thunderbird-78.6.1-gd.xpi 609380 BLAKE2B baf66f4879a0b82da4c8a10760f00132eb675f833a8d9732faebd29f6bf881fea5ab86e06d9b939c2a80ba0415d38d530fef26130d8f3e724985eb9916540e41 SHA512 0bd39f37e5bceacd0690ded7608501d5f2173fa437aba755ca51176d73e3a82f7ce5cde0ecaaa6b1199e2604ea497bc03f67f4464a165bf3e26de35ca623ec26
+DIST thunderbird-78.6.1-gl.xpi 615719 BLAKE2B b852ab7db18b6e35b950f791dab91937e5678317545c4a1982e4c9335594ae40fa2b15d829374bb1d3d042184758ed88b7fdb28d12ea363a7a35667372d283d7 SHA512 2a6009e9e596ca41c47a18ca0a804e1d7e58a10ae240c22922faee209bb597d382531dede9bd317955597c625aafd47044adc5827e92a8fa9f621b2ce265de0c
+DIST thunderbird-78.6.1-he.xpi 640493 BLAKE2B 9adbfdfd9029d7f3295a08643cb802e261631ea1e6321d8cef9f18911d92743513325b471c2b3de1350cac50f13acfc21bd38a218ce70f715b13a9ea755f7e3a SHA512 0f03ae87b60617167158a1b8863701473e6ef03bc64769d83edfddd1912deb43faac2de1ee37c75a697e69bca7b8d06c3a68b0fc6106c82d7c0a91de685bd360
+DIST thunderbird-78.6.1-hr.xpi 629032 BLAKE2B da9d0856bd33a7b12081c329e3721193256cf77e11d9040419b27101d2e3713a86049e164480444c02bbd1c02b0fca6337190651b1bd8fec698ea0d4314e1b61 SHA512 9f95d9fb18b66bfd17091148e3555e4868421da6aafa152b2d5de9928250c6db29a294accd2d3f8c22349816da433a69e77f2f80b471b1673d64af485e081679
+DIST thunderbird-78.6.1-hsb.xpi 668604 BLAKE2B 1fe2f5b87fd387d4d94eecde897cf7e6639aa2e4ae09986be96d6cc4819607e01f84d9005dbdf765d5e26b65cc0431d5ba387e9be1b713b1099fb23c10f665d9 SHA512 00a98a197217f26708222701115e9292aec43d66032931465db88900d64edf0208ca4b4e6b418713f3d82a3c813fbabfdebcbff98a28223c6a91d69121569418
+DIST thunderbird-78.6.1-hu.xpi 679840 BLAKE2B eb2808d6901aea571aff052b0357a433ea40f6549d9733d5b9c619d94a8d506a4a5f614c9c5de9365ee0bd3d828ea12f5e72cac0a8dde6b90d8698dcd2a2c926 SHA512 4f8e83923e66f00913a4e608fc7cab4686fe0ab78568ec03b6c91d723c1602226cfde9c88fdfdf0fb627db02d065f0a790d3c4dc823b74b184853f6bb0a85789
+DIST thunderbird-78.6.1-hy-AM.xpi 713330 BLAKE2B 4396a7d75a7d52baa25b170f01c840db19e9ff9cda1cbd7beffb8fd889c5f9e416623b3cf34513e70da12c164a97d60f2b6bce43edb45f8fe10a208b61389932 SHA512 6f6dabc061f339d0d90a34bcf3ba46f7dd0f391d985c9ef14ad082cd8b3a1f3a0c7d93edc8c42a98a2bacca6a1138e905d06e137c38ddb4ae7e75b9ce8a01a00
+DIST thunderbird-78.6.1-id.xpi 620682 BLAKE2B f35b50df580212c552474b81f331406970ada902651622639e636bb9ec0184f26fdf7804645b98ad9ef548afe1323617271fbccf484df9cf2c8a60107ee17d16 SHA512 215658eac2eb7b51431dd7a065b90fbb62b0fd3342da9cc1836a7445661e06ede0bad2c491a5a019b991c4cc7fe5272cb876ec4b16ecf8b367d8ab9d455669d6
+DIST thunderbird-78.6.1-is.xpi 581649 BLAKE2B 388b0c2fe807c2cf5aa31e5a57a1e44b968f059350b733303d3df8dffd56c5091b38200a4d6d75cc35eaca5832142c2d3fffb3e1bcdb19999371a36672f72417 SHA512 8d044d733442a48a8208576f547d63f29b8f0c292559e7f10c8f04122e2348a2821bdd4b9261ae7fba138a9e96c480f890f1dca6a4b630f55300d52ada9288bd
+DIST thunderbird-78.6.1-it.xpi 572958 BLAKE2B 0b0c0115e4169087c9fd962085ed5232b02764185dc4b2964d40cbf3ccb9f35fabad1baec24e1593fd9dbf2621c01291c4306aa78d871a79942a60a9c167822d SHA512 48ecc84509128aad59d90a88bd9f89b67be1366ba100520a19356d8c4afeb6d7498bbe838a718b4f2a86429455290b71bf2fb2f36e0ff121ea3cb29731fe683f
+DIST thunderbird-78.6.1-ja.xpi 722446 BLAKE2B 92b66c92e1eb9e6e2960cef8302cd7098a64064feb23f4a1e506fc791e7aed33ec5f1bdfddbb70fbda1f7fce0e0f9fcb8d0cb7e408a82a4b13682717b1b307f5 SHA512 7cf6b2ed3da796d89ab73bc7db2ad11bba96ef22e589df9a7ed6773b591189afb94f594b4af1175fd2db46fa369e17ed4527bb2f1dda46fe2dd7f58f5977952f
+DIST thunderbird-78.6.1-ka.xpi 717016 BLAKE2B 755f14bd03138a00be0d863a0e04c01148fd0691817b42e9d26bf18ca3d347b980faa16e53d419fcfcf382447cfeabae45ed7445ecce841d336526ce1b4033cc SHA512 58c582eaca90cef841ee02224412c2c1016a11d41d0664f3f37af9a410b7d66ae16c9e1fa4e6d1a8da0e33d61c63ecacb173d69037f8a507889c70715c9f6696
+DIST thunderbird-78.6.1-kab.xpi 651926 BLAKE2B da0c1daa58b1b6b9e2f90b4e01a78518d4db7281cf2f48eb10a0c21422bb90bf6bc3f8f318674c6c8baee2a321a6c901d1a837a72751e9102b0710ff9dd7f3da SHA512 c4cb1f458e82880e1097233864cebf5501031fd3172a92c2c824d604d6198d87255f658768119a837354526ffd2ae6c3f2d41229c3f548bf52f95d997bb497d9
+DIST thunderbird-78.6.1-kk.xpi 720461 BLAKE2B d4ae543c89f7577091fdc2c6d7b8fd3863a69d6af94e5654a73db57ae59d1ec646d47ba79d5e5d00feb4900f2dd0321f2f0bfc53ea6f7d2f3971b8fa82a72d56 SHA512 0a2168349dff87f315c8e013456659a2e341c342cbeef251fd86cf79ac3a4c7eab34da706487aa5d2a94e5abb92c8f5a8f1923c72517f0a74f6624137aced024
+DIST thunderbird-78.6.1-ko.xpi 688201 BLAKE2B d863d005de32c8aba1620fe9af86d4541cbd070f95c508ddc424530a7ea70a37c5bb02c75b7c928182f24c9404f05942f7d52067bc084e4bfc7a85ad3161047b SHA512 a4701560d4e6ba8b52d8cb6528fcb418cf37bbfb114eea66c07daafcd58b169d553e17e648b748de2ce0f01ce30c40419bc3896825c6f88cc1193451c6291cf9
+DIST thunderbird-78.6.1-lt.xpi 660301 BLAKE2B 407856ffbe249cc3d937c69c4e6704d9b3f0e30d055c8587a808f0c1d9971a481608d63c66daf490cd911e12dd225a51da7dcf8214ae8cfdb208085e868f1583 SHA512 2508e9fa781696a0c2cffd91563b763e9d5a9a2896d14f999c0787b30001a7519e6a060d1ec4e852d1b7c0349ff026e7d14dcc4eb2fc8df020fd70dc37f8c7b9
+DIST thunderbird-78.6.1-ms.xpi 572179 BLAKE2B 74fa5e42f7d749790841f1069a5faa367cc08503242c45a0026b2a3f71064696f75945409ed751382ec204e8b4f359fe89cf3eb42c02a6c8ed1e3105e2bfada2 SHA512 678c7419a5e1652b1a763e1e4eab3639813bbdc846f957166d1a5908233809d9752ad7c4180edc44222f26043bd8b16c3687e28718d37371c25dd62820f36d5d
+DIST thunderbird-78.6.1-nb-NO.xpi 637239 BLAKE2B 57f4128672e57e5fff83d44617735678e3f03ceb01ae79fff2038b64fc5eeb5f99169b9c460ee143605c86bfa7a350d55ce66ba90e4f334192c4433711784295 SHA512 bfb4ca357859d7b467eee75951ec1cc3490e8f6170943aa8e6ff95770d23c8936d6bd288fdb91e3a308fb469313e7cd685ddeba65570329b29aa831009392b08
+DIST thunderbird-78.6.1-nl.xpi 644355 BLAKE2B ba15ff1d565070d193548b2a1c4f314e4ec2b7daa9c4997dc6f2ea53e2256b5d9ba722ffee2accb749a989a211816a600194c640a55d67478f7cebde4ba5f0ae SHA512 175b03a3f94842fbc48c75bfa0e3ca1cbfdb0321f85b8e590f5511c41624e6fc9481c8e51e91a804679cb7c4a50bda7ad4ba8aa828af6550efdaad46af293a0e
+DIST thunderbird-78.6.1-nn-NO.xpi 640695 BLAKE2B 1aa628452c0ab95b15284fb4c5d73f2ca1f648b7f4da760bbe0334bcb05510fb92dc7a244b0d84d7baaedc75d08e287b667777e479035a9cc1c92c2559a1be5d SHA512 65731af02f83c88634f61371c1872413db969d191edf2d070d065c36f5bf0e1c3e41d88d5c417cd64f559e7316105711ee17b3f1aba057fb06f7e3a4f88f8af8
+DIST thunderbird-78.6.1-pa-IN.xpi 633219 BLAKE2B cfe1dca9234802ffa991275d45009143fb8b0fcbef77a98b342fe3130874e7d91dbf2f7e1d5ff049fe388110c86d6acdeb1bd18d982587842a7a9346d4cfac58 SHA512 13ffc0570ed34caaf98d6f036273c26945151c06d16558e263a7af85c409caa2ae3f3d62930c57d8bcd4d4e0494d95ec69bf1b5793a6c7ef404a8cee06e0cece
+DIST thunderbird-78.6.1-pl.xpi 637125 BLAKE2B 4ff7622b19e6b39e5eec148203d2b721f25757365e75cbe549e4619f9b952ad6e59392c58bc2a92af96fb7b2596dfb5704a0939fe9dad1d24d4d3da244c1831b SHA512 f748ffe82e2aa2df04d9820ad0d7b74aa59b65e1ea14060e5aceed98908ee4dadcf7818e7345653124b8e73d3926a281a241e3bb289d72b64857000286471a45
+DIST thunderbird-78.6.1-pt-BR.xpi 649402 BLAKE2B 8a7aa938e094feefd26023ccb8267d3b34b6b4d53a5df5780c530c757bdc8a8327cd13ce58582c1c86e967d88718c4a275d65ee1ca4a2618a1e416176ecd90e5 SHA512 e34950beae7c93f46d0e7eb3cbe5f7e21c1b19769ef84b25525493a728d8876a52ffe72c6bbfe1176330ac0b4698a9f68f5a373e031db51b2d6d4a27890dfe65
+DIST thunderbird-78.6.1-pt-PT.xpi 655494 BLAKE2B 41084fb4b7c6dabbd684d05dd9735309d16f9af0bfdd3861606100076d8d355ae80653412b2844c6e9e98d51c7a00b7380c0fa754213f3ebfe02dbae480de219 SHA512 083539a904e0c4ec1b5adeef705c51b8a395ad532539f796636ba6f0477ad768ed861a32fe3b834c9539fd0daa7cde9fa13fb946093f672ae4f4d0308e0b1223
+DIST thunderbird-78.6.1-rm.xpi 646521 BLAKE2B e3d0dc6a8365842657d84556fe485d8f89490f0b020830692cd498a3e0e905d37e9a58aa1d1899d34932309af2c4c4127b4d0d55fb892b4ae6a261eee00bb303 SHA512 e94fb8ee4e9884d51fd6f43268ff7b377c278bedb18d077388e6bc46e459905934314d22f0b33ecb54d05e22a42f0c0993f8b972a6c232805003b3de4ed0004c
+DIST thunderbird-78.6.1-ro.xpi 662634 BLAKE2B f8a66affef0f4a866af4e66478de1559457451088d8fd31516a49fed4949da0625c008935bff5cee6b33fe116d490777ba990f79a3e2a019a31cf5cfcfb1b31e SHA512 cd732df54a53fbc6e856d50da27defe258c41159e1e7b3955ebaa1268b825f6848802989877a68a9a3be4aca40824b61875fc5d6206d2c3d702d04ff47ab7b59
+DIST thunderbird-78.6.1-ru.xpi 756186 BLAKE2B 1d21b03e163225a2f0972520bc24545458c0ed78ab474facf0c50b06be522270221ec166b04ef7ff9d8c29ea6178b2989a5f7cfcd79d6999a7ac182a5d9b2935 SHA512 f57191febf197b514f2f1ad3dfbc27706138e8581ed9b29d1ced54a3cd0d71c504e8940e5b63f79c1e6d0408f3188c4872613d54fdb58a4cbe0d5715b223d742
+DIST thunderbird-78.6.1-si.xpi 651110 BLAKE2B 9b967bbd9b85293b1ce7e86ce219899ea7c60fc51fa6782742df2d272b785c5714975aefb3a0a639ce9d44f2541c4e3439a37368625dfe89bf165afe3fa58c41 SHA512 25d2d800e99a0cc04765ed86d9d91fa524d162de8b4233e9cc8d05a36762e97d3136c08a987d8985c90e32dd1b5a2c60fa81c4da6494b42781defb7d0c47a762
+DIST thunderbird-78.6.1-sk.xpi 643228 BLAKE2B 8d40464edc6cf813191680032918e21a8fbd46ba21490fb35640ea9a4edf3fc199fa12d31686b2237c3802ed98aaa40c222d1dc90a07bdaca7bf2c774fdad018 SHA512 c9fee505e42461dad487c65caaa9bd6d35287ef1ebabb533e30aa6669c60e8dfe49a2e7fcef80328626f6a64acec9a2af132c188b7a918d11c17ef19328acd2e
+DIST thunderbird-78.6.1-sl.xpi 632384 BLAKE2B 9fe5c5f7fa8e5bf2b3942031e70b1081e9ee55fa35bd884a4f1a726f55782d39ee17920a30618795596f3ca1e76f2481ada13572bcef6c43e1deb3f138b93bd9 SHA512 e7bcab0ac1cfc5c7c603f2d577d04e1e656f3a4d5a8be2a3eacaa5b067e1418bc3422417223cebcc00316158fd893cb9dc30213a0c694e832270d464f381df5a
+DIST thunderbird-78.6.1-sq.xpi 657825 BLAKE2B d2877a33c89b886e15eb29a11285c972cbefbb32047d918c5d8b7fd421aba884cc3f596eadb9a0aa7d4150f719d07df6451d6375b959bd00335656e30f7387a5 SHA512 52e23fdd381917aad0702b12315b0af1082853292864a4b2da65701b37fce29ecf18f34a7a52802b8ff3ba134b3e0742ef6f3a1ae28992723a3f220f253884e4
+DIST thunderbird-78.6.1-sr.xpi 683111 BLAKE2B e2ffd2145eea9fb8f49ec367919fc93fa13612d7ddd16358e65196813e877794d45873eeb13628bb2fa92d1b438298d405954f0dbcbd6302cda845de26c13397 SHA512 edddd2722d5488a14d0e35b23f23f4c310af72973673d60dd08c060b3663f686c83f360a50985c09cdf986aff74741bff7ad7dcd0f095b577160fa262ec779a2
+DIST thunderbird-78.6.1-sv-SE.xpi 648863 BLAKE2B 7f2cda06f7705504162ed9cdb95fa91901df0547225f8eabaa18b079a300149a46ac99bfbe41061553293178f50bad1c7d236d9e3d3c0a879b37895e86e96daa SHA512 9a650043ce8d457a383bf9179ab2049e280c5b12d32cc5056e1f84c2d2d4ea9819924123d985fc918b811f6bd28727b5613bdc8a1182d2ac2cd61e7473c1f656
+DIST thunderbird-78.6.1-th.xpi 712033 BLAKE2B 160826bc46de910002d69535956da25cd368e0e5ea7b71fc8ad371d3811210e55d8ba2b66f967757c7fbbe757cff815ac2257ead3f53112d9019a4067bde7ed3 SHA512 50073c9a5a0278e91fad3beec27aaa37dacb2dc5a54b63fd2795695bc57c26158dd1cdb60c384d004f1de026a1f91a0e1d2d53ff7f4b5963d1fb53d52ddced5d
+DIST thunderbird-78.6.1-tr.xpi 649074 BLAKE2B c6ff6ed1d9568a6af085601775c6c7c1b99cffac0bafc552cc34401c83cf79da87f56abf75a342aa71c36d9cb03ceda9b72888d398c560034447751013763734 SHA512 57ee0972642f769ee87e93d04945d4e0aa7c76c7abf1013d205e7b4f0c9f739594aa27f8830c84f1b6b8f6fee33c4ed34eb7075faebcf0dd18b94f4a0964913d
+DIST thunderbird-78.6.1-uz.xpi 586602 BLAKE2B c26dce6fe52528780f8840efa097392c2b08ae5e6bdbde60ea963a1ed4221005e8a6762cf298151b5b4d31a135190dbdbe1043418ebf58680075a5d1767f3144 SHA512 7388d41755c2476cf95a8e81ed5e0756a6ffdedfbcaa45b1627be339597de48f446a39f042bd9a3146cc9bc7dad5e58e649e0dec38c48d0d4d8027d371b18025
+DIST thunderbird-78.6.1-vi.xpi 674605 BLAKE2B 7db83cf29596b955a8a2f8376bbe3322d5fdacf84d661832603131639ddb4373a35f9810b2442dac4e5a920f189b2f44762c6e966b07e1c2867fde3528f115df SHA512 70b226b35e671956d2eab2d95cc15cf401f2339a74de5cacb6fa1de982ebcbb0b1642f83cf5cbcf64ca6b2c6ebd958f4aed33cf267ff7a52c248f6bd1ab6eff4
+DIST thunderbird-78.6.1-zh-CN.xpi 687175 BLAKE2B 08b9baf8e1e2090f579c7b1b480162654d4387a502e0ff7e74970ac737f1e1d0cee291a2979cb6ebe4e5baf7ea1245cba3a2d1d25612e5be5b33bb3be491d7c9 SHA512 d99d17ed9b4151c5cb948f36296f550110e953f912d5f7cff2133e8447b3eaae23b261abff356d81035d0a4624443f0eff71d34324c884d14d561893405305c5
+DIST thunderbird-78.6.1-zh-TW.xpi 687623 BLAKE2B 389a13ee623a350cdea95e00e6ed63f79f5096e846395126934ce5a77edab8e404aa77ac9ba6b12154a409c95dd68589eeeda4e5cd5dd792fdddc29be4cedf73 SHA512 e9f71faab7cfe04661298acf021562fec28f58aad1d5da244573c6dc561065a7c2dbd2e89dba965a31f279627b209a6d45dd109be4aa7c5fd5520b7828153ce3
+DIST thunderbird-bin_i686-78.6.1.tar.bz2 68072388 BLAKE2B 43f8017461a951a246b199ad25e6df257ed99e3c406e33521b02a8645acd6f7ca233e85bdfeabb0e57ebe2c5ec819865c199c3e6af85d3c983b287df00d74648 SHA512 fd96478c330c24ff12007bba2073b1f9087a9728f89a9f7f691ce176487131d041e5b9c2bfabf30f4b9a8682059573f72bfaba1a36b29ee8921c11521b1ec83c
+DIST thunderbird-bin_x86_64-78.6.1.tar.bz2 65170633 BLAKE2B 8732ac39df004ba4f1339765a35da49fc06876485ae55b6741a995fe25a60b08969e17b8450316e006f37bd74bde0e5af0379092f7682d9ef92bace91607f5e1 SHA512 2f395fdf93ba81c412cbe1b54da1f681a17195139993ba9aaadb694b98fe9efaee088899aaf77ce5702d1eb7c5172ba7759ae7bd696e3cf476df9cf70570180a
+EBUILD thunderbird-bin-78.6.1.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild
deleted file mode 100644
index 147ff9cc95ff..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit desktop pax-utils xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-
-CDEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-
-DEPEND="${CDEPEND}"
-
-RDEPEND="${CDEPEND}
-	dev-libs/atk
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	sys-apps/dbus
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.11:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-sound/pulseaudio )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="opt/${MOZ_PN}/*"
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_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
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	mkdir "${S}" || die
-
-	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
-			MY_SRC_FILE=${_src_file}
-		fi
-	done
-}
-
-src_install() {
-	# Set MOZILLA_FIVE_HOME
-	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	dodir /opt
-	pushd "${ED}"/opt &>/dev/null || die
-	unpack "${MY_SRC_FILE}"
-	popd &>/dev/null || die
-
-	pax-mark m \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
-		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || 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"
-
-	# 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="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
-
-	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^} (bin)"
-	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_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r1 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.6.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.6.1.ebuild
new file mode 100644
index 000000000000..908f3ef026b2
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.6.1.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
+	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_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
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	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
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || 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"
+
+	# 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="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+	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^} (bin)"
+	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_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r1 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 47852b8329a8..3b133b6bc552 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,70 +7,70 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST thunderbird-78.6.0-af.xpi 548345 BLAKE2B d89ee0a52cbbdfe33efb93f5ad4d89523f486b18fe62f5292dbad19b2ac7f8134d83b9c40e9424318d40de4a8d9f745f61faf0614015ce6ae1ae8b42b9fd0be0 SHA512 273c352acfce808b97bad77f0b9a3b02296ea78e086baf7b2a3c5d6c980edcdc20e2f525aa24dfffaee74a027a8bb2d34ec09f221f76a67bbcb145c6d21ed417
-DIST thunderbird-78.6.0-ar.xpi 648600 BLAKE2B 274020f982e55bb6892153e3a19b55a6bf5a845e85fdf144f114ae2be4a4607fe3f140ea67e89ea2a3b921355f550b23e5eb88723a58803c4aac08af7f7b161d SHA512 b73e36dd0a086cdcda34757a0e30dd6aa82791862d60d7c0f87bd8687d52d71da81dc1684130182be07001a777512897dcf4f95e23db344f97991ff937aae5df
-DIST thunderbird-78.6.0-ast.xpi 561260 BLAKE2B f6eff5ea45de17a5b370539ab83de54a04d6afa603e122f2afc8875e3f2b3205fbbedff7c3df99532c7ffa8985167a1b124ca586376a3a8b3f84e6023123ee92 SHA512 a7ce5cfaf4c96bdc63dc99aa1e5a31eb5e4f90a45350b3bcae2fedf2925a2372fe0058754f490e5e0a114ee5d6341fe8b632f4e3c01924da3f79738a55201117
-DIST thunderbird-78.6.0-be.xpi 666670 BLAKE2B 13402ba59c35c3d20c25cb18f8786c0a0b83088e8ee46a0b3c0fd86f0069c3848e966a9ef7c2546e0d665d01e16ee7372d1c920be902f18a0efa36d0ccacd8da SHA512 4ca4be8284f64132c99c11e4428fa7e4638b8a970eb31f61b5368a18425b7736622ff21b38907450361b943b680d50b2f0b293f6dc943cc8b665ff8af8cdbe8b
-DIST thunderbird-78.6.0-bg.xpi 672417 BLAKE2B f2fef6a49108146a3f4d0c4feb36cf199a5043a85544f4e0d8cee271f180126ad0f035f34bf4978071be3f7f7bbd15b25f9bb6addc5bc05aa7e8a22eae3c6c9e SHA512 aa18a8bf86ffdd83f292942f338e4ae6085ee50e0b573f95bf0c9fa99e257719e934e48d6347c99b39c7aa128a34cd6986154cfd8cea8e5c50a023a8b669a861
-DIST thunderbird-78.6.0-br.xpi 604528 BLAKE2B 4c1a1159eb3c2433ba2334833799cbd321b43165331cf4cd3fbc6f0e29f543aecd8755632938151220a30d69f6f9e503d22a1656d0488a1d57b36a7b982ae148 SHA512 85c9c83e535c87faeb98e2adb7b7ce41752d913e23cb7a92bcc3f5b7af412c184a3995bc0956872c9474dc45b00f6db00058f485a7ff202d478179b8b34af656
-DIST thunderbird-78.6.0-ca.xpi 620436 BLAKE2B 0124303d8e022da4a2a67df03e18d3c64559966c952a9df14a2d09de954467954cc9231904c649c09b40a4956752156b6eeafc4d904fdd9866a0e8bfb01aac6c SHA512 9d6debedb42e0d314dd4a8f14eba786ee32afb582791e2568a3a528cedef414c01a3df40bee44514ce8cb3e498a49998430b52b1cb3db3bda78989f1775b7a01
-DIST thunderbird-78.6.0-cak.xpi 635657 BLAKE2B 095934912bf56eeffdbb66c782a32ed30a3f1d940eafa086a69e385a2d913c38510eb5e3522c4df8d25e6d97e9bb4ac5bf5552ce096d7b92f14da2fe68676777 SHA512 b998c8972f193a57e0a601f0a6d51130567fd5a74d7d31fdca03cb2ae0d716196bcc36718ce936c15f92d24a2035e19479546dec618685505b4a3ba59ec00653
-DIST thunderbird-78.6.0-cs.xpi 635346 BLAKE2B 58d56bef182faa2996db3a66909e4daa113a66193b2bb1bed629e772792c2933ca7983062ab2828aed9957bb0303074d02c0729650939153deb0646eb47d71d0 SHA512 317573845d2d470a5466dd0863e2c462ad2357b3f6ce422ad74f9db53ceb6876095452bed13cf83cb46ec78c47145d2168b51c600fc17ec1bf0c8e458e15eb0a
-DIST thunderbird-78.6.0-cy.xpi 646243 BLAKE2B c02bbe1a26c4c295d04750adb393a786fda6acdfdac420c155f57ca90470ad2ff07f4bed50819bedf1739c0b14b5facd8223a68fb358b832ec683a970a058593 SHA512 836171f65ce69d61c0f2043c18db13f2fdf8e38b28982b89bb547de07930c1dd807f710efeb50b61c203c5f91648499dd58488dd6e41b050aaf78f5f1560deec
-DIST thunderbird-78.6.0-da.xpi 620993 BLAKE2B 089edb401b604309848a8c45ada0e048a76670d2ae85138b60d798afdee0597f8a3cf9d7344755a207c381cd74444f55e0c634c72b01863dbc6d547838d894b8 SHA512 e5d19b04b314dc29ba822ea6ccaa77ec54ee526838ca4b565ab74b63a8b521e7060af8d416a285b56db91631284b34941bce7e664643042440528e8165a01c65
-DIST thunderbird-78.6.0-de.xpi 665191 BLAKE2B 8236d20a297bb3f0b9ef0b9f7cd8eb49877aeb8d12b38a3de7204fbeaf544b109ab4d420c1792277dd4570d94a564ed13617287f6b3f9331404b213acca097bc SHA512 0ef3ba13a9feeb3496d295553f6908a0329f426b8b0fb1646a2f0c7638c4557765da5a39b58e4269dfe593a43909aa712024e16e0450df7c4db5a938172b855a
-DIST thunderbird-78.6.0-dsb.xpi 666771 BLAKE2B e1c15e7a2c5eca6630a5ff739c40dbc095903326ea324e8c2fd6356603737d18cc837cc511c0fcad0c322bc007b7c6d7f706f2062e8a8ceafa92ceb04fd952f6 SHA512 a831c73ead0e13ab05ae95b972055a3b329092b622c19cba1bf4fd917e85514b55d4fe1c31b1af51173f855f36b4a9bcc631bcf1081fda74d2bdde7a9584526e
-DIST thunderbird-78.6.0-el.xpi 774448 BLAKE2B 6f6044403442a9375eb42f9b6731a014aa2d008f713666a8caab5dcd6260ede83a7292ab2ca1920fa33fbe87c5e07c66b56feebbe7c8ec580db7624df45f317c SHA512 63264d5332a089e838f4a968f2c804d3e8411a68639caea65b7d6a13cb0569f5e44b2ade846032bb79f13499e9565ce231ccb55ba48ca3a2502c92e0f40adedb
-DIST thunderbird-78.6.0-en-CA.xpi 611773 BLAKE2B 1b608542c77d41edb37c583cbd74ff1932dd21e36954678161c57f6820ceba4c14408dc7d79a8d7a86bfd4d493ff45028fe520abff79719db025442de6d88b65 SHA512 0077c9b65b56e8b1c5f7dfedf2bb2d45896b4a02b5c6ace9e8e03d6499c96cf4a9ed1dc9eaa85a71357f9a1a5a60b5f8f6e21a92992ac5544c3d1992815204f0
-DIST thunderbird-78.6.0-en-GB.xpi 611183 BLAKE2B 9bc2ea427279866563e421c6ca7efb739b96a9d5aa11591b3595cb54a9293bd1876290e385f64206142d833ab3339321af6ebe30f234472cca48affbd5ee0127 SHA512 12761b4b100bd845f2f55c2b724b2bd350a0290ff821df84c4f732d5947e2cb974368ca0063f98e3e8ab264da4e2acda7499255dd82e96bf30b7e7e32b4fb1c3
-DIST thunderbird-78.6.0-es-AR.xpi 657788 BLAKE2B 2d14ebb13dbdd93d4f095d1c9a1345b68e9e6d488059e88bc3643695fa31cc46e8edd76aaeb8beb10c1fd7a1dbab313b0c693a68d46322159781e6efd199ac3c SHA512 0417c7c47a22c9e548120202d35b52fd4bf7bd6b08e4c9771cc027348bec1fa8db3cd551f41726cc61a830397738274d0483d1cbd507b90c501b53495f22f6e7
-DIST thunderbird-78.6.0-es-ES.xpi 569804 BLAKE2B 33bb8080008ef53e82cfb7f36c4ab8e21691f9fbe43c1691ffac98dfde64c707415bf8e0d8488a058c8e35813ae910dcd4e82126779ae2259dd9450c4bb87a21 SHA512 7c6cce31958b93afbbe4fcf99a62c4a73f2e37eaf51a54945d0ce2190df635eb53498d3d455e7b53fff035f9dd76b92b4478cf44594d67d293a5ca549ca43e36
-DIST thunderbird-78.6.0-et.xpi 597728 BLAKE2B d0aebfc5fe1335eed6dbe6e42015d59b4aedbf45f91f44950f125ffb8952395119f8427c83c0749b1d682fcff553e556ae41d2ea8ff011a2d3931bc78a05d285 SHA512 5381bb92715ad132cd8c68d9781c4c975a59df64000a6ea71a0113cfda54ddcacebfca8b90bd030128110c915293df26a2c34a10f9ebc2ffdf0a5b24eb39d18e
-DIST thunderbird-78.6.0-eu.xpi 632962 BLAKE2B c97291230b26dc72d0113af0f4cc8d8d4bf5be645bc784b8802852f6c58ef9e691bd73a15843b974ad9b2eb5ff48b291a35c774e3fdcfc54af492aa9f9f02e22 SHA512 3f38183f140aa30e7b947f47a9da01454722ceb69c75819c0a8831938faba084b3b2398ae5136dd3c72b8a504df78bae6948b6491b8ff8ff9f3a675b934d2a60
-DIST thunderbird-78.6.0-fa.xpi 639756 BLAKE2B e61f2625fdb7cfa1d3276b5f0a1fe13d89a7632e1437f7c32262dd0df994b41868094f57915d4b389d1277a0a7c8692203da82381a1b809178084b80e6deb391 SHA512 d8e4488007f6dcee3b499e8306086860d3d2d2e4031c0a03022402d1eac2dc7f35a77ed49d2de8ad0e1ce50450152c3f8e1a685f416c2b4aa14239b05e4b0d94
-DIST thunderbird-78.6.0-fi.xpi 642454 BLAKE2B b29324602268c3b347f8876f1c0e27de28b04c49b862bb93a614bcca40250c79f644887261468f2b110b6d71a1ad5da0d45bdf40301ea24a159bdce5da914273 SHA512 9b69c8a1ae2e04aa9282066cdde5831960d34bfee69188aa8fe0be69db799b79c3ea11f55d1c084b4d3376974c667d8dec57592937c4988617d1cf1dc81690ac
-DIST thunderbird-78.6.0-fr.xpi 669493 BLAKE2B fa3b3bfceed1852a3500b3804679d57f897a017d195f011fd79b9476f73d385f15ce3316cfc349d31c9fb03635aa5286e212343cf9b6b45be5532bd9eb698996 SHA512 bfbf57fe957bad0043b51950354cf1619a497c224ee3c84893f888d6ad72e695fc6a20a9c44c8cfe48d64f89f80304a8d814a600371708415c2671f28b9b7d50
-DIST thunderbird-78.6.0-fy-NL.xpi 653072 BLAKE2B 468c42637d99472415f5ab81d3126fcbcf2eab5e67803e16b7d0d0117fa039983e1d43d2c7ebbec0acff9d6dd20047c558d583ea2c7104b277e68989da90d9c4 SHA512 c4e4999c76af1c94cbf5009f23d500f2e5351fc38ce18c45c06dc85d6e548be411632b3c3cdd84f37a476cc391bf9000de7c0f4331bfad445b8e13aa153b2951
-DIST thunderbird-78.6.0-ga-IE.xpi 600703 BLAKE2B 7692232fdea4a106ec0c47c20f170ba0ed021438e41893159038bf9fdf5e00f7dd6e67bb53ab515c9d3bdfe540c5b65e29e2ebfd81506e48e9920b60128b32ee SHA512 d16ee32e21c3cfa354e34b74864f732b2edeb63177ab0ad19731f12ec724f4c59a684e013f0ca083edec9335039419e53b7c86cdcf01cf5bdb02896f7ac7acbe
-DIST thunderbird-78.6.0-gd.xpi 609381 BLAKE2B 7813fc3edc1080148a59eda5ceb3b2cc0fa47f734c18dde4412398169746fd037c364f7159b1ad1877cf7a2a0bc590b53df552ab2f00fdde0aac83eddf40cdee SHA512 a775f12c9a85c4be2ff7777e3cef7f921e6d70be3e1439c363007d383773b56657600eb816299035d959d97708e786319f927410dd83758c5b605c17447418c1
-DIST thunderbird-78.6.0-gl.xpi 615720 BLAKE2B 766c20db8418c07016c8acf90adfec3a64c86e6fa4f6f37b51fc92a36e4af9a588d4456177acd7ecf207e7d076f1ba4159eb00c94179a0082759d9ee1fceef4e SHA512 ea9003203e13a5beeac91b691e1fad55eadd83113a586943330e58bcfa00451acea801d374064d98e6649650545392b6bb5ff69d2cdcdf08c223dfad25058a32
-DIST thunderbird-78.6.0-he.xpi 640498 BLAKE2B 8b372d45238bf88182a53c2129e856c2c4ae59406bcb3f22740d5e8fdd941b351df58baef25e9857eeb42583fca4b99e1153bd5239f6ebdbadb9ff8d12c139d8 SHA512 586869e7648df55872fc824d13bf279cfb0ea2f133fabb235ba6230619a2ca7f0dd505cfe71b8788a2e965f3657aa98fbe5b79acd1995576d2507e56e0398c45
-DIST thunderbird-78.6.0-hr.xpi 629032 BLAKE2B 7f7410f9a10c348db7c605e485cd90ec0b88e028ff13577c10017e27c91a3f182edf2a5121febfe97ac849529b47f395aaac8b18bc0e705f28d4d5f6b5a7b27c SHA512 950c929465b15e13f06b065f967d58ab51b741cf788b58f3e54c15f7917b6dfa372213e4e685310c08e76274237f113b8edb457c29a1beb93e7643cbfd724558
-DIST thunderbird-78.6.0-hsb.xpi 668602 BLAKE2B de71c85a194402ec9e5f7e80e51cda8b25237c47354990da6ad187638d7e4a76ca49a7ef6bf84d24737669dfeda31ef26afbd57d09633a3d16d56c619a9baba3 SHA512 e2d20a2c3eae77227587b3f90621bd84a3b4c5fe289b97a03b3951c0a050a85faff3f2d4cd51f0e644ec073706e2249e304a5ccd00072ff70d37fcff902c14d0
-DIST thunderbird-78.6.0-hu.xpi 679831 BLAKE2B a5597ac70728c3d89c4af989b31dfb73e1dcdce1b6426b1eba03dacb17881d818b5f1e146ab808199e07f3f81bf6e31b0e5a89519d79ef5040cfba3a58843000 SHA512 df8a66b3907adda26bfc55eebcd463fcb2c93fd907c6c72a133a66a2848a9fca7cc1d78e25b745d750bbd5c8a47354a225891095d9d036ffd8f529eac4078b0b
-DIST thunderbird-78.6.0-hy-AM.xpi 713334 BLAKE2B d3fe1317a7bb149a60ffc85786c37b4b53a6b2ec41d4099357ee3e7d7a5d48aa477f4212a2419f94cbba117ce7e773c7f04467edd38ced72867545fa6c3aca9a SHA512 9c7a3b685d60f1ef899a0e61752740f1f15c8ff6d1f156d6b1dd1b90ea69f3c319a0fc5fbfdabad954f20b87c712bcf4a7d1010de7b8fe06618c24a4ae0dec51
-DIST thunderbird-78.6.0-id.xpi 620680 BLAKE2B e09060c821c4ec6c2fd047bf2fc01cc161fc984807d2fda7d571483029d5ab9be28b1f2950d279e8ba3aa86443e3eb7774dc15b377a048a75d0dfd8fd6541bdd SHA512 ea81176725de1a79cd6bebda2e41f01a852db5b8d3b2466919e77afe31335255a3fabd9d88bde684c5bd4fac447f106a183e217e72a15f436a92bc7f064d0acb
-DIST thunderbird-78.6.0-is.xpi 581641 BLAKE2B 0debf74e2280b2a1f0d733a6845f5d71c46f1ad0c3cb771e382247369d1d6529e410b98515019f7bbfc2ad4ddb600cb4f0922bb5f9f043d77a0c285e82c7ba94 SHA512 bb9a1144afe77eba866d03bc0eaa507e7e12fe785af4a7d0d61be2257511d48c83569fadaa7b71c71b3d74796296f34424c10ad6c6735d401542be23d97e27b9
-DIST thunderbird-78.6.0-it.xpi 572959 BLAKE2B 00f7fe1681a7e79acfbec06877732c1603263fc58ff1e8a595c672f8dc6e7368f0b028b7eecc2988dea2249a4b35db806c1b9e08e8effc67347c2f1572dc7342 SHA512 de3c634a4763a0efa48dfa921986f12dbdb5d8890628996a8b26f10e35dbff833851381a2b3846328e52d702d33eebaa0aa6859ed3c61dc19ffcededb99b1cc9
-DIST thunderbird-78.6.0-ja.xpi 722456 BLAKE2B 122ebc20541bd219124b2241e90401067a4c58a1b00e171827a95df43781b875703fd8e4b5388327b8f883da8fc87839d13c02883c284333947036da6e183a46 SHA512 70d5b3aa1efe0c6ad54c7b15599f6c63b0deaecd0f46cc20ccb16201d24a081f45f62f73907defc6d5b73d2bd3e3e8f959ddb5744d0f94b880403595802ba856
-DIST thunderbird-78.6.0-ka.xpi 717013 BLAKE2B 0733225b0cd6852aaa15f24fb99659e622f40894ad81dde4119d1e3b536038d310280f5edef41257355e6485e17e5db56a7532a20c6ba7f498b272f725a9d61b SHA512 2c4ecf76f42b2e0421a08d7825b8fed3a02f340634ea5136024dc4bd4833b93f5079ea31911db0af26472ea2fc1ba8ab0b47e5debaed8345533f1f1ef37fb7b1
-DIST thunderbird-78.6.0-kab.xpi 651911 BLAKE2B ae8db244f9b001eb84d463dfc20e032471c956164f366e9eadfa309f79879e7f52f3edc4436db2d4f0e41e76cfa8865f3debec2aa9f7eb4fad156d3c01bf551a SHA512 8ea02eb64f8852929b5a48c5616140ba24dd0d056e5371c6489fe080a8c4604108ec2b38ae6ed937304889aa58608a9815813f3bd1a1149940ce994528a1594a
-DIST thunderbird-78.6.0-kk.xpi 720467 BLAKE2B 6ebbff20d3d5182cc605f16ba98d99559f84b0e7db007e2a8bd7808eb71697b4d60d0ebeb4d2e738b41f546eb1c026d9d827579f566dfc5dae0e984cf73f729c SHA512 41e5fb9a5c03114b465ea1f7d1d7d41a9bb1a8147ce89ebf043a96ace293321c6a933b166637ff750bf3bfbb7722b39d589910d1e88680e18871f1c473b475ab
-DIST thunderbird-78.6.0-ko.xpi 688206 BLAKE2B d3d98362817d725aa1d69a1a7c0b8d84d517108b72a1bd37d8d43a647aac22032b7a3c6f1783913176fee64c501f55ed00ed6e1fabfd33e9d51963777d81fc33 SHA512 f7db483586c0d2f562316b63324a996355572177d83cc664db34048e4e613f2302f007cddb356381f93cf3526a33ee5a5b516fb9469775a99b634f5712651979
-DIST thunderbird-78.6.0-lt.xpi 660294 BLAKE2B a8fb815d4ce796391acc4f4eab4dc75c943b7b0814aa056d85d8fb687903a5bd11b7ddb839100b3a183ea027ef934f0fdf635956ca83885fee302f8270f5012a SHA512 f31729b94c20292a88deacf4e44a19fb9e3843334f87a062d1e0f482f1b7b2c81cb61c96ffc2a9e71f90823c0571c51ea5c3b6e1df83b7194cee00e93a200560
-DIST thunderbird-78.6.0-ms.xpi 572178 BLAKE2B 434711867a334f60871e013b10ef6b0cd5df01df9a254f80922db1fd4399ff367112595e6a04645274fd18b679c4536ba9f71d66108a2a1a8550458601b6fc34 SHA512 98b1db595979d635fd83013b878a91c7a54459755fa60db97f080d98328cbf967b4a4d6e12f47229d7162cfe06697b6adf87bd6a1b76bb151af0a45f2241fde1
-DIST thunderbird-78.6.0-nb-NO.xpi 637238 BLAKE2B c245f36cecd8416110390f9d654fc2b03fbb89a54e2f04cdc56771b72f88fbece43e78833c8d178ef733e1a1748e691ecca7e18858520cde82ebf310ae1570aa SHA512 5790635192abd36c6649af9024498a1830a6dcbfa4f830b54ab9940e908ad0184c696acfca3f07856f507b22793f7c401f914ad179c9d02ddfb278a4ce9e558c
-DIST thunderbird-78.6.0-nl.xpi 644358 BLAKE2B 1e6ef2483d2f7aea4645dffc6180b5bfada30e7eaeae017d25c62428e599549c9d7c7c6a1440d0456b52bf0fece5a3e3b04f015c685e37b05329e4d88a1c50fe SHA512 40cdb1860ff159c6929523278e2e08c0701333e76b15fd27689e424450363c4ee0f85088f3963fef3cc1dde891a886b31b48316eebe8c4f4c6cbeec4c35d603f
-DIST thunderbird-78.6.0-nn-NO.xpi 640689 BLAKE2B 9d7b6894ca31a9ce1d85ae57bc368b9d1c8ba7af2a98255e2e57253b6c5867e3657a5ba12b632fdc52985a4242fffe21bce69f4c085859454c3f1e6d6d58b24d SHA512 cc37e910819df0245d9b69364eec7c95bd5753fc4513188e8793c5e6e44ce7732261fe22fed4683e535dc68bfd047c4aec9d106a3e0912911bc9a522bb83335d
-DIST thunderbird-78.6.0-pa-IN.xpi 633216 BLAKE2B 689f49261d4d87262bc6b25e69dbbe97cb9d1c70124c67e0f48e8476ccb1d43875695f48276db8295296cf79fa8c9be404253a590c348c182d872bdf4e4ba7a8 SHA512 21a6c9e18e089c57541b827449b51d2591a7d4b815398faf36f727eedf17c8b97923687a6ac6947e89aebb1ecf4f10effb3aab39798a8ff3d2e99b0f2939984f
-DIST thunderbird-78.6.0-pl.xpi 637127 BLAKE2B 80440ea54e6135d51b34db18b5f1848fbdc0f0adb04aaccd8ace85c2d7521af9b3c0d33abc81b36c631db77b95663ad5dd4ac19364e8300183c6f6a82adea037 SHA512 e0a35f5a5fc44e3ad0150eb93e6e542c4676b02e16b797c04ddeed551bba191750f58dd743431350af3fe44d318483a6b823767a3a9ebc5a75483d0706a407dd
-DIST thunderbird-78.6.0-pt-BR.xpi 649417 BLAKE2B c4f22032da235c6f3828205dea272020d198ea6211d595900c9bdeacb890ac4e3e3b162f5cdc2cd163ce3be698bb8df56c7bfcba1d45709567c5e2eeae2e3494 SHA512 5223246ab5c33ecf43d6b81f1c26eebdb25d667726bb7ba5eadf7c4d8c774207543f098c049893b42965b8495f2162f00cf2abccf85ea6e7f141a9a0169eedb2
-DIST thunderbird-78.6.0-pt-PT.xpi 655498 BLAKE2B 256ce12702391fd3c9fb8de6e4f0257032d41679b2bdf9e43e7a96adf281722a714bf60004b4dfec4b210f7c7b64913114686f76d3d10af26e83573e45f09ccf SHA512 5a81abf08b6115480573e729bfb5c00bb1c8449b35b6b8ab8523e9c84c9d00e53973e4072a99a736c9d6a44afcfc4d5587df9e1b5036966d18cb5393d3523eb3
-DIST thunderbird-78.6.0-rm.xpi 646529 BLAKE2B eac9273aab4ee9fa46880e0f92d0041c1fc003523fa191918f34bc7219d6e4a5075bb815047881a07b8522a212d76a75c838ba0ced3c8af3cef5466d5aee8a40 SHA512 5b56d907789c926e92344ddbeae276e6879ac7d9171d52f235ef1a319422ba6f6b2c0d905d1e43eb28a65153ca8869fb69a3592a16a308a6fc0e3a7df981f79c
-DIST thunderbird-78.6.0-ro.xpi 662631 BLAKE2B 026ef09f7d7d489e30a28fd0f65a48a3cf0188812b3e34aa5768ade6a8638fd7e49c006ad8c7140c227e9cfd03a451c6206c0ffd55619834b6a735e5cc50f72d SHA512 4912ba964500b233b4caf08c004d69623d2fb864bdaf4ae46f0fc65c2552fb75d7da5c20815e471971457ef5a98661e3424218f78f88fa63077f542ae8bff312
-DIST thunderbird-78.6.0-ru.xpi 756183 BLAKE2B 8051edc385f5c9bc6263fdbafeb777a1c168a4f54f577867d965f5aa91e2b454b8734a64e4a2aeff91447676461d15c815c9a73b10213d60843c8da8e086a413 SHA512 d3f60e3b8efc6dc4fc1fc390dc3afa29f74e71df0efc553e2011f2bef341cce0522c861ac3f131ed4adf9f172d8390597de0aa094670e0a1e34e36afddcc0ad9
-DIST thunderbird-78.6.0-si.xpi 651097 BLAKE2B 70b48d07ddabec8fbf9257f8d3eca281ad35b262abb189445990b628efbb59af527135e873e96c5072c71b7b18325ed656b7873f98121660922b3e19c24ac2d7 SHA512 4c5769c720616276f900f21afbd580ad2bc97f86522eff3b75a09f69f2146f9510742c2d83f4080e7a23b97caafd0d30a40e6a6bebd819d1d67a1412831f6e4a
-DIST thunderbird-78.6.0-sk.xpi 643224 BLAKE2B efebcbcc0fdb45cb68a392837a893b8c6efac3ffa578024698834b3c4b6a1991ded082368d780832719c6d64cc049a4d989614d6d0cfe8b3f9450d1f9d763616 SHA512 2b3c748650b642e7790b854f897cae928197914feb95cab8003c0b33a3dbea050bc60fbdffc32327c458e052a8db8f7e670c4caed8fe5895b2033851215d9484
-DIST thunderbird-78.6.0-sl.xpi 632386 BLAKE2B 703614849ff79d90dcbdada61cd90f493e5bb1747465c4e037a5e5c668e5e0129d03a19fe9e5161c83ec64e9f5f23a134a1b8d7cfb7d3bfd40bb6ab4dec140b9 SHA512 73a5584dd6b27905c64ad3f4a20f089ced5f7987865b316145d8d7160e863381eafeed10918ca18bb58dbce4d9d302c72b511996aea9ec789d90e1e0e5137683
-DIST thunderbird-78.6.0-sq.xpi 657824 BLAKE2B 37c210e46f0865db3feb8fc05e0baf0fbbe5d0c7e2e40248b915cbca82e6f96f3ff1cd968a0979571fcb036fa06e155ce7e118c6ceea962bce28dc9b18201dc3 SHA512 d90f97a383602752adecdbff4c76e50cb5c5ce31589d2d1165bea6c5fe30d80382fc9294f7c7d1df6c33327f99ec87e7ab797645e5ea4ebd89acfeb2bc0a8e7a
-DIST thunderbird-78.6.0-sr.xpi 683113 BLAKE2B f3dbfd42ccb3d7476af6861e1e8650507240b179ee4d6b356797e95436fe43875c8e239facbcf75884a3c1cccdc2224d1da46cf142b571f6e6d24a49d5bd2c7c SHA512 7a3201573cba6949ccba92a5d6801e61775e8dc2e1dd1f5e5f64806559081c84364f974e93de032845fba12e469add4ed731975bc0490dbed03d928b65ae8783
-DIST thunderbird-78.6.0-sv-SE.xpi 648865 BLAKE2B 2682a73db0092415272cf1b99409f282b7b39538f018d697483b6b4a13b81182916f76f1fcfb608dd91e50a239e11e0d973333b5972f3d926322372118940043 SHA512 9509af73ae1efd8f7aeea319c736d962d81c0ab4708b4be5c5637d73c7fa804cd3a30b507f3d18c365f8ca1cee78ebe9a1797cbe4db7c91bd220fd82ef4a5be6
-DIST thunderbird-78.6.0-th.xpi 712032 BLAKE2B 0945fefe03f853e36e2d48b0991b0fc48e2c5a63c18405844ae0c225d302925a81ac3eb30221aeb16e68902aaa099669f961002f917663271c0c8de39c5402e2 SHA512 8e26902e33bb940ceb7e23ddbecd3991caf08ce3e9aa9049a02fdeff377d741ca69aff8e412c0f87329f67d92e7fb77f6a652fd05e3ae5422972776394f4bab8
-DIST thunderbird-78.6.0-tr.xpi 649077 BLAKE2B 0cb4d4ca9cc747f9d430873f4801d0c019701f07fcdf6846263437fc9c072251f0d957eed792fd51df02b80493742d22b24bfa3da2bed358fc7023fd23d4a99b SHA512 a98868cf4efd6fcbd0d52278b7d5a35ea0db4b0d8fcb4b0bc449fa73771f1f80d5b542521450f755c09cd509b0a806716b527ff5b36ff6c87ca1aa8dde654951
-DIST thunderbird-78.6.0-uz.xpi 586592 BLAKE2B 00ade31247f6aebdbb7c3d1dbe4913646ea752041cdd83e6c67779c764ce2f2530e9dc38125d92d9930cf5b5f4615a67b8ec1261e887412f00fdb54f502e553f SHA512 a5d20d2910e70535da06ce1a52d28190934834b609af2c689f6695e2c4b4e0fb20f438ebd4d8ddb4ef7f327acc845144ffbad4965840e72d069662a345d980fb
-DIST thunderbird-78.6.0-vi.xpi 674599 BLAKE2B dcc41dcfcb211f9362b92dde02fffecc83c53e279e97e6620247e617a9da03d641301ddfcb244f6977e932cd3a5e97528fb6d66c098e41394b9b8e2600cb9f52 SHA512 a73b25e4fcb1d110ae79fc14e000bc4f2fcf0870d521f4d2c98bb8774c889ba308aedc5a200f4b344aa12bca954d829abc4bfb4fabf1d14d15af2fb9e0a77eec
-DIST thunderbird-78.6.0-zh-CN.xpi 687180 BLAKE2B 4b662680445032e207b21136af182358b4d353d487baa42022f42b4ce0a9d413fcf7ddfd7b5a0ec6418c38d6979eb8adfbe5c435632873642f9f25a8614b9c90 SHA512 4655c5b71b75a483779b1ee974961f2f11f70d4f3ff60e0d7422681a6fc14ef7b44c7e1ac409c319081b88bdf4a76fa6dc3ca51fe19a0ec87b0df8716674439d
-DIST thunderbird-78.6.0-zh-TW.xpi 687618 BLAKE2B 56a70374a090c6e8118d513dc3f55e7b8b4dc51853cf8a243f369de3f5449a311d9da6b789d4ea326b36db4f386a0926964a3d3d8f64656a2a037dc3e8b45221 SHA512 26ae0da18bd99aa0bbb32fcc5a8e5cb2e22cf60bdef93be2805174c85a1372f59b3099fed24ee5d88c754ada0293fcac8d3ad2d029a622240d583ddfaca87da2
-DIST thunderbird-78.6.0.source.tar.xz 353496712 BLAKE2B 71cba995bc99181c7bee5ad99c3441301f12b79d4db3491d79df3c89f06927ab62261a12cbaae0031bce880f817eee9d35b3e2a66acfd3c070b902f6db1c25e6 SHA512 36194e8bf58117d8accbd6d8dc52a6241d8c572c023db1b271db3b73098652a608da28134865099792fbeb0a2f0d3705d98093447b64fa19eab7efb3e3bdd421
-EBUILD thunderbird-78.6.0.ebuild 29365 BLAKE2B 8e22ff9ab7eb9fd7142a6640c1fb7ab5de8c2e0df0cba1bb825fbc15f861e6329cc88e959449a871fd6811929c07b4cc8aa24b3529c716f2f6a12cf8942fc517 SHA512 0a8c671b75354acdebe80c3bb385ba16d3e45041a811d92006ee09361261bd9f73f245e0f592708c8224a7e50fce98295739fa11ce2eeed6fc9923445b8ce92c
+DIST thunderbird-78.6.1-af.xpi 548339 BLAKE2B 0702395342f4e20246550d4cbdf0a4733879f1f72f7ab430f4c6998ca8e827219d27e825f989f4534be0984d25deb736756855de02187f9cf9f6356cd9eb14dc SHA512 bfc97747475389b26dbe18bea983b0d211b98cfeaeaa8ebce2719b6d2da50a7b84d8741bd9df5902a0adcca95a9091b9b75c1069455627d6f2cb350b84e00000
+DIST thunderbird-78.6.1-ar.xpi 648611 BLAKE2B a05ef5bed6f66a1ecba92c7de0f192f43378313bfa2d59d54506f5fb80ee8ac5fe1d0b119a23f26a3769d8a29c06f1deb849728a7d18b04733223aab23090332 SHA512 fb6f5c18cff61b7ca52743425efeab85bc7573c21193ca8e16558cb91bf7b6e8b8be5fcd56700fffe55dce1239dd0829e55e0916399cb79b686526d58b0dfbbb
+DIST thunderbird-78.6.1-ast.xpi 561254 BLAKE2B 3936ea67b3466e7ad2e09880b85ceaf424523673fddf30bfa7526521e23461fe93bdc25b477c98a3887eb309372fd0361b7561c6272536859d18807d312f3256 SHA512 ad82892abe2e30ccaad2cc9b54bafdd245f5b6214f6f2aa854e3b40019e81ee25c945ec66fbe29ce8f737dde4e6b7ed8bc45d409c62ad9cdea0d0358803c2870
+DIST thunderbird-78.6.1-be.xpi 666677 BLAKE2B 336a83cdf448e47919b71ef1086e0b37b05612797f469c93314e74223e4b3d9cf6530e7bf3786e16cf19476529bafd6afddcc236a05785a94c6dff2f7742e494 SHA512 bf29d3d562b22123a11d0347786a3f2e7da7dc8bf2d2b1a299eca48e309adc6deabc7684f1b8a7d436d91cac151dc4290adf2850e95cf47c349d4427f303ce38
+DIST thunderbird-78.6.1-bg.xpi 672420 BLAKE2B a5809108c9939fc1104b93bc48d8365e35cc30d6478873968b23217deffb004830a76860bf3a37737fe3c883d37af99c39c7077cc6f8b0f8efb96c757d0aec3a SHA512 8b9af3134954b8c47d11fee37274011588a337ffbc3fde3148dd67794bab93da80d9814cacaadbbd5149f2337c4bb1ff1b94590ae7f7638a0a641c8688cc214e
+DIST thunderbird-78.6.1-br.xpi 604516 BLAKE2B 54c32341dd8d4e6379dbb5400acde2259968fcde2b6095beedbf0ff36ba832dc9159ffd0c08c43bc39576d7b3d8512c6641133feda67e82235e5523bd6ac422d SHA512 a387b40d6cd90e790cd20ab2a57ce5614fc43eae1027c54fb83bc205c42445edbc0d237d253c853c58e2cea8c28035f4063e16a6aa9de0d3e27a57e87b181b61
+DIST thunderbird-78.6.1-ca.xpi 620452 BLAKE2B 5ac11dde1bccd137f370d3c51a80dd2949d52cd0e39ab1d5738a7588e746782f18168bc58ecc702a48d911cdd54e088a1e6e71a75fc84effc9a0d85528186bad SHA512 f5897c4e70ab96a2939c663db2b74aaf868b242b9792b3c479c6cafeb0730f98a590689c9c17cdfd127116099b27386e876d7713c9450cfd6d52287611922404
+DIST thunderbird-78.6.1-cak.xpi 635652 BLAKE2B adeab0e29b19555a93e433095e574d370835d6c53667862193d7dbf2e2be2bd3c775f646f161cab68d0eaf7730dd1b4c11acea1c72b368bdeed586ea84a1f550 SHA512 328cd44e49c13e301a59434fcad9aff773dbda187b0f4614494d28bc937ff9173df313d183265348efbc236bfa965d49b4fd1493a99435aa441bb0bef4d5a720
+DIST thunderbird-78.6.1-cs.xpi 635338 BLAKE2B 56d68b02b75d09db0f191736a543bbbcc7ea219ac247dad89ddf4242be97074ed3078c90970d574a35230803acb01de67cd4cc98f3b482a97d948ce4353ce0d4 SHA512 da8d60da7bd9d8e84cdbd9aeb071568c28bd0e963b4dc011e94e08480dfab320de859bc95a2e91b48517b0dfde67177382f528a421da045c487f309323f8b338
+DIST thunderbird-78.6.1-cy.xpi 646247 BLAKE2B 5513c77cb0a4b1b024a657abcbd6b5b83b9c448910618ddda61be6092fcf4e34b935d877c68cfdeab8f7d716a15ccf183c697c8dd17679e813f996f641561f60 SHA512 ce4c63649e81062bd060e2376167b1dfc8b2e453aa66e458f43c6c535ed510b2ccd084358eda25e78394b76d6fe14dcc3bf260ddaffee099f8f4a510811c79f9
+DIST thunderbird-78.6.1-da.xpi 620995 BLAKE2B 1abd5047f1d881464e5cd79bae249f3b72d7b37fc56c4533cc8a69c2dcefce87bb0828563b2133a1ea75cbb20b7c66b007ff7b87f0352831f27878335e118d8e SHA512 ff925fa534badd6114d97be8baa18df9907c998424f0a9bccd6b7363a060d815899357bdd71915e18eb34bcf9ab4700d97b4dbb6c35c751009a173eee9817e8b
+DIST thunderbird-78.6.1-de.xpi 665196 BLAKE2B 07a2d1b063fe37c04bbd9fec2b759b2176ab799979e18eef291c2d8880873a489b14ace271869f5e937bdc37824c7c166df7f544ff8d36f2234f5d188590a086 SHA512 efce8574a66d6e90b8487fd3283559502829b5710dcfaed6468026f96a2dacd9e41e1658c11183a662f8196d5e0489ca5d46d7fd7fa3dd8be8201c1fbbcc2806
+DIST thunderbird-78.6.1-dsb.xpi 666775 BLAKE2B 61427ca4c8aca1481a864a793bdf7c71bd06ac9e248efcfea5edd78727c2e0fde9990c2403ecfb3a2a2425d0c9dc4a540cd36f5fdcbdd5b754dcac3e7718a951 SHA512 66ed6a2d26271aa2adcc5f04ec45bfdd4bacde86cb74020be185a88acce4bd5fb31f366d9f34d3f5007dbae3041bdf7560ad7efa1b43ea323deff225cfc584b3
+DIST thunderbird-78.6.1-el.xpi 774453 BLAKE2B 1d73f2d543f149e96ec6892140136a472647ac4bd8b4030d319a7618655dfd155f006ad1e89d39de25575be9dc559f3d81c0ed767f080e28aaee075471179c12 SHA512 0e779010192f96f7dfb260fdbae942048a15a635682354c58e9f7ea88d4a5b9ab7fc89b891e9b83f0cf5542318a16fa37bf6c823bc0f55ab1f4d9a0423fa05eb
+DIST thunderbird-78.6.1-en-CA.xpi 611775 BLAKE2B 4809d1d9dc86fcba7082fd4bb888c924ecb6bc70a707d1b31c9582d5eec3e56b9722e2387c5ffea7f929bfec915f5eff9e22f0c6b1695143e0e112895b771e1e SHA512 ac602e248abbdfe66858b544fb53d6c38d11988682617b6b21de0aee1c582cb9e5c7b4c7fa735087d29a857ea8e794501cd96118aa68dccf2960c7aa2e7d77a5
+DIST thunderbird-78.6.1-en-GB.xpi 611185 BLAKE2B e7547970744420a2cb241476b85434a84bb221be6956c8583c2dae687e938176ba299bc27fdeed8a97484beb1ca84cbce6b823e2dade43fc862f9a1dcc05ae83 SHA512 d8f914252e7e8d9f3267d1b85f8c798ca42e1c9eceb695eaf3d6b71bba7794ebb12e30ea15523cdace33ad55758f504ae6f4ac91571d7bd95f6bee67eea96824
+DIST thunderbird-78.6.1-es-AR.xpi 657784 BLAKE2B e29522355346bfde7bf7bb43014f85a39dd94623e5709db7a9fdd2248f4b160162acb17ebb5251585f5992c6b9d938e69b3f749b4331526efafc21d0efa79caa SHA512 8459f2c6fd57dd4109b5d41b412f95e2caf3f76b7005a2e45803139d16d0c99301ae123fbb8ce391cd8c9055e5aacac1189698ff8b9ad05e0d67eafbc7dc467c
+DIST thunderbird-78.6.1-es-ES.xpi 569804 BLAKE2B bd3148312fc5d2f44ae80a337dc55beac789d3982e15eff889df368992995aeb6de0220fe59caca85cba9cbf941563331918e4ba4b1dae4194863290cf22f425 SHA512 940ad9cd539159b6f4a15213274e2dc202ca8291883c8f7cfcd99a4c057d704c87061ea43a3d05ed82cdf6cb15aecc232befafc922829e0060c5579c9d07711b
+DIST thunderbird-78.6.1-et.xpi 597719 BLAKE2B 95572389dad231e701d890f4e59b450ee629ba99375e2764763fc87cb9e8aa035bc7566537db92f6f0b5518a77155614d4f4f0ab72eb685c0cb58e1f86b0efcf SHA512 aedb8a69cd9ada611df998fd1ecccfd680673f55be6b67f145680b53d0ff579ec8e5c59c04ce2380723ebe8159521c32f93cfaaa66467757faec2e2e60a58bd8
+DIST thunderbird-78.6.1-eu.xpi 632967 BLAKE2B 00eb014ea22a8862cec1033ae6dc047b4a0f08251703119f0fcef6efcea1758f25aeb33271565c6ffe19edfb2c06215251c9244b595bb1a54463ee3d15b47055 SHA512 f201053409332ddf4795c6a120c8b501975b8b56d40de724384630d48fbdd5cd2963285c34a434046f35814ceb3935088e51b3be002bd6ae6f9fdd16a3978330
+DIST thunderbird-78.6.1-fa.xpi 639744 BLAKE2B 9e671dc6a7b93fcd3a7e00ea73d7e8627b93576184c9deb0ca942fdc0dd5d6acbfd1a4dcda365b5f8d0e56334a8c51ed2fac48c83a78fc57e535cb30df5ae8d3 SHA512 397b97dd85009fbbf97a3ccb963f92f06bf63248d6c32b078165f9ea0a1484ae3c202b899542f4556f25775c24ea2302465a31d6e93d4349f1b75c74ba81b510
+DIST thunderbird-78.6.1-fi.xpi 642451 BLAKE2B b6ddead26dfa2baa47cd86bf755299e1540f824e2f81feb0d401c9340371a770b8f632361f92cb89d991ae576ecc6be03c37aceb1b754c987c7f858efb9cfc87 SHA512 0ea8297cef463ac11069212bdbfb4dfa44789e282b4b1c54ce152786aeb3f92c72196c4f376fa0c59045136e224e27bfc44ab06b6b45259c2d2a2f7085e83510
+DIST thunderbird-78.6.1-fr.xpi 669501 BLAKE2B 6465f98d2acd0a178a419e10b80a89be4eb58904776d914677afb8f08c33f7e56ce3cb2775977a484570f685d675b660bcf505eca0dfb9a27ebcd279ad95c3b4 SHA512 a389bd39e1ee0d0bddb96e542b3bfcd3ba708b32b9a38d95ef6a076f0f2abbaa504c243d46abeb71ac2aba28a45864b8fb1c24cfc6fbbac84d124f6b7a52d09d
+DIST thunderbird-78.6.1-fy-NL.xpi 653079 BLAKE2B 7c1d759ca0a088585a0d4d1cbdbe8c0e429ddfaca5c299788741f3f79dddf40c0aaa1e398df76e3768f61315def9c2911e020dc9093ad4f8f080c64f9cbed62d SHA512 11cca649f12a27e54749342cbebbfb8919ef30a28e1e78672650b7efb45224f23b7b0c1af3c5341934b6cdaf27bc4fca9e44252ef3eb6688bf403c15946505fb
+DIST thunderbird-78.6.1-ga-IE.xpi 600706 BLAKE2B 5c4441b31c77e8654f4e11dcda00ad4c95a6b630196d8a10e69d729ff4a65b33c213ffdcc7a447020df5696bafa03e11e998aebf459a93b48ab115855fba2655 SHA512 fa88b6d97c4a210f040c6defa1c834af6ff49912ac5b5b38f908809e8bff59c1a1cb1f91f80feead7e66b6035a6e8e98c220f1de84fb3a782cfe4fa28120c4c3
+DIST thunderbird-78.6.1-gd.xpi 609380 BLAKE2B baf66f4879a0b82da4c8a10760f00132eb675f833a8d9732faebd29f6bf881fea5ab86e06d9b939c2a80ba0415d38d530fef26130d8f3e724985eb9916540e41 SHA512 0bd39f37e5bceacd0690ded7608501d5f2173fa437aba755ca51176d73e3a82f7ce5cde0ecaaa6b1199e2604ea497bc03f67f4464a165bf3e26de35ca623ec26
+DIST thunderbird-78.6.1-gl.xpi 615719 BLAKE2B b852ab7db18b6e35b950f791dab91937e5678317545c4a1982e4c9335594ae40fa2b15d829374bb1d3d042184758ed88b7fdb28d12ea363a7a35667372d283d7 SHA512 2a6009e9e596ca41c47a18ca0a804e1d7e58a10ae240c22922faee209bb597d382531dede9bd317955597c625aafd47044adc5827e92a8fa9f621b2ce265de0c
+DIST thunderbird-78.6.1-he.xpi 640493 BLAKE2B 9adbfdfd9029d7f3295a08643cb802e261631ea1e6321d8cef9f18911d92743513325b471c2b3de1350cac50f13acfc21bd38a218ce70f715b13a9ea755f7e3a SHA512 0f03ae87b60617167158a1b8863701473e6ef03bc64769d83edfddd1912deb43faac2de1ee37c75a697e69bca7b8d06c3a68b0fc6106c82d7c0a91de685bd360
+DIST thunderbird-78.6.1-hr.xpi 629032 BLAKE2B da9d0856bd33a7b12081c329e3721193256cf77e11d9040419b27101d2e3713a86049e164480444c02bbd1c02b0fca6337190651b1bd8fec698ea0d4314e1b61 SHA512 9f95d9fb18b66bfd17091148e3555e4868421da6aafa152b2d5de9928250c6db29a294accd2d3f8c22349816da433a69e77f2f80b471b1673d64af485e081679
+DIST thunderbird-78.6.1-hsb.xpi 668604 BLAKE2B 1fe2f5b87fd387d4d94eecde897cf7e6639aa2e4ae09986be96d6cc4819607e01f84d9005dbdf765d5e26b65cc0431d5ba387e9be1b713b1099fb23c10f665d9 SHA512 00a98a197217f26708222701115e9292aec43d66032931465db88900d64edf0208ca4b4e6b418713f3d82a3c813fbabfdebcbff98a28223c6a91d69121569418
+DIST thunderbird-78.6.1-hu.xpi 679840 BLAKE2B eb2808d6901aea571aff052b0357a433ea40f6549d9733d5b9c619d94a8d506a4a5f614c9c5de9365ee0bd3d828ea12f5e72cac0a8dde6b90d8698dcd2a2c926 SHA512 4f8e83923e66f00913a4e608fc7cab4686fe0ab78568ec03b6c91d723c1602226cfde9c88fdfdf0fb627db02d065f0a790d3c4dc823b74b184853f6bb0a85789
+DIST thunderbird-78.6.1-hy-AM.xpi 713330 BLAKE2B 4396a7d75a7d52baa25b170f01c840db19e9ff9cda1cbd7beffb8fd889c5f9e416623b3cf34513e70da12c164a97d60f2b6bce43edb45f8fe10a208b61389932 SHA512 6f6dabc061f339d0d90a34bcf3ba46f7dd0f391d985c9ef14ad082cd8b3a1f3a0c7d93edc8c42a98a2bacca6a1138e905d06e137c38ddb4ae7e75b9ce8a01a00
+DIST thunderbird-78.6.1-id.xpi 620682 BLAKE2B f35b50df580212c552474b81f331406970ada902651622639e636bb9ec0184f26fdf7804645b98ad9ef548afe1323617271fbccf484df9cf2c8a60107ee17d16 SHA512 215658eac2eb7b51431dd7a065b90fbb62b0fd3342da9cc1836a7445661e06ede0bad2c491a5a019b991c4cc7fe5272cb876ec4b16ecf8b367d8ab9d455669d6
+DIST thunderbird-78.6.1-is.xpi 581649 BLAKE2B 388b0c2fe807c2cf5aa31e5a57a1e44b968f059350b733303d3df8dffd56c5091b38200a4d6d75cc35eaca5832142c2d3fffb3e1bcdb19999371a36672f72417 SHA512 8d044d733442a48a8208576f547d63f29b8f0c292559e7f10c8f04122e2348a2821bdd4b9261ae7fba138a9e96c480f890f1dca6a4b630f55300d52ada9288bd
+DIST thunderbird-78.6.1-it.xpi 572958 BLAKE2B 0b0c0115e4169087c9fd962085ed5232b02764185dc4b2964d40cbf3ccb9f35fabad1baec24e1593fd9dbf2621c01291c4306aa78d871a79942a60a9c167822d SHA512 48ecc84509128aad59d90a88bd9f89b67be1366ba100520a19356d8c4afeb6d7498bbe838a718b4f2a86429455290b71bf2fb2f36e0ff121ea3cb29731fe683f
+DIST thunderbird-78.6.1-ja.xpi 722446 BLAKE2B 92b66c92e1eb9e6e2960cef8302cd7098a64064feb23f4a1e506fc791e7aed33ec5f1bdfddbb70fbda1f7fce0e0f9fcb8d0cb7e408a82a4b13682717b1b307f5 SHA512 7cf6b2ed3da796d89ab73bc7db2ad11bba96ef22e589df9a7ed6773b591189afb94f594b4af1175fd2db46fa369e17ed4527bb2f1dda46fe2dd7f58f5977952f
+DIST thunderbird-78.6.1-ka.xpi 717016 BLAKE2B 755f14bd03138a00be0d863a0e04c01148fd0691817b42e9d26bf18ca3d347b980faa16e53d419fcfcf382447cfeabae45ed7445ecce841d336526ce1b4033cc SHA512 58c582eaca90cef841ee02224412c2c1016a11d41d0664f3f37af9a410b7d66ae16c9e1fa4e6d1a8da0e33d61c63ecacb173d69037f8a507889c70715c9f6696
+DIST thunderbird-78.6.1-kab.xpi 651926 BLAKE2B da0c1daa58b1b6b9e2f90b4e01a78518d4db7281cf2f48eb10a0c21422bb90bf6bc3f8f318674c6c8baee2a321a6c901d1a837a72751e9102b0710ff9dd7f3da SHA512 c4cb1f458e82880e1097233864cebf5501031fd3172a92c2c824d604d6198d87255f658768119a837354526ffd2ae6c3f2d41229c3f548bf52f95d997bb497d9
+DIST thunderbird-78.6.1-kk.xpi 720461 BLAKE2B d4ae543c89f7577091fdc2c6d7b8fd3863a69d6af94e5654a73db57ae59d1ec646d47ba79d5e5d00feb4900f2dd0321f2f0bfc53ea6f7d2f3971b8fa82a72d56 SHA512 0a2168349dff87f315c8e013456659a2e341c342cbeef251fd86cf79ac3a4c7eab34da706487aa5d2a94e5abb92c8f5a8f1923c72517f0a74f6624137aced024
+DIST thunderbird-78.6.1-ko.xpi 688201 BLAKE2B d863d005de32c8aba1620fe9af86d4541cbd070f95c508ddc424530a7ea70a37c5bb02c75b7c928182f24c9404f05942f7d52067bc084e4bfc7a85ad3161047b SHA512 a4701560d4e6ba8b52d8cb6528fcb418cf37bbfb114eea66c07daafcd58b169d553e17e648b748de2ce0f01ce30c40419bc3896825c6f88cc1193451c6291cf9
+DIST thunderbird-78.6.1-lt.xpi 660301 BLAKE2B 407856ffbe249cc3d937c69c4e6704d9b3f0e30d055c8587a808f0c1d9971a481608d63c66daf490cd911e12dd225a51da7dcf8214ae8cfdb208085e868f1583 SHA512 2508e9fa781696a0c2cffd91563b763e9d5a9a2896d14f999c0787b30001a7519e6a060d1ec4e852d1b7c0349ff026e7d14dcc4eb2fc8df020fd70dc37f8c7b9
+DIST thunderbird-78.6.1-ms.xpi 572179 BLAKE2B 74fa5e42f7d749790841f1069a5faa367cc08503242c45a0026b2a3f71064696f75945409ed751382ec204e8b4f359fe89cf3eb42c02a6c8ed1e3105e2bfada2 SHA512 678c7419a5e1652b1a763e1e4eab3639813bbdc846f957166d1a5908233809d9752ad7c4180edc44222f26043bd8b16c3687e28718d37371c25dd62820f36d5d
+DIST thunderbird-78.6.1-nb-NO.xpi 637239 BLAKE2B 57f4128672e57e5fff83d44617735678e3f03ceb01ae79fff2038b64fc5eeb5f99169b9c460ee143605c86bfa7a350d55ce66ba90e4f334192c4433711784295 SHA512 bfb4ca357859d7b467eee75951ec1cc3490e8f6170943aa8e6ff95770d23c8936d6bd288fdb91e3a308fb469313e7cd685ddeba65570329b29aa831009392b08
+DIST thunderbird-78.6.1-nl.xpi 644355 BLAKE2B ba15ff1d565070d193548b2a1c4f314e4ec2b7daa9c4997dc6f2ea53e2256b5d9ba722ffee2accb749a989a211816a600194c640a55d67478f7cebde4ba5f0ae SHA512 175b03a3f94842fbc48c75bfa0e3ca1cbfdb0321f85b8e590f5511c41624e6fc9481c8e51e91a804679cb7c4a50bda7ad4ba8aa828af6550efdaad46af293a0e
+DIST thunderbird-78.6.1-nn-NO.xpi 640695 BLAKE2B 1aa628452c0ab95b15284fb4c5d73f2ca1f648b7f4da760bbe0334bcb05510fb92dc7a244b0d84d7baaedc75d08e287b667777e479035a9cc1c92c2559a1be5d SHA512 65731af02f83c88634f61371c1872413db969d191edf2d070d065c36f5bf0e1c3e41d88d5c417cd64f559e7316105711ee17b3f1aba057fb06f7e3a4f88f8af8
+DIST thunderbird-78.6.1-pa-IN.xpi 633219 BLAKE2B cfe1dca9234802ffa991275d45009143fb8b0fcbef77a98b342fe3130874e7d91dbf2f7e1d5ff049fe388110c86d6acdeb1bd18d982587842a7a9346d4cfac58 SHA512 13ffc0570ed34caaf98d6f036273c26945151c06d16558e263a7af85c409caa2ae3f3d62930c57d8bcd4d4e0494d95ec69bf1b5793a6c7ef404a8cee06e0cece
+DIST thunderbird-78.6.1-pl.xpi 637125 BLAKE2B 4ff7622b19e6b39e5eec148203d2b721f25757365e75cbe549e4619f9b952ad6e59392c58bc2a92af96fb7b2596dfb5704a0939fe9dad1d24d4d3da244c1831b SHA512 f748ffe82e2aa2df04d9820ad0d7b74aa59b65e1ea14060e5aceed98908ee4dadcf7818e7345653124b8e73d3926a281a241e3bb289d72b64857000286471a45
+DIST thunderbird-78.6.1-pt-BR.xpi 649402 BLAKE2B 8a7aa938e094feefd26023ccb8267d3b34b6b4d53a5df5780c530c757bdc8a8327cd13ce58582c1c86e967d88718c4a275d65ee1ca4a2618a1e416176ecd90e5 SHA512 e34950beae7c93f46d0e7eb3cbe5f7e21c1b19769ef84b25525493a728d8876a52ffe72c6bbfe1176330ac0b4698a9f68f5a373e031db51b2d6d4a27890dfe65
+DIST thunderbird-78.6.1-pt-PT.xpi 655494 BLAKE2B 41084fb4b7c6dabbd684d05dd9735309d16f9af0bfdd3861606100076d8d355ae80653412b2844c6e9e98d51c7a00b7380c0fa754213f3ebfe02dbae480de219 SHA512 083539a904e0c4ec1b5adeef705c51b8a395ad532539f796636ba6f0477ad768ed861a32fe3b834c9539fd0daa7cde9fa13fb946093f672ae4f4d0308e0b1223
+DIST thunderbird-78.6.1-rm.xpi 646521 BLAKE2B e3d0dc6a8365842657d84556fe485d8f89490f0b020830692cd498a3e0e905d37e9a58aa1d1899d34932309af2c4c4127b4d0d55fb892b4ae6a261eee00bb303 SHA512 e94fb8ee4e9884d51fd6f43268ff7b377c278bedb18d077388e6bc46e459905934314d22f0b33ecb54d05e22a42f0c0993f8b972a6c232805003b3de4ed0004c
+DIST thunderbird-78.6.1-ro.xpi 662634 BLAKE2B f8a66affef0f4a866af4e66478de1559457451088d8fd31516a49fed4949da0625c008935bff5cee6b33fe116d490777ba990f79a3e2a019a31cf5cfcfb1b31e SHA512 cd732df54a53fbc6e856d50da27defe258c41159e1e7b3955ebaa1268b825f6848802989877a68a9a3be4aca40824b61875fc5d6206d2c3d702d04ff47ab7b59
+DIST thunderbird-78.6.1-ru.xpi 756186 BLAKE2B 1d21b03e163225a2f0972520bc24545458c0ed78ab474facf0c50b06be522270221ec166b04ef7ff9d8c29ea6178b2989a5f7cfcd79d6999a7ac182a5d9b2935 SHA512 f57191febf197b514f2f1ad3dfbc27706138e8581ed9b29d1ced54a3cd0d71c504e8940e5b63f79c1e6d0408f3188c4872613d54fdb58a4cbe0d5715b223d742
+DIST thunderbird-78.6.1-si.xpi 651110 BLAKE2B 9b967bbd9b85293b1ce7e86ce219899ea7c60fc51fa6782742df2d272b785c5714975aefb3a0a639ce9d44f2541c4e3439a37368625dfe89bf165afe3fa58c41 SHA512 25d2d800e99a0cc04765ed86d9d91fa524d162de8b4233e9cc8d05a36762e97d3136c08a987d8985c90e32dd1b5a2c60fa81c4da6494b42781defb7d0c47a762
+DIST thunderbird-78.6.1-sk.xpi 643228 BLAKE2B 8d40464edc6cf813191680032918e21a8fbd46ba21490fb35640ea9a4edf3fc199fa12d31686b2237c3802ed98aaa40c222d1dc90a07bdaca7bf2c774fdad018 SHA512 c9fee505e42461dad487c65caaa9bd6d35287ef1ebabb533e30aa6669c60e8dfe49a2e7fcef80328626f6a64acec9a2af132c188b7a918d11c17ef19328acd2e
+DIST thunderbird-78.6.1-sl.xpi 632384 BLAKE2B 9fe5c5f7fa8e5bf2b3942031e70b1081e9ee55fa35bd884a4f1a726f55782d39ee17920a30618795596f3ca1e76f2481ada13572bcef6c43e1deb3f138b93bd9 SHA512 e7bcab0ac1cfc5c7c603f2d577d04e1e656f3a4d5a8be2a3eacaa5b067e1418bc3422417223cebcc00316158fd893cb9dc30213a0c694e832270d464f381df5a
+DIST thunderbird-78.6.1-sq.xpi 657825 BLAKE2B d2877a33c89b886e15eb29a11285c972cbefbb32047d918c5d8b7fd421aba884cc3f596eadb9a0aa7d4150f719d07df6451d6375b959bd00335656e30f7387a5 SHA512 52e23fdd381917aad0702b12315b0af1082853292864a4b2da65701b37fce29ecf18f34a7a52802b8ff3ba134b3e0742ef6f3a1ae28992723a3f220f253884e4
+DIST thunderbird-78.6.1-sr.xpi 683111 BLAKE2B e2ffd2145eea9fb8f49ec367919fc93fa13612d7ddd16358e65196813e877794d45873eeb13628bb2fa92d1b438298d405954f0dbcbd6302cda845de26c13397 SHA512 edddd2722d5488a14d0e35b23f23f4c310af72973673d60dd08c060b3663f686c83f360a50985c09cdf986aff74741bff7ad7dcd0f095b577160fa262ec779a2
+DIST thunderbird-78.6.1-sv-SE.xpi 648863 BLAKE2B 7f2cda06f7705504162ed9cdb95fa91901df0547225f8eabaa18b079a300149a46ac99bfbe41061553293178f50bad1c7d236d9e3d3c0a879b37895e86e96daa SHA512 9a650043ce8d457a383bf9179ab2049e280c5b12d32cc5056e1f84c2d2d4ea9819924123d985fc918b811f6bd28727b5613bdc8a1182d2ac2cd61e7473c1f656
+DIST thunderbird-78.6.1-th.xpi 712033 BLAKE2B 160826bc46de910002d69535956da25cd368e0e5ea7b71fc8ad371d3811210e55d8ba2b66f967757c7fbbe757cff815ac2257ead3f53112d9019a4067bde7ed3 SHA512 50073c9a5a0278e91fad3beec27aaa37dacb2dc5a54b63fd2795695bc57c26158dd1cdb60c384d004f1de026a1f91a0e1d2d53ff7f4b5963d1fb53d52ddced5d
+DIST thunderbird-78.6.1-tr.xpi 649074 BLAKE2B c6ff6ed1d9568a6af085601775c6c7c1b99cffac0bafc552cc34401c83cf79da87f56abf75a342aa71c36d9cb03ceda9b72888d398c560034447751013763734 SHA512 57ee0972642f769ee87e93d04945d4e0aa7c76c7abf1013d205e7b4f0c9f739594aa27f8830c84f1b6b8f6fee33c4ed34eb7075faebcf0dd18b94f4a0964913d
+DIST thunderbird-78.6.1-uz.xpi 586602 BLAKE2B c26dce6fe52528780f8840efa097392c2b08ae5e6bdbde60ea963a1ed4221005e8a6762cf298151b5b4d31a135190dbdbe1043418ebf58680075a5d1767f3144 SHA512 7388d41755c2476cf95a8e81ed5e0756a6ffdedfbcaa45b1627be339597de48f446a39f042bd9a3146cc9bc7dad5e58e649e0dec38c48d0d4d8027d371b18025
+DIST thunderbird-78.6.1-vi.xpi 674605 BLAKE2B 7db83cf29596b955a8a2f8376bbe3322d5fdacf84d661832603131639ddb4373a35f9810b2442dac4e5a920f189b2f44762c6e966b07e1c2867fde3528f115df SHA512 70b226b35e671956d2eab2d95cc15cf401f2339a74de5cacb6fa1de982ebcbb0b1642f83cf5cbcf64ca6b2c6ebd958f4aed33cf267ff7a52c248f6bd1ab6eff4
+DIST thunderbird-78.6.1-zh-CN.xpi 687175 BLAKE2B 08b9baf8e1e2090f579c7b1b480162654d4387a502e0ff7e74970ac737f1e1d0cee291a2979cb6ebe4e5baf7ea1245cba3a2d1d25612e5be5b33bb3be491d7c9 SHA512 d99d17ed9b4151c5cb948f36296f550110e953f912d5f7cff2133e8447b3eaae23b261abff356d81035d0a4624443f0eff71d34324c884d14d561893405305c5
+DIST thunderbird-78.6.1-zh-TW.xpi 687623 BLAKE2B 389a13ee623a350cdea95e00e6ed63f79f5096e846395126934ce5a77edab8e404aa77ac9ba6b12154a409c95dd68589eeeda4e5cd5dd792fdddc29be4cedf73 SHA512 e9f71faab7cfe04661298acf021562fec28f58aad1d5da244573c6dc561065a7c2dbd2e89dba965a31f279627b209a6d45dd109be4aa7c5fd5520b7828153ce3
+DIST thunderbird-78.6.1.source.tar.xz 351971732 BLAKE2B e66049bdad344a8aa1d95828fb257aad2fa4f425bd64abfb77629f0257d11317ab4f2ca9f04cd1a3a584dd9a3e7dd2a13c861960c72fb1c94809cebdebbbbf26 SHA512 672f9ce2716114e83d3feaa7f322a405946731d540b5a9781249eba951cbf865af73ce67654e1c47e93828b0d792c1ff6a36d7ce26aee7af7bfc8cd715a8f977
+EBUILD thunderbird-78.6.1.ebuild 29421 BLAKE2B c52ed7d3d8f8ed1233556749f2219f5e687df42960af5bd542cbb1cb5358d55830506d10e195083cd8857a12c0c4069f2fa3e2f0bd697c26bf1465b87fff4dce SHA512 e3e888edb35d8ec2fe708f81089872c2dbb9a7ab6c33ab1d333230e1034b8ac5d05cf9a1fc3a70350289bbc2ab8b6c5e399a140ce653e4ab2eaa74a590ebb8f2
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.6.0.ebuild b/mail-client/thunderbird/thunderbird-78.6.0.ebuild
deleted file mode 100644
index 2018e0ec647c..000000000000
--- a/mail-client/thunderbird/thunderbird-78.6.0.ebuild
+++ /dev/null
@@ -1,1053 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-07.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
-	multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free
-	hardened hwaccel jack lto +openh264 pgo pulseaudio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			sys-devel/llvm:9
-			clang? (
-				=sys-devel/lld-9*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current CFLAGS:    ${CFLAGS}"
-	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
-	einfo "Current LDFLAGS:   ${LDFLAGS}"
-	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-	mozconfig_add_options_ac '' --enable-calendar
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-google.key" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build CFLAGS:    ${CFLAGS}"
-	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
-	einfo "Build LDFLAGS:   ${LDFLAGS}"
-	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-}
diff --git a/mail-client/thunderbird/thunderbird-78.6.1.ebuild b/mail-client/thunderbird/thunderbird-78.6.1.ebuild
new file mode 100644
index 000000000000..5e08a3969843
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-78.6.1.ebuild
@@ -0,0 +1,1056 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-78esr-patches-07.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free
+	hardened hwaccel jack lto +openh264 pgo pulseaudio selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="x86? ( lto? ( clang ) )
+	wifi? ( dbus )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.21.0
+	virtual/pkgconfig
+	>=virtual/rust-1.41.0
+	|| (
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			sys-devel/llvm:9
+			clang? (
+				=sys-devel/lld-9*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )
+	!<x11-plugins/enigmail-2.2"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
+	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-calendar
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-google.key" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+}
-- 
cgit v1.2.3