gentoo resync : 28.09.2019

3 files changed, 61 insertions, 764 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 379237cffcba..d52f574fb382 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -179,6 +179,7 @@ DIST thunderbird-60.9.0-vi.xpi 637210 BLAKE2B c48d8004d269350410fdfa2f5beb4ef6e3
 DIST thunderbird-60.9.0-zh-CN.xpi 626309 BLAKE2B 81e2846b570804b0aeb2212107eae1ceeb55789a5d5fe07b4f9d40e43d6e78d2ff3319668958d2f2c28779e8c6d0693f2f61e0d761098ca73a4ab30b3748da18 SHA512 d82844d69ba20b220e88b6fd425ae355d1cc57c40405dc1dee6699454c87aa36031b1e9f08f85abfdcdf6371a529f0eee8b3b00bc8b7fe149383add59b9d8420
 DIST thunderbird-60.9.0-zh-TW.xpi 626217 BLAKE2B c6739b670cda85e955b53a6edd704568c52eb38c00d69a2f222e8b991075071183d53e520dcd716d82826b6d9e0af4db2dc46a732790c71e5607f7f4c53067ef SHA512 efeb58ffdbd53e445a2427035f1857d2b02c763e6f75eac58652fa72560a74e4036ec65b2352ed4633d5f54a0b5aa4571f7a582ac2fc51a92d127ff126cdbafd
 DIST thunderbird-60.9.0.source.tar.xz 286400364 BLAKE2B 1de1557420b74fcde358e5c69a12c78ecbce4954359bda8dcdbce405582116ecd6cfad7aec09ff2d949c443ca6fbc06d84f315674a5577b978635af56ff13430 SHA512 f59d48fba7fb8a4bf7cb160e6ca2508312a7fce950c12f133206935bcdb4c9844a9cb063aa3aae67c82562d2a51e123cc1f5bbad0238a1e5ce386c514295bdd1
+<<<<<<< HEAD
 DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
 DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
 DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8
@@ -292,4 +293,64 @@ EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b
 EBUILD thunderbird-60.9.0.ebuild 18269 BLAKE2B dcd7601e846e04d22be61c634cf49e894239b7f7d9aded8151208b0000e1ddb79e034a5d2704f7a51630f34927b21acfe1e607fe52b834afdba2cd681655e496 SHA512 979ccdbfde25c34fe7899e21b6b9471e36e67a1afcf44e2a26cfc50be5c4bb749f4c240dc5a8eac7d250af738f83e7f31e7e53927cb17655c2f500a3f2b68b4c
 EBUILD thunderbird-68.0-r2.ebuild 24610 BLAKE2B 25e89232f280eee07e53d267d7a4a366c848c0c4ff9cb6dd32d36de98e85a04f147fcdbb103c3fae20024df469e03e2bcc99c28f3dfb5ce322d8a8cf7330dddd SHA512 eb03c124da0aee6afc2a47b1d1e7d1a257ec527395530e0502a3527610fbdeff49c27d1cd8a47f6d09fb91cda5a7521dcf2b2871c77f9879bf8db5e59b474b26
 EBUILD thunderbird-68.1.0.ebuild 24621 BLAKE2B 0c8e14cb0808ddd0ff32e7a925f24aa49ad2f5fe532878e298068198999483a934e099414ac7159cc423a77dca5f87a9e2dc0587490f47bab0d0121f9517adac SHA512 05131c4d9735dc03253b43b59a9735e7990cca72ba707f97534dd3e302c42c367c8d952f013a294b4967b52cf5aae99f765ee8497a3e2c8bf099719504051eca
+=======
+DIST thunderbird-68.1.1-ar.xpi 617172 BLAKE2B 6f993edac7b6002602c28d42419ea94a7ffa8d8eca8b808dd904106c65cf1f3e20f9f5e69a605997be9b53dbbf8374f4120577ad7651c98332d40654cc1dd6b2 SHA512 fd40a8273777368ba6aec4f0bf6363cd223284fda5e56bd6611639bbfff1484313bde514c1f57c510b7d9cbbbca1995b7e802d2fdb769ce31d72be864efd60c9
+DIST thunderbird-68.1.1-ast.xpi 551304 BLAKE2B 6c581a2b3b225924ea3c9dbf9dc1469510ad760ae98a11598f498b8c158f2db91787fef76081fa8ae302894bbafa335f934fcf4bd8b95a6b527c52698831c689 SHA512 5cc2b589d7b4f5c5e00e09323417271cf08d505e12fc3b76cb9686d433bb0e7f2c4615e5f0f9d99edccd156ac63eab210037bce306cc1adf91b624b1a0eb0c3f
+DIST thunderbird-68.1.1-be.xpi 646286 BLAKE2B e1c3650d6033b9d684c728cfdad6834a6bd6c65b9d54bb5d36dd953ed12633e9cc610567eb25551a21822e5138d4e9add70d39011b8c7b396ad534767ab46996 SHA512 473615b00eba96ad530625d945d1eb997fe6c63264d5d6cfa0c54a359aef3ea3d41ece726388cae52514006156419aecc986803fe62d0e90bbd0185f1b90e617
+DIST thunderbird-68.1.1-bg.xpi 646232 BLAKE2B d0a7dd7972df80bb775b02c675c83944837a49c6ab60654a8c9d68a568272743ec1f5e96aead8c2c7bf1624e8d0b67574749739fd8f3e167532fc550cdf102e5 SHA512 073070545db4b3ea43cf2d87490873acd3d193c4657635600ea761cd90206ec7d0e77618a92524729391c0d36167945ac406be51f44e6b1711e830bcb2b2aecd
+DIST thunderbird-68.1.1-br.xpi 574857 BLAKE2B 15dac462709b24dbcc89d36fb5e4156a73f0d61a166fb470a0a98ca993004cc5be8bd2bd1d39fb0326820e682a3ad79484531c2f6027ae2a0ff78c97f0999b3c SHA512 a5e48e25e81d85082f9bf5e77d8788eb08c16473dd1bfa8d778bbfde5e36fa26c6194919f87f04d5ca50a8524c9ffc5027f708441eb3519ac1db4a5c8be546ec
+DIST thunderbird-68.1.1-ca.xpi 578444 BLAKE2B d6ce3e565b0b0f165f315c8b9fd7107e2f26fd02cdbedf2f42402ac7652505ed6c9ca6a6e2cdd7a743732a3abcbfec7dea99fdbe590603265b6a8caffe0fe94f SHA512 cdf78901cd803c4b3931bc5d93d64a444d92ac8d9979b92f8ae80a7e9316ce8fdd725ae647b7b1d6053c0bb72f9764b615bbfcb72de4e6c92bf3186bbec0130b
+DIST thunderbird-68.1.1-cs.xpi 603047 BLAKE2B d5512055f429ec6d2607c40e928a23b5712945f0a127abfb122111668482516fa81d6371c6abfebc43341d09a31bdd33caa126e8b79edd348faecbe88073a078 SHA512 d6908a99cf69ed5dcd90b4a3a7bf6ccffc2264c093f3626a41e4fcf95a6ce6c5900bbbe4657f02041c1a511474941d26f8bcc775ac8ee732c4e0eeb995a484bf
+DIST thunderbird-68.1.1-cy.xpi 589907 BLAKE2B bb2e827690f571d2d25b967f448e6737a36e9d634bae9253b034b29e3e6091820fc25c9e5c01ef0d1d623d7d4f514d878831215a6af1fc579abf453fb40319c8 SHA512 7c9a4a7278db44edbb407de693be56e223ea857be58a801b7ae1fc23996ca82a117e7cd405b3398fb1397497e0b927114ac77ce8149b0fbca4576aae97f10a21
+DIST thunderbird-68.1.1-da.xpi 588355 BLAKE2B 07c232302dfe6dc32080ee0f8acf653ff9df3b3b73d3a7c39059ac1681ca3513fa9b9502d62727f5cd70016b6f5d80a8f260db9a483b5838f9d3765cc4be279e SHA512 9cbd1b7b21f89d5b17f305efc6d09e733ba7dbc2e97028a9eccc1ec1b3836dc80a2a13c51ae1a1f65f8da32b4bd7802d43a6f8ffbe624a357efc64317eb0c050
+DIST thunderbird-68.1.1-de.xpi 597809 BLAKE2B 793d1c87744d49de27603fb1bf8890ec88f2aca3984a8962f0d7c8d0e150d1900c31ef0bbf5dda82d1e8650eb5d42dadc23e74a0f655e9b0cd52289249256f96 SHA512 8ec2df0f97f79d34344c07009a48ff85c656efb37f4dcd31696a35183f4dceb7d3b42d596ac724f0c20d4f8f35d077c69918cf029ae4cbf1434d9da51f370f5f
+DIST thunderbird-68.1.1-el.xpi 699227 BLAKE2B eb40fbd7c52261ee14cc3f00cd588fd74231ceb5603c8e20f106d9acdbc72442ccc4e5854b9e4dcfbe41bb37a95bbfaf2c110d42e6fbfe0b6c6410f8dfd20182 SHA512 2928575f630e6bdd7882c1b268f6586f5c34e9039c56c8ec3501f960c0f7bd0263203925d5a8abdf418c2e20cf969f4fa75cddb932c785abbae3eb207bf52e9b
+DIST thunderbird-68.1.1-en-GB.xpi 556408 BLAKE2B d7dfae4bbb1fd39ec05d77178984453bd52777bcfd044aa4755db6c425a3e1f6136e5444641f862e52fcf383cf2159febcb014310d27406f79ae6a022022f883 SHA512 610595806a5dd9495faf3d7ac09c4413724079dc54ab92eab251ba1b81fa4f2e9f9ef445930b49d2d163457a830d6ce25e1ad80986fe2e01ede119f9beb9778b
+DIST thunderbird-68.1.1-es-AR.xpi 596556 BLAKE2B f6b1567c75c6c470d262d6ba47168fb1987dfd3ed37e23d5737870f9c2e8b178ac7f8d01f7e6ec795c0b16083b0181b5a75a9a33d787e2e903108d044dda5cd5 SHA512 5a1a48d8abd5e1b0a1392bcbe14476a0d0c0f97c10079e7c7d67a2476e8eca6068d47706e95dd840658c24f97ca259693667731c8a192553aac5a8764d1a0ba8
+DIST thunderbird-68.1.1-es-ES.xpi 518356 BLAKE2B 87ac72254884bfed7682e45ce8e846fbd70fb0e635dbf86745298313783fe27ab3f8446429711b1820d18b671d9a1ec20dca8281e7c961d24da12eae2dfdf846 SHA512 381c1235d0494cc5561c0dc5bddb4211faa8bfc3bedb3fafb6961a57060d2d65b3733a57eaeefb0df846c653f65ada5d26a8d5901dba7389fb0d9dd2feccba7a
+DIST thunderbird-68.1.1-et.xpi 573586 BLAKE2B 0224f28e33b6ebd2609d1805377f2982669085e3dc1dc58f6ebce7d7a206991d906a42f40248c1f9fa58aae42b8a82c31f02e7e6d92995dd9f36425c3d37c60c SHA512 d59436d2ec58828303dff0138ccce6bb683d62130f6d1b7c652f1bd157379edcd8dcd1af2d6c9fbd297bc8c73a710cdf6f31552bd1501433a237106854ea81df
+DIST thunderbird-68.1.1-eu.xpi 579950 BLAKE2B b92afba24f4b6599ba9d8a4f1288b6d86210e2fe8dff15d5242c70a8cfdaa0f0f9a20739b171a815a3e50b6bed556e5a1e10cadabbf859748518f71172cbe40a SHA512 ad18dfa52dadf6c216d1e66364534204598b7c30176de8e2be48291044d4d89e109a2240c4cce9f580e55287c9ef84f8b754b96b5623e0dddb17ed725bf0bf93
+DIST thunderbird-68.1.1-fi.xpi 578422 BLAKE2B c1e9a3c4705fe6964a2f0aa3cea6ac02a616c0b0138a0d656879d5a6ea388a34cbb90d75836a048485e079e54c55fd27c09c9bc9aee59e899f57216e7de4c8f2 SHA512 ac95158d2e607af7baa12dd2ad3499803a417238ecb337ed35c57c556279c5d890201b0771c2c1061e337e2c93f2d928c4a3bf262e146a18fd4815b2ae38a5ff
+DIST thunderbird-68.1.1-fr.xpi 607815 BLAKE2B 54d54c57a1bfaac21687759ae4c0d0760c77b2132a479a017e69cdb4967d384933389e5bd81e4d9602486aa5b35c0f6530dc1e2f95c0dc8c175e4feb0d4fe139 SHA512 30cbf80d3812ee65ebab393606cb0a67a2ee798704f5ac5a4270b8d149e51c723688a88aa0e39943447a42dc0dc9b4c286dbac262494f29e1c495766d2e060e8
+DIST thunderbird-68.1.1-fy-NL.xpi 594472 BLAKE2B f29cc1235ce2564e7e7d365a34f01603102bc775162efffb87eea4210d3a01d50022ea2fcf39f6e81f2ce91c569c8898743eeb163dbf244a1e4d83c55f4cecc2 SHA512 000238e2d826bbd1d365b3d57b80f6a89433c79a6d34593ab37daf2f37147d56d8056482be362fe6c8a64ebc4dbe437141cf305fbdf56efc2f35f9fc568301a4
+DIST thunderbird-68.1.1-ga-IE.xpi 588715 BLAKE2B 6cef363a1e07e52a7ab7fa5a1974a12fceea6857191849da94f85a21992fef64d5cbdb9025ac5c559189e6e24eec4f1620c0041481c1f58d1efaec8a4b1c77f6 SHA512 f7ac2939fa1a7cfc64954614d50bc9b33a50ea956cee1aad656d482f51f37f85dbad1f5167ce0019fa6c9c97d3e290074ab67fb875948580065e2d23228670b4
+DIST thunderbird-68.1.1-gd.xpi 587114 BLAKE2B b24cd419592db23299699c7205f944ddd81e6963385a2368d2fc4e3d3865511fd3c9ac64a2b6417b7e074876c647af59931faae24fa485f2843164cff937383b SHA512 f97938b60af9c131bf4041a64d760e71e419a45deb512653aebc1b0b520fc8007d02fd7cdd834439c2092df41b2b671206f3cf21b0421feef3a59b38cc3944d2
+DIST thunderbird-68.1.1-gl.xpi 568402 BLAKE2B 523a77985a686e2d50addfa8f6359bf4b042bddb11e08c3bb4417404a7e7de2ad7a10539d5ef3f08fc4f51069692996bbf7cba4140f834ff095a7a4b8dda4799 SHA512 07b2a316ae336623533aaad43ff6977c3ba8684303814e18403839d1c588640ce7c38335e651739f8782ee7ae1e570b4571b5c1e3da2d61152fc1ea659b9132b
+DIST thunderbird-68.1.1-he.xpi 604791 BLAKE2B 498591948031e8ff3e35bd43b204b5c625cc40c39fdd17719d5e8dea869063a65a1fc89d17a06bf8df21c8c8717f63e8904f7e70283d3f6051ce97425aa4ddea SHA512 30b03adb9592a93031725830fb93aef0284b3ca783f3a8116cb4b692851a2fab01a0a34c0feb7297859b623188a6412425c146649579e91f7d1757a12c8c276e
+DIST thunderbird-68.1.1-hr.xpi 583787 BLAKE2B 9f50d7b343428cc4fdbf3c6151a4c03dbcb7e6d1d34a0cd6fc9d4a471c7e8538459856b677a1468a624e12fd0d99bf71c622a54886cd04d90fea4fa32b8f4028 SHA512 caab92d0583e426196c3aecd56aad30e5c94f79510a5cfdd1c749c44d35826881084889955ac6062e760fecc32eacb8904de397efdd5dccfdd496784784aa47d
+DIST thunderbird-68.1.1-hsb.xpi 616040 BLAKE2B 0830c95d3775bb8e3f148cbe5ba461c0b5c4c8f37c0f2228e9a363f8d15b444a402694346562bcf237c7657573711cae6bb44926081779d2c83ca1d50e437188 SHA512 7ad62fdde85d95d87a85e078f1ecd0cbbabbd0815c5112e7b435f1a048435b7a0129d03577afe3577e4003e01a826baf5b05b318bad688e30f0e6091bc7ed623
+DIST thunderbird-68.1.1-hu.xpi 618159 BLAKE2B f9444563732136bc56d217636becad19438c0ce617b7bd8eb08a0e59f78dd156cdf5a9bf30cbddc75d8cfd48592b8e1024f114e70cf6fd5001aee5a8c84346a5 SHA512 670e9c1ef1293501d035880e873128940197651538bdecf6fe17c09491d7f4512a56c53593235ce482fd08d4b4762da0856c23fc3a8e66aada5a2fd3e142b220
+DIST thunderbird-68.1.1-hy-AM.xpi 630528 BLAKE2B d9e05dcd502a01e201925bb3157bf49141ace42e031178c576b454e893f31cd825f1e769da5476ecc3e1f9c33f0e32e7edca8c7457fcdaa6c7ce98eecbeb58f5 SHA512 a00163028efd07b1cc66dead6129e0e54bdcca35c1859c79afc36b8cb9798745336e3bcde4116273115214be60c0387e5725a1d6b2789b073deeb4831c5736fd
+DIST thunderbird-68.1.1-id.xpi 567751 BLAKE2B 732d7e9e66e2c8bef201e6a2322a4336ed5a30d95e8e04ffe1f6ce5fbb7754cdfbfcdecae80ce9838949632c000070430fdb446860a45a8a282ccab752e2519c SHA512 ac128a74fd37a76f7d1aaf423934520dce8693f2220e4642de1d14f54008851a08ac9e839bad5d1d936d5e1d1eb7568672467f0acb93a88e59c8932ea47b7cda
+DIST thunderbird-68.1.1-is.xpi 575445 BLAKE2B e78cb641998485e7ffafb949f12fc1d36e2ef50e1608d898ec6aec136ac8b1548de1cdb600c3103b9385287cdf2ffc358d6d30a9a4e7f0781c837c5cba90bc7d SHA512 06aae8ee62ae3769dca5eb0e6e5e0d7693f682465d8f5b2eaffdaf1d09827a3dd0afaf91e6210f95962f67d5e8e9450df220ed16a691b458fe498bfc42f35e1e
+DIST thunderbird-68.1.1-it.xpi 489525 BLAKE2B 890499685d2ae57468da59b1249146f5f57041b69b804aab7b1d86016e0511f72f91d0d1b705e738b0579309715d1ac5234c50b59664316aee89c58096d7fa04 SHA512 02602cd24091ae565edf1a26aa5d4a64e5beea552f0c5db11549f99db1aa3c49bb94660b03538f2831c20de71ce723abe831d1bfc0fd912e4485283d077c1719
+DIST thunderbird-68.1.1-ja.xpi 643579 BLAKE2B 6b75859035fdcf0f24b64d075a7bfce3faa84bc8f24b71139bbd001e4c5d3f5335db02f67a930573302f89d4bf325cf7233e27812acea6d02a6a1639d10394fc SHA512 5f7924101c2c7603ea8684143fc7d4dffccf676613db760bbf465c9c50e77ae2d081fffb6dfc41864128f40f5ffcd52ad94ba61cd714cf42ca5926689bbc4149
+DIST thunderbird-68.1.1-ko.xpi 620533 BLAKE2B 663b540521b8aeb54772e8dc17bdde54625c0cdca598372b4374210ed2f20154d59b3168c63eb54fb4a84c8df2fd3cbe8f957ba95721fa2479b038d89e20fa0b SHA512 7d07ea02b4acdfdf1fd1085a02b63ad8a07d879da127e5df231de14e26c6869c8a6826b173379328a0d4886e0590389bc83b25092183b8e044d6b0b606fb8f96
+DIST thunderbird-68.1.1-lt.xpi 603850 BLAKE2B 1661ad84bc58a62b1df93c9fa87e32aaaedc71925accec87b416052f9be974efc85dabdaeea0aa804def2e1156b3382276e7bd06485875e0482250188b3dffd5 SHA512 16d3316d9a6422f76e6470affac49ee8d97953a77572ad322891e0b81affa7610729f7d20816617013b39abf2d663473a30a0ed1969d9c365f89742aa5009752
+DIST thunderbird-68.1.1-nb-NO.xpi 574025 BLAKE2B 464cc60845bac70e5ed301197bbddfa1e19b0194662e62b499832165a1cf87c637e2001e60deedfc8dabf644e4d918b63c0b007a95f098e8b790f96ab8261277 SHA512 434559ef3d76839b8a006ab131dfb47179ee50835e8cc0ced45278e5016aa8ac057cbcfb9602eeec7475e530d5bce1618a8371d8b2cd5c0ced77b469bc01f8cb
+DIST thunderbird-68.1.1-nl.xpi 581359 BLAKE2B 205cb9b5fc8c471e37cce555d11f47636c508e9db0a2d9bfd22ec715a2eb03385035fc9850b31266b80719333ba91cee2db072caf68fd73c98ec00fdc4f00104 SHA512 2e6121e1426ae2ccdefdc74cbb12793d221b5efb690ce1b9a7967b0f8d7a7db2a81e85f20dc6b52d2e704417402ed9067622e605edf952a92f7f165d958a928e
+DIST thunderbird-68.1.1-nn-NO.xpi 574954 BLAKE2B bf779b43ff49f4ebb80170dd96253b6e2c64419c90728a37cc381191729592e212f74bb7a8ec115917db3fe5e5e94e669eb6ab0c690420978484d33af9bf5983 SHA512 2cb0c816caf93032da35ad203128d15964b41304d81c97f03d25e99d0e9710aeeddd4e97e918b4a2a60617d3ed60218d6e4f360a2c5ff9e8b305e6fc4263d9b9
+DIST thunderbird-68.1.1-pl.xpi 576089 BLAKE2B 2863632067d9e72206a3f9077f565f7cc1d3a638872d74ca2439d42964b9a9eb9c774b1725f7b509fa314255ae74520f3b833e7799c0aaea6b66685b0289ac5b SHA512 055119073e0422bcc4290b27835fce7b9bb5fd625409158b1154ae637e7e9e239a3ef636cf49cc7886fe4edc425ba56a391915cd9921f332f0c441355f79741f
+DIST thunderbird-68.1.1-pt-BR.xpi 589840 BLAKE2B 3330c16a9cdc57eba4efb02d1c83162fd84d3f084194e5e91562a26291d951f82c6e8f72b0c4d5582009ab7716bae056388a63a5e4f72e009c202ca084c65d32 SHA512 6719f2ebb7e243d5bba3cbec4835b8794fe4897071f1e99d2bd944fd4f42b228d09afb4da196b89c858cc059c0e7b02bbb06a6a942dc7c47117a40dbbab77a6c
+DIST thunderbird-68.1.1-pt-PT.xpi 588107 BLAKE2B 5ba7bc94bbeb02fc3e96480e657fc0dbf8dc65b8a5a7095907c51633987fa33282b6fdeb032992df740e73dbc9ae778cb2f093db6cc164e4514c6d968dbd2dc4 SHA512 af3edb0e8c69ba206f22b2a3b9909e12153dc916a3b19a6c61772f8442f2e965e1757020778c8aeba446acca02b3a45b49efa75f3a9e3e778a75da2275bc98a3
+DIST thunderbird-68.1.1-rm.xpi 578054 BLAKE2B 923d82ddc57c3fe1010266ed37f19674c96d355f7232bcc075afbd65cc85efca2a8ab607b919887f489310320142909463af65bffda812616bad3818767de89c SHA512 7dba955bef13fedb85e57e5bce0ea0f64278265e7c288ebb4a71cbbb9f185aae30fcc7150e125c49e35b90a5508e967f52ebcf5dcea85ad2e119763fb9df7821
+DIST thunderbird-68.1.1-ro.xpi 594846 BLAKE2B 0b700444fab813710de5c6f24bb81f3f9c30c5fb5178fb9f13b14cd97961e89a16e3aaf9bcfa87a4973814cb51ddf93e7b547862869aee8a6daa7dcdfd6db6f5 SHA512 36d5fedd8187a721a6bc828c787e1ff641cfcce2c83093c311568855edea441fdf4f3e1b8aa69dc489735a8bef139fe685701af458bc3cc9b79c94b1330dfce0
+DIST thunderbird-68.1.1-ru.xpi 683330 BLAKE2B 88bc6869ca9137202b87554e87cea52a5774d7db529316e76eaec83f7adf2952062c320b631efa132f3f2c1ccabbfa5177417737f3bcff5c46f43bfecbddcfe8 SHA512 5dad9645fe962fb774baefc3231c2594fc3a1877a1301edf59d6f2016aabc7a03e168594266d4a95a72c45cde5886cd8049905ee49277066b1c3f1da3bba875e
+DIST thunderbird-68.1.1-si.xpi 637409 BLAKE2B ea91018652248c74bfc5fa10bec2598d54e9fcc52fa3305c899f5fbc2653419b1af8755c22059a1179253f1ca80135d7890d2b2daf219e00d66a4edd7a8f1d2b SHA512 f4b1d3b95acb77e0d1000a8f2d68392e1faf40c6ab8e30537b8da318d8aacf347baa8893455ce266f8eb7fc27b6c05e059c5797b125cd3d836ed0dba0d5de545
+DIST thunderbird-68.1.1-sk.xpi 609758 BLAKE2B 61e7cf155bb64d122d85814956f7110b0c85dd1d21377c8be5026801c4b36253526be45eafc1633e23272196420e0d00b91c3604d5259e9566390ef6e09f8ffa SHA512 eaa8fde11e22857246dc2e90640548bb4a625221f03cc2ab7061857418028c4d83786e2536b06af8c6bfc4ef529360c86a36d93a0f101b5057e77df7cf0b18ea
+DIST thunderbird-68.1.1-sl.xpi 590633 BLAKE2B 71c470c581100bf2306f6aa46fbb98f8324580b1ac1d6240342fc5f6e718fa43bb69286143902d331865d0d8e0a7929fe88a1e83e29d20737720b7a8193cc836 SHA512 b52d7396d50f36e9ca8d02a1038834685acea791d7a7480bfa7ec72124166c5835b420839de8e5555a8e71b3b5413925b6babb483ff6d1da25852677d3525f59
+DIST thunderbird-68.1.1-sq.xpi 598905 BLAKE2B 62c9448befb69ee0d155c851eb39093bff69ca86ad354fdd5fa9ab270b8eb47ea0c42d0d21fc1ee9060cee42da087fb2e77b6cdfacf00d23484a3b9263973267 SHA512 64c80bfbb8c4571daedfee814b98dda619962c9b45eacd22bdcefe3c5fa996f35b593543373674d66276f2e5a8dbc5e259fc7e2cfa5fae848300889e4293ac6e
+DIST thunderbird-68.1.1-sr.xpi 624902 BLAKE2B 85c39299c296c6cee8cd34c557bcba8ec0eb45a7233a4726ac7db98e84519c3dc48ec034d34611cf99a7600a32e0f5dbb0c42fe617a40ec6e0905c7fe940f017 SHA512 9dd447a4bee21383f7c735b18e9e211762f878065936c1f0f271c324a27ab9e3898f3811541f9b5c50f000eae6117f161fa54ce1a8819d924d7ca2b288063bcf
+DIST thunderbird-68.1.1-sv-SE.xpi 591601 BLAKE2B 60364caa021c114daccf3d44f9252383160171b8bd3ea30b0cec013d560ad546ec6bf0a1d2caec76da0109051696ca52242413d22e165540eb9e030f54c5cf91 SHA512 95d339ed36e6ef7a6ac3c615e73d878ba7d44f785c68d8a0da480c162ddd53eb7e9625dd13d5dfc9a1395a9a8b3c07ec39ed995a23b97a6cd8b5824fcb48e9a8
+DIST thunderbird-68.1.1-tr.xpi 599712 BLAKE2B c9340e9ef2c5f03544e455df04d6c75778cd05b396b206d4ee5b9f6b3f6526f86af29c2befdba403abb08dfa752fc27b4777f5a1db0f4fb733f2d3213bacdeb9 SHA512 c75f65175db0fa6a501ce2323cd2447abbdc60fc564e4310e9275fd8e58f0546c9cd65c77df95ca45ec9acb42e1d777d90b2ddde08b08a554dd16749a42e74b8
+DIST thunderbird-68.1.1-uk.xpi 671458 BLAKE2B d5c719a14cb8c52e513836b96187cb7199e87eed0958c3a34edff293a2ce0a5116b9a39ea0e2b3770deb95521f76c678b2df83eb245e9dec62d86e499190a2d6 SHA512 3d9e11b02508979b526b74dd2b395d9a82b82d61efe66e1adcfe1d566b48b7523450fa1fa8c06f8f643cb19dfc47fbf22bdccec68c59c8a39d10b4a607034aed
+DIST thunderbird-68.1.1-vi.xpi 623427 BLAKE2B 20262f7cd6d9adfcdf7cb60877ed804e41e61f4117bac907959bbd6dcab558621ad4929723ea36e5cd70322711cabf82f1e5e142e4deb409329dc63fdd48629d SHA512 896baa8a5eebc9c4465418b611ad08b8a3eefb602cdaf5439eebcddb8f02176861bc714da734f1ccd1f11c5df8989375ada14c06d5643ddd97bf5108d0eec8b3
+DIST thunderbird-68.1.1-zh-CN.xpi 626823 BLAKE2B 8959e8fe1de04a3115850b265b398b58dba6c66bd887cce3f3c1913f4bb40e0850b8a646357a4d751e5d2875ffa270c3e007e064b0064e4e429cfb2ced6a3649 SHA512 5ced7ce8bb8df9d76522cf6cf97ea0df5d54895cd7f5d1c35a0414ae30ff01da45796e6f0d48afdf875b830c0dc806343a73512d258dbc07d26875efe2ed89c9
+DIST thunderbird-68.1.1-zh-TW.xpi 627480 BLAKE2B 760922a766577238071ac9b0dd05e11cc34ca0d702533a67e1867cd4e98f3e20611c0fd2187f3c2a941c63eb2cf9d5514fb993bd9b69015d00a521abb5ba5af0 SHA512 e5ba5240e15e880099114ef913a3b3efbf3a966c6bcf33d4a03d9b8fc77e281fb58d5f672761f2831010003fccb09b304d4a9b3fd7e2dd142cb4f6b06084628e
+DIST thunderbird-68.1.1.source.tar.xz 330615656 BLAKE2B 7d34c19a26f383c616cbe15e0f32c367a390e68e87853863aae108e85a26d37ec610a0cfe0ece2f80ad67c94306dc3837a0ddbfc72d3ce7e989f0862549f5171 SHA512 946b9694c93bcd416fb2fe1f2448c7304d97a9b8dada9921ea5790cac019b0a53da2666eb974eb416bffd9f7874a51650563daa4dee97fef1091ac3b8df3f2ac
+EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
+EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b9e2db9bec34997f206b90a8f6a572e5902665daebc3ab9b7649f55e6a4d2a355e5408ae9c07463989bc332666b7c466 SHA512 0aea16f24405ba73b053a30838058f69863d51f9ea7a152151b90c5cf8155ae53fbaac5deaabcdc9177e71253df997d81ce9fff809713f8f0eefd1144cda5c2e
+EBUILD thunderbird-60.9.0.ebuild 18269 BLAKE2B dcd7601e846e04d22be61c634cf49e894239b7f7d9aded8151208b0000e1ddb79e034a5d2704f7a51630f34927b21acfe1e607fe52b834afdba2cd681655e496 SHA512 979ccdbfde25c34fe7899e21b6b9471e36e67a1afcf44e2a26cfc50be5c4bb749f4c240dc5a8eac7d250af738f83e7f31e7e53927cb17655c2f500a3f2b68b4c
+EBUILD thunderbird-68.1.1.ebuild 24621 BLAKE2B 0c8e14cb0808ddd0ff32e7a925f24aa49ad2f5fe532878e298068198999483a934e099414ac7159cc423a77dca5f87a9e2dc0587490f47bab0d0121f9517adac SHA512 05131c4d9735dc03253b43b59a9735e7990cca72ba707f97534dd3e302c42c367c8d952f013a294b4967b52cf5aae99f765ee8497a3e2c8bf099719504051eca
+>>>>>>> next
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.0-r2.ebuild b/mail-client/thunderbird/thunderbird-68.0-r2.ebuild
deleted file mode 100644
index f350154b58ee..000000000000
--- a/mail-client/thunderbird/thunderbird-68.0-r2.ebuild
+++ /dev/null
@@ -1,764 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-68.0-patches-11"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=8
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
-	+gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
-	 selinux startup-notification +system-av1 +system-harfbuzz +system-icu
-	+system-jpeg +system-libevent +system-sqlite +system-libvpx
-	+system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx
-
-CDEPEND="
-	>=dev-libs/nss-3.44.1
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/cargo-1.34.0
-	>=virtual/rust-1.34.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-REQUIRED_USE="wifi? ( dbus )
-	pgo? ( lto )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			eerror "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply firefox patchset then apply thunderbird patches
-	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}/mozilla-bug1554949-linux-headers-5.2.patch"
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Bug 689358
-			append-cxxflags -flto
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# disable webrtc for now, bug 667642
-	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-68.1.0.ebuild b/mail-client/thunderbird/thunderbird-68.1.1.ebuild
index 658382a52e51..658382a52e51 100644
--- a/mail-client/thunderbird/thunderbird-68.1.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.1.1.ebuild