[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/

[Thomas Deutschmann]

commit:     405e9454455ec59464f1dc8000bab2154a0d5a6c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 18:29:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 18:29:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405e9454

mail-client/thunderbird: security cleanup (bug #690664)

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/thunderbird/Manifest                  |  54 --
 mail-client/thunderbird/thunderbird-60.7.2.ebuild | 602 ----------------------
 2 files changed, 656 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index d3404fa053a..83c69b21b19 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -62,60 +62,6 @@ DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9
 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
 DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa
-DIST thunderbird-60.7.2-ar.xpi 627180 BLAKE2B 98e07743f498639cf2d1f1891c93d1810c1949b2e386d1efb838b453096ca669b7082108c2ee531ad09a03e4ac92a536cf7ba04b7e1033ee437e71d1a86e7108 SHA512 4aca808cb725aa700ff4be091aaff1d6bf02bd446b67bd318e9d24e5b77ec44e2050a39d34ae9355ec8c267ccff3a8a9550115b13b6fc61f014137ecdf65cc2b
-DIST thunderbird-60.7.2-ast.xpi 559643 BLAKE2B 50affd682e07a51c9c9839d98ae2bfa13963a64739cf4666c0d720985aa4c74f8cb620bdc6473878a9251bebfe2550d87a7ab5925047d0641584fd078af42736 SHA512 8f0ceeec768b03d44d44013700103e1c1f072fd16b78218390bd6f37bb30d87124588dcc72df057eeb6412e47db16e01e194ef406b0294bbc5f245fc2cc3eb10
-DIST thunderbird-60.7.2-be.xpi 659079 BLAKE2B 874df5e34023d088a48dca5d050c0e3939cee6d0073146a110f8646454f48896f02e79e89e493a4dd30061f4a6b3aace57baabc16f55af4a89c234836c1ba3e7 SHA512 10f6d7ae046654911a7f0992b806b92da9cbe995da7d3f5a3fbefe29aa8b865ee8c842c8fc909290a1e2f8135842b1138d6fa1203708e919d07e43f248e4185a
-DIST thunderbird-60.7.2-bg.xpi 669318 BLAKE2B 630bba5d7c2f79f8c7ac3adc8c8119af198fc84013372c1aaf2a2b1e7e10775ec2bd7e01ca809d997a79a88ada3a0b38b3ef7ff70d2f3f8973eb23b909686d5f SHA512 8325403d4284baf2d4c5dd1c322bacff932050190d7701a075964512503cec9d1fa325b9fce7968954e4bdf5feb3d094c8757d5c5dcdc63546a47e9eb8bae89f
-DIST thunderbird-60.7.2-br.xpi 580371 BLAKE2B ab2b5f58e1916cfe4040d9aefd9abb0594b13705d701485668bb2187b7cda6155d24fa564af845f4d336e180457e110560ee42127a68f011393fd27bc6f94b58 SHA512 f38f68eba5292aeda34a9f76190eb860d5d6e3c13fa6f7130b15564df922a5afb451263d26f5095b206942daad3608f9061fd48bba8d3c0328eaff25c448fe98
-DIST thunderbird-60.7.2-ca.xpi 591972 BLAKE2B 329d24d7544d833b5d0abd6727b3c0a7973eb0cddab5382a24aef18348b6647587b4b758775345a539e3a795905b24c6101f56eaf837b2c601f68d626748a231 SHA512 a16b6ed229c23c64f25d7cffd5ceeeec6807ecf9d78cac3e0fcb0cbf63c820ca2b312b97a8b1218359d1583ce36969a08d4513a47bea98bc4b1e15a6f2287ef5
-DIST thunderbird-60.7.2-cs.xpi 611203 BLAKE2B 4849c9d661ba4331d6dfbb27c46905fadb2a2131f9be03c5eb5fb4ce4a55f890b3c87c63fa1fa14aa91ca12e3335abd7727d5a599fce6b29dd246ff39fd6e24e SHA512 e9d77ae328482e17ab022104565c799ade9dfcb80d22037b3e443fa6794cc82fb6f13db5af25e02f449af6b08e734e6148311a14a1b0ef6b4598bb5306b67d2b
-DIST thunderbird-60.7.2-cy.xpi 586038 BLAKE2B 5527b106836a41733a1be1bc29e81a2becae276130234a79e11f5ddd5bdf7a4dc110edd55de9acf249226274e05afc8252eb3db0e0078725aaa9c8804a6df3d0 SHA512 d937738db0da179384461b0b0ec31302a19152ef3579adfe6c76c13c87617a7eda82eebc4a917b11082b13e8ba16ea58cf4f20f42cd80f52d5ebcca9c1cab625
-DIST thunderbird-60.7.2-da.xpi 570807 BLAKE2B e5e4417ac3e22e50b855c96dcd88f5e0bc276b04adc77c1f1a5908aeffe1c8e1b92b206daf7b0941c3959819b1a3d38b8f7f38e2793e32a0212855bb9308b196 SHA512 a6b3e24f490b9b8b6bd90d94c3bbde35502b0e18fd6949fc844b64ce42c89def0eb1bb52541a2811233b3ddc1695735ca78d761a8eb99adeba5b1c6010504327
-DIST thunderbird-60.7.2-de.xpi 582575 BLAKE2B 3d1a8a94fbcff0e7b9a7be0556ba0354fd303a24243ad7bcabced646b179c22ed98e9970f44261b58905f5df3bfe641711bdd81623dc8b40514447e903d7f994 SHA512 f509193cf16bd504f13f3d4c8a9cdaeb3dbaf0d6f4479f3bbbbac1abbbca6193eae43d79a8b2dfbb32b8a8bf09f24a58a6905372589f0968fd3e7c97ae27eca0
-DIST thunderbird-60.7.2-el.xpi 694861 BLAKE2B 41d260aab917ff7e6e2fb3356fa85172c3e00b3247adf7b6b4cb69aee5f9bb0dd4941d0312ff6b7b71a020d9072491e21a3a399234fa31105ff67f4aee4ad00f SHA512 77d0a72163e14e6e8ecde4cbf1fcf519ef319d709ebd798c73b38fcea327369896218a90c5020ca6ca83257d21527e87fb23685d80602fc5c76ae6d26cc680f1
-DIST thunderbird-60.7.2-en-GB.xpi 553896 BLAKE2B 117decabb1b43ea3674783816826d96511d10443943e0b4496868d65ae303f21997ac40f32be51824b7ed687a0035b605f85fcb9e1976157804275e23850152a SHA512 6730d1dfe7b0f63cbc71b4a3a02b7d0be3cfe2d58123073eaf2a3befc12b3a8c82a22b2bde87170cb59f0c2d34b2402beb27dce652ca457a9128571c13791a57
-DIST thunderbird-60.7.2-es-AR.xpi 595048 BLAKE2B 2c31f84a774d0e6cb8a31ba0358bfc8aecb058ccdb05f3cc1fbfae71af83caa88d5da1422411193ca94269ac36bc0220f7c61ec760dd7a7c278b22c3dd7bee70 SHA512 5c4a575399c9efcf33629e6579afb7ec6c5dbab90a3c589de77e9bcb678dba72817c80749171e699d3ac02d15745b153cf6150a8d4a9e6b62478250efa8ff98d
-DIST thunderbird-60.7.2-es-ES.xpi 492210 BLAKE2B b19020a20fb772159e08c3f3e49e152aaba5f8b8e41330202c4e78b0dba1e2bbad3d5b74955f97cceed9f84274e28502aa5f7eece395e46e69c1f03abba670f5 SHA512 fb54f0ad9b6047d2dcbc9d4a77a2c521dd9c51071c5db31beee12b58005b5c3e1632a7fcc778b0e1bcb5c22912982af57d204cb9474949c1b64b5ba90b9ee45e
-DIST thunderbird-60.7.2-et.xpi 570867 BLAKE2B d92a2343e398957b24c97032375c60612876c879436bf4928da602f760489ec4595c0b1999a3b07ef914b9e6ea8165ad7925a0b5aaff5e165cb201e157c06811 SHA512 c89eeda232a6276e6bd50d52d13afddad59bae7386267249cc1085babec1b0fd673714eb4112184a9ebffe3fef5b9f6b92e073d6ca991dd45c6fee3bc8996167
-DIST thunderbird-60.7.2-eu.xpi 581384 BLAKE2B 1c8316dc5bc71297c96e5657e0b5ba3da798dc8d9f5fe3eddd7cf057b1780106ff603058dd08ba29a821536b0f70fb512215388abd2504991cec7e80f556dd6f SHA512 ed9b078f303d5fdf58e3d53bc1de3026c2804ca1af5f70e09222b256e6fd1bb39422e0e761d6a52faa8563d79a11fbf41d0af66b2504a859b494a5b14d174d13
-DIST thunderbird-60.7.2-fi.xpi 575755 BLAKE2B e7135ad240ff96b237867054ea80076546d1c0577e099771133b6f940f0b65c735b5e428b9cff3368ef47318b478c49da1078b7528dea62e90ee3c608c9e50af SHA512 415c00736382343d104170bf51d9a324670cf55167d2359233b113baef7cb2cc40862301872b494f0dc61ecdbd183b531a62eb96a4b481792887b95d1c57c049
-DIST thunderbird-60.7.2-fr.xpi 608467 BLAKE2B 9e96597ca225a0e142611e2d152f3bf068345165fdebce231454d1900d5421740899a086c85bf57c6f4be811593bf65b01f3e176dfac12e7d538de5ccac5757d SHA512 25120acdf64468314ba10ad625e3bb520bb720351d7f60c626dd148d551eb679353368179224e27e22fc649056a7ba6680b4fb6538928227d27f40a2f6f336eb
-DIST thunderbird-60.7.2-fy-NL.xpi 593851 BLAKE2B 266826144a4a43c248cc290793eb0692e8f0165e8707f254561a3657d4d3706b9a60de103741b476dbb7290cafc7b3406e30d8b03f9215b377edc70cfed1a2b9 SHA512 6153da7e0026e10b391d51d8a904920a0e0250fee0f152ecf286830a787491b171d5b11b7e1cbbbdf8e3ddfeb2de71090eddbf12617afcfd67ed0001900e843d
-DIST thunderbird-60.7.2-ga-IE.xpi 603507 BLAKE2B 28539f49273a9554d174c5f10e6716d71b056c20a8aadeb4a202ec87c2e35989369cae0570ce0b0f52b7576f54287b65f8576595810f89d26dea72d9d94e519f SHA512 86d424e5b9879845f2c9c37038cb713845ce1f3d21986cf5c5bb12ad9e9ee275d6e89235e050c60b0b8331e3cd54c86ffcfdff31ff5d5643ab80ad50c5a81f36
-DIST thunderbird-60.7.2-gd.xpi 599262 BLAKE2B a9fd1bb3c4e4d887f7fec4065aeac1f510f7eb16171e500df41ee5daad80ae62c57f487ed611c4f233915081baf04e01b8fa9e5e23727d159756dcee4a7679c4 SHA512 8527fe0d4f48806d902ce360dd633fb42c0ab9460297fc4131682288f708f26da300df8613d687c4e5129a592e8a295045643e0f0401f15f9255dd0dd4c20967
-DIST thunderbird-60.7.2-gl.xpi 580343 BLAKE2B b695f381133218ffc2decc889e0429ca5353fc5e96b452128f93fd944d9b26594adce5ad3586ece0b86b05722c376a4f8bd79fa4aacedf9640babc4ca80b0655 SHA512 3aa9631d50fbd40d575b04d5150b9344d46b3ad3f31665711f6a0309f0449daa3f8374b0ad563ca637a2c5f951e897b01251ec593f14cf2c2383e914b3028881
-DIST thunderbird-60.7.2-he.xpi 617143 BLAKE2B a68b58c20618559515a3eee344d8b54d340a5a39a1bd1eb2df2c78f67b3d117cae581dd48911b48ac35fc3e6ff54e34bbcff3e7a0d1f8a60e529ce461e74ecea SHA512 ca8d12ff2785f51ece645d97ea608139d8e72faed80a366d0c49faa78da67b6a8cf8eebd2fb9cc6b373bb455b74b3263ae438a04ef9596f46e7d09eb909d88b6
-DIST thunderbird-60.7.2-hr.xpi 582238 BLAKE2B eb1c4fd4e52fb911ceae26f9122a7066575f68bf6b60a37737ac487885878c8affb07a5fe8980adb757b94e62114ca6f925f70f994c29521d382dc11cf9c4b60 SHA512 c6699d3bcc938eb866cb07f7092264749510f1505bd01871be6b325fe18708b3478e73fdc2c814b9b0c71d2fbeaa710baf98c8598dfc3761425dfd5f1bc839d9
-DIST thunderbird-60.7.2-hsb.xpi 615132 BLAKE2B 0df3acd06fe18b54e43c859518bebea23f5c60ad1cf550ac43803a59d4f96dbe137446930dd998be982b25b87c9fc1cefdba269a8d61add61f06229cba2c49d6 SHA512 092125c43ab329cc8c6904152860894beda20af11a8a8df9a681f1b61862e0edc637fc3312db59cb1f03870811f72dc0bcf369f00ffe2245c4ff260be43c84cb
-DIST thunderbird-60.7.2-hu.xpi 615346 BLAKE2B 48ca3a04c8b24f635726326061c676a082dcf150d80f31b513eeb05780bedd96e1a7db45599b613517d3682efd71d48437772629f14458270c867d60d3bd59cf SHA512 0ff5a0f2478167927f19ec3016ef67b9fdb226ba1e7692b5fb336af0bf0f0e249773ad2278f41646081337de0e97120ec132a8b47960bd7c98ad86b3c4ad0fcc
-DIST thunderbird-60.7.2-hy-AM.xpi 653530 BLAKE2B 82986446ef22dffe53714dd3615c802244ca12da47d6cc778874e9b3d8e6494d7ae43ee97e44df765a08a8f0d4c12597c126e40554a139ac0ed1fad372208df5 SHA512 632a68f5fda792d0d0cd6efbd3e3fed7a51ce70d05a184a63ad124412d6d4347c7e4fe69651d64dd837294fd2a5f199166a27df07e83b37026e39139c22523d7
-DIST thunderbird-60.7.2-id.xpi 568861 BLAKE2B 142fb948bc5428cb90b0b19f9e42e35a7656399c296ae4be1551483dc1c7b0d229b6bd641f339ad9cbe9c37a90afe0a42d54f1b94b1abd8a011af6c55cbf2ccf SHA512 4a5c5a3073b92cfc72628bebc50e5e71c613ae00cfb45a61f580db1be19dbdc83e555923e0d29470e08c9c07c0a4ba7ac0a340e3d562caa48982617503cf29bb
-DIST thunderbird-60.7.2-is.xpi 579047 BLAKE2B 0304090b295dae4bea4270f4e4610ced4f67a729d7bd9b01b156d29ab66997d4cc916728817c895b560daf3e3f78669ff9b5a192d69714489efddb5b4442c1a9 SHA512 aaea3f9bcd07da7d6443e4867ab5e761c48226c3018b61f36c2ba5ce288179f3d2be67567d91c31c9643fbd18d156edab810881bc510cce303b6828d020f54e9
-DIST thunderbird-60.7.2-it.xpi 477501 BLAKE2B 52d6640d83734183ff3c89918a8d40cd30bceb3714231003b19e46cfe158c808fcb500199b8aaaad485eadd62e2bc520f6f5e321572e1291f5607d8fb8c56012 SHA512 225816b1853aeea433923aa588146a3495c22d17f79c3a5f3e6f38960f722f87f1b804aca4a0386b150e3329b34e1a57dfa2eec9413454f2291adaea4c32d200
-DIST thunderbird-60.7.2-ja.xpi 653344 BLAKE2B 4a12817a13e85861cd5267473f83eb2c597f88ce74ce382ede70c5bf792805c79d5b88a58dc8a1809fe1ab8c164f68ce063a1bedd1771635f38c6f28ceb067cb SHA512 4a17f939e19072cb79b0d8dec7701815403eba39bd1ba57a989b2441aecb4770868b232bc5ec44cd485b0ba2292609902a90dc660f7c4c9bf4a0f1f313c3f92b
-DIST thunderbird-60.7.2-ko.xpi 619730 BLAKE2B 23bd17e52191c232bffd4caeea28e8fe06f188a242647cc8da8813d5ee3c80c43f77c82d1db363c2335f42aa4bb6edbabc13d8f157f044196284268c55765f8a SHA512 562d05d5456c10a5310a5fe976ed6760898f71e3ce57cf0bdb9ab65701d0d08d3c5fde1a9fd51179cc9ff94bdb9396337ff8a32cbda5bb99d29cde011ea71a2e
-DIST thunderbird-60.7.2-lt.xpi 605441 BLAKE2B a39f52748ad3974517c3c49dec36d3dd0848823f9692e622ffb1c63982939d067e99568505259d5829fb859f4a72786b4a07e0eb03b53b1e39cc5f1330e63c42 SHA512 044b2dd8af4b9b640f009326c8fb226f4312744ee8493f7e5e22d1ef255ac114dcc3eb2c6b624f6c90eb95c097600e373099da9ffd12970ab617eebaa14da803
-DIST thunderbird-60.7.2-nb-NO.xpi 577004 BLAKE2B 41994efcf50c777bf93dc19c6d24394fc81603081ea129543576286212629203f6c2074415353c73cbc87c46d67f1ba7493791247381c4a34fc4bca4d9c20bae SHA512 6cba8f4c2aa70c76886eba0e66e293dcb6aaaf1571f24407f6d5751eeabb140069c4e3640ba8915272212bdc3aed3ad32892efbb5ef4ecd244d31087c1093dc5
-DIST thunderbird-60.7.2-nl.xpi 583913 BLAKE2B d40a77881c58ca5d281e803c7d6984475a8444b7be9388bd8bfa5f3e17438793cb5a97aa4964154c3a42ee89e117d0aa4bc6b8f4b838427f9b69f2f4b6e120a5 SHA512 a646d2d4e5bfc51e7553316222273c4c9378e9270eeaefa7937cef4882786913fe7a8a66660462f43da0aeaffa19dd302e3e7534279c886b2031abca369e73d2
-DIST thunderbird-60.7.2-nn-NO.xpi 576422 BLAKE2B c248d29628c30cbd07e4d525787a614db71fe6d8d2ec603997f3ffc0a389175034fc75bdb02d51d5f289f30c74ba60df045d20c6e6cd08eabb104949eff38de1 SHA512 b42e8c465e18d4c811ea351093e1c771330277611c99add60aeeaf142d0804008f61c92f7a60823d319dc6a7e9d686741b060d27255672835f5934d7df18dda6
-DIST thunderbird-60.7.2-pl.xpi 480725 BLAKE2B b205d4791f00ab4e612e043657de37dc6af4b4f383cba91b738539c9c36c121fecac2abae6736f692c98340eb4c00522d6c83c15b672bf3fd1e98854dff82a39 SHA512 f1dca27649bb92ba45d8bcf1a2124aa0d0fa875020c4550b22a83b81f15bcf372b2f93f31112f1b2832a523bfcd497361c8cea056f6803e0b0de231d4b99ae7d
-DIST thunderbird-60.7.2-pt-BR.xpi 588835 BLAKE2B a227060c3c111db66bee9c2f787f4a9830fd0063947719232f0d84324118a0ec517e99a702b5e6ecfa16b5d5c2bbec2a1bd604631fe5dc527fa952edc53cfa74 SHA512 db290e4ec8821158751daa8e95fd11a5b931e4a28e4e5e44c22203c84eb58a74287eca6c1d1450df6155f608233df9c5575fed6320682080c2d7e814faf9d51b
-DIST thunderbird-60.7.2-pt-PT.xpi 593186 BLAKE2B da23e107afab89e4e66212261ee5478f0a9ca617a8780b898df0120cb8c2929aa88ec79dce2ae2e9ff269e51213ecbc8bb3825edc3fa1a4b599426541315a5cb SHA512 c4038451b60f6cd2ef15707295602a3e8dee484a70851d8fdf1a69eaea52a3fdeb900e03892f8fbb0a53628aa7f01e2332ed86f03007b6ba0aa12c9bbc2e6a95
-DIST thunderbird-60.7.2-rm.xpi 578383 BLAKE2B ee4a231cd9ca5d6ad4489dcf21c7b2ce6a68f31842643da7893fb67da55e2ee7064b4272ed60f2b402d669b006a19a586751c1adb86f5ccd9bf9898b75ca6593 SHA512 a8d5513a31e0b8c55b4ec50fd22b0e7c73e531916b43cb0a9c89b8fc1ff13077f5fa583d7bda1cd5d0a96ea14a9a3223158e80f2e5b449684225654ce8af9001
-DIST thunderbird-60.7.2-ro.xpi 584307 BLAKE2B 49713a59c3115f016089105655b3efc6587a9fdbb483e48d4f997599d752447fcd5d2100a539bcdb0ff01e2be805866647fe830c8d82d39a0c197bface5c7912 SHA512 f5ef9dd61bb40ff78a755929ce4158d8f731fce035d47fa5c1bb35e3cff81760ec35d126575d731a68e3dc09f1db1dedb7f839e9ca084dc26d8375d52990298c
-DIST thunderbird-60.7.2-ru.xpi 694706 BLAKE2B 3d8cf47fce32c6aadc3c10d7777160fb15f23194dfdd28b92137e56cf73c707a23d3ec7e99cd3863db86adb4999355831223d95562578ef335fe25c2167b9e4b SHA512 c8e820391559d2755756a28bcf2748de54333d2c64b90f420adea5b9ee63f1e3e5847426f155c3d33744b31b2752326ad9765309efd042a6c5f1bc334846dd45
-DIST thunderbird-60.7.2-si.xpi 647590 BLAKE2B ca20e0ec0f306dc82935d7806dd4d3623d8e0d58deb32fb6d3624bc9b0cd1466cece2e8d9bd5ded61f9f3aae2aa4ff947751a5e9fc09ff512d15ae6e436d1e29 SHA512 5de326cfa30013d07ef8e343a6cf8c054a8eb189cb79a9eccc0e2449d0059727d4e557db4b649461c0b2bd0bd7d7ecaaefa52ac5c68bd169139821ddce326de9
-DIST thunderbird-60.7.2-sk.xpi 612217 BLAKE2B edb4f89ff99a2fc60c2db4d6b2a6e081856678373fd2121845a9412081caa924174482b6db0f90a16a2d5d3583c6325ab4c9b50eb8e3b8f4dfa814ee7c02f808 SHA512 e02f8c2659c1ac1a8b70d8a4b1f891d90f9cb1bc948e2fa0bbc062fdf4f8e035e71e39cb8ac9c3e48c7e9f7eae7e179e8c2d1072e79102bc87493d42785ed826
-DIST thunderbird-60.7.2-sl.xpi 589947 BLAKE2B d20ad98125c2cc65cde6b69dafe2d36d0d2935b357b1f46ad514db9e89c7a7584a490816698377c470821ea75c473e032066aaef6b24a9e661a72a04feef9f5d SHA512 d544d3a57b3d3c21d43804ad75e9add2a6c1cc1ab15b0544c2a10f77fcd9fffacf88a263efff5094d6250083fa0d04b787980dce793a8de8122b4262a537ea5e
-DIST thunderbird-60.7.2-sq.xpi 593096 BLAKE2B 12d497f4dfa6e46d2ba62442bef92009ba6005bc171f551c8b3c4669cbe8e790452f2c910661d5fe9b33e169515446e98c396042d37d58414f929782757fcbcb SHA512 8aa10288cc1aced6d6ca6da974f1ffa6ba1f1cbe5f1435d0a4779a7b06d6228ab976b7b1db219c8a650c1df5b7bfdc5930effc909353092fdd272fa94872a6d8
-DIST thunderbird-60.7.2-sr.xpi 641527 BLAKE2B 7b555e01afed11a7b668b02309c65375e259e1e42908066c771e59a141a436c1d7cff3e3e1db06b754a523c56ab4bb1983cd5fa5da814a15e2fd2c733ed271f5 SHA512 b2b1e5644c7d068fd6a9ad86d8b50833fdcba83300ec09ca15ce02eae456dfe287460a3641929f8a040168737e7e7fa56625ca93624836d5a89f1530201e2778
-DIST thunderbird-60.7.2-sv-SE.xpi 594077 BLAKE2B 0eaac3c7f1a2e28183b260bcab19fe2002e8fd4769ce569362b60f41c97bb5b09c25200e0574fe155ca3d205a9754f1eeb44843b5da597a77ead0028fd670d56 SHA512 cc8786143dec43b6b12b28d587eb68df6d1b5c5977d1909880251a7ceba7c84d7b9dce9f8f3dd8ed21b046392dc4bb4f4ee79306e20d5f7adbce80c029cf57ac
-DIST thunderbird-60.7.2-tr.xpi 598010 BLAKE2B 13428e76dab2ebc5ce7f56944684effd1713a041228d508c2e32a2e7d7dc07ab65aae3bcec6b9c5ab00277499c3a30f17b14606bc5cac7978307427d6084a8ca SHA512 24ff9bf278ca96eda2b61dea8a5f96ec2cf19a0e4a0312a84226027d27d8c09b9359344e115908feee1d3cbf442746f55794e6a4fa007ab9b36d90db1dd0cf15
-DIST thunderbird-60.7.2-uk.xpi 684155 BLAKE2B 3ab679349b0536d9682bd9433c83f3950a120440888e74a2123f3b93f9335ffa9e5a4310011f8d0c17069416f93c1bcd2e13ebea08e694c78e6ee4aaa276589f SHA512 a49ffa3357865b9dddee981efd3479c3f37403273b24bc9bbdf00c3980958ca178b2612f38b6b6ebe6133f647de365d01e1a9f23d76fada583b265121f189719
-DIST thunderbird-60.7.2-vi.xpi 637187 BLAKE2B 548dd4e16045d30ccee93eb925891e16bc8e7f361e59a676e4fd23fc39123aeeb50c2f9772f35ad512daad48de8ff8e757709a67c87c87d6225d40245ea7e6a2 SHA512 5147a2a3878e74081de7a3f935d9a2f17b3d9e94b33abe3de07167617b482c0265b4d66ecadabe88370c1be0d24abcc67b0e9eb2b5fad52137cfd6b693b21fbd
-DIST thunderbird-60.7.2-zh-CN.xpi 626283 BLAKE2B 7d8c138b0676ac3d1c19a04d322580bc150e7cab9965aaaf7c22e8609451e4522638b0b4d522861d689fa2260ea44d1e2d56895914cb7bf0db0a27c60fa9ed96 SHA512 c40f59109a2efe8cbabbe2018e17829dfa6dee6e6df54abe7b70c14eb843ea0e35974c5b19b5aa790d7ce2eab159ed9562ec215c595721b1102e4965149a5c08
-DIST thunderbird-60.7.2-zh-TW.xpi 626190 BLAKE2B 3c1214413fdff4463429d4450aeac80f194bf048d897f1ebd419d5f513f0312da01b83dc05f0f95a67e76ac0d7f5b24fa30e13905c90975b1ec34a42477c559a SHA512 3a49b28fdf5681f63ec9a2dd4477ba4ad43566e161090413d3d0a4711c1fd7804e480a3c848130281ddbc023e4d878928ba637dd57663b5aded75e0c10631efa
-DIST thunderbird-60.7.2.source.tar.xz 283874432 BLAKE2B 8d30fa0d20b2abd092d3093238f5358dfa96f0266e6e99d567c0b831e95617b7b35e9826b7fae969b93fb7730688eb347c7cfa23d766b65bc66b57ee29c852d2 SHA512 e889bbc75a72a7063122f4e49b702d921a1795d59e63597b8f42da1665863cf925498acda44bfcb4328b183be3413dab5f1f51d96bf4b867156ac15b3fa3e712
 DIST thunderbird-60.8.0-ar.xpi 627180 BLAKE2B 31d1631f7ec6320830dcf3545a5c3bd9fa346c6d8807e25f8c2071e7dbcb9c04858f2982407154d68abce45277ba96f650971268c389be4691f546464813725f SHA512 c92af1c4eef761c30ac2bbd6a333a18826534f35bbe6f5a0da342cb9cd354151bff4bbcb48cf0b804657de1f8e67c385c4c6ebf14d92a0a6cfc39f34586f961a
 DIST thunderbird-60.8.0-ast.xpi 559643 BLAKE2B 763f6bce63732bec4b01c28f597e2e1948394f5cb8a404f0bcf5ffaef663d8b9ff3e8b09141989347f944e16c841255bbf32ae50614aca25e12e5f2968872e9c SHA512 bb61302d2e14362819a99df3de4e6309f778f025f85758b927604391a0f872d6df63a0b69d669f008972863fcc230a345c1cab9b961d5df4e2a403648c484a3a
 DIST thunderbird-60.8.0-be.xpi 659079 BLAKE2B 698ee1c4c58a8d5e6ddcedfe439ebd4e91a648ae9fe7d7040075f5cdeed733442ab6b933bc10389b58d2c35eaab14735dfb2eabe65e2ce956d0f133c51f4e27c SHA512 a73da736f77c7ff6947534aa7557ec11ea302ff378394d5ceb2cc1b6365bb36f81b556dfbb66c5521ded65168f2fae3a03cd3cd0f59d030093553590a21950e5

diff --git a/mail-client/thunderbird/thunderbird-60.7.2.ebuild b/mail-client/thunderbird/thunderbird-60.7.2.ebuild
deleted file mode 100644
index 4629cdc73f8..00000000000
--- a/mail-client/thunderbird/thunderbird-60.7.2.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-07"
-
-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
-}