Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

2 files changed, 0 insertions, 658 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 6d35bfcea5fa..35dd0e96037f 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,7 +6,6 @@ AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79
 AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
 DIST firefox-60.5-patches-01.tar.xz 13332 BLAKE2B 53308d415369c6814504697ed9692023e636c42b58053867fd14e8edd94baa2777ed9f33e147f796d6fcd5f30c1d2258f9fd3247392e37a921a53f41a6903e92 SHA512 de24544c5aa8ade35e4e3e0fac10399f8eb44ea4bb9063b85bbcf2db12280d23ccc5fd29032f33f3723c0a0c3c2381429e2c19bd631e90615908b4f68f745a21
-DIST firefox-60.6-patches-01.tar.xz 14548 BLAKE2B 412059a6db015fff0985e637768426f877b33bb6b649c54f1292780b9d871f8fe9bf8e6b150ec36ab3647b4501fa6aec821c089a5d6fa861402f05e948f1a9d4 SHA512 b97da7a7b65bbf53cb6b9f48fc6c07a32cefa9d4b4a79ce57df047f941f5269e21bf09fa56a5f31bbf757ed2d76f8a1fe01d2306c92d20cab979e0a21f895e64
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
@@ -123,61 +122,6 @@ DIST thunderbird-60.5.3-vi.xpi 637197 BLAKE2B aaf475ec7800c6ecd5d450c0697e6f9ef5
 DIST thunderbird-60.5.3-zh-CN.xpi 626283 BLAKE2B e8f63b43a7060cd6a56696d38b7fd7a35311b015a576ce3e13dd5528cb97f914e3dbf393fe71d29f9d1355769e31b3190bb1e9584e8b9992163b24f122627b63 SHA512 a83c5e9de03027ee62402510daa6c7afa58af300b9b2605f840220ccd70361492011473f1b9b39d0162235471175c50b998aeb56649f087a87fe9cfe6225c927
 DIST thunderbird-60.5.3-zh-TW.xpi 626189 BLAKE2B 91175d151a1ae7f0a191c30b3e40ce47b2616fe7e3c8a9aaac1fb832b1dd29dbf74868015d909b17eb14356e69f80f94ed0a9126e9cdad640e571d7730a1c0f5 SHA512 a96dff2e5094746cd84ec9e14b88580fc3481a82d0f52f78ef970164bbd7093fef1eada4fb0a832397a39a98c7d4dbdac8a667e071483e36a5e888c0d6702158
 DIST thunderbird-60.5.3.source.tar.xz 284754320 BLAKE2B 776872c255fd204ad28d8cdbf4a57d822714c0ee041c824263427aa48a7780abbf0e707ded655ec29fdd3111e5bcfe6c1dc0263d9809191178ee86bec8def768 SHA512 0b647988e711be9a113b6c520d889200898a675391e61916a4d16578d5b1335263c9ebc623369b4f5160abf08fd1be5954ede42bc17f03f1b2937d8b9fd565c9
-DIST thunderbird-60.6.0-ar.xpi 627181 BLAKE2B c585cd5d66bfb65542b4e45669e30417d786713e2918ad205ab6224a6375697b8b66dc4e91a1b25cfbd9ba960e48b791c2dff79ddec3ebf7b062144a250df2a7 SHA512 ba9f97ef66105625e09a0ed7f4dc28af90d5b01981b2f980f6cc2e7c2520a3a660c70e9234a7f1ca2d428188eab2b93e0217b465d15d820c7f2fdf4bcc6cd5bb
-DIST thunderbird-60.6.0-ast.xpi 559642 BLAKE2B 0edfe183ab8af3e44a2ca4ad41bf98d5afb5570aa073675c9ef7af297dbe8c367dbff748a9b69b7a6f7b320bc8cef0c8f1ec54521637ccb9d3b17bf281896615 SHA512 3a346be489cec696787afce7ab8cddf7424e585afaf9d6b6dd8a92d6a2d7f729b2fbe7adf7cba63570b23941987a0ac160cc306a8f9326c84d5b9fa8042c7736
-DIST thunderbird-60.6.0-be.xpi 659078 BLAKE2B 4225ca50c9ddc590688ff94ea044c5b48a948ff97b4259cc25036a651f761a20c6f63c821409d477405fa5382740647580329cd735dfd416372a4afdaeecd211 SHA512 9d021963bbf56738629e46ea005e9f039b2a544df1b354529fb3f684cbdc026fc91a706a6465ecd0f2dab61dc3466e3262486e27c533d8be5ab565895538aab3
-DIST thunderbird-60.6.0-bg.xpi 669317 BLAKE2B c16781cd581166402bfffa03dccfac0643bc4b3d429c914b7c8a418b6a6e17af5ed828652775077eacd281bd75221d21c308e7a8d5ab8bce722143a802b98cca SHA512 1e34e49a865513c5b84b635db595b21aeb47f121d9a87292186160e9b8a3e1d0f4cea7cf006fc8242ebb9191b7b0df21716bb522606b434f83714a2d3dfec263
-DIST thunderbird-60.6.0-br.xpi 580370 BLAKE2B d1b92d4a9a8c1e6decba376b9a790526f989e1962aa737662cedcc80b6348b03d4cc692bf13d09255efee37ddf5ff82abfca88bbd26e0b9b65e2960e16bcd1ee SHA512 f4f68197b33ac3f0aeb73fba51445f37d3b05e3baaea336e1d51b912fa7e554b4314f04531cd1129b98db989cdd3263050397377e97c25448ebfd0e7aea46aa3
-DIST thunderbird-60.6.0-ca.xpi 591972 BLAKE2B 21ccfae5b17debad1e569f1105a11b9fb23138a84ec4501d5b39a4a01b8da1ab1a79a6894942f71392df614b4cd5556165aa230fbdabdf8bdfb74c4ca8e10f04 SHA512 d38c74fc9db2685a24a1e424d2365f996413f06fc37c45dc06655ab2a558a0427466bc98c868ddd1fde8ab305e5b2847464b60b06f0aab3b2176108dc719dade
-DIST thunderbird-60.6.0-cs.xpi 611202 BLAKE2B 70af45e3e710f23dd751c9a152ecba5b2f24e5ae7c0edd9597a2b9c876852e9fda809ff69f2bc9e6cca0eb33a64ca3661c8ed748ae8f219c59b9e65097fd3594 SHA512 dfcc19ebd5999497ba393a5c2555c1360ecac4dfd20a3d71b69060267fb5ad637a0d52a11238c224d021a512fc8259bdd494e52535e1f3dd7c10f4b9ecec8c5f
-DIST thunderbird-60.6.0-cy.xpi 586038 BLAKE2B 262c2025241e00ff404af9078a2e23b69318822aa4f2364c4814170f327385ac92a800fcefac456aae31ed158e6c7b3d46dfac72948c031ff4a85a3d181b4047 SHA512 dc2c91a9b61735955ac5576d79adc34bebabb2e8c69ea5e11d8d505575fafd662b19b7b599e42fd0a016d8572973e7d214c1eb32861e44c0d882a470a4e74f86
-DIST thunderbird-60.6.0-da.xpi 570807 BLAKE2B 40900dda7bc4a38990f2072c6e5f37ea950039e5a195909c34ed8d9372b8f902a796f76a17228d84abe607a2d5be038d9d395d300b646fa32fb0febeece41f48 SHA512 79e3a17deb707342590c0436ae95c834c8586e26290317449429f8fd16fd1b538365a1732de32c933a01b36ec225d8c145e55b5c3b8a8c42a5c96e22374fd6b8
-DIST thunderbird-60.6.0-de.xpi 582574 BLAKE2B 661a85856271ff2768458f515c674c065715d41d81ee7555ca9b7000831d5b97c8a1118ad0aaec3fd586e040493d47cbca02cc16b625224a2dde42e0daa89bae SHA512 d1039dcef888c70d4034a0ef3fcb11a885faaa739d6b87d50678f8712d3cd52343879809ada1b67b8deeab3099e2a1809ed36e803acf0d5ae27c01223b856bc1
-DIST thunderbird-60.6.0-el.xpi 694860 BLAKE2B 9a8b86c8de3f7bbe786d339dc4e3c22b8b03e03a356790ef55f02248109c131eea565ecdb0b473024e5d8e61256cc8a9420ecf5141d908a2d44b69f8f5d53cce SHA512 cf881e6dae0f8086ab14668aa10440479a17c5587daf6551f23e0661ef3936875fa50c3808d81c39caa37cb3be8d548d2a5e5c50bb10b36600c2781fcb1d2dc9
-DIST thunderbird-60.6.0-en-GB.xpi 553896 BLAKE2B a4f48bfbf5b511244ae281cd6fe64ac1ef97c483b18007381345302a40909c904b21ca6084cc06b7aa0fbebc73327bb4a12125bc0fe7f35f30d1aa1e82bbb3d8 SHA512 3309c420af7f9c2f85e9825ae52d420cd15a92bf839ca1fa5a01b6f371760c49b955643fe1b5cda89dd2b97a1b000e15ae68067f40b3834f3427c03c6630e8e3
-DIST thunderbird-60.6.0-es-AR.xpi 595048 BLAKE2B a09060c29ff9db4c486d5be975d233011882c4c86accd9dbf9078f0aac98cd214f8bfdc7cbd5a35cd1771a9e6d8b76cf983e4725215d585f588ebd4503ee6270 SHA512 a30271630543716a444e6bd04c5456f2e528339f54cf972e87d3b93549a291c450b0f6002f68dec8e4047c20247a093cae544e9ce3e93010b9b81c5dea4df477
-DIST thunderbird-60.6.0-es-ES.xpi 492212 BLAKE2B 47ff76d1becf9660ddd783e8ecbf8044e23e3a44855e053a1af93dca510dd641fe1ed383720783614c3ab5443645153539ce690cbc6b737968c304cbda88c88d SHA512 cfb1bb66c9a0fcc6f4de5b3abf9fb1deb0055031466494cfbc9d028b0612e4861f0b7fe8b97089b0cd84305e36769b7d231401a86011c1cfeab11ce1930b1ec6
-DIST thunderbird-60.6.0-et.xpi 570867 BLAKE2B 820d6fb13b722507717f002a5ec33ce5099163898be263b5c5e344553c044a7ea8ce9cb9d0337eee849a55bc4499f87c40d4049031727d99861fe3d922ecac3c SHA512 70ad0f3878e863a5e8ce083a80477c474e56281becbaff9ff06b0ab1300e6c76e00e1df848d26aee28f9362986c6354371a00cfab7fe9156e10fbbaa48e62737
-DIST thunderbird-60.6.0-eu.xpi 581384 BLAKE2B 024ef5cc4c05820963448c980dfaa17a77a0e2bcbd21a86683a3490ae98d6e0fc39c2d61eefd12156222429c695fdf59784ebcc9f7a7f8a31d233876e6afa540 SHA512 c63ddc1633d6ec5c3449b8866328c3a83e08b8f60dd813d28d530b3d266ea05f10b37e1e471e1711f5ad92fa1fdca9131b878af9f474344e6635e05d180f752b
-DIST thunderbird-60.6.0-fi.xpi 575755 BLAKE2B 599f982add19a1f08891382024ae2a60b7c15323517233bf34508355f67284dc6da03fb146f1acb72540e537ba36e79d82d6d7528c5ffcd25e412f9214a1c7b8 SHA512 4591076c09832d014fae5e5e5f19441205210cdf0a79f37aa953c2c57b274a47d22e9edbf363a3a0b955f2a124ebdbe84687a3e021f237ece6f75fb60fb9a23b
-DIST thunderbird-60.6.0-fr.xpi 608466 BLAKE2B a47d1d3b186c887c37ac378a3d75578e57de23bef642268257a178da2c5015350f4d7638f342562c01b8432276ef5e8e3f34dd201693f58bda814421e1bfefdb SHA512 a9ecef839f36f0e727d6869e5fde626233006b10288ced723f04afb121cfb665a2f0be9e5cf5627a24c2ea462b145413b50b5846d488f2d4d683d182297c7f61
-DIST thunderbird-60.6.0-fy-NL.xpi 593850 BLAKE2B a27edf042c71c40c580a0af14f23f129024f1a766199a554c65f3b72e8c21711b76fb764be58265c067fd1351aa1e98c4601a3b3be42043e2b39a13629eb7e7f SHA512 257cb678ffb82494ace62610ee1d04ad058ddc8829a332b78549ded939c9bbc8b18e14d8f2f88b936b68c7215c3add921542482a66f69e0487193b3bf0ed7bbe
-DIST thunderbird-60.6.0-ga-IE.xpi 603506 BLAKE2B 2b47fe28c3df1491f9a89bba8495b0eb06c1607b0ae22bd099cc50cf029f5565389f70be6362fc5e8235760d92f385074719129a77c82167a08be81c876a8f24 SHA512 b323e791ae498f7759827b68dd611fdbc854f9a82046bec0eb6c54bca616e63b40c3c89a2effc3f764b3c14e7b497f2e285b81d166a958477e24a6d3a994a19d
-DIST thunderbird-60.6.0-gd.xpi 599262 BLAKE2B 8d64c0a03d34d6f6317b100c4fbdf146a64190092af0e92efc5d3f8a561c5eb74707d7256eb23caa4e79c3b9cc41ae2c2f5ba169d325cfb2e8cc248b7707e00a SHA512 13daa6b8341d852242f4de5161c4d5489673f90c5f081ae1d8b21305dc76b6e9c5832c6bafb6606f443717c5e8b6ede016c0bdca0db8d7967b10d9a98bdaf528
-DIST thunderbird-60.6.0-gl.xpi 580343 BLAKE2B eee56a5c30fbec556ad8ed307f7f309016de86f310ae3a2975008cc3ce228522acabaa3525b4152f6a7c1e1676454d25d9585db14e10722915e391813715c362 SHA512 6584a2158f4ac39d0c2d106ea0b054f01c41b66175c1b0aceab78afb4fa5304f37bcd44115082b56ce90b3d6f7b52cf48a5d8e625ec229e6e374fcee0c20d872
-DIST thunderbird-60.6.0-he.xpi 617142 BLAKE2B a6e8e7e885081a537ffbafa4690056f43c21a3b3939ea2b3e7b9d84fc705aa856e2d76396ab5f6c85a6cf2fdb91229aa7134ba95108cf2ef77402c92fc3387eb SHA512 50856a82f1f5685614b278d388a98d68a3a67f048c759ac489e6e1e5f080cc7127098882a03b7c0eb9fe4142d42c354ce52ff59a44193d912fe91890bc041b4c
-DIST thunderbird-60.6.0-hr.xpi 582238 BLAKE2B 6c870dc88b243b016b095a250f898e65df668502ef95e9dd3af2ba2efaa5c9f8fe9bdd4f591cf762fd2702aaa09e6760da79e957f481d38cc2904d3837dd9c85 SHA512 ec556a6971ffa85f50ac7c15748cf0a5b7d0e1abd3ed9537a58c227ebd9f9bc32aa57c000c9f09b2a37aa740e037933e482ebfe01d3d3d703ce2e318a88f327b
-DIST thunderbird-60.6.0-hsb.xpi 615132 BLAKE2B c4df0247dfb7c0c7feded2037512c2c9c7f0233abc02c160e81ed3aeba98667c7445f05e8d4e02c1764b21361b43ab41626ac7cdd7fd9cef524ae3e7846bf10a SHA512 67762a239d8552e51916155fc517db77c395480c3afb12468da1a2396c269f609c926a595783369ed07f8f57ac3fbfc3960c6e1c4b41634f25b56d119181b795
-DIST thunderbird-60.6.0-hu.xpi 615346 BLAKE2B 0824c1feb3ebfd5fcafddb16d05dc25cf62940ed8a9112dc0a55ce903b61568dec0f79f4f6d9352867405af44f7b38430333affdccde95eb098d3b5d7db6fd37 SHA512 0dc3c78135ca472ab76c7c84d0ee8beeaafca4caeec7c5951a99169203f2d3f309c7f61a3f5e5989874d21888e6bb67401151a32258cfb46f63e3d08c7bd925f
-DIST thunderbird-60.6.0-hy-AM.xpi 653530 BLAKE2B 2b40de78e0aba1a1a78f4a6b620f3f825c547c810fc5f5c750edc20732e321c0c7a031900973bc861fc0d39bb46566ecaa56f21d1582c6e9dabefea33c30ccd5 SHA512 f8102c3ed19d0aa558a4f4fa06add1662429b22fda49ab7f129a1ecc11fdfa531bf78aa3dbad38be62d485140b4e28438527cae1faec8ca55470cff8e8b94cce
-DIST thunderbird-60.6.0-id.xpi 568861 BLAKE2B cac1c08f8381ad3b638425cf5bd091c28c34d1cd9ac22a8f11f3b4a34b148f990788299322ddd55d5125d731af47c89a42840af1c10f0529ed1f68a982a9c6f0 SHA512 3c08bc7b4542c6369b115cbace8fa32068c8e1eed3dbe8132dc965a252fe6567c4b2568f92a1edb8cd67ba101db40888b335a79883fe9124a81a8d3c501e0823
-DIST thunderbird-60.6.0-is.xpi 579047 BLAKE2B b5517ed864d5ae4e971df3decaa086a40f46f23f6ae4d13d9d70e0c0d2b31b0c1a698b8f11a5bba93c37d3a94f51c017de356f2d3d60530e5024dd753c484672 SHA512 6c909ad4494c94a7b6140a540ad0d62246dd2e293f13e86c9de9c93733f3487eec9963770e702365b996e6cd62d520cc80f8ab1ae0565fc0eae26f8b7738cf42
-DIST thunderbird-60.6.0-it.xpi 477499 BLAKE2B 7488d160d41bc4f74e61e2fa8b9f94d2309c529c2ef071428455ef7f00a43398020256d4610727898f2e438d27f10d7286aeb2cfc4a3371709879d1f63017a19 SHA512 814b68ff056116afee57eede618fcc29ee64273ce17c987240c8320eb76ffc6a173b52a413c46363e356ecc18038abfab6bfb37866680093e49ccbebaf32a2a4
-DIST thunderbird-60.6.0-ja.xpi 653343 BLAKE2B 26c024f97f5703623db0fa6fe9cb33a6b2d52b1ab2fd2cd05a0187ea3936be24ecdd137c39decb9c12edd4cc5f5898671d41ed6954880c9f897b05915463dac5 SHA512 299d9a3623e545f30d1b896c854cb7a0635ef5f865fc1326965bc6c28ebe867a84d9591703cb741a43320464e648331bf16a29228823aa78660d7a2bb0f055e9
-DIST thunderbird-60.6.0-ko.xpi 619730 BLAKE2B ccbd7005c5c7673bb6e9c35f6cb3a46656f1213771f7b70d821c8a47f2d372acd9cf0f73b8cf158a91d39845ebf83780fbc8bcdea2e2bec9f9e588828653a8e4 SHA512 213f7f4efd94d650d0249bfdf1e2941ea8fd9c665590bc00cd98a87274b912313948691c41289ed8c98562c06c97f869895cef2323da2a894f70b062870b9e6a
-DIST thunderbird-60.6.0-lt.xpi 605441 BLAKE2B 6413a36788f4ac9fc057354049e3980d68b10cd7bfc2b2d8b2d52039d93ab20dceebefd5bea0958146678657553b63069bc5e3122e5eb0a78226992f83e9ba69 SHA512 a66676e5711bae0dee141a2415cb46940fa21c78ca0a284fa278bade8be5dd3198568f5a43b6b1d89886fe63a3ef283c31f0bd4f87e8d8c520f9c5292a857063
-DIST thunderbird-60.6.0-nb-NO.xpi 577003 BLAKE2B 6d65bfb9ee786816545c117efa1a03f09e72cc28dc315c137c1e0ee7c681d1fd21fd854874fcbfd115f18a573b1298389ad6a332d68b9eb5f06512097b9a0cd4 SHA512 0924ca3cb4b267667a9c8aee18cfdf5fca5917fdf341ef985aaccedc4ed2c76a25df573a03bd2dc043e87bfd7c86a7b9a0aed1a2774c7350f67efb68d58281de
-DIST thunderbird-60.6.0-nl.xpi 583913 BLAKE2B c3c146f7f106f79c0fba1c83d9c1a7bfc20654e8a96d4c53f5e06e73538e51950d451a927241be42aed8c1b9f6e698d8ae29f1e620fad8737c40209a9dc600c3 SHA512 223a9d97811c3fb962b7278cbf1da34c72c65c2f40993ce717c0bcaf3b4131e1f9fdea49e99f73953f12c57653820cdce4821431e1ec3d9fc05710f7d42999ec
-DIST thunderbird-60.6.0-nn-NO.xpi 576421 BLAKE2B c77072c8d1618593203f3322cb9b9c20abf35333bdf9824899bf9124ebe04174c3fabc5d173eaa115eca13f7c33597c913fec77e8f69c2389ac519bcc150d822 SHA512 0dbb8464afa2cf274436c6a9c9a910553df07ff1ef1f1437aac5d421b6d638e546b24067112eecb1b44275ef37c6c485279872c16a9c231598aec45670c84a85
-DIST thunderbird-60.6.0-pl.xpi 480724 BLAKE2B 40966f339f4d069cb0367dc2c47a7255a4d01af2405a6964d77d34abdb4e6b5c51d45804b640ea954fad6f73f860949c6a250992680ff81d918ebc01eb4bd044 SHA512 eb3972945c2240a90dcbe4a16c5bbf2ecd5c5dc0deeffdd379a43d2b384d50c9aab5e736b77d17aabc220d12d1ba167f5577ffae08bc4cc7842aaf82125214b1
-DIST thunderbird-60.6.0-pt-BR.xpi 588835 BLAKE2B 58fd6a0dfd14d815a5ddaf253db39bbd45e2bc18ed984a0f95f57b8db3916bcf85ae9b28c512eae354f8d7a06b22ac565430818f936d7e31a8226ca71844b766 SHA512 d5fb2d3209321ea7e2d7d1373841308ceb9bec00209f8fd8bdf6cb0441667c3e51fa5d53ba111497b0e29acb80a122688899180fae803046b4c19be139d409e9
-DIST thunderbird-60.6.0-pt-PT.xpi 593186 BLAKE2B f565efe3c4820bd0130b47cd96666a2ea5aead93c03ecb2e3e9773f3db33325762567dd21d6a404cf94c52a2cab73c2095f5b296bc238d33af4f4d73284a92df SHA512 bb1acf531d5b528ae8323e666366d5fc073684356fe6f95a020d1b92241eaf90ba6978e44ea2fc682cd6157b78e5af11e79f9687d4cbcf930e39883bd28ed27b
-DIST thunderbird-60.6.0-rm.xpi 578384 BLAKE2B 803f5fae3b8cd3949a207d74eaf9b6c91d2137ee5ac750421495bdf8702e76dee3ce2432982a56008ad7ae796f214e7436009f18ad891716d7d71b2669c90be7 SHA512 8825fb746d5db6457ec55ecc86051ab9f9222c841214528afe6c2db34eac5f25f86af74b19e78a655eceffc5762948dce41337967156bc919ebce720f037de62
-DIST thunderbird-60.6.0-ro.xpi 584309 BLAKE2B e277f61feea84b4a47af09bdbc7be7358f4cccc28f6f406520be88de752e7f67a5d1adc4358c8b6eba362394476d9e4003ab8281e74a1b3e6168fd6ffdbc6335 SHA512 9875c7c2b9bda6c331a2adfe1df84a9781bb086f8b0ecdb6814ca5368b827fd4daddf332e405d091ba5ee05d9fd1f793d5b34dc36e82635c84a45e62d59dee48
-DIST thunderbird-60.6.0-ru.xpi 694703 BLAKE2B afb1f1d275496023b525bd1c11192a7fee859c0867e581d44a7742d76a0b8310aa87bd357fda5dbd7e1c771dd87f013d3eb3ed75fb2acd3cb8ed19eaa3247e82 SHA512 13819fc13bf813d1d2c37d82d996da0fb7926a937233256ba2b9c7fd05f2dd87ca418f725f2cb02bf4963dfca61fdf6a9e5cfbe78442a953292baac3706a1eb7
-DIST thunderbird-60.6.0-si.xpi 647589 BLAKE2B d0492d43eb8c0e70a1284b8ae714c6ed69cad23c41fd997c872e5011f7f5cb363f517555c68bd4f54b45e6d6ed374afb9b5b196da1da3a77f227f3dfb3b17f23 SHA512 6085a7620dde9e1d74a5632a0e2395b8e29f3edf6caba14fb6e29be6b135b2b12e3bc6c24e2117ac1b2d944796454764e1672a438162ad5464fdc30f81d63273
-DIST thunderbird-60.6.0-sk.xpi 612217 BLAKE2B 0743557d1b0628fdbcc46d290668a7b68a672c38fd6e61e597fda5caa41f38448f6b9595448201a75052cd0956bc545849c72007c03f53e126623c58a1f5a0ab SHA512 028f925a2ebce0376a2bcac4a303d484d7c4d90609b9ad4c3e050dfb36ff3db2a279f593677851441a931f05649427d888359d2db570e553ec6b85a223cfe54f
-DIST thunderbird-60.6.0-sl.xpi 589947 BLAKE2B 103f87c770d98f1988f33398f6e7ac2745595f04da218516a657d7c4184ca79ee3b0ae82af3dd75dc94303b4a514252e86abe91d27fc13938dcf57f884452e8a SHA512 03c7b5b9b78ba5b2fc1ee462759fc1baa9dd4c297041245485aadd3b72d712414f1c5e8a206e248bb3f85eece40bdd1d920d7953b653c7117ddc14a7eee80f47
-DIST thunderbird-60.6.0-sq.xpi 593096 BLAKE2B 3a1e691f4bfc04a8bbdf8422ad681a3fa5f67694d20ce78cc37b980c5db723df47b5a5385db65fc56e700990cd092808b29829ff404e2dfa869195fe57e02f8a SHA512 b4549a8068d95d68fe3731e8d6bad6195cf0e9e9b76f86590024292e00c86a84620a6d9d668ae7346bb577b89d68e25da71da1ac6be53426bce346056878c0fd
-DIST thunderbird-60.6.0-sr.xpi 641526 BLAKE2B 8b150d470d81e93f8f4a0e2da90e26f7bf121270978b172b0cb214ed5cbb8629069339d55a988897b9996b299d86104cbcc8619489b751c5679a34956769f5ae SHA512 278b6433b482c330413c09d96f7db1a266d1b9fe542bdeec38ea8a869df8cc1fda5cee4eadcd3f08ecc5d75bcf7a798fbea27c9811e641d79617eb90e36b75de
-DIST thunderbird-60.6.0-sv-SE.xpi 594079 BLAKE2B 1e908341224ac3e66259126267ba8e787311f6d6475e52d57707a7578fe3b2888a92caf90a5cb6bd0d2241d7d2e5a1df72761c160d947daf87517096a87d2abb SHA512 e73cd3b112009602256175fce80365d2b4b6e7d6bb8a6f8f610c9ceb813f01b77e1d93c96d8e9038f5bca1a05db2bf1eba3af5d4b0986ab76d3e106407ce282f
-DIST thunderbird-60.6.0-tr.xpi 598009 BLAKE2B e3fb35970ba351b3f53cb2a3a3c4db0a15fbe3f2b86fc5772396dbb52406d6706bdf15a16f5e404f32dc666da2781e73005d3115471c5eb230520497f03bbd14 SHA512 14702339a33b48d7848f094567d7a6ff1a524509ee686cbb67c584ecdcb2598119fb17ec1f964e23f7699a642a06b12d5c6fbb202d1bf1548786a752048bcdd7
-DIST thunderbird-60.6.0-uk.xpi 684154 BLAKE2B ee0f23423afe1f71f544f564f7e7443cba33b3cddc49da6ff8b2da3cfe99dcdc516be40c68d37fc0ac941d5a0d5772d434e63f8274e3a0f7a1b32e9a7bb3fd62 SHA512 208ae4cc607e61518896bd5d581affd669ad7fd4c5096aa7fbebc6d32bcf01e67ef2e2d225313b1e076457e790a2c0b7b239197bbeb15a3cb0e0e8f7f25d2d3e
-DIST thunderbird-60.6.0-vi.xpi 637188 BLAKE2B 821bf465db8c1a9b2bc51f228eb9da730c39817e6a1a0aabd797166ffb7e9979f107421744f730a2c75c4dafc3579814e1ce6479eceecd4a9e8c3afec690de36 SHA512 8ec6900bb557bfc7a3571da7f48ef5a02c1afca7ca75c9e9cda03fc206bb361e2e02349c96e9f0d2722eb1c03a3c89cfd4f7d19563dded7a7403ffb29ffe971c
-DIST thunderbird-60.6.0-zh-CN.xpi 626283 BLAKE2B df4c88ed96d047d4f84c4f9cf33ef24a425910c12113e1879dc89786d1339642cfd74b82998440b9fd3ba369db8d3b896d55db17d5df7681745cafc508e3f944 SHA512 af85c5d2232adc97e3f69d84bfa445d4debc477e515c9678babbaea9698adf30dcebcb549c71bd03a211354c8d4297a93014fec8f6f6604667eb254980ef2b40
-DIST thunderbird-60.6.0-zh-TW.xpi 626189 BLAKE2B 76b7accaf02882e17118291a0e1c97d3d024df311f2cd2b7e9f9fb0620cce9b1508cc75ccf01652fe0ce2afa0f01b42deb8310ee0aea554154b257cf7e977616 SHA512 6f93daf1adfe1056d9032ed0990ab979a37cff0028aa7a6ed523abb7da949a308d793ed108d529da1e8484404e1cd324dcd2f78e8133fae196235b07d77270d6
-DIST thunderbird-60.6.0.source.tar.xz 285222616 BLAKE2B d49882083ffbd645f97373e36227529fe053d7a88b130f7a16cc6b42dcdcf2bca3c6761493dbb9fd264a243e797361d54b5d3af8cfb1839ef36b43c958e10c53 SHA512 9f58ca34b7b1ea9643db1bd3f370176d9439a38db5aec41b68e118041f6c5cfbc94750ac1b8333d2e20d2f376fb97a0c97deadc87a597896b24cfdcce31b88b4
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.5.3.ebuild 18260 BLAKE2B 6bbfa007fff1f09ea9ec24f58242bc7bd9d52eb901f2d6f5c921e40c46b59f04cf96e18a2afc5d6be8e85afe1099cd2138fada3f6d6952c18a94fe98d15f4442 SHA512 8c53c13e5236e2b208554d9af034965b6f573815762c48c3936a6a8be48e4db39066a34064450a431568fdc174fa24b64ed1c2e7ab47d332e6b5dde4a99cf33b
-EBUILD thunderbird-60.6.0.ebuild 18262 BLAKE2B 5eb609c49d6c3c698f366c6c0d6e77d5d37415534f4fe9e4d453cf22571e74c2a93b55c3922b805ac3460d2a818c95039b83a564d0775d6f9785c064fccf1848 SHA512 7424f29f9898fa51933d29bc77c22cbded6a343fc7aeb5188be75388c4cc9006009b1d03f9f68deeef1e2f71239d9a556d6b65c8bc20d1f1e95507b251305dbc
 MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/thunderbird-60.6.0.ebuild b/mail-client/thunderbird/thunderbird-60.6.0.ebuild
deleted file mode 100644
index 2b695022bfb1..000000000000
--- a/mail-client/thunderbird/thunderbird-60.6.0.ebuild
+++ /dev/null
@@ -1,602 +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
-PATCHTB="thunderbird-60.0-patches-0"
-PATCHFF="firefox-60.6-patches-01"
-
-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
-
-inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
-	selinux startup-notification system-harfbuzz system-icu system-jpeg
-	system-libevent system-libvpx system-sqlite wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${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[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.36.7
-	>=dev-libs/nspr-4.19
-	>=app-text/hunspell-1.5.4:=
-	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
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.34: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-harfbuzz? (
-		>=media-libs/harfbuzz-1.4.2:0=
-		>=media-gfx/graphite2-1.3.9-r1
-	)
-	system-icu? ( >=dev-libs/icu-59.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.5.0:0=[postproc]
-		<media-libs/libvpx-1.8:0=[postproc]
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=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]
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	elibc_glibc? (
-		virtual/cargo
-		virtual/rust
-	)
-	elibc_musl? (
-		virtual/cargo
-		virtual/rust
-	)
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)"
-
-RDEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.9
-		)
-	)
-	selinux? (
-		sec-policy/selinux-mozilla
-		sec-policy/selinux-thunderbird
-	)"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-llvm_check_deps() {
-	if ! has_version "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 clang ; then
-		if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		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
-		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"
-		elog
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patchset from firefox to thunderbird as well
-	rm -f   "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
-		"${WORKDIR}"/firefox/2005_ffmpeg4.patch \
-		"${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \
-		|| die
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# 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
-
-	# 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
-
-	# Apply our Thunderbird patchset
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${WORKDIR}"/thunderbird
-
-	# NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual
-	# check on lightning version or changes:
-	#
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	#local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
-	#if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-	#	eqawarn "The version of lightning used for localization differs from the version"
-	#	eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-	#	eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	#fi
-
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# 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() {
-	# 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
-
-	# 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
-
-	# 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
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	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 'Gentoo default' --enable-system-hunspell
-	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
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]]; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	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
-
-	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
-
-	# 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"
-
-	# Stylo is only broken on x86 builds
-	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Stylo is horribly broken on arm, renders GUI unusable
-	use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
-
-	if use clang ; then
-		# libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
-		mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
-	elif use arm ; then
-		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach build --verbose || die
-}
-
-src_install() {
-	declare emid
-	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
-
-	cd "${S}" || die
-	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
-
-	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
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}