7 files changed, 905 insertions, 2 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 8259de0f91d0..4ead9d70ca9f 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 07f9bd228c51..cde9acd0fe0b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -14,5 +14,5 @@ EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a084
 EBUILD mutt-1.11.3.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
 EBUILD mutt-1.11.4.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
 EBUILD mutt-1.12.0.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
-EBUILD mutt-1.12.1.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
+EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
 MISC metadata.xml 1606 BLAKE2B 4b25867379e06da3cb6cc6500c42c731e18512be107f69df9764689ce2de3741ce235d0f610711e4fbfb256319b1343647075da7808532a63946451f7e6107f5 SHA512 054aee931ba2bffe79982ffbb2f32282f8c7277319915ef55a2a2cd3e39f20b1ab90c664016630aef63f0d325fbd3934336f0d5bb25ff610ecb26fc9f9fc66d1
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index e7a091241ec9..6c1d31ab1ce2 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -25,7 +25,8 @@ REQUIRED_USE="
 	smime_classic?    ( ssl !gnutls )
 	smtp?             ( ssl sasl )
 	sasl?             ( || ( imap pop smtp nntp ) )
-	kerberos?         ( || ( imap pop smtp nntp ) )"
+	kerberos?         ( || ( imap pop smtp nntp ) )
+	vanilla?          ( !nntp !notmuch )"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index b830e3d95a07..978a8d875590 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -114,6 +114,59 @@ DIST thunderbird-60.8.0-uk.xpi 684155 BLAKE2B 14fab464620240a30a650c4371ce790d91
 DIST thunderbird-60.8.0-vi.xpi 637187 BLAKE2B 7ecd85e521b230a2de85382f0ca2588523e6a0a819124bd440cc34859230d89f827fc2ad3e193dcc5049bedf21fd1ce3bc177c6451278eee13623532828d72a7 SHA512 47dd90cae041761fd58db8a9c9b1c97e7df1933cb6f2e36f11376d683cd7f802fcfb74d8887b5333222484daa1e6c925608d54a4ec30f1ba8d6b234dba324407
 DIST thunderbird-60.8.0-zh-CN.xpi 626284 BLAKE2B 90576f52f491b6af98489ee02fd48a7e27ca25eb4090986abe0ae67edc866240fc77e3b9aeeb768759eef9f2cc0b138f6aa60f59473ad2e6d786e578ff5da194 SHA512 35fc72b7894b7a678c57e8b89332a3478bd8eb49db01e8cd74f9a347466f577ddbcfa07dde487478e9c120d462ada430b0a569ab50114a0f603cbceb8223a137
 DIST thunderbird-60.8.0-zh-TW.xpi 626190 BLAKE2B e388d36ca6963d406372af7d26e9ea612cc69633a162fdf96f298a4d61753058cabdc5c4f400345751e7485a4f1bd5d75cb129dc993722f796936f3659da0ef0 SHA512 41abd5e0a83bb8da396e1b3f469be9c89a09aef74f2a6e9ee7cde27b8d09980b2539d1c36571b65cdafb1bbf765c671105c519db63aa33131781125dacdb3a83
+DIST thunderbird-60.9.0-ar.xpi 627207 BLAKE2B 60aa4a5f9973206a6280227e7b3634fd7cef30be5d3d038f778c50a23edf77fde8ba4fba7f4f40a5f87a8b46b76ad6dfca24d4bcc1dec9c638d117f90c688722 SHA512 5a0081c227c8949038c7861c2def222b2c7fa913aea35d0c6f71fd30a35af74b2fd6f93523704f4c45246449ef006d424a18a6245fabd0b0224a8c4954b500f0
+DIST thunderbird-60.9.0-ast.xpi 559668 BLAKE2B b235321b88735ee77ec5c8ba45c1fccc6f4cf02265aa22907f2095ebfea61e7a1f873961860f1cfeab82cdbae5e9bfc0402b47f854ce3c52befbb16dfb8f86ff SHA512 9d59fc3d756e28e4b852037a663be92fcf75a776899a9f33df3504c9e584dbc836e8456bb5b8b1f273597b3bd7a2e407718e6ae126fbab6abf383ab4d6454d3d
+DIST thunderbird-60.9.0-be.xpi 659109 BLAKE2B 2813952c4405b57b006cc4eb84c5aa00d0c283f239b4cd16fb7b7a1fe5ef0f4e5c33c11a1b34c7eaa65d72f79ddbde148bae14f88da6197db3b131be0677aae9 SHA512 5bcd7ed6e99a046780abde8c6ef9500930e9a18d77714d0b8cf2ebf394fe42f1b2a0f9b81d5039922e55cce93aff397b80010c542c5343e56291ca8f431fae65
+DIST thunderbird-60.9.0-bg.xpi 669347 BLAKE2B d5e23da8af71e6a155ba6187cd0a736f92599a88e125ea67971b5089b13319c91c6f8e013badfe7b7fb4f6f4f4e96ee28eb028245575c72c1fdf8e011c1cbf2d SHA512 9acb8a0cd376beff07175c55bbccc0da0ad7a14ad75a0e13aa7c3d142b8b7b7e3bd01c2ff40566caa56f2c4ac663904e38d34d618beda643d094b4ff4d462197
+DIST thunderbird-60.9.0-br.xpi 580395 BLAKE2B 17ca07acfd57df6b8b3ee7a8abf186ffce2e74ec2d5fce8a869c3f2e1b51bfdd1bba8540c3c76478132690a6302bee608f1181ed74687431d96b962b8c9a8571 SHA512 cf62c874aa8074a9a5831f341e749763ddba3c98b20208af344e5a9fcc81c13982c2e05350e934389af6f2b2f994d11cbfe234ad885cf377bdec4794b88eb1a8
+DIST thunderbird-60.9.0-ca.xpi 591997 BLAKE2B 350fd1a5bcc3496c8b574f4962248ef7f01ec8929cf1467a8dfb9e5aa3fbb078d77c487d9b555fd17dbf475ae12db2e4d51e104a8837904ad8086b8f5d2e11fd SHA512 9672e3d20845474e7690b9cd25173f10d351dbfc75fc454030b699444c002beea477648b27c48e8d9293f1157935ca736612254c5e1e84eb162ab9f8fd698561
+DIST thunderbird-60.9.0-cs.xpi 611228 BLAKE2B ffc4f7b4340ec89109dfe577f8e47544c1c9ce000e98340b5405c2bfc96ceef03e27a9486ac9d18f2a5b7335515d5530bb7a4b5c027536b0f4d3248cb060d07d SHA512 9eb401bb2422f23f97256b3abee0840daab3149f5019a200d23e9d9f48a738a9645624e161c73e843ac0cf0219d771f461dac6deee8f92c43342abb7d1fedb2c
+DIST thunderbird-60.9.0-cy.xpi 586063 BLAKE2B 7e23f5d954b40e8ebfd17f0f0af2104c9c6f2bce42920634cbf0bc61a12e9fd0430dc634216241068a44525de123f2863022b4818ee4537035cea32be8dde30c SHA512 6eda96c22cf707631c2f10d60e40ea5498e220633863f3c06cce51318cdfb6d76c432f12ea295c299913bd2c23c227138d368b803c0f086d3930678342e5e863
+DIST thunderbird-60.9.0-da.xpi 570833 BLAKE2B b6e6b65213df030b55b0fa0bf706c318445073a788d6e3bddcab9bd998de12dc2eef2a8dedef58ff01eb8df88a19f19fac6139355e534e5908047a6ac89a3f76 SHA512 ad03f0a36a657b916402403b0d231c63187f3380b4032ea11a2f3c24c1d4efee9d6144ce2aeefdd6049501fa89f4a8cc9f217e1f5a5b2c50be24692d30f61914
+DIST thunderbird-60.9.0-de.xpi 582601 BLAKE2B 7dc5a3cba3773080cd7ce986271f4138c01c4a195d3a3257be2d70e4f5a9532e97f52160e08b5c7e45b3bc13ff202279e9e2eb2e55269c28f15e8f8d4e1381aa SHA512 0987b26a2a8fde8cd8f7b394728c6a071f1684701a23f9da5cdf0700e39d7656a8bbca5e79fc9534452c4f9c532c607a0036c19ce764b1e2719c0890efe6fc2c
+DIST thunderbird-60.9.0-el.xpi 694890 BLAKE2B 6fa4f6df7ef656583c28be35b40d424e2a62cbf56cfb246ed22f6e7fd3c4995eea259ed44cb63c72fd49d3d386df9b79b68bd5c0b1911de7c5a239cf94d4d44f SHA512 a53dc157012e0f8877279a297976c5ded093bebfde6fcd7a2748e67e1da41ed3c0db0b4291f4a233529a4365d8b13636ad45dca011d5a4abd50bfbc529d81728
+DIST thunderbird-60.9.0-en-GB.xpi 553908 BLAKE2B 5ff099d40693f3de04cf86302f37ca98a495b0f972569d19122176abca3d764dbdd66e40e899054745314209836953a0bace73a64b43911f94e30c6040fb3d2e SHA512 45f395ac86308fd71d78f59ca63eca18ffc9e896a0314d66b3b2934ca00aa0eba4a9fa71841850044309e25e2bb5a57297deabf7a8b029fab619ab2843c8af92
+DIST thunderbird-60.9.0-es-AR.xpi 595073 BLAKE2B e5858627c4e989926458eeef65e6af804d5aaff880fd564b574b26159570eb5bdebd853d6a245820f45c7b5a611af4c5f59c259dfe705ef81d316ab31ccd15cf SHA512 f6223ad80e47a8b849d3742a463504d94db3ddb03ebde28c621934c866156fcef7292d96946379668d95bfb584436670aaf104400c5c98ea152151306ef33949
+DIST thunderbird-60.9.0-es-ES.xpi 492237 BLAKE2B 61323c7e8325845cfe85c34d06213764d7ea94fe5ca0c4b5624728530e84c3341c513d4680138065e66ce6b7d1d86e09cc0bc4101510dbd56bffb1e917835408 SHA512 217858203c32821bd092dc09a17545c940ec3110ec5692f9536e7d93a63c885b8f304bb2a9e504fa050b639f265fbb56f6546a3f26790c216bf9427d4a6e94eb
+DIST thunderbird-60.9.0-et.xpi 570896 BLAKE2B 2bb24c51e100fe14214d4cf14e4a02f3dd0e10f9119600bf58148f634cce0bb1998af409838b3bf5f3aa755e66548577665794dbd6a756b493d49210a0322648 SHA512 413b7b57f58a8d803fcb3b2c26d305a3f5d53c96da773138bdcd14224b057e99b1aaef92046fef9ce8447a89dcd1b256738a3ff3db2baad20dfb1a68dd1bba14
+DIST thunderbird-60.9.0-eu.xpi 581411 BLAKE2B 272f0b3447ef72edb0fafbdd6bc4134d627670dae5a97def3b6544897d5c99828d05d9dcabb790680ce57827b55fa1d30dc660604412aae0f149729847a103ca SHA512 bcfbcd81643cf8adaa2496eee73ba4a1c414ad9cf47339d557eba867a24fa62fe0eb4dc061ea6b0d59ea9a6302e28dd96d203e12c6d885aad85bb85844e47d15
+DIST thunderbird-60.9.0-fi.xpi 575783 BLAKE2B 3e40c66dcb349481a37a39c588a88a222f653bd2709d37e9a22aa8b970e9cd6edc3801e234ad3d59f5346fa0f7dca4e55f5709b256abbd29ddd3c103ba28a797 SHA512 f0caeefaba563f7f34873be71c206bc18212261f71881bce8a31bacff504bc3a1ab7a61efd7b32be53e909034a1845dd2aa1047b5180ba34cf155a31d1c872ed
+DIST thunderbird-60.9.0-fr.xpi 608489 BLAKE2B f52ab3ce78591b7ab3f9e0223ecef48eaae12a27f60df21af33b176412b3a4c467fe78a938feedcfa8e0434c5f96a06af255c5b323b29dd529f1d3224817aef9 SHA512 010c4c4337e4225228b2ad6e8c7d9dcdc2ffc70fd7dedcd6e5141a76f86e0780f6c4969967868bd3d79008ff9cecc807625c7be42caf42e2d2e12852f4ab5eec
+DIST thunderbird-60.9.0-fy-NL.xpi 593877 BLAKE2B 9ac32e46c5e4cd2db94af1d549632cfc8dd9df6fcf5b1e5edaa75af794a4aa159f3e606e8ac53cf5904341a1fbb5acd0e779bae34045f65ab568d87fc294948a SHA512 92305ca9d3742d02cf7d2ecf7bd91371efc6efed4f97d8eb4104acd34fa03facb80715d12d57a3bdcb9455f422858ef2dfa84d1f897129e3aa6b5e62d605e7f8
+DIST thunderbird-60.9.0-ga-IE.xpi 603533 BLAKE2B f7af3c0eceefc42101599e6a23a2c2be2005182a39fe6c5d64e60dd4c9b97024dbb71f57e80bb304bb1bd6e46cd755860ea67f25ad13fdd7c52dd34a81bc144e SHA512 77ebdbf7e8dac0c5af63377a70e8ef550aab331fdee7a1dd9c6214ceb2999be93e71d883cc93b26d387d0d4a4da5a88a10d76abd6ad95fb16c820332d6a960c5
+DIST thunderbird-60.9.0-gd.xpi 599288 BLAKE2B 7a498541a739757d1489fc869cc7ed399f9471da89b423034c7e2ade886a02895409eccdbadd4d434961efc4dff6b6806faf4ae1b1fc8922bdd739cca89fc94b SHA512 775171cc45922da91a93b3e36e29de5a60577293f362cf8907f5a0d8024f40b95e4950945656b15c3acd8fe6ea69e8e158bceb86d96d7ff29ad31cdd59d748aa
+DIST thunderbird-60.9.0-gl.xpi 580370 BLAKE2B 430e95d9d8461d2e2167452b911808ce47502ed569210a9e3c798fc0958abe38c0d91abeab7ef4ffc673052ceffc208c8e3da4ae0c5b3a8a3ebff0e30d576e7a SHA512 683146105206bdeff2aa75c0f694bbc463d2a09fcf2852d65a874a135a7595f90c48721a707b980d42583518b7a59e7bae2188f03a6eed27aff66e8dfe8730e3
+DIST thunderbird-60.9.0-he.xpi 617170 BLAKE2B 46fc5f92952a468647c1586ff5ebee3eee161513ca92a150b72fe6badd835bd5914a3c965ebb4b3c043541b370becd8ea7cfe6033d183d99c991b4e7af970c80 SHA512 0a993a33fd1db3844f86a2d6f988dc04a666a2246a44f0bb42b92f0f3b6f1702edb1a4daf86457adb0b02b64adeb5e270fd7936db97d6ed55c79ed52e36517e2
+DIST thunderbird-60.9.0-hr.xpi 582263 BLAKE2B 5e9f39ca64581905de3577adda937dbe01eac30e2532569bee565e8c7de60c23b7fcd7054f75da60f20d6a34ceb3b72a2b406f8d7a16793ebdacf33281518973 SHA512 547e39b05906e419f21d41ee446dbdb895c9d52d2a6f7a53cfe0464b9dda6303476f06e813dadbf8150010b885f301d04e9546a5a4c97d67bbf9c7d05c460fd8
+DIST thunderbird-60.9.0-hsb.xpi 615159 BLAKE2B a009f8d51450b60fa26bc977064911177449feb704b60af588448344eee3fff37798ca80e7ee259e3edc48c7c63e06e0018233e7faa9c08e487926d56dd5d6af SHA512 154641c2ce94d706ceee1af94e0ff053f50fc1814914ab873babfd5c777a5fd2e1653e373503293044762b7a3c47bc32629bd291c3a3085b00bef8bc4b960489
+DIST thunderbird-60.9.0-hu.xpi 615371 BLAKE2B 933d999108419ea88204afe4a3004847ff43134d3a6edc32892a7b3ce5b8422f0c46e4c9432f05986d5dcb95943b50ff6ff4c2abe96b7a632247781e85083aca SHA512 999d234ce7679126f8de6119cd94702b51153ffd9bc4e1a1acb2207a99ec40ffc23683f3bc2f0821ed66045ff98687e9b9f45cc4540ac6fea63beb6c0edef36d
+DIST thunderbird-60.9.0-hy-AM.xpi 653559 BLAKE2B cdd21cea8025b70c6382fb16cc51732eb912ad011a3ccb1bd7c8091db7c63ac996297daba93ce2726a9c8a3e314fabc0b7658403d64b42cc01af479047961e45 SHA512 357612b2f480350f3437d6be431d2d7d21b9490561887da56ef09e52b5d89f7c3616c2983abe82f89c3ead04c6743d4b56af6abe8a5974a8551aa7f66962f7be
+DIST thunderbird-60.9.0-id.xpi 568886 BLAKE2B 0692577d45ceb25ad15f10db4061da3692573783b10d211e007beb54eb4b27763d9220017da256ff2c7d4cae09e495eb2d8767d913682f0d4cf395b1ca8bf3c8 SHA512 18ef57140c735cc81d05f900fdcdb5d0cfcf7e942fda24ddbef024057bb04bfce8a5e5ce85a7b22d3bbd0230b5bb48723c856be6b05eb17ef0a2a3ac29f10535
+DIST thunderbird-60.9.0-is.xpi 579075 BLAKE2B 76247c0bd29cc174bc06052c6f55c45e7cbe707f9dba2e70a5419566f77c7a6b94800f1d4b4618f196f50af1f67e165b317fbe9e9273ef00e9ee8b8551024a9a SHA512 f63198b9faf38751ae08f053b7ba66037bb9de613f76c105c0cd68eae3b207fa69adb9e9930c41eb3047e9d8144321b5061a6ef56144a716fa4178b8f6942d50
+DIST thunderbird-60.9.0-it.xpi 477525 BLAKE2B dd9ebee2faf8dbc081dbc5fdd2fd3335cf38e53f1e958914f357305ac6a0e8e71bfd0729afb274cc71f092cefc72ead3657792fda5ce2cb2242724bf12ca6b18 SHA512 0cf65310ec22ce8ab932c2f21e3a81de9e998b5f520f7143facdf8d8a59b5c4b5f678c66aa3db84fb48846f495a48e5e962851b74381a5b14d30a95728605543
+DIST thunderbird-60.9.0-ja.xpi 653371 BLAKE2B 1b94cefca2cd474ed121b0242e43d4717f298540084b22313c88950026016305397d7e21d3aab8ac27e1b596d260259a98acf858ee8b5e2284996d6949f988b0 SHA512 22a77b41c5ffa0ee886595cf91dd0448b859437332c17ace67f7fc1bbf74f5d8216481db46107f46641e14afb3302d2ed7e037b86a91d25d8e32f9becfb0c2cc
+DIST thunderbird-60.9.0-ko.xpi 619757 BLAKE2B 154f6ac6ca7c539e3cdf6968afbfc3e89d6b1bdac0b1fcc87607725c59ca1b3a46dcd7d47e1ad3afd7c9e5dfdb89f84b965ed445c2f238f2a15a739072d1c1f2 SHA512 5e2eb7802bb68b7118cfa59fbb123c4775282719f7dd620fc58b7f9001aa333c07784473cd733e351b05b64bd6a7b565eb11321ad4d47149516e25a8549cfb43
+DIST thunderbird-60.9.0-lt.xpi 605467 BLAKE2B 81dd5e324bd559678a94d3c059fdef1cbf0384851d90a7ed8da4cf623704999683e0f4a6517f4648a889392a4c9a297eb269f0189f13b962c94573e440999c09 SHA512 0c8b53042f1ff7574cd1a082a05b2c6dfc3a647b34de87e50e17e2a68a85533d3fa4e38218f3aeff19b2584de4cb0aefc04028003e82c0cb1725ca1ebf8e5fec
+DIST thunderbird-60.9.0-nb-NO.xpi 577025 BLAKE2B e1f341c2ace93c83e4045443d6f221fc1d16ddab347762367fa681fa2ca2752b7b280f28f37a363e74b8c038a9d1583e6d63a8c69b958b1000dc3c87ee11ccfe SHA512 e5ae45d0704e0992456ceee5a02e06aa65a8870d24ff6a31af9368930e13522e83a9ca9dfb04c3a109479e9a89b03bd524ea2d50c296c8256eec83a6711bf0b7
+DIST thunderbird-60.9.0-nl.xpi 583938 BLAKE2B a9c95ad7abc86becbd3200c2a5a0d120446bfd315c2753119132661446da0c516995343141646afff100276cf70e061a6f8cd51fe5a4cfaae0d5141f4480d375 SHA512 aa0b494e7a64e5e7a6a62f1a2a1edeb4ca8ccbbcbcb3c47b359b2d248f171627cba39e4bc9fe066837aa52996889a660661f52a46bd90015d87c0a323809e7aa
+DIST thunderbird-60.9.0-nn-NO.xpi 576447 BLAKE2B 745755879dc6d01ff02cd922ccaeeb8a56e45d5c8a8e2d9d5cd822a708ce3c099bdc4e5c23f9efbcc74f54eadd8bccc65d8d0eb8746fa1f60cc7449c0b23584c SHA512 5364f5d851e4a8e407b8400c81745bec91980a4eb521dcd4af8a88cfbb17c86e7a98a7b7f4bdefc0554c0725e457aea043ce22b40cb9de3380199f7668995cc5
+DIST thunderbird-60.9.0-pl.xpi 480752 BLAKE2B bf3e51be873a7e07c791f39294192d6045245c6d05d8d574054c7f1bc725b908c099575d7743c819c772cc2d22baa6108c56ef6edc0db1f06cafc55fd35cd6ad SHA512 5a1fe6bee2a9cdb0e6b7d3a4ece8e662b125cd985ffc0db99ca5cd022d39aa5a10b90801a6dd9ca0032692adf8f8941c2144d39337e0208d3c422dbc9748cc1b
+DIST thunderbird-60.9.0-pt-BR.xpi 588860 BLAKE2B dd106ac8208c979c4ad80b0b086b96d211cf367a5631b4df824a0c8622385ad57c9b704e1c75f278fc90ead95fbcf2a7d14e9021b315faa33559755c0bbfb906 SHA512 b9f14b141c239bddf1b741e31b9b91f721c3bb41d673e44adb77bf1bf8b212699be79dfd68ee1f5c0f66ae94f7e10bca88c5605c5e0d5210e936c885b77b996f
+DIST thunderbird-60.9.0-pt-PT.xpi 593213 BLAKE2B 7c9c226692e4bf6aa0098e76d66aecf99beec909796823e9dcd05d8082110a189ca3c402927f3c594453042b22b4571ca9224606b15c59f76291bc84f01303e7 SHA512 97a55e18f44d4ea3c13cb5fc3e7cee9e7080615f0e18c333f200a15b957b69cb5f8b53a72c6df39facb204fd18f83717806f2bdfaf603f1ebeb355a9504eb33f
+DIST thunderbird-60.9.0-rm.xpi 578410 BLAKE2B a79668aef9699609804516ecc1748f8eba32f27abdb0389573ce8394a080c7bb57d405da53f8bc3c78850451766b370996ceef9e0d2e2418bf970a5f9eec2412 SHA512 bde3863ee45aebfc775b3a87910c907a6ec1cc1b39241e7e1553c6ca1d9a917ea79d77cca5975aa2d55bdec27d5ba0d6eb9abff7d23e54306cbe89b8b1b23980
+DIST thunderbird-60.9.0-ro.xpi 584335 BLAKE2B 8827b8bbf47bbb7dfa7f7b980baf13fe40f82e1fbece5e40ab0e65f15158af28a92f6200f8cfb13660989a678cd00fc2ad239d05e472fcfbee06fde17998a32b SHA512 739b2f275cfa241c235adbe4d9a1da0ff9264b3eada0fdc233cbf303bfc7a84f43cf7890dfd00ee553b6e6f519d736e39687f6f29cd779e83123505e89fade77
+DIST thunderbird-60.9.0-ru.xpi 694735 BLAKE2B 141cea82a274c69b5a2d14468151df1123983c94ea047eba4cecad61c70e6065e32c1cca5d26d0691a1a9f6247322477c33e7e2f775a3ee1e46138444e83b882 SHA512 4a48c5715fa866a87229d1b1bbbc8bdb42cb1c603ec859ee2cee5cd6c43534196d02460af4371bf0547b230f4e25ea9e581d56a81731975c2b2043f875cf0d71
+DIST thunderbird-60.9.0-si.xpi 647615 BLAKE2B 126d09c8c1dcb20e07ec1b036df7229e09b42348ad415c14c362c41b87747a8993b2c85e623f928836c8c423daab9ef360004eaef32ed8afe799c1ed11943830 SHA512 c71fb7697eb7fef0cca5be0e0a94862fdb17157e708396b99b6aaaff3c6f2431d55c04775e1f2f7dd09ca9950a4c8187f7145abf8862f8dbec242c9cd59561f4
+DIST thunderbird-60.9.0-sk.xpi 612243 BLAKE2B 2464182018dae30808c8d35c01c370b996a2aacb1787f3b79923407bdc09fc56290874a2ca3c01b0fef063fb8e88e0fb09a1b90518a80d3de8855642eaecd662 SHA512 06b7dcccf19b068dd453df905becbd3c0c9ed56e8c116d8ce68250132d7f112cd8a4e1671e3ccd8a33ccbf49c51ca78e14965adac3f8155feb9dc4d13f71aed3
+DIST thunderbird-60.9.0-sl.xpi 589971 BLAKE2B 8aeb38893fbcaf5cf191173111e8098d1a02cb32f8771370d04241b148a0d3d0df6871c17b68edd248251e84cf548e43fa0f12c4f0bc3246295d7e621056b527 SHA512 49f667b88d5859b49a001e3236266c92ad873204b24600232a2e845f72cecb97f128585c520c6404ce118eccef144133ca7d1adb35fb7d63b25ec873bcc69078
+DIST thunderbird-60.9.0-sq.xpi 593122 BLAKE2B 54b3a6fecb76fec84e24e861dc60b110646ce6d164f674d2dc7c101f8cc2756442a85768961e7eb69b754fca358f08a88fe02715a143175bed955eb0a27c3b03 SHA512 f1c7dc45976508034614fef5269bb5051d669507c477a7359b5d283304dd759078d61cb9c6c4ca2fd7edb9e6078185afdb1e9adcbdafd749e819c93971631acf
+DIST thunderbird-60.9.0-sr.xpi 641555 BLAKE2B 474bc8caf49a2663a0e14edd47173cafab45f3e41ad2b22b39b12e560d0b61279c2857faf0cb4aef2b153bc3d0708b7eebeaadb41bc23999aef677ee095c251c SHA512 d9bed52764966f935b3e099ff8be8779eb9edcf49c82bf8c7390f196dcd5f2ecab1de41d69c99fbaa6b823399d3fc31e9d058291fd10ddf35700af505d433d04
+DIST thunderbird-60.9.0-sv-SE.xpi 594105 BLAKE2B 1a1010cbced90e183bdbabb9248d4aa6264fdb081d4e333241655369c37764aa2ebbb7322a9eab3471bd95670e5e199c5fd3157ee8e54365e7547620a30a9cd3 SHA512 42d0840b5cdf114c6014576fc689ad06c976c5751893522ece261d97af17ac5bd6f92a5f537f4adbc23d4aedb3bb763a2df35405ef42d283ed14311ce4e6c614
+DIST thunderbird-60.9.0-tr.xpi 598035 BLAKE2B 66737ec7641a54475881576218384663651b7c91641c3fd3edaa98b8d777d7ae22cbb866ec2c9ccd9dfa0b1017d3d58c61488a782f2b601b20a07f9052a2cff7 SHA512 07aab50f3ef708340de25205cf0664d1071a79bbd504aa8cfdd507cbb30d6b6cce25a2f9b81c3341299f3a420784707fd9b3432b8f39b168721cd37d58ec8d03
+DIST thunderbird-60.9.0-uk.xpi 684182 BLAKE2B 2bfed5f8b844be664e08cb0bf4932d0c9f4a5639ef28c6d2cd9ce7689a979df1604e13cb94bc68e7bd9f1f084ff4c915811006bc12fc1368116d973ddab7d781 SHA512 6bfe6bc2cc577750aa06d3802ab71057b05a8610a6c5dab85ec16f1508c305ba223eb78049f1f82d1bbdbba90277c95a5c49bbfa03d4e61eb44a6733aa414f3a
+DIST thunderbird-60.9.0-vi.xpi 637210 BLAKE2B c48d8004d269350410fdfa2f5beb4ef6e37e0635bf288f5c8cde3e4e043acc1fdf4c81b61db999baf4a050261d9f80d5b6bbdb298010fc44496b37d34ac32887 SHA512 045a871f7f316c3fe86cb45b9748ce621ac333ef52dce8b7b6284cbd50e3a91c7b1feec68737b611f4ee2902ca1f934825021d67470ed0f5451e1b9f4d8df325
+DIST thunderbird-60.9.0-zh-CN.xpi 626309 BLAKE2B 81e2846b570804b0aeb2212107eae1ceeb55789a5d5fe07b4f9d40e43d6e78d2ff3319668958d2f2c28779e8c6d0693f2f61e0d761098ca73a4ab30b3748da18 SHA512 d82844d69ba20b220e88b6fd425ae355d1cc57c40405dc1dee6699454c87aa36031b1e9f08f85abfdcdf6371a529f0eee8b3b00bc8b7fe149383add59b9d8420
+DIST thunderbird-60.9.0-zh-TW.xpi 626217 BLAKE2B c6739b670cda85e955b53a6edd704568c52eb38c00d69a2f222e8b991075071183d53e520dcd716d82826b6d9e0af4db2dc46a732790c71e5607f7f4c53067ef SHA512 efeb58ffdbd53e445a2427035f1857d2b02c763e6f75eac58652fa72560a74e4036ec65b2352ed4633d5f54a0b5aa4571f7a582ac2fc51a92d127ff126cdbafd
 DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
 DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
 DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8
@@ -222,14 +275,17 @@ DIST thunderbird-68.1.0-zh-CN.xpi 626821 BLAKE2B 18e4d225bdd0b765d7f9c1a5351c997
 DIST thunderbird-68.1.0-zh-TW.xpi 627477 BLAKE2B ff3b76ddbdffefcb7c75c185812eef137e66ed370f819d94372696004e702d9f18aa370df5a51217fe24bb7eb705614606052dae30a58d10ca9d2a6ee5ceaeff SHA512 5d4fe1509272f1c0a4d857d6cb44eb6d6fa4d3c8f2e573d0200f39ce1de937f53438a2defe194b397104c49adb92991a20324cb0a79baa7e4f74a791cbffd955
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.8.0.tar.bz2 52674194 BLAKE2B 06ecf87d3788db44a2d15de33e64fbb5c4ea530c4d638167e6e1e01543c349c36a6d9160c98509c9fceaf38719206780100053e83d837454da46e027b774dc0d SHA512 5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa
+DIST thunderbird-bin_i686-60.9.0.tar.bz2 52847155 BLAKE2B 2288039c6f5478a5e7ed78a1dd18164ac7203dc380bcb2b69c2aca7eb73cba0115e5eb4d9b12c7ccb2de6a352f3927cd7a8d4b1769a17d9d1c681e8d4451c577 SHA512 b5e3a7d7df69f788408b9d83b05d45c6f8464e9930416d6feaf70a5da58d464b71993b6891d77969537a1f806227565096d2649e19b87bf46ce81550cf7f59fe
 DIST thunderbird-bin_i686-68.0.tar.bz2 57137293 BLAKE2B 38c0cec86dfddc46c192faf93596f747ea827aba1ea685757c53c42766e974430886486ec1eb4bda73e8a880e3cb6a7ee6548adf4c27b1630c662c270402c339 SHA512 6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19
 DIST thunderbird-bin_i686-68.1.0.tar.bz2 57122527 BLAKE2B c4be069e15eb7ccfdf8135d918f1907bcc13440a0d385efa9865af76d285cd776bf68a3af3524d635b872881286ce673052ce29b302b433d3cc5f7b424e9c5c0 SHA512 adc1dddf36116435b3948810cd9d647febfc97d62443032100b0f2d722913aa051d44244f057c29cb8c6cf494fc67b3044b83ebfd5eacbc36b6cd9c88361078e
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.8.0.tar.bz2 50477272 BLAKE2B 60c8c33d5eab011c6eeef44288d0a483927a0793818633fdaf5800beb6223a675c39b8a3a4c4bdca6f307ac5e47bde2bb672eb034c421092ba1188a9c6d4359d SHA512 c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea
+DIST thunderbird-bin_x86_64-60.9.0.tar.bz2 50538647 BLAKE2B a045c4c982cd14f6b454e72f8036603dcbbee2203cffd1cf916bfc50c393e74030ea490b4acc1237feb9ea0368b1368888769fd500ef4f7a1868368547bf05df SHA512 0a490a7b7b02bf13b2a47e7c838b9e1dec7848f2f40445744f74ed3294fda0588c2ed6ee402f3722d0dfccd0a9df9ed3e38021807ff337be3f340ca85c96acfa
 DIST thunderbird-bin_x86_64-68.0.tar.bz2 54593293 BLAKE2B c5975073a9fd4343dee9d1b4eec2e4b830d0107ed8e743349f4663f4ca83511215847c8865348575aeac2a47a8275de91e9ee1052b449c95e6dec08498e018a7 SHA512 257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7
 DIST thunderbird-bin_x86_64-68.1.0.tar.bz2 54551785 BLAKE2B 99429bcfd82bca0e31f222365afe7652798f29d416e8a34c4375ae343c0dba3dd4b230fd37dab8cacf91c3a953533c81d9b059cbd5e0974171d016eebe6d0d99 SHA512 7a29cf0a238e44a2051b53e5476bc8f622dffd088251b66d951ad6874fba5fba180f440c80c7d5ae154c688d3e29fcc6c889f0031d81a018b7fd1dfd53f112a5
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.8.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
+EBUILD thunderbird-bin-60.9.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
 EBUILD thunderbird-bin-68.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1
 EBUILD thunderbird-bin-68.1.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.9.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.9.0.ebuild
new file mode 100644
index 000000000000..c62086bbf2b4
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-60.9.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.5"
+
+# Can be updated using scripts/get_langs.sh from 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
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip
+	app-arch/zip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/pingsender
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_prepare() {
+	default
+
+	# Lightning
+	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	local emxpi="${S}/distribution/extensions/${emid}.xpi"
+	if [[ ! -f "${emxpi}" ]]; then
+		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
+	else
+		ebegin "Add localization to Lightning ..."
+		# hide warning regarding extra bytes at beginning or within zipfile
+		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
+		rm -f "${emxpi}" || die
+
+		# Install language packs for calendar
+		mozlinguas_xpistage_langpacks \
+			"${WORKDIR}/${emid}" \
+			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+		# roll a .xpi that mimicks what upstream would roll
+		pushd "${WORKDIR}/${emid}" &>/dev/null || die
+		zip -9 -q -r "${emxpi}" * || die
+		popd &>/dev/null || die
+		eend 0
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 128"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index e24cec63a100..379237cffcba 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -125,6 +125,60 @@ DIST thunderbird-60.8.0-vi.xpi 637187 BLAKE2B 7ecd85e521b230a2de85382f0ca2588523
 DIST thunderbird-60.8.0-zh-CN.xpi 626284 BLAKE2B 90576f52f491b6af98489ee02fd48a7e27ca25eb4090986abe0ae67edc866240fc77e3b9aeeb768759eef9f2cc0b138f6aa60f59473ad2e6d786e578ff5da194 SHA512 35fc72b7894b7a678c57e8b89332a3478bd8eb49db01e8cd74f9a347466f577ddbcfa07dde487478e9c120d462ada430b0a569ab50114a0f603cbceb8223a137
 DIST thunderbird-60.8.0-zh-TW.xpi 626190 BLAKE2B e388d36ca6963d406372af7d26e9ea612cc69633a162fdf96f298a4d61753058cabdc5c4f400345751e7485a4f1bd5d75cb129dc993722f796936f3659da0ef0 SHA512 41abd5e0a83bb8da396e1b3f469be9c89a09aef74f2a6e9ee7cde27b8d09980b2539d1c36571b65cdafb1bbf765c671105c519db63aa33131781125dacdb3a83
 DIST thunderbird-60.8.0.source.tar.xz 285643576 BLAKE2B 223915c001c19908db5a4d6a580ff210f45b5c61a06212ba630a2d1b348b49b7067985b3ef42ee1f69fdc14725aecafd36ecea55af42cb6f6e4e00197ffc2178 SHA512 b465544a8cbedf0aff0f737cf98e2d030331f1ea016b2e541dfe30a5cf3172f9075e5a9c8d6b7e0f97ffc2e0d3eebbaf9a39e76a499b9fc976bbc0c944dfd058
+DIST thunderbird-60.9.0-ar.xpi 627207 BLAKE2B 60aa4a5f9973206a6280227e7b3634fd7cef30be5d3d038f778c50a23edf77fde8ba4fba7f4f40a5f87a8b46b76ad6dfca24d4bcc1dec9c638d117f90c688722 SHA512 5a0081c227c8949038c7861c2def222b2c7fa913aea35d0c6f71fd30a35af74b2fd6f93523704f4c45246449ef006d424a18a6245fabd0b0224a8c4954b500f0
+DIST thunderbird-60.9.0-ast.xpi 559668 BLAKE2B b235321b88735ee77ec5c8ba45c1fccc6f4cf02265aa22907f2095ebfea61e7a1f873961860f1cfeab82cdbae5e9bfc0402b47f854ce3c52befbb16dfb8f86ff SHA512 9d59fc3d756e28e4b852037a663be92fcf75a776899a9f33df3504c9e584dbc836e8456bb5b8b1f273597b3bd7a2e407718e6ae126fbab6abf383ab4d6454d3d
+DIST thunderbird-60.9.0-be.xpi 659109 BLAKE2B 2813952c4405b57b006cc4eb84c5aa00d0c283f239b4cd16fb7b7a1fe5ef0f4e5c33c11a1b34c7eaa65d72f79ddbde148bae14f88da6197db3b131be0677aae9 SHA512 5bcd7ed6e99a046780abde8c6ef9500930e9a18d77714d0b8cf2ebf394fe42f1b2a0f9b81d5039922e55cce93aff397b80010c542c5343e56291ca8f431fae65
+DIST thunderbird-60.9.0-bg.xpi 669347 BLAKE2B d5e23da8af71e6a155ba6187cd0a736f92599a88e125ea67971b5089b13319c91c6f8e013badfe7b7fb4f6f4f4e96ee28eb028245575c72c1fdf8e011c1cbf2d SHA512 9acb8a0cd376beff07175c55bbccc0da0ad7a14ad75a0e13aa7c3d142b8b7b7e3bd01c2ff40566caa56f2c4ac663904e38d34d618beda643d094b4ff4d462197
+DIST thunderbird-60.9.0-br.xpi 580395 BLAKE2B 17ca07acfd57df6b8b3ee7a8abf186ffce2e74ec2d5fce8a869c3f2e1b51bfdd1bba8540c3c76478132690a6302bee608f1181ed74687431d96b962b8c9a8571 SHA512 cf62c874aa8074a9a5831f341e749763ddba3c98b20208af344e5a9fcc81c13982c2e05350e934389af6f2b2f994d11cbfe234ad885cf377bdec4794b88eb1a8
+DIST thunderbird-60.9.0-ca.xpi 591997 BLAKE2B 350fd1a5bcc3496c8b574f4962248ef7f01ec8929cf1467a8dfb9e5aa3fbb078d77c487d9b555fd17dbf475ae12db2e4d51e104a8837904ad8086b8f5d2e11fd SHA512 9672e3d20845474e7690b9cd25173f10d351dbfc75fc454030b699444c002beea477648b27c48e8d9293f1157935ca736612254c5e1e84eb162ab9f8fd698561
+DIST thunderbird-60.9.0-cs.xpi 611228 BLAKE2B ffc4f7b4340ec89109dfe577f8e47544c1c9ce000e98340b5405c2bfc96ceef03e27a9486ac9d18f2a5b7335515d5530bb7a4b5c027536b0f4d3248cb060d07d SHA512 9eb401bb2422f23f97256b3abee0840daab3149f5019a200d23e9d9f48a738a9645624e161c73e843ac0cf0219d771f461dac6deee8f92c43342abb7d1fedb2c
+DIST thunderbird-60.9.0-cy.xpi 586063 BLAKE2B 7e23f5d954b40e8ebfd17f0f0af2104c9c6f2bce42920634cbf0bc61a12e9fd0430dc634216241068a44525de123f2863022b4818ee4537035cea32be8dde30c SHA512 6eda96c22cf707631c2f10d60e40ea5498e220633863f3c06cce51318cdfb6d76c432f12ea295c299913bd2c23c227138d368b803c0f086d3930678342e5e863
+DIST thunderbird-60.9.0-da.xpi 570833 BLAKE2B b6e6b65213df030b55b0fa0bf706c318445073a788d6e3bddcab9bd998de12dc2eef2a8dedef58ff01eb8df88a19f19fac6139355e534e5908047a6ac89a3f76 SHA512 ad03f0a36a657b916402403b0d231c63187f3380b4032ea11a2f3c24c1d4efee9d6144ce2aeefdd6049501fa89f4a8cc9f217e1f5a5b2c50be24692d30f61914
+DIST thunderbird-60.9.0-de.xpi 582601 BLAKE2B 7dc5a3cba3773080cd7ce986271f4138c01c4a195d3a3257be2d70e4f5a9532e97f52160e08b5c7e45b3bc13ff202279e9e2eb2e55269c28f15e8f8d4e1381aa SHA512 0987b26a2a8fde8cd8f7b394728c6a071f1684701a23f9da5cdf0700e39d7656a8bbca5e79fc9534452c4f9c532c607a0036c19ce764b1e2719c0890efe6fc2c
+DIST thunderbird-60.9.0-el.xpi 694890 BLAKE2B 6fa4f6df7ef656583c28be35b40d424e2a62cbf56cfb246ed22f6e7fd3c4995eea259ed44cb63c72fd49d3d386df9b79b68bd5c0b1911de7c5a239cf94d4d44f SHA512 a53dc157012e0f8877279a297976c5ded093bebfde6fcd7a2748e67e1da41ed3c0db0b4291f4a233529a4365d8b13636ad45dca011d5a4abd50bfbc529d81728
+DIST thunderbird-60.9.0-en-GB.xpi 553908 BLAKE2B 5ff099d40693f3de04cf86302f37ca98a495b0f972569d19122176abca3d764dbdd66e40e899054745314209836953a0bace73a64b43911f94e30c6040fb3d2e SHA512 45f395ac86308fd71d78f59ca63eca18ffc9e896a0314d66b3b2934ca00aa0eba4a9fa71841850044309e25e2bb5a57297deabf7a8b029fab619ab2843c8af92
+DIST thunderbird-60.9.0-es-AR.xpi 595073 BLAKE2B e5858627c4e989926458eeef65e6af804d5aaff880fd564b574b26159570eb5bdebd853d6a245820f45c7b5a611af4c5f59c259dfe705ef81d316ab31ccd15cf SHA512 f6223ad80e47a8b849d3742a463504d94db3ddb03ebde28c621934c866156fcef7292d96946379668d95bfb584436670aaf104400c5c98ea152151306ef33949
+DIST thunderbird-60.9.0-es-ES.xpi 492237 BLAKE2B 61323c7e8325845cfe85c34d06213764d7ea94fe5ca0c4b5624728530e84c3341c513d4680138065e66ce6b7d1d86e09cc0bc4101510dbd56bffb1e917835408 SHA512 217858203c32821bd092dc09a17545c940ec3110ec5692f9536e7d93a63c885b8f304bb2a9e504fa050b639f265fbb56f6546a3f26790c216bf9427d4a6e94eb
+DIST thunderbird-60.9.0-et.xpi 570896 BLAKE2B 2bb24c51e100fe14214d4cf14e4a02f3dd0e10f9119600bf58148f634cce0bb1998af409838b3bf5f3aa755e66548577665794dbd6a756b493d49210a0322648 SHA512 413b7b57f58a8d803fcb3b2c26d305a3f5d53c96da773138bdcd14224b057e99b1aaef92046fef9ce8447a89dcd1b256738a3ff3db2baad20dfb1a68dd1bba14
+DIST thunderbird-60.9.0-eu.xpi 581411 BLAKE2B 272f0b3447ef72edb0fafbdd6bc4134d627670dae5a97def3b6544897d5c99828d05d9dcabb790680ce57827b55fa1d30dc660604412aae0f149729847a103ca SHA512 bcfbcd81643cf8adaa2496eee73ba4a1c414ad9cf47339d557eba867a24fa62fe0eb4dc061ea6b0d59ea9a6302e28dd96d203e12c6d885aad85bb85844e47d15
+DIST thunderbird-60.9.0-fi.xpi 575783 BLAKE2B 3e40c66dcb349481a37a39c588a88a222f653bd2709d37e9a22aa8b970e9cd6edc3801e234ad3d59f5346fa0f7dca4e55f5709b256abbd29ddd3c103ba28a797 SHA512 f0caeefaba563f7f34873be71c206bc18212261f71881bce8a31bacff504bc3a1ab7a61efd7b32be53e909034a1845dd2aa1047b5180ba34cf155a31d1c872ed
+DIST thunderbird-60.9.0-fr.xpi 608489 BLAKE2B f52ab3ce78591b7ab3f9e0223ecef48eaae12a27f60df21af33b176412b3a4c467fe78a938feedcfa8e0434c5f96a06af255c5b323b29dd529f1d3224817aef9 SHA512 010c4c4337e4225228b2ad6e8c7d9dcdc2ffc70fd7dedcd6e5141a76f86e0780f6c4969967868bd3d79008ff9cecc807625c7be42caf42e2d2e12852f4ab5eec
+DIST thunderbird-60.9.0-fy-NL.xpi 593877 BLAKE2B 9ac32e46c5e4cd2db94af1d549632cfc8dd9df6fcf5b1e5edaa75af794a4aa159f3e606e8ac53cf5904341a1fbb5acd0e779bae34045f65ab568d87fc294948a SHA512 92305ca9d3742d02cf7d2ecf7bd91371efc6efed4f97d8eb4104acd34fa03facb80715d12d57a3bdcb9455f422858ef2dfa84d1f897129e3aa6b5e62d605e7f8
+DIST thunderbird-60.9.0-ga-IE.xpi 603533 BLAKE2B f7af3c0eceefc42101599e6a23a2c2be2005182a39fe6c5d64e60dd4c9b97024dbb71f57e80bb304bb1bd6e46cd755860ea67f25ad13fdd7c52dd34a81bc144e SHA512 77ebdbf7e8dac0c5af63377a70e8ef550aab331fdee7a1dd9c6214ceb2999be93e71d883cc93b26d387d0d4a4da5a88a10d76abd6ad95fb16c820332d6a960c5
+DIST thunderbird-60.9.0-gd.xpi 599288 BLAKE2B 7a498541a739757d1489fc869cc7ed399f9471da89b423034c7e2ade886a02895409eccdbadd4d434961efc4dff6b6806faf4ae1b1fc8922bdd739cca89fc94b SHA512 775171cc45922da91a93b3e36e29de5a60577293f362cf8907f5a0d8024f40b95e4950945656b15c3acd8fe6ea69e8e158bceb86d96d7ff29ad31cdd59d748aa
+DIST thunderbird-60.9.0-gl.xpi 580370 BLAKE2B 430e95d9d8461d2e2167452b911808ce47502ed569210a9e3c798fc0958abe38c0d91abeab7ef4ffc673052ceffc208c8e3da4ae0c5b3a8a3ebff0e30d576e7a SHA512 683146105206bdeff2aa75c0f694bbc463d2a09fcf2852d65a874a135a7595f90c48721a707b980d42583518b7a59e7bae2188f03a6eed27aff66e8dfe8730e3
+DIST thunderbird-60.9.0-he.xpi 617170 BLAKE2B 46fc5f92952a468647c1586ff5ebee3eee161513ca92a150b72fe6badd835bd5914a3c965ebb4b3c043541b370becd8ea7cfe6033d183d99c991b4e7af970c80 SHA512 0a993a33fd1db3844f86a2d6f988dc04a666a2246a44f0bb42b92f0f3b6f1702edb1a4daf86457adb0b02b64adeb5e270fd7936db97d6ed55c79ed52e36517e2
+DIST thunderbird-60.9.0-hr.xpi 582263 BLAKE2B 5e9f39ca64581905de3577adda937dbe01eac30e2532569bee565e8c7de60c23b7fcd7054f75da60f20d6a34ceb3b72a2b406f8d7a16793ebdacf33281518973 SHA512 547e39b05906e419f21d41ee446dbdb895c9d52d2a6f7a53cfe0464b9dda6303476f06e813dadbf8150010b885f301d04e9546a5a4c97d67bbf9c7d05c460fd8
+DIST thunderbird-60.9.0-hsb.xpi 615159 BLAKE2B a009f8d51450b60fa26bc977064911177449feb704b60af588448344eee3fff37798ca80e7ee259e3edc48c7c63e06e0018233e7faa9c08e487926d56dd5d6af SHA512 154641c2ce94d706ceee1af94e0ff053f50fc1814914ab873babfd5c777a5fd2e1653e373503293044762b7a3c47bc32629bd291c3a3085b00bef8bc4b960489
+DIST thunderbird-60.9.0-hu.xpi 615371 BLAKE2B 933d999108419ea88204afe4a3004847ff43134d3a6edc32892a7b3ce5b8422f0c46e4c9432f05986d5dcb95943b50ff6ff4c2abe96b7a632247781e85083aca SHA512 999d234ce7679126f8de6119cd94702b51153ffd9bc4e1a1acb2207a99ec40ffc23683f3bc2f0821ed66045ff98687e9b9f45cc4540ac6fea63beb6c0edef36d
+DIST thunderbird-60.9.0-hy-AM.xpi 653559 BLAKE2B cdd21cea8025b70c6382fb16cc51732eb912ad011a3ccb1bd7c8091db7c63ac996297daba93ce2726a9c8a3e314fabc0b7658403d64b42cc01af479047961e45 SHA512 357612b2f480350f3437d6be431d2d7d21b9490561887da56ef09e52b5d89f7c3616c2983abe82f89c3ead04c6743d4b56af6abe8a5974a8551aa7f66962f7be
+DIST thunderbird-60.9.0-id.xpi 568886 BLAKE2B 0692577d45ceb25ad15f10db4061da3692573783b10d211e007beb54eb4b27763d9220017da256ff2c7d4cae09e495eb2d8767d913682f0d4cf395b1ca8bf3c8 SHA512 18ef57140c735cc81d05f900fdcdb5d0cfcf7e942fda24ddbef024057bb04bfce8a5e5ce85a7b22d3bbd0230b5bb48723c856be6b05eb17ef0a2a3ac29f10535
+DIST thunderbird-60.9.0-is.xpi 579075 BLAKE2B 76247c0bd29cc174bc06052c6f55c45e7cbe707f9dba2e70a5419566f77c7a6b94800f1d4b4618f196f50af1f67e165b317fbe9e9273ef00e9ee8b8551024a9a SHA512 f63198b9faf38751ae08f053b7ba66037bb9de613f76c105c0cd68eae3b207fa69adb9e9930c41eb3047e9d8144321b5061a6ef56144a716fa4178b8f6942d50
+DIST thunderbird-60.9.0-it.xpi 477525 BLAKE2B dd9ebee2faf8dbc081dbc5fdd2fd3335cf38e53f1e958914f357305ac6a0e8e71bfd0729afb274cc71f092cefc72ead3657792fda5ce2cb2242724bf12ca6b18 SHA512 0cf65310ec22ce8ab932c2f21e3a81de9e998b5f520f7143facdf8d8a59b5c4b5f678c66aa3db84fb48846f495a48e5e962851b74381a5b14d30a95728605543
+DIST thunderbird-60.9.0-ja.xpi 653371 BLAKE2B 1b94cefca2cd474ed121b0242e43d4717f298540084b22313c88950026016305397d7e21d3aab8ac27e1b596d260259a98acf858ee8b5e2284996d6949f988b0 SHA512 22a77b41c5ffa0ee886595cf91dd0448b859437332c17ace67f7fc1bbf74f5d8216481db46107f46641e14afb3302d2ed7e037b86a91d25d8e32f9becfb0c2cc
+DIST thunderbird-60.9.0-ko.xpi 619757 BLAKE2B 154f6ac6ca7c539e3cdf6968afbfc3e89d6b1bdac0b1fcc87607725c59ca1b3a46dcd7d47e1ad3afd7c9e5dfdb89f84b965ed445c2f238f2a15a739072d1c1f2 SHA512 5e2eb7802bb68b7118cfa59fbb123c4775282719f7dd620fc58b7f9001aa333c07784473cd733e351b05b64bd6a7b565eb11321ad4d47149516e25a8549cfb43
+DIST thunderbird-60.9.0-lt.xpi 605467 BLAKE2B 81dd5e324bd559678a94d3c059fdef1cbf0384851d90a7ed8da4cf623704999683e0f4a6517f4648a889392a4c9a297eb269f0189f13b962c94573e440999c09 SHA512 0c8b53042f1ff7574cd1a082a05b2c6dfc3a647b34de87e50e17e2a68a85533d3fa4e38218f3aeff19b2584de4cb0aefc04028003e82c0cb1725ca1ebf8e5fec
+DIST thunderbird-60.9.0-nb-NO.xpi 577025 BLAKE2B e1f341c2ace93c83e4045443d6f221fc1d16ddab347762367fa681fa2ca2752b7b280f28f37a363e74b8c038a9d1583e6d63a8c69b958b1000dc3c87ee11ccfe SHA512 e5ae45d0704e0992456ceee5a02e06aa65a8870d24ff6a31af9368930e13522e83a9ca9dfb04c3a109479e9a89b03bd524ea2d50c296c8256eec83a6711bf0b7
+DIST thunderbird-60.9.0-nl.xpi 583938 BLAKE2B a9c95ad7abc86becbd3200c2a5a0d120446bfd315c2753119132661446da0c516995343141646afff100276cf70e061a6f8cd51fe5a4cfaae0d5141f4480d375 SHA512 aa0b494e7a64e5e7a6a62f1a2a1edeb4ca8ccbbcbcb3c47b359b2d248f171627cba39e4bc9fe066837aa52996889a660661f52a46bd90015d87c0a323809e7aa
+DIST thunderbird-60.9.0-nn-NO.xpi 576447 BLAKE2B 745755879dc6d01ff02cd922ccaeeb8a56e45d5c8a8e2d9d5cd822a708ce3c099bdc4e5c23f9efbcc74f54eadd8bccc65d8d0eb8746fa1f60cc7449c0b23584c SHA512 5364f5d851e4a8e407b8400c81745bec91980a4eb521dcd4af8a88cfbb17c86e7a98a7b7f4bdefc0554c0725e457aea043ce22b40cb9de3380199f7668995cc5
+DIST thunderbird-60.9.0-pl.xpi 480752 BLAKE2B bf3e51be873a7e07c791f39294192d6045245c6d05d8d574054c7f1bc725b908c099575d7743c819c772cc2d22baa6108c56ef6edc0db1f06cafc55fd35cd6ad SHA512 5a1fe6bee2a9cdb0e6b7d3a4ece8e662b125cd985ffc0db99ca5cd022d39aa5a10b90801a6dd9ca0032692adf8f8941c2144d39337e0208d3c422dbc9748cc1b
+DIST thunderbird-60.9.0-pt-BR.xpi 588860 BLAKE2B dd106ac8208c979c4ad80b0b086b96d211cf367a5631b4df824a0c8622385ad57c9b704e1c75f278fc90ead95fbcf2a7d14e9021b315faa33559755c0bbfb906 SHA512 b9f14b141c239bddf1b741e31b9b91f721c3bb41d673e44adb77bf1bf8b212699be79dfd68ee1f5c0f66ae94f7e10bca88c5605c5e0d5210e936c885b77b996f
+DIST thunderbird-60.9.0-pt-PT.xpi 593213 BLAKE2B 7c9c226692e4bf6aa0098e76d66aecf99beec909796823e9dcd05d8082110a189ca3c402927f3c594453042b22b4571ca9224606b15c59f76291bc84f01303e7 SHA512 97a55e18f44d4ea3c13cb5fc3e7cee9e7080615f0e18c333f200a15b957b69cb5f8b53a72c6df39facb204fd18f83717806f2bdfaf603f1ebeb355a9504eb33f
+DIST thunderbird-60.9.0-rm.xpi 578410 BLAKE2B a79668aef9699609804516ecc1748f8eba32f27abdb0389573ce8394a080c7bb57d405da53f8bc3c78850451766b370996ceef9e0d2e2418bf970a5f9eec2412 SHA512 bde3863ee45aebfc775b3a87910c907a6ec1cc1b39241e7e1553c6ca1d9a917ea79d77cca5975aa2d55bdec27d5ba0d6eb9abff7d23e54306cbe89b8b1b23980
+DIST thunderbird-60.9.0-ro.xpi 584335 BLAKE2B 8827b8bbf47bbb7dfa7f7b980baf13fe40f82e1fbece5e40ab0e65f15158af28a92f6200f8cfb13660989a678cd00fc2ad239d05e472fcfbee06fde17998a32b SHA512 739b2f275cfa241c235adbe4d9a1da0ff9264b3eada0fdc233cbf303bfc7a84f43cf7890dfd00ee553b6e6f519d736e39687f6f29cd779e83123505e89fade77
+DIST thunderbird-60.9.0-ru.xpi 694735 BLAKE2B 141cea82a274c69b5a2d14468151df1123983c94ea047eba4cecad61c70e6065e32c1cca5d26d0691a1a9f6247322477c33e7e2f775a3ee1e46138444e83b882 SHA512 4a48c5715fa866a87229d1b1bbbc8bdb42cb1c603ec859ee2cee5cd6c43534196d02460af4371bf0547b230f4e25ea9e581d56a81731975c2b2043f875cf0d71
+DIST thunderbird-60.9.0-si.xpi 647615 BLAKE2B 126d09c8c1dcb20e07ec1b036df7229e09b42348ad415c14c362c41b87747a8993b2c85e623f928836c8c423daab9ef360004eaef32ed8afe799c1ed11943830 SHA512 c71fb7697eb7fef0cca5be0e0a94862fdb17157e708396b99b6aaaff3c6f2431d55c04775e1f2f7dd09ca9950a4c8187f7145abf8862f8dbec242c9cd59561f4
+DIST thunderbird-60.9.0-sk.xpi 612243 BLAKE2B 2464182018dae30808c8d35c01c370b996a2aacb1787f3b79923407bdc09fc56290874a2ca3c01b0fef063fb8e88e0fb09a1b90518a80d3de8855642eaecd662 SHA512 06b7dcccf19b068dd453df905becbd3c0c9ed56e8c116d8ce68250132d7f112cd8a4e1671e3ccd8a33ccbf49c51ca78e14965adac3f8155feb9dc4d13f71aed3
+DIST thunderbird-60.9.0-sl.xpi 589971 BLAKE2B 8aeb38893fbcaf5cf191173111e8098d1a02cb32f8771370d04241b148a0d3d0df6871c17b68edd248251e84cf548e43fa0f12c4f0bc3246295d7e621056b527 SHA512 49f667b88d5859b49a001e3236266c92ad873204b24600232a2e845f72cecb97f128585c520c6404ce118eccef144133ca7d1adb35fb7d63b25ec873bcc69078
+DIST thunderbird-60.9.0-sq.xpi 593122 BLAKE2B 54b3a6fecb76fec84e24e861dc60b110646ce6d164f674d2dc7c101f8cc2756442a85768961e7eb69b754fca358f08a88fe02715a143175bed955eb0a27c3b03 SHA512 f1c7dc45976508034614fef5269bb5051d669507c477a7359b5d283304dd759078d61cb9c6c4ca2fd7edb9e6078185afdb1e9adcbdafd749e819c93971631acf
+DIST thunderbird-60.9.0-sr.xpi 641555 BLAKE2B 474bc8caf49a2663a0e14edd47173cafab45f3e41ad2b22b39b12e560d0b61279c2857faf0cb4aef2b153bc3d0708b7eebeaadb41bc23999aef677ee095c251c SHA512 d9bed52764966f935b3e099ff8be8779eb9edcf49c82bf8c7390f196dcd5f2ecab1de41d69c99fbaa6b823399d3fc31e9d058291fd10ddf35700af505d433d04
+DIST thunderbird-60.9.0-sv-SE.xpi 594105 BLAKE2B 1a1010cbced90e183bdbabb9248d4aa6264fdb081d4e333241655369c37764aa2ebbb7322a9eab3471bd95670e5e199c5fd3157ee8e54365e7547620a30a9cd3 SHA512 42d0840b5cdf114c6014576fc689ad06c976c5751893522ece261d97af17ac5bd6f92a5f537f4adbc23d4aedb3bb763a2df35405ef42d283ed14311ce4e6c614
+DIST thunderbird-60.9.0-tr.xpi 598035 BLAKE2B 66737ec7641a54475881576218384663651b7c91641c3fd3edaa98b8d777d7ae22cbb866ec2c9ccd9dfa0b1017d3d58c61488a782f2b601b20a07f9052a2cff7 SHA512 07aab50f3ef708340de25205cf0664d1071a79bbd504aa8cfdd507cbb30d6b6cce25a2f9b81c3341299f3a420784707fd9b3432b8f39b168721cd37d58ec8d03
+DIST thunderbird-60.9.0-uk.xpi 684182 BLAKE2B 2bfed5f8b844be664e08cb0bf4932d0c9f4a5639ef28c6d2cd9ce7689a979df1604e13cb94bc68e7bd9f1f084ff4c915811006bc12fc1368116d973ddab7d781 SHA512 6bfe6bc2cc577750aa06d3802ab71057b05a8610a6c5dab85ec16f1508c305ba223eb78049f1f82d1bbdbba90277c95a5c49bbfa03d4e61eb44a6733aa414f3a
+DIST thunderbird-60.9.0-vi.xpi 637210 BLAKE2B c48d8004d269350410fdfa2f5beb4ef6e37e0635bf288f5c8cde3e4e043acc1fdf4c81b61db999baf4a050261d9f80d5b6bbdb298010fc44496b37d34ac32887 SHA512 045a871f7f316c3fe86cb45b9748ce621ac333ef52dce8b7b6284cbd50e3a91c7b1feec68737b611f4ee2902ca1f934825021d67470ed0f5451e1b9f4d8df325
+DIST thunderbird-60.9.0-zh-CN.xpi 626309 BLAKE2B 81e2846b570804b0aeb2212107eae1ceeb55789a5d5fe07b4f9d40e43d6e78d2ff3319668958d2f2c28779e8c6d0693f2f61e0d761098ca73a4ab30b3748da18 SHA512 d82844d69ba20b220e88b6fd425ae355d1cc57c40405dc1dee6699454c87aa36031b1e9f08f85abfdcdf6371a529f0eee8b3b00bc8b7fe149383add59b9d8420
+DIST thunderbird-60.9.0-zh-TW.xpi 626217 BLAKE2B c6739b670cda85e955b53a6edd704568c52eb38c00d69a2f222e8b991075071183d53e520dcd716d82826b6d9e0af4db2dc46a732790c71e5607f7f4c53067ef SHA512 efeb58ffdbd53e445a2427035f1857d2b02c763e6f75eac58652fa72560a74e4036ec65b2352ed4633d5f54a0b5aa4571f7a582ac2fc51a92d127ff126cdbafd
+DIST thunderbird-60.9.0.source.tar.xz 286400364 BLAKE2B 1de1557420b74fcde358e5c69a12c78ecbce4954359bda8dcdbce405582116ecd6cfad7aec09ff2d949c443ca6fbc06d84f315674a5577b978635af56ff13430 SHA512 f59d48fba7fb8a4bf7cb160e6ca2508312a7fce950c12f133206935bcdb4c9844a9cb063aa3aae67c82562d2a51e123cc1f5bbad0238a1e5ce386c514295bdd1
 DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
 DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
 DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8
@@ -235,6 +289,7 @@ DIST thunderbird-68.1.0-zh-TW.xpi 627477 BLAKE2B ff3b76ddbdffefcb7c75c185812eef1
 DIST thunderbird-68.1.0.source.tar.xz 333332920 BLAKE2B b4bd65b6751b377a0d42c3069e3d8b02d293b6e049e3c16f7e750636fcf6afb81e593dc80ede4646f28b5f77d534d1a285168fe69a88abb7268ddbcaa469f4bf SHA512 eb2a71bbf4b87ee1156f32b3829cf6970855187f9e60f5003bd3f3680b53b80f34220ed2575c26834bc2960b2c85b2b53c2ee5437b4c19031f94eae5ca9a010c
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b9e2db9bec34997f206b90a8f6a572e5902665daebc3ab9b7649f55e6a4d2a355e5408ae9c07463989bc332666b7c466 SHA512 0aea16f24405ba73b053a30838058f69863d51f9ea7a152151b90c5cf8155ae53fbaac5deaabcdc9177e71253df997d81ce9fff809713f8f0eefd1144cda5c2e
+EBUILD thunderbird-60.9.0.ebuild 18269 BLAKE2B dcd7601e846e04d22be61c634cf49e894239b7f7d9aded8151208b0000e1ddb79e034a5d2704f7a51630f34927b21acfe1e607fe52b834afdba2cd681655e496 SHA512 979ccdbfde25c34fe7899e21b6b9471e36e67a1afcf44e2a26cfc50be5c4bb749f4c240dc5a8eac7d250af738f83e7f31e7e53927cb17655c2f500a3f2b68b4c
 EBUILD thunderbird-68.0-r2.ebuild 24610 BLAKE2B 25e89232f280eee07e53d267d7a4a366c848c0c4ff9cb6dd32d36de98e85a04f147fcdbb103c3fae20024df469e03e2bcc99c28f3dfb5ce322d8a8cf7330dddd SHA512 eb03c124da0aee6afc2a47b1d1e7d1a257ec527395530e0502a3527610fbdeff49c27d1cd8a47f6d09fb91cda5a7521dcf2b2871c77f9879bf8db5e59b474b26
 EBUILD thunderbird-68.1.0.ebuild 24621 BLAKE2B 0c8e14cb0808ddd0ff32e7a925f24aa49ad2f5fe532878e298068198999483a934e099414ac7159cc423a77dca5f87a9e2dc0587490f47bab0d0121f9517adac SHA512 05131c4d9735dc03253b43b59a9735e7990cca72ba707f97534dd3e302c42c367c8d952f013a294b4967b52cf5aae99f765ee8497a3e2c8bf099719504051eca
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-60.9.0.ebuild b/mail-client/thunderbird/thunderbird-60.9.0.ebuild
new file mode 100644
index 000000000000..08bdbc37c1bc
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-60.9.0.ebuild
@@ -0,0 +1,602 @@
+# 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 ~ppc64 ~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
+}