gentoo resync : 22.10.2018

3 files changed, 627 insertions, 2 deletions

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 42c6957089cc..e01a0f63e641 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,9 +7,11 @@ 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.0-patches-02.tar.xz 111088 BLAKE2B 9564d55b243c5e759a83b6d48076d3de9060c7bd99498df3ced477077b5ce2e2582452979872f0707ee681633d04a9761e2887282d69cced7e20bf39efc38c2c SHA512 919ffdb0624f1fa68a7e457f5270833e69c8f29e1764a46edfc345056c4e8ada1e85e53de3766fd9a0b2afc1a959c15762e27f43e29f5945176f9ade362407ac
+DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce
 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
+DIST lightning-6.2.2.1.tar.xz 1521172 BLAKE2B 0155735fbebfa1d7103281f2d24c41ddd16561a09db3502bdc2e689bf8174a86c414608fcae199e2756eaa93b57332b0389433c7e0d86c454f244b8a50b43a85 SHA512 b9427709022e07741dba48f4933e364c2df15c1f4bcda481f50e05fa5f8f118d47a87e4b5322fab412e9f2f89c0889a5154a369bb6d0b9a1a94a748dc768fb59
 DIST lightning-6.2.tar.xz 1647116 BLAKE2B 88a44c7ee6a1395372e260e8d0a0e00a6b2546398000ca701b74f98f85b73424e4126215c94543534ae1159de6644e81583353d53ae15b0e82592b17bf5fb2da SHA512 d51e56c6b21829dafa59cef086afb23f4afdd7dda5b1fdc1f6ad47ba0945e11dbedc826bb9764f42323275e251a48802eb5af2f0e5da27f3a64c105ee9f0dc4a
 DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
 DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
@@ -123,6 +125,61 @@ DIST thunderbird-60.0-vi.xpi 638422 BLAKE2B fbcf5bf28ef6c090193258d2eb7cf5a3e8f3
 DIST thunderbird-60.0-zh-CN.xpi 622464 BLAKE2B 1b06dd9c23a6519561d29b8f5a150d2f15df19a2a897d418deda253b24562f774ea69a18fe1de466f8d7f9f9d11b89d6c2c7a21b9feba8c50e6331ca14f320dc SHA512 759cdf2b1e53597bc3273d97ff119cce4519936ed9424060c857349f701e7a94519a43c1899d4e3e20482b3a4a8eb4c4dba9d09ca6e74422fcf07420b1b0c3a4
 DIST thunderbird-60.0-zh-TW.xpi 626189 BLAKE2B d68803285e6abdc76e8cc61abb72dabe4b47eeb482f59fbf35be105d972218c12360b381ca13b7b9f1a6db4ba8e94a2b3a93293e20077da8d5f14df6a552dcd4 SHA512 8ec61caa32a6f90f2b553dfde6ca0dbbebeb517db827193d73b0c492c6a1bcdd152fbbecbcf501a95ec62bf2ed01d926274f4f69a49ecccfbe401bc1d34f941e
 DIST thunderbird-60.0.source.tar.xz 282494428 BLAKE2B cd021d819f62c79c7486eaede35dbd82a3ce1079de3a4f8689994d1f5e1c53a60cab3e343d4ea5ae1480cd6a14bcadb0073ae6df08eab460cce8928bc0893da3 SHA512 ca3346eb4b6e1237a74ffc5c3d483fcad8d2f0d1146f56a4b11f1ab0f83b47b28fb2da8c0344f228bfff8c84b755f46a86a5b44fd7172de387ceb83650b33152
+DIST thunderbird-60.2.1-ar.xpi 627179 BLAKE2B 7c3794cfe13e1c29d44c1cff7c86b0610762de3cb29c2ea8692c3000db22eb3afedb40c092bcdb4244fc7c21970c3bb838c14659ae9e669b7c456d78470da538 SHA512 c41737af99fc3d82547e82784289b6292d0bbcb47be13a785b668a97c0b804d9ce4ed0a7e18f089d36d234d085f72af6c1ad4908c1d335baa83bd0bb591c7538
+DIST thunderbird-60.2.1-ast.xpi 560865 BLAKE2B 550692ec34d6965122fbac0e58352ef503e053eebc2b9c295d354cc19a49c9f1d6e12363c67d1fe74bd0cf078d2613f637bb82655f7404d173005c389375c534 SHA512 e7f4878f5999455cf61f667aec7dfd285b0624a7410feffb9d5fdd0eabd51e988d64bb97288cf601f512c8f42d450d01abf80af10a5055bec8bcecb2d95d28c5
+DIST thunderbird-60.2.1-be.xpi 659077 BLAKE2B 96adeeec268a1a0bf16ea1b9c705417ddc59a401f1ce4cb4d33a007dd6fe1e5c12c5e4d96202c43914f9ca5015ec0401818dd65062a4d5770fa78f43ad738ade SHA512 9d4499e3776f6e93083b44113e14e2899dbfa26cdf19d3eb28a5a87df8bc3fe99edcb9b8c572cde6f0488683f7c1b2f3fc2c24437da712633574aa440e6fdf01
+DIST thunderbird-60.2.1-bg.xpi 665511 BLAKE2B 7a0643b6afd5738b8049bcc955fe1c8089cb077ef2dcea87fa4ef14db64381ab2438829bbeb40657805eefe49920f2ab8eacc0f9d27a72a19fe84c90e12f6e9b SHA512 ef79c6fb8149bd83aba5d18ac05d833caa5fa84c40c6e7df6f7d82b0c4d2053fde8dee10be60c9c0e68213295d98b1226d7f0d7b7e6152249040a85ad8327ed6
+DIST thunderbird-60.2.1-br.xpi 581591 BLAKE2B c47d508ac793f09eeb758b062e2b21ba6fed59e35a3a4698f47d4229407ba347abfef4f590a355c95175d10e0bf9b9bf99f400e7bd1af441c9808cd3dc185c10 SHA512 d54c60f9125aff7ab5a1d188769326324586ba3daab75916d02800680a9ac010b4bb08d84b1afc1345f40b6d52c1d661ad04f8c9b1a8021690516d0631af3b50
+DIST thunderbird-60.2.1-ca.xpi 591970 BLAKE2B db5e0bdcd9ac3dfbee80ed6d691f5c2b8e12cec654edac4441ec4faa724b25892f14f143f4355d9b4a2025e997e1fd0f647e4c60c2306c315b163b449d0e4780 SHA512 483417c228eb084839e15969550c17aac20d28dab770729cd2d9f2b06b5bf3e01b7e9ec4dd5927405464c87f96f86f66791fde646224a200551d1b631d6500b5
+DIST thunderbird-60.2.1-cs.xpi 611201 BLAKE2B a13fe6b452088ac2905656db9600ffbff9e0fe3dc57935108a390f95fedd311e634070f100428e24672e69f4b7a8c697dd97926b66f8375a4c9d533340a546d1 SHA512 f47e917ebd48fe056d775ecd824cf29ee6191223526f124941bc82bc1feca664ee7182cd2c0dabcab0bd7a2171da381c744575179d80936cf65efe3db8874b67
+DIST thunderbird-60.2.1-cy.xpi 582232 BLAKE2B 2978bbfc433c068f7bb724ebed4cda41f5535665b8e36fed0938b21798a8aa954bbe4f90f44b6720de52594d26f2acb6a4e93a1b0305a94a748c2b8a2ade540b SHA512 81a18fb92a01826ea780a97c65f92baa6920eb653f3dbfef792681ee38da1a29ea33946a374630c8e7863337293f4cb648665419938df5b380c7a073102bf5e3
+DIST thunderbird-60.2.1-da.xpi 570805 BLAKE2B c9e56b2a1cc0de4e293531a67f2278814950783b7088a1530dd5c08c55c30ad4566f129c1271fee36df4f5817e9ed1db452a739c182b251c12e9f637c3dce211 SHA512 b8e8a75111deb9ab31b82f7c7d6f9ff70f7a60cdf384dc7a3bb21c893655124bc9a1c31fb22b42b05c546fcbd3e430bd1417f6795b66e43140a21506edca7e4d
+DIST thunderbird-60.2.1-de.xpi 582574 BLAKE2B fa7ee24a23fe150315d96c8a1be7fd3f76054cfa6817f20718c2bfccef8a8adc20ab451e1491441d4c0e85a0ee28b053752d67ff245019d75d9bb5f2aca1effa SHA512 4b7bd57f2bee29b786daaa1331777b2e81bb281a0954bf8ca2b11420cee81a224ed1d993375ff70a97a8fe33543596c52218966b149beae0e78f832c42ae2189
+DIST thunderbird-60.2.1-el.xpi 691053 BLAKE2B 23afc96b887c1b0e37fb0c2121029f9fa0c3437ac21c28b11cbd454b9b6318755480ea157d04f7962cc3b86326d1e2515a0cc65e5146d8e532f7ebaab7c25bf7 SHA512 20a71719c5fb829a22167fbabb1f1c1ad7fab634fb801fcf7784c6a2094808483a17da500342ac93cbf766d3b5f6078f98ed774c7a67d529a4811c0dde4ac3a6
+DIST thunderbird-60.2.1-en-GB.xpi 550353 BLAKE2B 28a870df8627fbaa12a9e909c521350c7033c21e5e53c385e65228dc45dd16938c4c35c77d9de74be0fa3b5884fb0a7717df3e1064dcc7340508dd88846a36bb SHA512 a012c1e40024a006177563e0735e49fed9e5649367e854ed27343f6e7eb52f0a870cb4257f67e76b6fe045f7657f3f5425174d1c955a778f116f781eaef4b9aa
+DIST thunderbird-60.2.1-es-AR.xpi 595047 BLAKE2B 26c0b06b7f75c1292b6cd93a8ffb4cefec164183ac38da4d6635370e73dda3ad248285022af8a85ac8e10e3fa3772606db3d5a0668678cc049b4ff6af80fd5b5 SHA512 e87a68b60f6f24c70241a9e188cdb2f72e9fa29128c480013e0b2fd70a5f75766c985c64618cc96c17bbfc4d7e6595d6e1956438db8e938ee977a39740c14313
+DIST thunderbird-60.2.1-es-ES.xpi 492210 BLAKE2B 0f7c4602b30ac91b21539ceb3e75bbbfaba022bbb8ed195fe30442405916ea000b72a188b85a978449518b4d79ee0d5596afd7dce340adc59a3442e6977a4229 SHA512 4ef1c35fc033e5a1db43aa79ed4f9120fa20f914a2461494c614f9d260086fb8d58cf4e00f425b793630295e45a4c66243c30d7809e3c2596e6f8ce717b93a79
+DIST thunderbird-60.2.1-et.xpi 570866 BLAKE2B 5a718f4a8abd388349cb44f6509bf5a07c2d9641b84599a4ff22df654489afc529dd2940d2a7a3443cda3fa9c04363cf72657ebc377a18c3b42c8c5986b8f82c SHA512 e8b0cab938174f85f2af9936404ff2bc2213e16677dbcd85502b7179794130b01553b6675cd93ca2ef34ab1dc1dfcb9c434eec76c08f68a22ad1acd4b2a74ae8
+DIST thunderbird-60.2.1-eu.xpi 577578 BLAKE2B cf412d1c7be358450a8d17f3000c79aa59dd4de08e6c6d57b089894e3fe81aedc2078d18d69967c4bc47278b4b86a7749c453113a26c1509d8741831f62a4177 SHA512 7bb3a0fd563c5d09ebafc3da6ee312804c8a465574f6b8355ad477e13935b2b6483489f6b039575208ebfa0c8266ce01b3efe6e2fa7e0802eaf0fcbf7dd0b15e
+DIST thunderbird-60.2.1-fi.xpi 575754 BLAKE2B f193f0777ec0576775fd942fd9991ca3fceed4e08894bd84d10c33a0d4235c94ae822c569bc09b2fb0f93092b81c6bf983d986b156ad8d4e598fa4ef92b2ecf4 SHA512 65462fcc19a20d8a404e1511faf3241e26fbf99def1f4e695f4cc920ac872743e119206e0ffa3a3fc42be37d5cfe9ca3d63d95333c94fafc8dfcc073e4b1bbb9
+DIST thunderbird-60.2.1-fr.xpi 608465 BLAKE2B e08725d4fa02c1735c990872f9fa84b70443580cb1bf216fc9dc28b4347cfd9ca70c8f2607e4d6fcc1efd9cdba01902a90db9342e7af6f8ac169c51601803526 SHA512 aae25897c3868d0fc2a42ed79eff8050189e81d2ae2b748f523980cedccc244a182209018b0523b58ac005b941bf84364d7959b4fa403956bb49bd5e46100f47
+DIST thunderbird-60.2.1-fy-NL.xpi 590033 BLAKE2B ab093bfaa1c3a92ab76e2d0d0b1486932833d45c67d86b6332b82b93f150ebce6da39d2882a5d92ecd6043cc9e297327a22c57ff8276a25fb9c29704ccfeb7af SHA512 12d4d8362e59edfd1699fbb65b51334816d9b0ad2f5ed7345b1c3a9a80d1e3e60b0d079e16d1901854fbd2832d56a461beec9cd882ac1571314f81aef763b3e3
+DIST thunderbird-60.2.1-ga-IE.xpi 603505 BLAKE2B d8704f8f2217c0afa3586311eee6cd16430c4680f12c88555c2c02c34caaaf2f767ffaf5939953f8103fd732bae4ea59e94173f3d65e0506e2a5603d60963a36 SHA512 7b8a75797a4e8442db0ca18ba6e331a1bdd9b9c4bea9e247972fdc8ef249d9c6d52202cc4a6537d7c6e648edb120719b88869356d2244e9e85b0f574d2236dac
+DIST thunderbird-60.2.1-gd.xpi 599259 BLAKE2B 88db9ea39c4acf9e5e8ae5e16e7c08c11d574ebab8d7fa1c82416b945c5e07b794a2dc1ec505ff697d51f884f4e6d927d16d5b38d7471b3076e2373e1f184876 SHA512 c055d56d99a79a7bd393f294170b892ceff34dffcb16c5193cbc8b94c3e2aa1a1796ec0146578fece9ba6c4de11c87f379e4818c0960b05927e5e540eabeeb90
+DIST thunderbird-60.2.1-gl.xpi 576546 BLAKE2B 03a21ec2aa4879672675b790a509adb1c231cef47657624ec1a296377b29c35f81b3a9971fd2bd2687205c8853bb0a2a0dc62121c76d986387b59db4b5c4f422 SHA512 5d6c6e769135caeb535f0123c6725eae8fc6fab77e703ca80d6bb1951d14a2f149a1def591968d0c268ad36d409d65d581df1863c5a7d17bae0689d577fe0951
+DIST thunderbird-60.2.1-he.xpi 618364 BLAKE2B 8d45600a325e7bc4694d86841968db2927a42ee0e78786f58c8e234c37f0064d8056ab368a5073e9464903bdcc7ab979af1044f778785d6b8dbd06960a39ae05 SHA512 c5b83a9b8bc3a38904698da2dcc40b21b8a8bce2314edadf671812fc49e8edc699d74f12d38830b54a80d81af38ac168edd101cb7ba0c0d4247620ab5e456f93
+DIST thunderbird-60.2.1-hr.xpi 583459 BLAKE2B 21ead96d533480ece2c935c9697b8c5e69e9565019177a1ee4056471618b647cd67d0e1e12dedb8ff9184fa3c433f3e02a14d8164a974be34188b45f5fa60d4d SHA512 124d68b07766051c71364620e0212956b81e25f1687efd9fd7ea0ed74f6fc3e194f10b82e598aa1f1d8d54a50953202f805b071ea45805e716af73a2115240f8
+DIST thunderbird-60.2.1-hsb.xpi 611322 BLAKE2B 954352b8df8c298e8211403d5866f9c284e98d6d96d2b54f8d349e2b6ad18e1b01f73f4f303e61d337b425d6dd68e55555be7fbda2743d459f681293a3433b80 SHA512 e3d0cc09f4ba43d3b9a63a7b0d9f71101ce636787b2d8d6b94d88455551f6b922c94f0edc310c0cbb7119c8c268bd71ef3d003215d4c74f32359b6cf601b55bd
+DIST thunderbird-60.2.1-hu.xpi 615344 BLAKE2B d1f0965776ced698464519f3cb2f869426b769b4b26105b3478570dfe693ee4c5abfb6389326952865d07366c2f9080ab5559908536ed2c522861ddcaba7c5ee SHA512 06fa03a7bc0e84bed80d2eff93e8729dfbba026fa62552138f69e87177881c0fe07c291e90ce78ca5e8d4debeb5e75fa0df48db605c634a4717cb70a4a2e12d6
+DIST thunderbird-60.2.1-hy-AM.xpi 649712 BLAKE2B a7c01158cde19dca4532321fb47ac83734cc6804ae20b7be2bf8ebd1e5b82c3596c816ddf1aaa8235cbe562baad2a6569ff317a74885d400589f924f46a8780c SHA512 fe15756885a43b882bcc7a94c916fa90ad9b7f7d7846518e446dabedf5df21185f2dae807072402ba7413dd23533bab9ac83c1c6f1488c69b7e42fbf1d6d82ba
+DIST thunderbird-60.2.1-id.xpi 568859 BLAKE2B 7ca1514b2fbb5236449121711013fc26fa1f225c1380f8c6bd58c4831db7696ac73a63df9912b8279da51f119a42adb17e7a49e112390c22123ef1dc5d05c4d9 SHA512 ca6bce5ed8cb66abcbec233941062b01bc18e35d501e796f16609f22a11d40ede0568aa3600a590b6c3bbc073ce74b08095903660371333b8f868867ed2ad6e1
+DIST thunderbird-60.2.1-is.xpi 579045 BLAKE2B 0d5404b555519ebe0dfb101cd132f5b571cbe72cf1f198b672ec25195522b6b139590342e4f1e14cd1ef4e2793da1b83e20aa4411a78a97dcf12a8feb3c69c6a SHA512 1c9578cccc15e64b0fb6985a0d5d9151e90923972150267076d89dc4c16a46848a347f73dfb7a08326fbb8b97f7b51aa6161d995fe0565e30ee67f71940ef712
+DIST thunderbird-60.2.1-it.xpi 477499 BLAKE2B 11aa1ef2c92cf81715c0660408a29dd37da9a8bee8bdcae546adc28a5a23a3a3222e63451aa15648e0256475585dc2e5742bf38b22b8bd75934ea4eb3599df3e SHA512 322e4f05034facbb6bb4e51214e4f95679cc7328846c00b85694a20a8bf4e89c6ce8a6e6e65cddd563169e11ef78b8502a6e9649c890004b5cc371774d125fe5
+DIST thunderbird-60.2.1-ja.xpi 653343 BLAKE2B 981b32dedeaa8176dac5a53a2c856b6f030e145830e38014516cfd3ed4e74f9ec5993659031c1de2479a05ca3daa2c132c69e96724943e970a3754521636b258 SHA512 4952429ba4b73a5357b6d395ffacb7d895ed74900ee21deb3f228fe5623b5bdaeaedceabd1c893c1824c33cf805ee41aae2fc1318a667fc0f9e7ec01ecec4c5c
+DIST thunderbird-60.2.1-ko.xpi 619729 BLAKE2B 971b1143fecbadfa86c13fad4c89eec11951598bebcb7552049b3ed98f3dd5896cf81a315fa497cd7e72b22e3168e62eb252f033862e7ea49897a5f1b7fa6578 SHA512 c060712228441e866e9d4309407a894b7729edde6e135743264d26ee93c0e828a2aabdfacc3be121f53f7c4a47a43d4f6aeaea87034a4652808d9f0a8da77a50
+DIST thunderbird-60.2.1-lt.xpi 605439 BLAKE2B a6f284da627a8ac98a18c7c938b53638de665c7a6f9005a6c200e1da12f6e108ee109c52f9a49d9639378dd695aa2291254283fd0cd6ad042fb9a44d6cb9688f SHA512 440f1d37677ba90f63489fc542b241f570293cccf3a2ab843e9eb8abba664c107e061cb3b14a30bf432459701a51a9b58e6630a220acbd48105fd5a7492da46a
+DIST thunderbird-60.2.1-nb-NO.xpi 578233 BLAKE2B 4a868790ab2391393f646a94d2d5098acfa3d546fdf5c5c823cd9f5768305fc74878c687acfd748a20a2eb4fbb8651dd458a74652b314cf04f7dc53dd3613bc5 SHA512 436ee46a66da118e7a29c2e66bcc5922d486dc6f9bdfc29e025733eac3e1bbc316baf88185bf62ee301273dae95c72b930a4143ee6c1094596714f34404bccbd
+DIST thunderbird-60.2.1-nl.xpi 583912 BLAKE2B 28280d14975769549fdf06f239b51fdbee8f7d915f99d0c64a237dc09f8736f130cd38da15f98ec0f89c9e42b9b08fc1dae5a25cd958baebd553ff8d8e340924 SHA512 0dc2eeb723efcb3af4c3e3f8df3bc07ace232285f65d3cbc2a970673eaee3e6c720dc391a8df0cda3472a3b986fdc92df0b7b4aec0abb2bfb7adbdce475a4c8e
+DIST thunderbird-60.2.1-nn-NO.xpi 577653 BLAKE2B ccf08b3002a04bc231ced93f4b07453f2244de08103d2bf06dabd6553ae72700df6c99c48a69cce8eb7202b12bfe81050110c0107ee4444f04b141c6e57a676c SHA512 340f9704b4d654af42e9cc8bdb85daf16f32af10f2675968f26456c29b788b49d41bc9740c15e52796b74365c1bdc30995e5fffa0ea53abab15d203772c74a78
+DIST thunderbird-60.2.1-pl.xpi 480723 BLAKE2B e9704a151135b13e9d64fe5e2468dd649c118857391d4677b3498813606cb15cbbcdffb08ced37fc3baad4ff3eed4ab83ed3c98818e662475361c2394879433d SHA512 5623ff6b1f322bd44f1826980c0eb459d82ed4ac12a41846e5006eecce1971d2a534aab90ffc6a7b922a412a8828f6bb411f78ef123a727686d4cd08eee7c457
+DIST thunderbird-60.2.1-pt-BR.xpi 585016 BLAKE2B 546684c5086c11bca71a3810c386a90b8e82e54ef20f476d7a94463ab37db2a0038472c333bc44eec9cd46a5478d8b222a52784ae0e31170a47d99a930b49f33 SHA512 ba861f3db1e4a033d66b68ef625220701312d854a50bfea367e6b90bfc15e5dbb994c9eebfd2596da1f4879d0f796ec7826c72a6c659ad205ef7386a4e6052e5
+DIST thunderbird-60.2.1-pt-PT.xpi 593184 BLAKE2B 02fe8b204c3248795aa1218b1e3d84b19e9351520207cded3d05f4db992336d78c54f235b1e53e8eaca0079056755cb4ba905d700d267a8b31e9158d82323bf9 SHA512 82ca4bd6f4d68d187132ab864577e3a16dfe4418bf68796f6ccd477c6eac4bae267054ac06b491df1847cc8e171b373d826f7ece8790908bb9d20ad960db59a7
+DIST thunderbird-60.2.1-rm.xpi 578381 BLAKE2B 4ef395e34f33ea60ff7220879fafbe64dcb153b46fce10fb0782e85cb1e3c05a4912ce4b7b7bdf1fdc20d6912352ed5f7c7dc46f4165f21596ac2200fe481666 SHA512 6f6f8d4116c66ba6cce7b937993c3a188d1f44c2eb0ba178b3efd87236ba71ef390dbe6209f28db7479fc025a2f0a0d6821d1405f2c0045896761d509a90ce1b
+DIST thunderbird-60.2.1-ro.xpi 584307 BLAKE2B a30de1c9acfb3f0b52b316de64d32b2a641fb7166a0a5561052352c97151657fa58dd1b61c91f6e972890cab96555bd32a13f8aa777ccbabffcca682d003dec6 SHA512 24472ac2bc8c09c2c1a35b95891b057abef35d4b420cb6e995e3344340014f89be4fed706747fa4666803a23562f6a8e3f60843ae78a2ae129c154448ff7fbdb
+DIST thunderbird-60.2.1-ru.xpi 694704 BLAKE2B 6c1b51e60190d039b8cd467608f83246ae6aeff3ca513468556d6d351073a1cc67b46084d615c5f35a4341b1e4557abf253eb40d444036c2b1f9380f4bcf39c2 SHA512 9c0d08bc4b9efb53011e50f68ec0250c79b571851f71a3c3b9c6114c3f9abba13aa00d1f7db2b10b0b255d8899b37a868212e909b2eb40037d149154f126eedb
+DIST thunderbird-60.2.1-si.xpi 643790 BLAKE2B b1281a4035549a7c8a2ebbebf2261f0f6f8d2691cc2da9310ecb27b14345f03d3133689d2698e26968f23c313004720f4b80db14000b98ab94a1540271e53a3e SHA512 80aaa375781a60c8ebdbb7eeeb00bc843715e5d4a48762406aac85d5c0d183a9b02eb83392ffd2f0d3e82e2fe9f66a72626fcee9a8e35306ead5499f3538a04c
+DIST thunderbird-60.2.1-sk.xpi 612216 BLAKE2B 5122498248a0958830725573fc231b1c7d7832dcd4028d58a66e4e4da56ae4f2b409ab9e6493da669cb7fb6128c9a2359dbc635544472094aa06429978905e6b SHA512 2bcee77666ffe135925c313482edb8d32c0004f458b33d9b3132b57db664fa56318d8f0b0f83fc2286283a3879fbf1882dc8e9c5562eaa5116400a6f6ffd2565
+DIST thunderbird-60.2.1-sl.xpi 589946 BLAKE2B 51c0a97552420f5c675c3098458b5d48b49a01c411a2715c74770a5387c712aaf9ef0ab9d335f768ab39d6eb1b3678db536adff1dddab2f8183dbe99639c9dfa SHA512 ba4a08a9f1ddeacf2b9c4e46cc13a0c2637eb1a2373baaa9cc4a868d810dea08fb93162206b3b6839fe8d6d500544d785c470dd76cd842c752a8ddc7ddba8cdf
+DIST thunderbird-60.2.1-sq.xpi 593094 BLAKE2B a8503abd814b1db1df6ff6378d2d190f77ffecbf34818d456b67e55832ec8d87b7e68f27b78b09732c147040b0520bee4fc5eca976b0987289f0c870706e618a SHA512 22d2a1c92ce35fa815de772e953b29887a973fcbe3777c54e5ea3b0867c9252c23f9134189345c4578840014fb084c408dad7b753a2f404a50fe762097bea98f
+DIST thunderbird-60.2.1-sr.xpi 637720 BLAKE2B c81d73640c3deb3dc58e3bf1602380393791b5db396d0e689d2560c25a44395c2834ac6028b20f4336ec09466e0958cb61473286e5f8e6c5f02531710bed38f2 SHA512 b5359bd3fed66cc7b112f0a6e529c8c54a033f499fd3b609ef6980676cd43ed7ce972d8f8b81994f5cf1b1ce55a7169990a895549cc671502192cf95eef4fd8e
+DIST thunderbird-60.2.1-sv-SE.xpi 594077 BLAKE2B 3050274155460b06c69ba1494096a18c2df55bcbe36859c2ec2969aad50672e4f73e8a8d75b3674c937e8e84b2217a196ae833834f628240dc5f50fadf8353b6 SHA512 5e634e247a79ffafb62acaf701ee808e1aca91b12f5b6bbcd43625b477440700be6a7bc8d11fe41e68d887550af0c14e8509ef5864aee144e2728255ca1d14be
+DIST thunderbird-60.2.1-tr.xpi 598009 BLAKE2B 92963f4d5ea6f89c38bdc826c3d3b62275be2e667413ef71c37555b1581df89369944a51529cbef459cf177ed1c7c4e85d67e7a3209460e26e4e598d6319cc05 SHA512 ca3e430d82b8b8833e24ea7498d48ee330e4009de9ae145e50ba06ae1072c3a93b1d4e1d1bfa22c3452da8b4b0472b8926d13318a08d6730475057f337f2f39c
+DIST thunderbird-60.2.1-uk.xpi 684153 BLAKE2B c7e2ef3d08e329c1b1eb67e26bb6737d445ff19f2b6f248fbf88c9991af838f6d5118555c0303b11bcee3228a3a2d8a2b866fc630aeb8b384f199383649cdcc1 SHA512 b9ebb7111e88c1d78ceb6b6afbed34b912812c049711721882234b5130bfb2a98351b78c36f462919ca48a26e2d6eb3bcc3b76746f9e98b47ebc907766159ae2
+DIST thunderbird-60.2.1-vi.xpi 638421 BLAKE2B 90d5ba56f7e874d4097968f027ddfbb507fea954442196491c9bf4b72ac3b6f0a2b5d3489dc670e51c01a5657f5dfed62d1c21c192d54db4f78b58154656fc03 SHA512 e2230a2a9a694a9b68f8d1d00f13cfdc4fcd5e880dd5bbf3dc637c88a31f4a02863372e2158759b9a283ee8490c1cd622873213c1c42542b45dd92f8447953a7
+DIST thunderbird-60.2.1-zh-CN.xpi 622464 BLAKE2B 05dfb895f9033a524c91dca56ac691cc6421842e5fb241ee97d3cbdabdbaeb4401c0764788dea1f6f7ced9c6c300ceeea13afd1b48b5d5f388269f690c2a57c7 SHA512 9397bf5942ddf7198bb2bbcc152d4335a47fba602f0dbd0fb8c4b8731ab5a8aa1d5edb4ebac4424e2414fec441b19e337fd5748f21a369d9709e2bae1912d8fb
+DIST thunderbird-60.2.1-zh-TW.xpi 626188 BLAKE2B 02497b01f3f51b1bf918c9e8f03cf943b1777140ea53b8c31a06859ba86345cb136a678961d22f48893265cc8b0f41760493b552b541fb43f3321487993379a0 SHA512 8770a606a67fb0a6dbdcd05e964a949d4e075107d04ebd0d429068f114ae7ccb097e72775ab64e4bd7c158b32a9d859a9d7789e2927e64f661d4d66d511bfe44
+DIST thunderbird-60.2.1.source.tar.xz 284570000 BLAKE2B d551f453dff6ab4e350948efa23ca3432d66b21ad2d5b9ea5691846d581e9c04b0c6341e87b1ef458ddd0e35a33bbb02fae287e11f04bd8052a52b2979b49a9f SHA512 d74da3c90658c5baf09c22760cad31594524c09f2cd5aba81c5b15bb6db64d78f613562cb015d8a725b4902caa4a57a2d1dafce28284533747faed00f8268a02
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.0-r3.ebuild 17535 BLAKE2B 54471ae7025b588fd96e8cbb106261d28889a07fcc3980538bee52581d47b21ce92f16381e66f0121eb01edf0e7556fdea8eaefef5e6b33624ffe7c02c7a9aa6 SHA512 c16584a4c375e8f91083dc0fb16086aa1615672cbc973943d1dfeeb54183a253354198e4e3df43a4f7d09af68acf13a4f4fbbdc6760c6571898a22c21023c996
-MISC metadata.xml 1979 BLAKE2B c3d4ba5e77d6e9edfc13cfc90e54526e4e157df85f22953caded074dded690a22f323c1097b609c3b21c5b908816b131b2aeffb271c0b6878e49368d3626a75a SHA512 5960ca9793fb094c4c39cb4777c1be4e0078d74a6b9981427f9cc295931e086fbead0ab28d9c1fe409c6b7215c86e950658092783c1668344bb453e77d26146c
+EBUILD thunderbird-60.2.1.ebuild 17562 BLAKE2B f2539d7d2e6587c02043cd02660cf1b47f511b3a4de03657b530f9df9894e7d945a752c0f3b1829702b251d3157676fd003900ea8dffc2e3780bb7ac28b1ab6b SHA512 ed15cdb66e5812b10c1c3865db452acc56f4925175577ce8f500a8284100408867390b179ea07324377523b9d7608e343f26d8a94dae84c1241007d86125b829
+MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 7fdeae0d1242..5216de1435e0 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="custom-optimization">Build with user-specified compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 	<flag name="gtk2">Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3</flag>
-	<flag name="jemalloc">Enable or disable jemalloc</flag>
 	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
diff --git a/mail-client/thunderbird/thunderbird-60.2.1.ebuild b/mail-client/thunderbird/thunderbird-60.2.1.ebuild
new file mode 100644
index 000000000000..dd425c79d897
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-60.2.1.ebuild
@@ -0,0 +1,569 @@
+# Copyright 1999-2018 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.2.1"
+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.0-patches-03"
+
+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}"
+
+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 mozdom 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}/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.4
+	>=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= )
+	system-libvpx? ( >=media-libs/libvpx-1.5.0: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/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	clang? (
+		>=sys-devel/llvm-4.0.1[gold]
+		>=sys-devel/lld-4.0.1
+	)
+	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"
+
+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 \
+		|| die
+	eapply "${WORKDIR}/firefox"
+	eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+	eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.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
+
+	# 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() {
+	MEXTENSIONS="default"
+
+	# 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
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	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
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if use system-sqlite ; then
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${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
+		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
+}