gentoo resync : 15.12.2019

38 files changed, 2046 insertions, 104 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a00ec608a1e2..c7ed45a7c1c6 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/aerc/Manifest b/mail-client/aerc/Manifest
index cdef4c5b799f..1bcd23ac8c33 100644
--- a/mail-client/aerc/Manifest
+++ b/mail-client/aerc/Manifest
@@ -1,35 +1,27 @@
-DIST aerc-0.2.1.tar.gz 89448 BLAKE2B ba2e5d7e4b2c84ebaef907e93a0c184f3839a31cc63222541ed51e595a2ca2de5d29d48280dd9867e076471c8a6a105dc7fba93a4652696b2ea67694ffbb0d2e SHA512 8d1903215d654885d5011e0408d3c15d53a3bf9ec7f9f537c9b9b560b2324fb13876ce96da0525f1d0a354e0580ad24ebc5da4f4e623403d31ecde27ee29c3ac
+DIST aerc-0.3.0.tar.gz 109525 BLAKE2B 2fe64c5eb49a3859dc6700dd55f6876fb1c0262ccfb44cf572ffdb4f911b83239f4db137b1efe30d77983209757b17a96735e04a0839d910ff36bcda0c69c536 SHA512 7f2b285b1045d1f271e3741a3d66fb48afbd7a372eea70c89307d8853f5dffd8e25d077c51da4139ed2568ec465782c97091da3b5fd0fd03b89e9cec936d6f27
 DIST git.sr.ht-~sircmpwn-getopt-292febf82fd0.tar.gz 8429 BLAKE2B 0a0f5382f803e658ab920ee0d4cc85727a6ae280e1a3110440b2fec2b44745782b613651881d6a789c8a00429d35ae856ec60841e084c3b05c37159f94c78e3e SHA512 625c1f1cae0f4ef02c09b4c33176d15814260b9fda2acc19da846dab2e8a1a76fda26ad8e0fddfef218a0fe0b61d7c4ef5fdda746c1c86a83c55198ef7dac924
 DIST git.sr.ht-~sircmpwn-pty-3a43678975a9.tar.gz 5834 BLAKE2B f2820a23a3b96e149691683e947a8202ba0e9891a09434286edf03c2add5a84dd132c5f9836e2238b7f97f3d641a62bbabc9bd5e2c44bded3961520c37f80f7a SHA512 7c174890ab367268af6aeb5e58d1da927ea70bc0857e63fb6990556820b2f3cc5b773e0812f21ded7ff7f93889797d3444711f7db39a930a8fe6d0439f63681a
-DIST git.sr.ht-~sircmpwn-tcell-0abd73a30946.tar.gz 745186 BLAKE2B 539ee0bd65606ef3d34dea0486726381c9763ba958bacbae16eb5e1b8cadcb1e21bbbf946f3c25b3b3f93bfda7745a3b567293cf3ddd56cfefe629ea7346b3e4 SHA512 44786d916dad9edd3ac7dcd8b927ddf13d8f3648946f23f59a33387b8e6dc2e46fd11ae5a0063bb9c20a3db241be440e5ff700bc9efb44e273de75a9651677d5
-DIST github.com-DATA-DOG-go-sqlmock-v1.3.3.tar.gz 26572 BLAKE2B 37457107ae192758ef6595f8cef3c8479654bf1373b1205161701dd65874a079a1b6cf0ea0e9478971f60d759a8384088695196cb076dd11329786460905767b SHA512 7b238043e0b96f5b61f7cdd0a1ec3d84303502a47ec44b4340bbb35d42eb24d54bceb7613032650a6c0594db1a47127642e542bacf02065138c54857a77eceaf
+DIST git.sr.ht-~sircmpwn-tcell-3fdb6bc01a50.tar.gz 744866 BLAKE2B 0309d0dafbcdd905e8ce0a3e760d609f3d8ffc5eee4fa06bd4213dd491bf12d98042d78cf72c5b5cfe83bef8501df6962b5debfe286a32dd27e7b22589b1544c SHA512 97ab5a40648f4a28d6550965c2e7a364c3d692464e8084a676bf1700db5383b2630eebf318491784e259c9f1e407bf222b4a7e13c61099b9387db9a754f23d19
 DIST github.com-danwakefield-fnmatch-cbb64ac3d964.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
 DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
 DIST github.com-ddevault-go-libvterm-b7d861da3810.tar.gz 112755 BLAKE2B 6da92796ad08f92f480972e5ddb7c4e6dd5b30febc4ca40ec64d6d8b31620140b941772a94ff7f88486a838b3438f1ff87c29f238605c8197dcb5243d1784238 SHA512 eb388cbce7b0c22d02b129e60d431fc36cf6d97cc61dde6173d1fb87b3b8762547813b9657c42dbc85f0fa27159482cf9197c198b173eaad3bcfbdf66f22c799
 DIST github.com-emersion-go-imap-idle-2704abd7050e.tar.gz 3632 BLAKE2B ada6936001b74372d44a428b3204b96277e4a222f4da883e4a9de8e5310be9b4886e3efda588efb772729abfbd8f6d95cbc295cc549649ba84221b09d3045325 SHA512 2c46c2eabbcff018409a32d603d823bfc7232685ef31ba44deb87bdee4098ef9fb3465d55904806c84da3375e55918dc0da95b5e3b93e26e4e1b1ecfe9dad886
 DIST github.com-emersion-go-imap-v1.0.0.tar.gz 93253 BLAKE2B 82d74089b552b7d2a9ce968b0d6e6151599ad9b816bff6560909eff2d2ddf2d211bd4e21710850b486772a52f9cb1ee51e76cff6ae30c5bc8ab5206d21dde737 SHA512 63ba32b1f5ea4dd5b4085f4c292bae23657be8642d51f6228beabd9653aa9631a604ded470af304d2522d0b3eee8cda67e9ca17f60628ecd12a18ee5c501e48f
 DIST github.com-emersion-go-maildir-941194b0ac70.tar.gz 6447 BLAKE2B 4f9a0c1d0815fc0323ba4ed051dde01884eab507e88da81869cabc2546c1b1078ac074311a3de5645ec96208ea7ac66078dece485413de19347fcb5cb115bbf6 SHA512 18d78d7bde1d12251214e3926e4bf488b752e30812c7de86519c26eeaf4ba8617c7ead1fac05cc5912a8f4836157b61fb8b25b4fd282f0c25f942b054a082970
-DIST github.com-emersion-go-message-v0.10.5.tar.gz 25688 BLAKE2B fac678a40dd26f2123dafe52d147103a07c078ff6c0cbdedc397ee63c0688a27d9323334c2f638e7531ced4baeac7106897d58984e6edd711df0dc9fbe27efb5 SHA512 3901ee616d96423f473fc48c3eb55561759b80c1c3961920f61be5933ad70e640f85ec10f8c67302e83fb348b07434bfcd201acde1a1ea68c3c26ddf6b6f3455
-DIST github.com-emersion-go-sasl-36b50694675c.tar.gz 5504 BLAKE2B d9f0912e5c72d32c9c1eb4e83fa41f9a1c1dd62e7c7cab3a065377e61712c4ab4e8f05e2ec714ea60a4d228ab3ea6ca1df2475767c89868a0ab5238f9a3ad1db SHA512 553c0a9b00820e48c6aa00add7c6376d6d53bef4040d4ec7a9b6f7d14c27325119c5508650c6d6ee3fddb595abe1c621ba82f9a1113778c965ed0d3439f36591
+DIST github.com-emersion-go-message-v0.10.7.tar.gz 27157 BLAKE2B 659f9d76ca47df643faf7e9450eaaa4816badbc873ee99b16d298ce7032df9247ab2a301bb349059e1d42d504c7be52088481d25a447c80b82f1275434068b0c SHA512 0070debc2e7bad921ee13dec722ac27b7144dc2c6fb8a917c7b6c1d9f3c533234881dde73aba444c7a2c2a3e0e7d40d1692367b5d52e56a3f908f5820bd45b4d
+DIST github.com-emersion-go-sasl-240c8404624e.tar.gz 5747 BLAKE2B 3a3c6771ce79e5f56cee86c47a2516a9ad1bb7b2cfa6a955adc393739e227ab3d1a42d778ef37182c93af02ebb9ebe2bcea2c401748b477c4107e88290710d05 SHA512 25094442b11428ae74fb08317d0ea0273169e55f1166250c13971ac08facda81c085556519e984efa9c7afd5879ab51487e25658d1da7373715ace9f94079fb3
 DIST github.com-emersion-go-smtp-v0.11.2.tar.gz 24309 BLAKE2B 2634d1bd70a2a7f58d8e0ef7e6c67bfe9ba658581c73605a5a1daf373ad45447a6d408eff9e48568028c7a6f2cd79311cfe35f1b0e02eee3f5992c63e7dcc4d0 SHA512 f3d3e2022da944c9036e480d40527bf7e820eee8f21eef9028953b771ca81b6edf88c7e125d2ff4e4b4c25b5a81304404cf4573716a667ee5b709f85c027cf2f
 DIST github.com-emersion-go-textwrapper-d0e65e56babe.tar.gz 2168 BLAKE2B cb1d7530017bad89222717bcd64555198ede31e841263d4c82f60905fbc9df7cb92541c30a21556bee2f7839ebc3a342b27380e1f535d0648228350fb3922033 SHA512 9ac4f3dbf81c1844dc150928570bcd0bc3592e0b22c51da1fd905772c2c1fc0349a18d5e1a956e782db5fa08accc8ba8091f42af9c4c935b427ab18cdaeb7dbd
 DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
 DIST github.com-gdamore-encoding-v1.0.0.tar.gz 10886 BLAKE2B da5f463291cec9714b3212848d442f533fcc34dc587637b54dc89b12f0b026121e7571619e3713cea7c94ec4de7c94060d83a4ca658d0cb34e4b770c68a07318 SHA512 7ddfa1f796a32e7c69185e862a633513f1ff8a53dfb9333d4c4902a4f545ad570aa37e9faf473206465a487ae243d6003583d56c932ed99230f0ee5f87e6d49e
 DIST github.com-go-ini-ini-v1.44.0.tar.gz 35817 BLAKE2B 1121d091a04003cf7af7774765ccbaae39a4397dece559ec5c557b0e475940ad070e4ba6c6092bd725b1df4f6d2bd35d62e131122b20e573c542024fb2b6a5f4 SHA512 ce6d143e1c804635bdfffb48ae9cb6d58a7fc8ac713fc1913f9584d24051d289bbb481d7f2b8a264b7df0ada255761c8ea2a5521ac9e18997db778f810a3ad7b
 DIST github.com-golang-appengine-v1.6.1.tar.gz 333353 BLAKE2B b26431816991f0c0cd3e13b760f2a0a381f77368083e3fc063e718d5c278c413c42bbf93ef7f1271e68f9ed206328178a7b1a904aec97ee922e169ab73a904fe SHA512 86d5536e55c1fe362f06186aeef13ed3d42bf0768a88ac972626e7336c20550fb89a94eb34880fec405b86fb88f36f40fda30fef325e0d7a31b7814d6487b80c
-DIST github.com-golang-crypto-f99c8df09eb5.tar.gz 1691014 BLAKE2B 435ba31ca6c5aa3d9aaecd8f1b9e21304be21d9f14b0c94fb4a4bf704505bca6f1c638b481dd038e7a1abfd4a1d632dc1ba0504430c074747241256f2e68f70a SHA512 dbc86822ca2181c60c1f610a6c10cdb8e803b3e1e3bf20b1c195764615ab5548f7a956798b31e7737b9cb9cbf659d744441a3580c6cf8cf45a45cd19bcbf8dca
-DIST github.com-golang-image-f03afa92d3ff.tar.gz 4877903 BLAKE2B 8f74e889caca3511b71ba7bd332ff1efc1da04eb98b56c935737110ff6e72bb4ca5bd8d597d1169924dd26ef015858289660ad06c8472bfe7b75e8c80aa23037 SHA512 485800b8165d770a64a3ddf46bbb0866c7d9a40a40935357e89e5d476c120ca8317852dbaa067b59eb2a9c44e49a3cdd0d4cd4d0f2554b86d4d35b6f907ea5a5
-DIST github.com-golang-net-ca1201d0de80.tar.gz 1099752 BLAKE2B 6300e151f53e5a5886000fa82e9567d644ce0f769588f4f8e3d443208718c36ef790ebe4fecdadc9517b232cfe881c63bba215a649e429304e612af473cce0f5 SHA512 8ba27323bcfdc8f7e5ad3061906bb993c0a91a3da1812768f5652553f9f06ebb8ba35572d5512e65f7ec10363e506779cfaeb1111f1b7db95fa012b9ff64495e
+DIST github.com-golang-net-74dc4d7220e7.tar.gz 1100169 BLAKE2B 9d9dd3a3bf103ce7709b2a687e35b44edb0af7968b9b85061250ef3d89ef76101c2edb89aad77a2040f8ab695b2e04c766d1be34d6d94e6ce6c55e1197e5077d SHA512 0b3c26446304cecc1b6ed467776a1ba3c0be9beb0c6f6c159df2cc48da5085a38d8ee3dd5f47535bb66cca8c020b59357fb3d648d1df40e87a82fba20930596f
 DIST github.com-golang-oauth2-0f29369cfe45.tar.gz 45476 BLAKE2B 42a97cfb38a2633d99e5995b75f055a6ae5bc3f34b3a501fd4b016c129a0e85fdf1412f5f8e5614ccaf19b1abf018e3b5da7339c9c796ed9d2bb40c25ee477fb SHA512 f7b55b531c924bcdae71beeae0191b0ba002a7551012e8a6e1c088fc74dc4c985353af362138fa9276eb5d965f25b45b3c87c8e1a756d8c0e89893816b825661
 DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
-DIST github.com-golang-sync-112230192c58.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
-DIST github.com-golang-sys-fc99dfbffb4e.tar.gz 1457201 BLAKE2B ccd3b08b0ae5008ea3bc73f250309bef640f18df2183d60d6a30ce746540b55ec99fe91cc5caf09707c507ce7eeb578648781ce3275d01644c56bedef7f6d155 SHA512 f79b2450543dea4387e8f0540d98f11e7d02fea0669b7e2a96726ea38d8bcd976f9dd2751f866bb5ad3554141efcd84f464bc909de11083d99197bb55e041b91
+DIST github.com-golang-sys-fde4db37ae7a.tar.gz 1457524 BLAKE2B 339311cc9717e89e70d5e5d4c56500c7969a08b78eed48a27d9cad111d3d4b15fc4a4d2d6aed506d0173aea5c4fbd7eef2aab2ddb6d89b0751c1c85a62dbf453 SHA512 10d47c2b5fc004872db6e61b447d258aed143891eb7b68f4b8d3afd135511ee7138b61580c5c6cb6e4c953f640f0c581aa1a1450e42054a0c497d5e91e40ba7f
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
-DIST github.com-golang-tools-d0a3d012864b.tar.gz 2124540 BLAKE2B 9b13fbb0ca6e1c47687b5650662e39fa138e55f22557e79735487062795670fd1db6b0b1ca58b5a35e1523cb3dc55ff1330dfe3106e001461121b1f8f4a17349 SHA512 9cdcadd3086778822a3bc957ec3bd6b5b82fb765cbb7fd84e3f0dc7ec5dce5e6426e0ada2b4f711cbe83543b4008da99a90de5bb9d5ff61021ba9f853b7aef2d
 DIST github.com-google-shlex-c34317bd91bf.tar.gz 7237 BLAKE2B 9d401b05a59769f477be4f37af819892686d7711c11095999e2d7b4773c43a07dd95595567470a44cfaadbf9e11e648a47bbe62ffc966a04fd38ec84b0919323 SHA512 9e86e074f2f71f6e3fe01777f959b5c368929d67421a140af8e3b6e952fbc42c4c3d867791979833cec59f3d1d97c38d329e86e54e65a81326e212df36f02fcf
-DIST github.com-googleapis-google-cloud-go-v0.34.0.tar.gz 2047971 BLAKE2B 941b73da86f596a4f8d0b528a383bc449c16762a5ba64e9ef5877fd0e7d9da10e1630a402ef70076499eb3dbf2abc35b37eb8d93a292343694b68e71beaa65a6 SHA512 c61639df6c7a803f83cdafb4877405c3b92c3103e473fb1ae68e85543dc3406a1c7a87aaa84dcb1f71acd8eee8217eed179dc7c1245120af82c64b1bb01f66a0
-DIST github.com-gopherjs-gopherjs-3e4dfb77656c.tar.gz 228372 BLAKE2B 7f411167457cfcaeb3e2d0eddb0225755f171e37570caf077468e4a860fb8b14a069c3fb14c43a6e79d81594f426048fb9bad3e36ac9720b51098766405ab179 SHA512 f2c8b62bbb9878bc043ef579bc614b073ca142df8c31e961b360e7677b290df000cbf2ba7266280b0a7c4ef6efdc7b92a1c3f6a54b47ff1e782c67bd4f96c7a1
-DIST github.com-jtolds-gls-v4.20.0.tar.gz 7306 BLAKE2B b0b744daa92cf14772541c2b16558f3223396acac49efc02d6f877a1edb0af524c40bd8327475221c731c4d69f1485f93f8b652c0a533022528755b7dbde162a SHA512 e1bf4556befebd971fcd2a39c3119e79833772404df52258dd50190d0d45e3fe7692d41e9ff91740c5c2652a55664154036b66220dd226574d77f32f18bd73a8
 DIST github.com-kyoh86-xdg-v1.0.0.tar.gz 4151 BLAKE2B bc63fc117251a66a22bea4b473f203e72b4fe711bff422af3718647bcace4b36b83be316b0417fd89d984aa4f0f4af567d06fd0da29f52fd909705bf64767445 SHA512 2c4a87279009cbd0323aef01ca9df16775f023f5747fe9445d470bfe58b07c9f8d4915509536197e7ad38f20682e3b8dcd5089a9742842d6366683cb08c2942c
 DIST github.com-lucasb-eyer-go-colorful-v1.0.2.tar.gz 430545 BLAKE2B aae8c623678bd8d0f1f361522cbf1591108ddf74bc75afc33788a5db02c75ba0f72b7f9a27bc21924a46faa616308ccb9d91e5daa497cf35354254b95a295aef SHA512 1e1ebf03ec1e8a8c282af46c207016ea146e70b4d8a637c5cf54807a988cc27817e5c67ffa9e725746b808499d65f98aa138e725f61a2ec229818db125f36e02
 DIST github.com-martinlindhe-base36-v1.0.0.tar.gz 3161 BLAKE2B 71c40840659ee4e229e3eba2bdfc2fe6b768ad00a46329ecfa0371ace11725d014280931395570951779b019bf526de687693e46017f40687b92f435f99beeb2 SHA512 f8a5c9cb9a93df86608051da8f98e9ec073a07ef15c8347a4eff987d1375fb083af905a00cd5a056d85aa9360999f3de0b25c82e2492fc9a955ca8ff76c9e568
@@ -41,9 +33,7 @@ DIST github.com-mitchellh-go-homedir-v1.1.0.tar.gz 3362 BLAKE2B b3388de9230439ec
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
 DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-riywo-loginshell-2ed199a032f6.tar.gz 2017 BLAKE2B ea822f0eed7f22a3577ad83978de235231039f412f6ae8edf99881e7775c4d9aca4b2eed213aa1e748999994f79d04fe80a5b65bbb0877cb471c18205e64be8f SHA512 80cb65104321eb1b437e0e289e58a8be0ebb9d3cb6b674800cd6ea4717d4dd8e2bc6fecaef446479bf81513ca219aa013600fdcd3579431df5dec285319f8516
-DIST github.com-smartystreets-assertions-v1.0.1.tar.gz 84573 BLAKE2B c06780bdd8aa1b51aa6bfa95a905e75b0bfa1df4084a08c5c00ee3e5281801ecb1b1a400479e3c18e642724e03aefc591a1f335485be4ef8415a2b6b72bb0287 SHA512 ee5390d263a4069e6ef5a14bf55ea405c270cb4d1108c0688254f7b6d5134f3afc67f633a6e1e5ddb197c0912019e01bdd69754e0914f054c748a3ed78860346
-DIST github.com-smartystreets-goconvey-9d28bd7c0945.tar.gz 1479148 BLAKE2B 04aaa225e58b6da29c2a557b80e50bb1932779d8c24d29b5bb8eed80b63d8d2b112019712c63ce37d95c1a4f7e6441f692bee5c05d5bff498ec3f92228133cc1 SHA512 7694c5a68f203af7f45593b1a013ac8c0e9cae6c089aed35fc9cd4e2b1475b0e20d618719644c189c688a9ece6be433475379ed3fcaddbb122ca041463fad425
-DIST github.com-stretchr-objx-v0.1.0.tar.gz 109451 BLAKE2B 4283e5260eac80654b310c02660973644f2f8a4520e8ff4f58d34c0be34938ab7da2a56a807d0661f66c322555277e10f43a2d4cefdc282fcc54fe97a9ebbff4 SHA512 206d0c5cb6b4879d3eafeacfae6d0bd9e6f2372eb3e48d62fc57e4f6b0680253b70326ee1d68d55024a1b8c6ffa8a0007eaff91dd3a75ff7096ac8b885889bf9
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
-EBUILD aerc-0.2.1.ebuild 3043 BLAKE2B 03a1c0f092e80453a4a510e5747adf2d86474fc573051a4ec95bc7be996e1edfc7dd1baa2eead393fc71afbaa5c8931c1787d07c1aa6a4c7a13be50be30fe6a5 SHA512 188d509cc877abefeaea2849cdc7ae7a1c8d40943c7678ef762b3b566dbe1a8eef8dfece34edbd88bffddb5a08fcb35626e8dcba3fe2f86860e0f4118724fa23
+DIST github.com-zenhack-go.notmuch-5a1961965cfb.tar.gz 32561 BLAKE2B a9c301434da8a986d9b8620572e2317cb0faa623e5fc77ab0fdb183446ce3d2a9173e18e18ed26da9bb54c5844007e812d428afebc8d5d493d29516a098338dc SHA512 e041e7cc7b325bdc9aaf63fc090f964d56426f721be521732c58ad77eedb331eaa5e0cdf4353e7f42a1f11ce889bc4b47a000503dde047237838ea705d3404f2
+EBUILD aerc-0.3.0-r1.ebuild 2799 BLAKE2B 9034cc07650d6fa9d65285219b91dd8a2fd0841c4a72f597b70f77167248aa367f83df47369c546d44f26da5277a2f9682c3c7d3f07bc12c3bdc7210b75b20a0 SHA512 54c9867b57c457576f3755636bb8c2b2e5f59aa7f2a35bb8b8451a5b5d96b6c0676bc7c61ce9730abe084a2d59fb73b5e611189666b27817a4c9cb8fa7238dc4
 MISC metadata.xml 395 BLAKE2B d0e4023ac2ad8d6a93fac8540545d62cd24278fae29fd370cddee03223a8de9628c1885245dc10b5505038b23db49202978eb152c6861ea74e112ee0c57c2236 SHA512 3a232226cc6156fb4244c5c59cce641c8521418a14f85de97619fd0379819264e2ee766bed2654fc1d74198b870610e91c41a89e9fdc1e25f56a6cb859d06c07
diff --git a/mail-client/aerc/aerc-0.2.1.ebuild b/mail-client/aerc/aerc-0.3.0-r1.ebuild
index 2388bd5b2dac..58fbbeb85dda 100644
--- a/mail-client/aerc/aerc-0.2.1.ebuild
+++ b/mail-client/aerc/aerc-0.3.0-r1.ebuild
@@ -3,31 +3,31 @@
 
 EAPI=7
 
+inherit go-module
+
+DESCRIPTION="Email client for your terminal"
+HOMEPAGE="https://aerc-mail.org"
+
 # go list -m all | magic
-EGO_PN="git.sr.ht/~sircmpwn/aerc"
 EGO_VENDOR=(
-	"cloud.google.com/go v0.34.0 github.com/googleapis/google-cloud-go"
-	"git.sr.ht/~sircmpwn/getopt 292febf82fd0"
-	"git.sr.ht/~sircmpwn/pty 3a43678975a9"
-	"github.com/DATA-DOG/go-sqlmock v1.3.3"
+	"git.sr.ht/~sircmpwn/getopt 292febf82fd0 git.sr.ht/~sircmpwn/getopt"
+	"git.sr.ht/~sircmpwn/pty 3a43678975a9 git.sr.ht/~sircmpwn/pty"
 	"github.com/danwakefield/fnmatch cbb64ac3d964"
 	"github.com/davecgh/go-spew v1.1.1"
 	"github.com/ddevault/go-libvterm b7d861da3810"
 	"github.com/emersion/go-imap v1.0.0"
 	"github.com/emersion/go-imap-idle 2704abd7050e"
 	"github.com/emersion/go-maildir 941194b0ac70"
-	"github.com/emersion/go-message v0.10.5"
-	"github.com/emersion/go-sasl 36b50694675c"
+	"github.com/emersion/go-message v0.10.7"
+	"github.com/emersion/go-sasl 240c8404624e"
 	"github.com/emersion/go-smtp v0.11.2"
 	"github.com/emersion/go-textwrapper d0e65e56babe"
 	"github.com/fsnotify/fsnotify v1.4.7"
 	"github.com/gdamore/encoding v1.0.0"
-	"github.com/gdamore/tcell 0abd73a30946 git.sr.ht/~sircmpwn/tcell" # fork
+	"github.com/gdamore/tcell 3fdb6bc01a50 git.sr.ht/~sircmpwn/tcell" # fork
 	"github.com/go-ini/ini v1.44.0"
 	"github.com/golang/protobuf v1.3.2"
 	"github.com/google/shlex c34317bd91bf"
-	"github.com/gopherjs/gopherjs 3e4dfb77656c"
-	"github.com/jtolds/gls v4.20.0"
 	"github.com/kyoh86/xdg v1.0.0"
 	"github.com/lucasb-eyer/go-colorful v1.0.2"
 	"github.com/martinlindhe/base36 v1.0.0"
@@ -39,57 +39,47 @@ EGO_VENDOR=(
 	"github.com/pkg/errors v0.8.1"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/riywo/loginshell 2ed199a032f6"
-	"github.com/smartystreets/assertions v1.0.1"
-	"github.com/smartystreets/goconvey 9d28bd7c0945"
-	"github.com/stretchr/objx v0.1.0"
 	"github.com/stretchr/testify v1.3.0"
-	"golang.org/x/crypto f99c8df09eb5 github.com/golang/crypto"
-	"golang.org/x/image f03afa92d3ff github.com/golang/image"
-	"golang.org/x/net ca1201d0de80 github.com/golang/net"
+	"github.com/zenhack/go.notmuch 5a1961965cfb"
+	"golang.org/x/net 74dc4d7220e7 github.com/golang/net"
 	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
-	"golang.org/x/sync 112230192c58 github.com/golang/sync"
-	"golang.org/x/sys fc99dfbffb4e github.com/golang/sys"
+	"golang.org/x/sys fde4db37ae7a github.com/golang/sys"
 	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/tools d0a3d012864b github.com/golang/tools"
 	"google.golang.org/appengine v1.6.1 github.com/golang/appengine"
-	"gopkg.in/ini.v1 v1.44.0 github.com/go-ini/ini"
 )
 
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Email client for your terminal"
-HOMEPAGE="https://aerc-mail.org"
 SRC_URI="https://git.sr.ht/~sircmpwn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
+	$(go-module_vendor_uris)"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE=""
 
-RDEPEND="
-	net-proxy/dante
-	www-client/w3m
-"
-
-BDEPEND="
-	app-text/scdoc
-	>=dev-lang/go-1.12
-"
-
-src_prepare() {
-	# needed to workaround go's assumptions about modules, GOPATH and dir sctructure
-	mv -v "src/${EGO_PN}"/* ./ || die
-	rm -rv src || die
-
-	eapply_user
-}
+BDEPEND=">=app-text/scdoc-1.9.7"
 
 src_compile() {
-	GOFLAGS="-mod=vendor -v -work -x" emake PREFIX="${EPREFIX}/usr"
+	emake PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
 	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
 	einstalldocs
 }
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you want to allow your users to activate html email"
+		elog "processing via w3m as shown in the tutorial, make sure you"
+		elog "emerge net-proxy/dante and www-client/w3m"
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test $v -lt 0.3.0-r1; then
+			elog "The dependencies on net-proxy/dante and www-client/w3m"
+			elog "have been removed since they are optional."
+			elog "Please emerge them before the next --depclean if you"
+			elog "need to use them."
+		fi
+	done
+}
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 5bd10460bfbf..d764c16f8de3 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -6,9 +6,9 @@ DIST alot-0.6.tar.gz 1527183 BLAKE2B 60e06d806bf5bfacdec485c3bcde6a5473bce2093ab
 DIST alot-0.7.tar.gz 1539283 BLAKE2B 33e77f815c4f83fc08f1834a89a984309c1d4b89454d9bb0df625d00725c64769ce4989fa8df8f38d40d1c35fb78202880fedc0a0a5e7134f1938a03c79e7721 SHA512 542827c94e6cfc57699613b352527582dc2e365d957ba6b7e835584e8b83d0704452acd5ab8e4e1e408c283ec3400a8bbe465b2a8fad9f95fb330328c4fe81f8
 DIST alot-0.8.1.tar.gz 220342 BLAKE2B 019f41f1f1fe73aa17a309a73b12883cbbae6a232d912d0e328b3862fc4e8e49ea6a3d0b6e2921ecb4d6ee8a58a9f6826facd7ff4cd6fafc17f6f5fe0195dd2c SHA512 bca4a01636594f0e71c6ea260d74cf26e74dfd7aca1ea7801714b4aaf9602ae7737769e77e3af0363ed2701df1494e0f87ce85b58c47a6380ad1a9098f8501d4
 EBUILD alot-0.3.7-r1.ebuild 1824 BLAKE2B 30ff26b9847099731b551c48da9e0c47f73168628ab156c0d596ecb11a4f1b672013c988e6a291e68647f7a7dd6c1bcbc89f5126c9f252457b8b76bb10189201 SHA512 b422278386cdfdc4ad1c4e853945ed680428b1cce9ca11ac251733aa86269515cf66320feedb1dcc8afb3b85145c45f9c2325e94b8968cb184df2ff4161961ae
-EBUILD alot-0.5.1.ebuild 1966 BLAKE2B f4dd9063838c3d31fff83943c86d1f1e926b87e1f3163fb4ff8df6dc5de13693267391b2101aaaca69092fb9cb6f953ac50a42d967411eb5ab89b45bfbf623b3 SHA512 6ff16a9eed4fdf2c713bd249b969d3e8f70b4821d81224f1f2b910abceb2b899d6ac1a75c9dbfaefb6ff863a2500ef7b3ae3a64f16c04ece5433894f3b0039e5
-EBUILD alot-0.6.ebuild 2438 BLAKE2B 9f69b9206b295f58d37e4501688256e05cd7a1475cb99a7421a73bd21189fa009db9c69906184ce8cf144eea15d2afc1e542489d072552f819c0eb70b8175058 SHA512 2f88e6e868ffeeed30f3ddc03998d24931c60ff6a64944b3baca132169db7b57cbca945215f167d6d7ce9aa3320eaa23db1378379eb59705d755a93ecf9b7855
-EBUILD alot-0.7-r1.ebuild 2424 BLAKE2B 0c35c0e08d7f1ec46e2271414a4a4eed65d64be26499dffaa6fc637e32a213726be0a0d80f4349bb299ceb6bd19fff308f93fd5c749f31630d46c96101038251 SHA512 8051ca5d2b216375f1c60eb07b51e517942a428ef75546c904f5cac58be0a0a0f25a4814a1a9c9b6fdea74ccfb82cbf47d7a291e14296529536843b181b9711d
-EBUILD alot-0.7.ebuild 2438 BLAKE2B 6206adf16196557e1ffd817bfed0e846f544e4eb21272f7aac3fed4fd1c184da38851f44f4b62d9de0d6a472d2eab3a7540795be242e5cb0bb5869b6ae466719 SHA512 f84b6e2fa31aa8ce916995248c8b04971fc5c0bbdf20242a84ddf33f3e2a5fb7ed9a87ffa31883263a70dcb5668c947fcb94dc3c0b463a1877c205af1e2fa242
-EBUILD alot-0.8.1.ebuild 1908 BLAKE2B 4657364dcec3fd8d4e236850e2d4be376d622920412271af61363e91209023c4b36863c891fd67de10515e7288e686f9afb873b56333efe12448363670be7338 SHA512 f012dcb68ffed9e9f8a16621fa7bea8d0fbf72319545cfcb2dceb7c2f456d95a6dee2da29d5e67258199f7e24d181348a7befb73c08a820fce1459c7ce5b2546
+EBUILD alot-0.5.1.ebuild 1990 BLAKE2B 87adf5637dbb42c6090bafae548d78349e5c9a3cd8fd0385f22887816cf0aeff0308550098b0999ffb79b340f2d5cdcbeb82e6703e051d5f0b3a994bc985bd68 SHA512 d6ffc51bc52e1a55916c09ebf9eff276d27a2469c36dcf35ea9bed4d1480150be3f1d709622013d376ec86bf69fa6d92ca1151160534df082b940a90e9d0d92a
+EBUILD alot-0.6.ebuild 2462 BLAKE2B 702a18133d948f1d19701cd7927cc751c4e560cd5cedfd553d10f7ad2ccdda227139024530050f7f9a813a003ea8d18b68ff1c23b8482d9a4bcf53edce6cfc12 SHA512 1cf34c14c5b785aa00c73f58edc26541cbd5f5c70cd2ff43c65dc8e6ede65729f0527ce49ddc6adfba2d0f5fbd14175b8c11bb1041dff93b569e39c7c9197543
+EBUILD alot-0.7-r1.ebuild 2448 BLAKE2B 6c43724238b23874af78476ae2a4f2968e900a9a778d903726771af3e9b1395ef81c9d624e710555413a2371b0620ae48a22d28f10c1ff52d1168cb5ad277836 SHA512 eb18097730ff2670757ea0bf5eb00c260e413e824fbc7bc2dc879b8f3a61949c6dfed57a768eef1f00a45b7b1138775ff53ff07a58a3cf16a4f0a57048477935
+EBUILD alot-0.7.ebuild 2462 BLAKE2B 702a18133d948f1d19701cd7927cc751c4e560cd5cedfd553d10f7ad2ccdda227139024530050f7f9a813a003ea8d18b68ff1c23b8482d9a4bcf53edce6cfc12 SHA512 1cf34c14c5b785aa00c73f58edc26541cbd5f5c70cd2ff43c65dc8e6ede65729f0527ce49ddc6adfba2d0f5fbd14175b8c11bb1041dff93b569e39c7c9197543
+EBUILD alot-0.8.1.ebuild 1935 BLAKE2B dc6ffef7f576f2f53bd29c673830e48f7696555502ce5d2bafedd3313d76c3b08752f28c7618d984cd70dacd92d30ce5f6f818d3149b1076a903f49aedbd845a SHA512 90d7dffa8a6d350bac188ebfcfba69d30e8213170e8b105d2bc12b5b055084bfec0a467327dbe11068019782bea844e467daa89f4e57e049636967106627f7f7
 MISC metadata.xml 828 BLAKE2B f6a639fc8922f7c50e2ac449edb16e17abb622c3f39ab055d13db4cc81db074dfee37fff81ba043574fce37a8d9db426184c0e6d50c9dbc0f8124f72de8741fb SHA512 3300e7f9f49bd40cfb9cbbb4917b88edad34a03bc0b69699d79ad8b120800433b27b74b65207292602f54157496056c59caf4bbcc50b9fc94ca50e59ddaccbd4
diff --git a/mail-client/alot/alot-0.5.1.ebuild b/mail-client/alot/alot-0.5.1.ebuild
index 868e96638b99..fde61c5f8263 100644
--- a/mail-client/alot/alot-0.5.1.ebuild
+++ b/mail-client/alot/alot-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/mail-client/alot/alot-0.6.ebuild b/mail-client/alot/alot-0.6.ebuild
index 863187a6ee6d..9ac4153a9cdc 100644
--- a/mail-client/alot/alot-0.6.ebuild
+++ b/mail-client/alot/alot-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/mail-client/alot/alot-0.7-r1.ebuild b/mail-client/alot/alot-0.7-r1.ebuild
index 55e4adc56b62..ab4df39fe3b8 100644
--- a/mail-client/alot/alot-0.7-r1.ebuild
+++ b/mail-client/alot/alot-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/mail-client/alot/alot-0.7.ebuild b/mail-client/alot/alot-0.7.ebuild
index 3432cecd6bcf..9ac4153a9cdc 100644
--- a/mail-client/alot/alot-0.7.ebuild
+++ b/mail-client/alot/alot-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/mail-client/alot/alot-0.8.1.ebuild b/mail-client/alot/alot-0.8.1.ebuild
index 3461bbe6f022..809ff797b5ab 100644
--- a/mail-client/alot/alot-0.8.1.ebuild
+++ b/mail-client/alot/alot-0.8.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-crypt/gpgme-1.9.0[python,${PYTHON_USEDEP}]
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 9456674e03b5..4f910dc50841 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1,3 +1,5 @@
 DIST clawsker-1.1.0.tar.xz 153404 BLAKE2B 8d19eaa94339b49689bd97921101e8c064f8cd35802a08248ddcebf6e595e1cfd8b577b68dcf1534c054d21dc1ea92d109a2c20ed30b7387aa88c60518576d34 SHA512 e76be7214e5f7568423890cc29e736c163678bb4501911467afd5a4ded2f61a6493c31ac08ca2f55cd143109a37c0f2f27481a0b556628cfaf6d477112375f2b
+DIST clawsker-1.3.1.tar.xz 166580 BLAKE2B 1e0fc3318c150047fff8bdfa371fe4fc7a6bf7da5b16681cb8c0d84947d46a4f9934808bc12ec72aa0143859a6ebb5026a3d7b26cb7b9e7dd2e69b4552c01752 SHA512 d46f55fdd63493c85d47d3081bc2c0d82d76b63b193ffa05ae3130944a68c1ae78013329338f0ac773da6ca45455b3029346f74e2ca7a01129013e931da5ed85
 EBUILD clawsker-1.1.0.ebuild 535 BLAKE2B 0996da933a4096acb62b1ba5f424cb31ca855fd8abd0d8ab286216a6366cfb3cee4887d7a5c4338cc7cb3d2777c27efcb5c20e9ba07151145e45a59825a6283b SHA512 81682ec24ee5187e5757b6086bf6062857deb9f65d44db759acec6d5e2712bc9bd9b79638b9a91e01455aa7d5510daf7715197533bd7143a330ad4e51412cd5a
+EBUILD clawsker-1.3.1.ebuild 613 BLAKE2B 9443a9ed313c5f93dad3a05e53074fe9bf2c7d30c40db6049e43f639c4c2dfe656f3ddf4dee330733d356cbb64e34b89a0575157f6be459342b7f72239c9c97b SHA512 c747b00b958717dca91243b609ee04f2ec406d58afa92478525a4e5b3148e2b7db5d66961702d339e9758a398b93625894fa7375cba5902159f1d260095b3225
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-client/clawsker/clawsker-1.3.1.ebuild b/mail-client/clawsker/clawsker-1.3.1.ebuild
new file mode 100644
index 000000000000..1dfcb2dd951d
--- /dev/null
+++ b/mail-client/clawsker/clawsker-1.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="https://www.claws-mail.org/clawsker.php"
+SRC_URI="https://www.claws-mail.org/tools/${P}.tar.xz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Gtk3
+	dev-perl/Locale-gettext
+	>=dev-perl/File-Which-1.210
+	mail-client/claws-mail
+"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index e9f903bb4573..20fe891086c0 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -2,6 +2,8 @@ AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d1
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9 SHA512 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1
 DIST evolution-3.32.4.tar.xz 11793452 BLAKE2B bb009a5881cca6724b804a1203d393003f92ef9f6a8fa9692fc42344224b0b2f5def5c05160d46bbf7f76b9ae9bfa1737f78207aee7038540f410df57f7a76cd SHA512 a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931
+DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
 EBUILD evolution-3.30.5.ebuild 4255 BLAKE2B 3f1267b948e040eaec90fd2196d852c621b7a46f0ebcb968a06aeb83fa7072219cf85fea42d130bf65f5a02c95ae667e89c163972b33f4bd9b7602c683d6f7b7 SHA512 2455a3faf8b3b57b2570f90ccb1c6ce96c4ddf1da76720641ab1b7d4ca6d1d888cbbe7f3dad614a8d117ef22a09e1140e749e3aa5e64b53ad28cd4af88b7bb5e
-EBUILD evolution-3.32.4.ebuild 4308 BLAKE2B d20bb3b2cdc1ad7f732e83c2f3e746c22c0b738657aac2409f3078a9e41de234a1bd655e37106b326e7f2432d097d580cb5bfdff8d234ef4082e70ebe7c665be SHA512 580ae84a4a1c2adfe78732b13988080e52d485b08fd0a8bbdfc34525252f859f7929c5a6332d4d3c84d5fbfc38d847e1bed507338f981d682ffd76996d849d90
+EBUILD evolution-3.32.4.ebuild 4306 BLAKE2B 806403fabcac64fb0256989088e5aa8997f24c2c5e021c94bbe6fd3eda2a3098bf0f66336843b574056306496605c3108055616f4534e6b9c6cb05fbfa9fcb0e SHA512 1b1dc13722d1344daf5dd606e2a49f8f08f0796c8f435ad2f36123381584d55d92edabfe7e8eaf3f4a825ae9f3a06cb838b07237f74e748f4a5b024110526ca0
+EBUILD evolution-3.32.5.ebuild 4309 BLAKE2B 32fb6c7172dca0a3883ab32c5496dc39cc0ff37c5dd972b2ef0eae055edb28a59768281fb2aae16464147997004c92ef5356947588b38ccdcb0c311f5c1975ad SHA512 3ead9c0be00fe4169b60f0644111d426852b46564bfe3a88573fcded727b6ad7934d35ab4244df8b040abf33e7ad085d6ad1d7786446c8c095d9124abc71351e
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.32.4.ebuild b/mail-client/evolution/evolution-3.32.4.ebuild
index d83be2ff5b83..f122a35d124b 100644
--- a/mail-client/evolution/evolution-3.32.4.ebuild
+++ b/mail-client/evolution/evolution-3.32.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/evolution-3.32.5.ebuild b/mail-client/evolution/evolution-3.32.5.ebuild
new file mode 100644
index 000000000000..f320eaad3ff2
--- /dev/null
+++ b/mail-client/evolution/evolution-3.32.5.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-1.6.0:0
+	>=dev-libs/glib-2.46:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.16.0:4
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	>=dev-libs/libical-3.0.2:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spell? ( app-text/gtkspell:3 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=1
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GTKSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index b72756253a8b..e71f04549ccb 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -3,6 +3,8 @@ AUX geary-0.12-libdir.patch 2742 BLAKE2B bd931c4577630001998a9b444226690002a8177
 AUX geary-0.12-use-upstream-jsc.patch 18753 BLAKE2B 818c36ed24c7a0cfdee0679e41243c8ace7a966947c64561808587ccc7bf2a8558a48b3245a494f82553d9fd4bbf712be00efc74531cd21547f9445cb56208a8 SHA512 40fce0b4098ab13adf6f2db0f6bf4fe419f77ee159074928d7e44d103d989ac86de609df7bb8d13e47e87986fceed0e5ec92365913ae24daba148769ec82d5b5
 DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c
 DIST geary-3.32.0.tar.xz 2228056 BLAKE2B b9ee9e48fb901aa8fe8ef291b8332ac222d7581d1700170aa605071698ea0d8b698511c6e372c9a5056c3d7bf4885ec84aa389f7558fdd00cb4eeb43d745ee39 SHA512 eec6a552fe87c74d364d7242631f6ddfb6cfe35dc4f634ec7aa80342f9e02439255a2a4b12b0f88ee6369962058bbbdc64c390189bd6480a225685ad52cb68f8
+DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
 EBUILD geary-0.12.4.ebuild 2195 BLAKE2B a33f75b13f693671d5efea769caea8d16e622f18fcc72016af69f562d4bad3bac33c9a8cdfca265242a25acea6785feb5903f59ca9d39801b8394d3ff11e11da SHA512 b1242bafe73a2247c577e08084ed2d9a6b7b276c90b5dc354e25a44bacd1839f18b9760dc69702c9b3792bdc73cf1844cd286944c9259635f6ab3f354337d75f
 EBUILD geary-3.32.0-r1.ebuild 2071 BLAKE2B 5e73549b214c11f019b0ecb1826f5a99c2f4060949f2347952f4062069c848113a6d5ab3b5dc760753257783f3563c5499e2edfc67ab54adbd777c57a8be85a7 SHA512 5c0f666a0548458d396a378851300481ba6445318dac29db09fe0d18f67b02c686fb27505c7a70bb1c9a5f3501619ae8379a128fb592466a9333ed4395c9e6d7
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD geary-3.34.2.ebuild 2124 BLAKE2B d3339a5ebdac99fa2f7f320ea08dc77c02aa9232988028d99b073ce254e2c49701d608c2b3110908d53a49bf77f0219caa5dcc182eb40a38dbcbf2d3dec69351 SHA512 82cffc1646f839f6cf81869b672b5ca4012ee66d4ab3b04d69760dc7c9516149095825d64d93906be3e04c1af4551d107c2fdb5b7c5e43f67e56ddbbf640b13c
+MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/geary-3.34.2.ebuild b/mail-client/geary/geary-3.34.2.ebuild
new file mode 100644
index 000000000000..2ba8bb3a81c4
--- /dev/null
+++ b/mail-client/geary/geary-3.34.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
+
+LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
+SLOT="0"
+
+IUSE="unwind +ytnef"
+
+KEYWORDS="~amd64 ~x86"
+
+# for now both enchants work
+# FIXME: add valadoc support
+
+DEPEND="
+	>=dev-libs/appstream-glib-0.7.10
+	>=dev-libs/glib-2.54:2
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=net-libs/webkit-gtk-2.20:4=[introspection]
+	app-text/gspell[vala]
+	app-text/iso-codes
+	>=dev-db/sqlite-3.12:3
+
+	>=net-libs/libsoup-2.48:2.4[introspection]
+	net-libs/gnome-online-accounts
+
+	>=dev-libs/libgee-0.8.5:0.8=[introspection]
+	>=x11-libs/libnotify-0.7.5[introspection]
+	>=media-libs/libcanberra-0.28
+	>=dev-libs/gmime-2.6.17:2.6
+	>=app-crypt/libsecret-0.11[introspection,vala]
+	>=dev-libs/libxml2-2.7.8:2
+	>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
+	app-text/enchant
+	>=dev-libs/folks-0.11:0
+	dev-libs/json-glib
+	unwind? ( >=sys-libs/libunwind-1.1:7 )
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	dev-util/desktop-file-utils
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+RDEPEND="${DEPEND}
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+"
+
+src_prepare() {
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd po ; echo *.po) ; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
+			fi
+		done
+	fi
+
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	# appstream_util & desktop_file_validate doesn't seem to
+	# doing anything useful for an actual release, maybe for 9999?
+	local emesonargs=(
+		-Dlibunwind_optional=$(usex unwind false true)
+		-Dtnef-support=$(usex ytnef true false)
+		-Dpoodle=true
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index 39980802b1da..2731a6978a67 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="ytnef">Enable optional TNEF attachments parser support using
+			<pkg>net-mail/ytnef</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
index bfc05367032a..b8ec5aed4ce4 100644
--- a/mail-client/mailx-support/Manifest
+++ b/mail-client/mailx-support/Manifest
@@ -1,5 +1,5 @@
 AUX mailx-support-20060102-add-sys_file_h.patch 397 BLAKE2B c560eb7a53f2c318873f17c2a3543bd02912c7f635a864e987ac333eca8f4fbe33e5c39ae5bc6122607fdf4c1f73ac40618b6a050eec2d520a0fce32da626c46 SHA512 d2906ca15610090ab93d0f839a0687b67556dccc0cd8dcfe1c5ae52d23c45e74d008376d57d84eaa4272a56f209628819a60108eebaf645cc1c3106ae5a954d6
 AUX mailx-support-20060102-respect-ldflags.patch 537 BLAKE2B 34dbdd5f8a9b3537657f98f8ea274349e043618dfba3d20f004be3cb0fe58438b6c3dd9af91e921f776ee8b38bfe296718add6da217893dae001c904bcebf225 SHA512 cec6b2cf6a3f8b85ebdfcd3bdbbeac9ded468b7f34053ef6473aefd413292d9d7dc350782488481a3ae2db273ad9a7005193acc0e601c5556a2fdd49640dfe1f
 DIST mailx-support-20060102.tar.bz2 8822 BLAKE2B aee5141916f3d59f730e52f5e80fc465e7a3d961ff38e5e3d3feead4b772682c999925b7d900e2d3f87d178a6730994c2e0ec3d1625b5794bed5945a219aef81 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2
-EBUILD mailx-support-20060102-r2.ebuild 864 BLAKE2B c56fdcd8848b373bfab4a1db2e2867a35c6ed0430af061c3aeb311389f903d05772f8cb6618bf25e922a1a94eb4f558440312543c65db8591832371a264f225b SHA512 4a4bc8b5ba34184296f9b66d15d125284ceb8b4d43b515f656d3f4be0f43556b9b894d41f135ecec14f4aebc0809a8a32f820002875714e99104d3be00ba3fb0
+EBUILD mailx-support-20060102-r2.ebuild 842 BLAKE2B ec25d7e92a37a9817279b6fa55107f1bd4268a19bca8cb6a24591d270b9b0bc3625db5236ca28e946638b093ecab8949d958fab665143b1a08afefe66a0b0fff SHA512 be7fb63cc71ebe96a208b1d5a889317f95f19aa5d8f76f7d3cd814f1ec0dfd8c82819b53065ba4632e6ca7bbfb28546da4a81c0f2ddda2c982f265314cdc6b23
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
index 409e2a4d0ab7..fcad4903c028 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" BINDNOW_FLAGS="" || die "emake failed"
+	emake CC="$(tc-getCC)" BINDNOW_FLAGS=""
 }
 
 src_install() {
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 97e3996f91ff..41dbef5bc2e7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,13 +4,16 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
 DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
 DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
 DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
+DIST mutt-1.13.1.tar.gz 4895458 BLAKE2B 4a69e27137c179571724fdd98781b4a282a8fda34964c13f1777a29e77389bca1a9ff1d3aed7fcc909f4153f0cf16cb8f3be3d1dd25c2cc3d34f215f3518096a SHA512 d65026caa0095d0ffc89bf169eec6bdbce539252653c81ed7c5aed1d00363d468ec052126ee702102f7225cd61dc4b9f8d7d677bd25a32b207adc30b49e9a0e8
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
 DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
 DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-EBUILD mutt-1.10.1.ebuild 9212 BLAKE2B 15ad1afb3b4e28c7b49c71d6b33354e00c1c04051db11405b56976801e9cbc782deb4a8c1129208851c4220037791a96f00087bd743e076fe5df6cb6424be709 SHA512 c2503f2608a70f89822d1f0b58614e8c2df326cadd9f1e8af368ebf7a7547d4e95b02319c421c4e4f0037f2c4cd6b72bc813151f3d9475b4ed1c79a2c0eae6de
-EBUILD mutt-1.11.4.ebuild 9451 BLAKE2B 2631c66942a343498191cecd9c6947cb83719a380212d633c29c45adee891211f0a14f0d9a6c64c321e1be392051363414a650d3a2a15b752b2b5e9e1828bf02 SHA512 b8d422fed0c11c2d3a1d6a2d58d27c2f83cef3f2d02f0ff3ad1b995a4b87a77eeabb768e80975f9d5dfa2a0298abd0127638652f618f853c29ecb526e800fce4
-EBUILD mutt-1.12.1.ebuild 9489 BLAKE2B 4926dfb65f78ac7c3fad5d401c27d272608ff0c731f029608a7d7481d7f6a90a0d42e5430c7528e1f5d5424ef2bfab91e8548a343953624f3b46fc1b4aee67be SHA512 a0ae2c8ca8ae1c9fd698b3528ea4548a7ee0faff5525ace20a91eec92815a26766860b75adffb3786b2d17fd86eecf3ed5fb0f869a86012f494aef771d27131c
-EBUILD mutt-1.12.2-r1.ebuild 9489 BLAKE2B f0fac69e1b51e1b1937a98cc9dd4d7a9b3323c63bd5f5a64422ee9add4eb47e43ee22c72ee534e349ce061565319ba522c5c1923cf05df08a0c49e8b389c48ea SHA512 f88d38c12ee3e5dfb96f4c3aab0c664fe702a6011b512275aeabcc954619e45972d0091898bd64d762e351823fdb4202772a20e2fac683a04b712dfbe6a1da99
-EBUILD mutt-1.12.2-r2.ebuild 8739 BLAKE2B d0d6206eaf247cefd667fe053a468b8a30dcb65cb6a7b5a7089c91147f2d29ebf0e3e2eeb69094044da0e24ca964f2ab64914e28c64cd2089b08e2dd2ee7aa7a SHA512 4a53e27e8097cb66e50f0a45ec321dfb59017bb20db1c28e8e4443a28c088e6283d069fb5e3496d91d267152ac998e965c247ce87de52a843ffc986d849acc4e
+DIST mutt-gentoo-1.13.1-patches-r0.tar.xz 35888 BLAKE2B fc84e40794e0d1a66226c84423ddfa61deb5eea8bd87d8c6b611aebb049f8e100dda96e49dfd4f42e284ced8cf99e6aac38d72433cfad6c378e3fcf34ecedc57 SHA512 7f8045075df8e14ca8a163d9c2e0f7047dfb783e40086dc47b0c2c27a5e094f5e50f9df34d3eda935f9679339212c150579f747a85cdb4341e2f6eeaa2f1db7b
+EBUILD mutt-1.10.1.ebuild 9155 BLAKE2B 49b5576d721a9ad68e947e904a6e464dd18282ed9077601fcb209f259da364324b03c031067966673f6999da42c6907b5d4221a241db2f377288ceca79499ec6 SHA512 777929da223e49ab2fde78024009015203ebdad6aff9d954a9930ef108eff1025306cba2ff4187bdbdbc13e670060c6771d29c463ad3af189e42fd0d2ce6f2a5
+EBUILD mutt-1.11.4.ebuild 9394 BLAKE2B c5ce202ae5350d5c86c4e45f3ab1c30a33c1451bf5bad16076799feea6160e26ca765617c0801102f224a4ff511ef28bae72108635a63b32461b44574aab504b SHA512 f826f54b9f508b20605689e306954c22b2928f4eba9b7b2aadab6ff362ffd79088f3ab076a7462004cace8b0def8a3ebbc2b59fe2b1e60200ec84f2734ec9294
+EBUILD mutt-1.12.1.ebuild 9432 BLAKE2B ed526a801f5dbe3aa4ccc18baec4acb897d94723601c203538c4ce2ed1a1a6e171203f84b8048fdd1cd9f1b6d9fd04a21b527025b6658d8799774d440e1055a9 SHA512 1c46e2ce78b6326a931f33ab01422713c5126d06bf3bb09912fb784ca4390d92d884d64db64396a5c87004a3da87bf90291c13ce2a374fcdda598e1ae41edfb3
+EBUILD mutt-1.12.2-r1.ebuild 9432 BLAKE2B ded23934158fc034c03c20537d7bcee864eb377ad1eeb207489be14cc3d9d002e06266905ca4b285359ceae237c47e3adae36540c5bf7c4bb79baf17f0203708 SHA512 bff57f1cc021db6870e34e4b73f6f9fbc52292ff85e0bf6cc6877d64b2d0752ea56b7f217c250373f1ea6043a4604e083d8f7b9e45093ffd883013a4a735910a
+EBUILD mutt-1.12.2-r2.ebuild 8682 BLAKE2B a7ed03d38f8c3de2ec00915906f3cce024801303fd0c83afa57cb62add7585198d706d519f5217f686c48d270ac5732d23b29daa27e5e87288f819471e2cde25 SHA512 c87a76711ba98e17b85c85cfed4b8ce87ae2a49f07b838d6f6e8c25509b10f15457b33d2a070ae29ec1997b07450c5736ca3a95c25d5b81e8aa3bbdf6b1d6e1d
+EBUILD mutt-1.13.1.ebuild 7936 BLAKE2B 7ad5aee8ae967dd666ed6ea9919b2053fde4f1d25d0f10e7ff9c1c318bece8ceae707ca8ea31b0e0c857e6f72bd1a49f877093a8e318732076db592318c4471e SHA512 5321971e589eb19abb7cf71a5636f17290e9f0bbe0476979a6a07900cb9883affd36605dec5073de0a0f8b754c79d1555d7df733a03630d86b185c25e7953d70
 MISC metadata.xml 1633 BLAKE2B 86c5eea8025bff6323e0ac1f703839caf87e868dfb934f6d42e5265bc31da40fa55145ca474174163feba2863e65ea53e22c1de811703d262f195ad89b17648b SHA512 2248ee20a23502741fbd1b1cc9d7d9cc60f88864e70ccb5729fee6448297146599b073c5124ffe04653ef04faffae532ba5a7d906bb515e6f399be8e7ef06368
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 2c5a5a9392f4..291ba186831a 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -208,11 +208,11 @@ src_configure() {
 		myconf+=( "--with-homespool=Maildir" )
 	fi
 
-	econf "${myconf[@]}" || die "configure failed"
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
@@ -227,7 +227,7 @@ src_install() {
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
+		emake -C doc DESTDIR="${D}" muttrc.man
 		# make the fake slightly better, bug #413405
 		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
 			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
index 3f6633e30d9e..9a75061ed7ca 100644
--- a/mail-client/mutt/mutt-1.11.4.ebuild
+++ b/mail-client/mutt/mutt-1.11.4.ebuild
@@ -210,11 +210,11 @@ src_configure() {
 		myconf+=( "--with-homespool=Maildir" )
 	fi
 
-	econf "${myconf[@]}" || die "configure failed"
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
@@ -229,7 +229,7 @@ src_install() {
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
+		emake -C doc DESTDIR="${D}" muttrc.man
 		# make the fake slightly better, bug #413405
 		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
 			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index 95e66231cb21..c6dbb7693066 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -211,11 +211,11 @@ src_configure() {
 		myconf+=( "--with-homespool=Maildir" )
 	fi
 
-	econf "${myconf[@]}" || die "configure failed"
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
@@ -230,7 +230,7 @@ src_install() {
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
+		emake -C doc DESTDIR="${D}" muttrc.man
 		# make the fake slightly better, bug #413405
 		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
 			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
diff --git a/mail-client/mutt/mutt-1.12.2-r1.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
index 461d17b16b6b..b246b32c07b2 100644
--- a/mail-client/mutt/mutt-1.12.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild
@@ -211,11 +211,11 @@ src_configure() {
 		myconf+=( "--with-homespool=Maildir" )
 	fi
 
-	econf "${myconf[@]}" || die "configure failed"
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
@@ -230,7 +230,7 @@ src_install() {
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
+		emake -C doc DESTDIR="${D}" muttrc.man
 		# make the fake slightly better, bug #413405
 		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
 			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
index 1300423d9a3d..77e569123721 100644
--- a/mail-client/mutt/mutt-1.12.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -205,11 +205,11 @@ src_configure() {
 		myconf+=( "--with-homespool=Maildir" )
 	fi
 
-	econf "${myconf[@]}" || die "configure failed"
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
@@ -224,7 +224,7 @@ src_install() {
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
+		emake -C doc DESTDIR="${D}" muttrc.man
 		# make the fake slightly better, bug #413405
 		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
 			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
diff --git a/mail-client/mutt/mutt-1.13.1.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
new file mode 100644
index 000000000000..4cd23e5423af
--- /dev/null
+++ b/mail-client/mutt/mutt-1.13.1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		ewarn "The nntp and notmuch patches were dropped from this release."
+		ewarn "Due to too much maintenance cost, the nntp and notmuch patches"
+		ewarn "were dropped from this release.  If you need support for any"
+		ewarn "of these features, please consider using mail-client/neomutt."
+		echo
+	fi
+	if use !pgp-classic && use !smime-classic && use !gpgme ; then
+		ewarn "Please note that crypto related USE-flags of Mutt have changed."
+		ewarn "To comply with PMS, the following USE-flags were renamed:"
+		ewarn "(see https://bugs.gentoo.org/695078)"
+		ewarn "  pgp_classic   -> pgp-classic"
+		ewarn "  smime_classic -> smime-classic"
+		echo
+	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		# https is broken due to a certificate mismatch :(
+		ewarn "      http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 409da0a3c378..3eb4b0567c0a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,11 +3,15 @@ DIST neomutt-20180622.tar.gz 2769280 BLAKE2B 57e708a0502d8de795a08150dd92c4b2a8b
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
+DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
+DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
 EBUILD neomutt-20180512.ebuild 4151 BLAKE2B de49b44fd2b4eb865b5457e6379e908cfc7f1500cd1ce6a97a1d9d19eb29b59efa595fc92227b4138ae55418b5b0fd32ab600f363adbf2ebf77865099e39a6d9 SHA512 31dfc159c61781e58f3e721b5ba827d6b526ef0fd201cb29b94fbff4affdd8a1a2f77546d56b4fb0deaca60f427f9fe76125c138875a989290e606c161991c75
 EBUILD neomutt-20180622.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
 EBUILD neomutt-20180716-r1.ebuild 3299 BLAKE2B a516f340254dfef9ffac1088ea245d88ba5a325de85af2fc3ee05b77f22fd3ff8c4628d05513ac38f0286400e430832fbd1a3214d58d05ebb97296e9060329e1 SHA512 01c18478542f0ab765aac4c67cf7ed3192a4013b67fff6d468dc42cf4a82f4d98a713e3caccbfc5ffc0f9797322b345f48e8d7aa891169883a32d95a474ada32
 EBUILD neomutt-20180716.ebuild 3278 BLAKE2B 02747c8e7443aa7a57c4a9d24f71698f897a1f720cd95e3386544e0b9cbb96e3527f4d4cc96a9a23bcb6e74cfc9a7b04123ed5c9e0888a85231dc3ce633cd18c SHA512 4f8d617c55d0af52170ca62b97c1910c5d536e6284d4457fdfddc403b830d8bd980715e63b4af1fa35a00a8e120813c8b989562ef8d5047d8ea28325d40a5f7c
 EBUILD neomutt-20191102.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
 EBUILD neomutt-20191111.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
+EBUILD neomutt-20191129.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
+EBUILD neomutt-20191207.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
 EBUILD neomutt-99999999.ebuild 3315 BLAKE2B bdf80e05854de6e592eda4e51eb9874d90a5d0d8e33ceff4480d0335822ddbfd5e850bf9ab2050932b2cb4b2a29d326d564f6f507fd5e6a8b021f6049b87bdd5 SHA512 530d4387fe1d89cf6681b9040548d9213afbc44a89e1e0bb97da21a3702f89df11bd5f2c4e2b6321a99f34210df48e2874a6dda1c29e43f6110f46bf0c6b528d
 MISC metadata.xml 1527 BLAKE2B e2ef4f554270f908ea9806b3546b339831f89d17b099c7c279a961a28931af6ea6d9f74dd7e7a3db451405fbc59c8850738b6b32673b9d9904e390b70ab3148f SHA512 4410cb23ac93604778559e9d9721c67f29cb0e5f68a213ffb9df857b0816d940dbc82c715adbddc7af2e7946b9a8169d565f8cd6d8af2884f6620d3311b69a8c
diff --git a/mail-client/neomutt/neomutt-20191129.ebuild b/mail-client/neomutt/neomutt-20191129.ebuild
new file mode 100644
index 000000000000..2d262a02ac39
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20191129.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-20191207.ebuild b/mail-client/neomutt/neomutt-20191207.ebuild
new file mode 100644
index 000000000000..2d262a02ac39
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20191207.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 3279f7c39c71..38f4c73a1246 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -5,8 +5,10 @@ DIST roundcubemail-1.3.10-complete.tar.gz 5495189 BLAKE2B d2b6d7ac28fc609ab3d727
 DIST roundcubemail-1.3.8-complete.tar.gz 5534385 BLAKE2B 2f0cb528d0901d267c74d57baa18d1f057fdd2eb0f872f3cef1053847861998f8c6551fc17506ae365086ed1f86c3ee9e73a96adb2e43c6c32025e7afaf63710 SHA512 34dc9205cd93be6d6551086f4d22654dad7213b4b09000dc4def08357acdc634744ce1f560144a3d3b46e936258e90482e77fc4c691a55c205bcfdfe3745441e
 DIST roundcubemail-1.3.9-complete.tar.gz 5521697 BLAKE2B 4689bb43ff02b99a9b2b06d6370a5dce0ec4eca4e4da2a74e33e77ec74ec14bf22b6bab415c8b5fde9bd76bfaed87f183a8979edb353da3ed947f9bfdb0ecb15 SHA512 42ae9b772272b3e82476beeeb0fc5a909fb07ed0bfbdb655627b1e31da1c292f67f5a305452de31b2d60fe5905bcacabd6874dea394a9b0fd66b7921d73500ac
 DIST roundcubemail-1.4.0-complete.tar.gz 6997256 BLAKE2B b19a2d049512ceb53b3844f4680ed061044d2d142bef322c067b381e3be57ecb3181cac4f2492a162da1417fefb4028c36d34dae4bf9064c97568f681bd0c78b SHA512 274372793f1f3af761702f8972f6360f8c8e64a705ff96f1432f6a520d24c9ca0e8ccc3933f26433f1c864bd6c381066fc9eb48bf97e9497b4cbff855412d811
+DIST roundcubemail-1.4.1-complete.tar.gz 6998687 BLAKE2B ff33e512bb202d37d77ae2a4c7820f1061598bee1eb01bed5f15b25ad0e27c0cfe3611b44d451982491b702abcf6d7ae1bc88cbd303bc9a2573fc79efc54bec5 SHA512 0c8e09e93c86aad0f3e3a5a81c5e9ad8ab8aee101ae8ebb78d29556575db94a51a07cbf955ec79235425a961427b826ad27fae750b8eae785eedd195161dabed
 EBUILD roundcube-1.3.10.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.3.8.ebuild 2426 BLAKE2B 3028d0e6f300d6eaa7d1cda1ec854b2a3f1149dc5a56e29a89a4de71e3e4b1f2f8d927f5f89cc202e78dfa34d603f58430aee493c03c11cfb9edd7636503b298 SHA512 60d2e8bbf22312f9f81a6ade6628e7ed67ca771ba914e8045cabd2786941c13fb0b363575d6b2edfb9f847e92f255b0441535d12655f08588fd479611e2eca9a
 EBUILD roundcube-1.3.9.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.4.0.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
+EBUILD roundcube-1.4.1.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.4.1.ebuild b/mail-client/roundcube/roundcube-1.4.1.ebuild
new file mode 100644
index 000000000000..e503aac30822
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index b5b3d75476d0..34c13725a3a7 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -167,13 +167,69 @@ DIST thunderbird-68.2.2-uk.xpi 671452 BLAKE2B 06996c4bf847d33491a92c7282deafb4eb
 DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e1bf1a0ac6133d2d5e6ee4254d20e0726a81d8d6c1ec01d2e50e5b1e0d0ac6dfba0e1c05e5bbb57cf857b3a9230db4a SHA512 b613ffafe4fc240d82f50b086f186e4149835a168c8a931fa5547e1ee87e930d1fbbbef90045bab1264f810aee51f7dda492fa133b0f6f89d274a4bd349171f5
 DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
 DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
+DIST thunderbird-68.3.0-ar.xpi 617166 BLAKE2B 81e86d3aa7dcf0e59f2746e92a8673a325325016206ae528b7aee7b710115fcea8b6b5cc7a27721069f4f5d047e8537956ea1c7c42c598f54f9e90544789f485 SHA512 eef8b1830ec2fce91c1adf8c3c6dcaa632de94d7ce7e48724d0026c4105a4b8e057b5bac62207ae24ad8733a8621e0ae9a13f1cb94d92d84f7eb0423eb23ac8a
+DIST thunderbird-68.3.0-ast.xpi 551298 BLAKE2B 30417f8854fe6d08e3cf6e8c0926734cf5197dda8075b413bfd86ffe441cfdef8a9cc60910a7bd30c02c79ae5534af7abb8dae77850d3eae4f35e85c49a216fe SHA512 08e6486b25e715991aeb28c3ee47f0216b1183d7aee7883f314e6b24c32ef34a6529dc960ea8452d2d3798ee7f24cf588a536a69d019d1f6fc85a101dcf5610a
+DIST thunderbird-68.3.0-be.xpi 646279 BLAKE2B 52285690a1891766dfe56a6f8f4aca8bd5b31f3e66d7a091eb74336ea35490e9258ad16908cd4ef519415518162a330708b9bb00b4b423b4426f25c01ea04a84 SHA512 d5d2cf16dadb1a3db3d4b5d00819142cd1e2b9fd6e2b908739f82f85c89c7af8813e68fbb3a382cd319b15107b9f948b54147bc777245db9ccbf1f149db72dde
+DIST thunderbird-68.3.0-bg.xpi 646226 BLAKE2B e2f0322c6d2eff45d93615b8a8bc6bece96cff3e908946703c37c2b03a7b8d1360ed520efde966720dab0eced6028e20c369d1ec400a5419126b8c89272a058b SHA512 99e8af121c42fdcd1fe734ef472e4eac6b5d1df8ff461f89dfb8a055a7fc8f7663cd99c0b2633ed719028014ebc0ffc80eb31267061ec8008874bcfb908e7dea
+DIST thunderbird-68.3.0-br.xpi 574850 BLAKE2B f9e8866b9839bada5fdb9f23c1e77fa70a0e0ccb17e73be6e0fa7f4119c329345ba35d09e82b073cc6c1a3bd6e04870dbec526d51d301588cb450e16c40421b2 SHA512 5b44fc79fd7adec90192b4b426e5a00d836f61d7c2271ba3276d4adbe761dad267d921760807316300ff74651953ef5be93bba80a3b24955e27e9fdda9d21e8b
+DIST thunderbird-68.3.0-ca.xpi 578439 BLAKE2B 479cda688b7756105e5e1b9063228fae6e357e635927e438fd20ccf71a80746aefaadfa897204378142f8af60c5904515b41747c1ee839cffd5099fec692c6a0 SHA512 0238989d3f310784cdf53a95b6ef1c873a241922f89cc8c66261e1f002e9f04d7f25d3234cf42979fe23841200af6f3af871122a471e4b8717ec9db5538a73e2
+DIST thunderbird-68.3.0-cs.xpi 603041 BLAKE2B af4ee01bfed89227b64c075191df822d5040a3c411bf6b303fe835419615b1aec1512188eb04f52780d826586d1d689d0b586affc2c3aed35d2526fc994987bf SHA512 bfb30e99456197158c1a715d2f468c97d990361916fc82f79cd28e94433ed2d669645d1285e8f614d8b19c9506a861ee9258fae0a28f90d59b871ae5b1277be9
+DIST thunderbird-68.3.0-cy.xpi 589901 BLAKE2B 08aed0d086b847c28e1845a06fd97700965d5c3325758c3959b045d1142df8c3be645e647b4f216d8e950ee064fa66ccdead3d35192443b000ef8965e920e3a4 SHA512 8d5ff3e083a9d22f03eda8d1e987f180d93b80c35920fc3a6596326cf202e449c808b01cfec2e9af84fbec496de679b92d53797c6fcf94f7c3bbab3b025c1f97
+DIST thunderbird-68.3.0-da.xpi 588349 BLAKE2B c7aac916287b574d9295e4010db7fa63a97b327c56aeb598e6781d8cec6d0ebd55d9cd02cc1e2e111d53ee377faf517f7b9cb754abee3d2a230bd03c3ae1a8bb SHA512 e1e1fe202bc0331b6ce6d34b590bc3baded447a4b1498e2219ac775a1a61403db391b30e2cc88bc3f84a29b539bb007880e194117c4a3779eb6a5ffd5ce4fd9a
+DIST thunderbird-68.3.0-de.xpi 597803 BLAKE2B 5e399b0c8ecf45d837437d9c1bb4d5bb2c8e8f4af027673fcfa25425371f109c39b67143effb44b866e614e175118c72f8d7d0dcd7afcd98c6ae6481343da02e SHA512 540a3d998a9e075dc0de3a82268b1c7e892b407a31be1fc4d0ac0af368306194ee4a86c191ee12ee024cb3268e9c77aed8e48462e36b4aca74dcd1be7d2b6cb5
+DIST thunderbird-68.3.0-el.xpi 699221 BLAKE2B eec5d10d16c84714f2a98b8ab25ad7a99bcedeabfecb217d3d17d353bb3b3b5569a7a7c0d6c260654a95e17fd9280ce62ad025adae0fb8b88f5a09a71a0fb1c9 SHA512 222687f2a4dfee344d06c3d66ec8f3718a9f59542889e4092de7e75873c03864b2fb820d8a268669b28d9e73532a35070e214a62bacbe47d1cd82c00651d18c3
+DIST thunderbird-68.3.0-en-GB.xpi 556402 BLAKE2B 95a1d459925ada987a3980e8745f885468574be08f448011750eb444053eb8863e8ddc03099c3226345430d12c6cffecd605d275043ec1fa599327addb26fc64 SHA512 45c7329aae7456e8dbb2a83db398e191f2589d518877af7762bb60dda8003cf7a04bb25e49d0155fee5fede87847d68075e8047b1ad11e251358fe7f8851b4b3
+DIST thunderbird-68.3.0-es-AR.xpi 596551 BLAKE2B 7b42bc7e3dc42c04bb52ee0f3282c42ba6c88208d474a6db345bc985f627949f6b5c7ed9b3fb55d13f229e5f60d80fe3dd73e801986ca67b5bc5ca4ba2c9b5a8 SHA512 c344fba459bfaae9dd09e89990832795c7f96335e4a15387bef172971e5952f231198a374e3c113fdd47be3d06c6d0101fa9dfd56cc31e592fef2990425df4d0
+DIST thunderbird-68.3.0-es-ES.xpi 518350 BLAKE2B 5fda6fe7f2ef0975ce9e239789e222eb1f28a80b9e39139bd180716aa5f675526932c584f73c43ffc742c8095aa30b28d425ab2dbd866a68433bdc4e3c8e4009 SHA512 118deaca4f293e611634d18d91662423573848b5e7a1cbf235f5c99b1914697c10b225ce2a72eb8b68f79f2416670b9dae1c0c562ba5c4f48783a4cc3c86bf92
+DIST thunderbird-68.3.0-et.xpi 573580 BLAKE2B 1e2aa2442b9222d1dc4d425a3178d6bbce27414fd1704b085d36a8c541671af9f5fe6f41669b7f9b130326cf473649d0321a21721214cecac2af642d63a70931 SHA512 8e1e07a3d824bb2bbfd5a1c631f561dae133026f853525bac9c4a6947a84ff4c287e724c8799dbb59cc06f73d90acb2a5809bb8cc279f20e7c90d7e8cfcef939
+DIST thunderbird-68.3.0-eu.xpi 579944 BLAKE2B d69724f69720613f82ca2471764ec9e664f9eebeffb95053517173f5eca7868e4477ba6706996afbd9a3f068db18387e054a9a770196b02461274cb2398069a4 SHA512 6986925ba9292815732d7e905e621011abe86f6b38605257e9497855033595a1d3175885cc54b6843d515732630bc5e4f4990ddbcfce371fefa1f98f8e80553e
+DIST thunderbird-68.3.0-fi.xpi 578417 BLAKE2B e14604c80a020b2d7ea789510a6d44114a1348390a2bd3094e526e9adee5f2bd031cbd6a8d1bddd766fc6c81b3d6ee12281af85c4fca6d85ebc6f277b222629a SHA512 2dc58cabd19dfd338f6e0331cd3b9b786096c368e706172a1863b06b9ae70cb56b858910e9da7e64fe33c4ac99f6c7fa35cc2beb138c1ace382b40cdb6e65792
+DIST thunderbird-68.3.0-fr.xpi 607809 BLAKE2B c204b9602918bffc8507283be28cd8c430a37320e30f9ea1911a5c2101a227cf7e61c22257da68c0bfa31a9e8bbc31dbd7a0b90ec3a47f6dc41918363b998b0c SHA512 5e9504b0285b2b5cf7f24a5080af49ec6826d65c528e68a3fae8114296a08b0a27edeabb0b2e023813ac07bfb81a13bcbce650fdc0e8e143f0226429e4aa808d
+DIST thunderbird-68.3.0-fy-NL.xpi 594466 BLAKE2B 800f464cf2db9ff8c3e80f224637b7c13a109b21f1d1c864d3aadda923cfbf722f7213a03438e263f2ab35e6d40a5e62f2aff89cb467982ec837132aacae747f SHA512 221a25f721207248567c85369cc13956ed0383fb9e5d39ead8e8680280970922e33ef719d674f3eca2aa6eba2b38086a9e4d17044bc9e6e1d0094f3276817b9f
+DIST thunderbird-68.3.0-ga-IE.xpi 588708 BLAKE2B 7ed184030e233c2a2454ccce81399830f8a352ab485e31f13a6ef2bcd0013810c05c1248989f155631a55a4c7565e6a1cef38ccec9383ca47e26c5666409c55a SHA512 544f1c28f0e3b92b32a999d08b98afff592f5266c9ba6bf2d1e4a9d931cf8fccd0eba0cc302ca60dd792449ee7545e153afa5d0d02247630675cfa5a070fc97a
+DIST thunderbird-68.3.0-gd.xpi 587108 BLAKE2B 9670e3bafc8aa5687ef3001a42e84f9eab2e172f689bbe73b29e4d9483969b5401b0a6c94ddcaf2659e769ed26e43422ff0952ad5cf82f084126816b52df844a SHA512 f501fb064b42e3d76e184899a8e5844b529c98153416c0496ebe07ca98bce90af52ffb6a7718587b8c4eb193b48a5f414f718845bf021a6dd2068d9f44560365
+DIST thunderbird-68.3.0-gl.xpi 568395 BLAKE2B c9de15881f5fccfcb8ff3126f9d7d53b805efd56a40791c3385ddf2085d897065b1cedd69a88ebf18a75a7fae4aab69bd8b0d1795bfc35e5dd39b4ecb793699f SHA512 383cff75476af0cb186254668f41d5141f8f211e776e26e5acd63a004ac798488774149c6218908b002e29e8bf0428dca82e6980200bab3c2e56ddad6a71f247
+DIST thunderbird-68.3.0-he.xpi 604786 BLAKE2B b14342ebb77aacb071196f0d4877a71c0429878cb2888742bf1d12c22a8b55cd9f32478e6d0dbb1c7911375d8a78f19aa39f75037345e8b091b6172d4ad646d7 SHA512 df4d77f6b6a71da7e4fbdf0599fff72aa59c2f366880018d6733b8e5ec02a520db2b9e036e02c6d0469d0a70ecb6d68746cd833f61c1d669a0ad403ea1143ff6
+DIST thunderbird-68.3.0-hr.xpi 583783 BLAKE2B f1975b0db4b4ced78365b6ba899552d1caf7d3e0a2af3f92d17ddd343d1dbd6d177ef91ebd29f548fcdbbb59602ba45d3a0056b1f98eec2591456f30b3125db4 SHA512 1545275fcaac9a6f76de634f6c3dc87579df8ac1600fb4eec937fc1425107007cac500225a56cec696e3d42d4fce4f505a277dcdaf31d04189c19f1912147c84
+DIST thunderbird-68.3.0-hsb.xpi 616033 BLAKE2B ad43045ce5b0c6c78c3f486a0d605d01e075f84aacb16651008654ebcacc2f5a62069dd62846380b96a0972cbd4efaa3d4cd41a57e300657bbcc49bbbc1d5b6d SHA512 51f4b53b82bd091e78c91e4cb1a1d7912ff01b9e28aaf7cb8b72ab2d6769bb147c249236563764532e44e42dfc733e467fae4d1277f11133cf00c5ff788aa20a
+DIST thunderbird-68.3.0-hu.xpi 618153 BLAKE2B 71e613cf955e75196f2768bd26d5f152189c9b0a1d4a715d58591d9e6bdb03a7fb11e523ce5cbf62085d50e7685ec700e86cb170860b68ef940346b847ecfa35 SHA512 3334539638c7bf627d71163b1d2cd22f23c380c5c041a2c1da613dbdb373b8e77deb1fff4ad5ae645bde3d076febf7a4287da1b2db7a53f87582f89189ddec7a
+DIST thunderbird-68.3.0-hy-AM.xpi 630522 BLAKE2B facb4ef4218a13defbb5ae768167af672981dd96ebbf0d51ff2dd684f2df13a4c37bdab30e639203c86fdbae50167a1e459d1b2cbc43e44e1d170dae55a2172f SHA512 704d58e597809ebbd36f947be136044e6cb00e0e1453b1308e53e4bf6f81c3be6ab021b2877fd6efd25cb9b2c2429a3c0def7e530420975e221bd720f68db61a
+DIST thunderbird-68.3.0-id.xpi 567746 BLAKE2B e52cb1c3fd595c1f6da9f84b63acf489476c35ff7a1f0ffd4090e59332adcb3a313bf799cb17dd85648874a5f26a4b5df1ba77a366eae5503450ab5338b181bd SHA512 4f611802354100e7ddc2a8c229deca1263213c33dd03abc00fb156af8f88a63b9f4f6212bba5e9e92ec9914f366af9380527e7e9c4adcb28512e1ee81cc60d9e
+DIST thunderbird-68.3.0-is.xpi 575439 BLAKE2B 9e9f62fa1db1cdb0e82e403e10a4197c17f039c293cf8a997ac1ac47a8f7f7a7b8881889b1180eef40def6117ee96c0e336725e42edbe5a16fea32e03431fccd SHA512 cf2eb20457709c4ef3597945efcb4629737fc6099ec5a40d627a36a4f74981010c9aafa2b15951319330f2a11c393f9092c909cbeb603c75edb1e3d8f8495b9b
+DIST thunderbird-68.3.0-it.xpi 489517 BLAKE2B 8b93474ff218f9edbada61065f82023852e51da8dd2ec244140b92d3bc29780c8b5e409b515d50bda2e3f0e0613134446261b44ef10209704e4d85475402b4d1 SHA512 c6a2583e5462b00846779ffc0ddef2833050ca4a4b3ad00310eca9169102e7e8914f482facfdf8f3c466d0b0ef49871a66cb040e9371cb54588497276c548153
+DIST thunderbird-68.3.0-ja.xpi 643574 BLAKE2B a9824ccc6a0c0fd319d2c2fea7f2c27f44d3c0fc6e1dbc2a2a729c1248f52e09badd15d29621ce9ceaaf675f65469b0836ed7a4a5554f016a465ba779f4b574c SHA512 d267b54fb2bd8448d7af659a363fdb9c622ea2ebd52377a1ca2e590be968350e9f2ac3d654821a90c835fb0f24454335cbab14d8088acb43ad3f1d9abeab83a3
+DIST thunderbird-68.3.0-ko.xpi 620527 BLAKE2B 5631ae1e44a0bd5c5ee44879aab50c35eefee28b74a18741f100631b942baaaf7902639c7ba1cd2905c9341bc67eb463d49fb39b996c4ac0e72839c5b96099da SHA512 166faf8d5e8592339d2f5fa357f7853ef903cb9f95918141129729a8831344fd8dc4d1aa7209b99d4ad71ef01958829414a0e77b94cf1010a98752b073e556f5
+DIST thunderbird-68.3.0-lt.xpi 603844 BLAKE2B 0e4ea29e0ba7b82852aa35ce0d47ac6e0a8a388bec9b5e532d41dec8cccfe169e3a15dd6212d6e7896fd93bf16f186337048948c4912978ccbc8c9df41b83a46 SHA512 06383a5eed292280c32280e631d72f9f26f451689651fd2f559c47205848b7b092ede326fd31f86bdad4c9e1bc093e83b6e3dbd8a02a9f0034d708736f61b77c
+DIST thunderbird-68.3.0-nb-NO.xpi 574020 BLAKE2B 752f053aa132439df58cc616f550e9ffa5809517c29c51c2c560d006768088f25e16be5c8247a75b2ced36a2125f3842dd2aab0091f707d80149cf14d35e4e6e SHA512 5ccf2e9e75f8d4b9761f7ce74305334ead26d9f44269a62f71c4085166dd4ed6b1af9e6147e3362b85cbc3d4cca409b1ffaa66b73682064af2113dbede3b9787
+DIST thunderbird-68.3.0-nl.xpi 581354 BLAKE2B 9e8f41d64a6c6ec581b22ce72a0d4326d1e5a61f2d2cb388874a08456196e41adaa76bb1889fd99681c32b40ea681f6ac403026c15d2d1abfac91252467e0616 SHA512 3d0e0ec787e78d69e3126dd52b1732f2e8e28c03d6173e96fb098cc24efc275a0706ff7c2dc58c275b934934aa7e24b6682f37067408b1228029439fd0609b49
+DIST thunderbird-68.3.0-nn-NO.xpi 574948 BLAKE2B 965223512bb4b923dbbb2d2dc7bde978d78c412bc0ca03a80a40adaf4e4e391e25ab66f266c1896b786b9178cffc51684dc0f69918488598defad88bdf716a9a SHA512 6e1e094588bfb1fd79188ef6334c5a2bd8617f2fb244ad8b8b14f925d1ba91614a565c6fcd8db56dc1d0404294d815d4411c096fdce7f464ba3195334aef53dd
+DIST thunderbird-68.3.0-pl.xpi 576084 BLAKE2B 1363605c702178199ab23e60b206617cbd72ec2ed8c5c2f2b28e301c4d7507c5a90bac427d440b71b5393c12e1f590dafbd267bd613fc8a8772842787548fbfb SHA512 89b54b8266e18b5696502d1ba6cab8e53bd1444f9677270e6fcbba597d73f0cc684b6f5ffe17f37064f4205bbad7b8ce559ae16b18e2825eb009cabc612a1fc4
+DIST thunderbird-68.3.0-pt-BR.xpi 589835 BLAKE2B c1e88c5907bbdfcb2a0e2fa97bb4abd56bd595bd7967d8fb5c1e2207624c0d7e2d8d06e81e5d08790eb56a3b21f923216d72194c43c4958180141d276ba884fc SHA512 d215892fd20f4f74bc9408de37e0caef2b53d4f9106fb8a9e751c247338a79d6b54957f104cb0172ced70ee86f199bd546d46ea7a38b98190bc82099ef123f7f
+DIST thunderbird-68.3.0-pt-PT.xpi 588101 BLAKE2B afe21532c5b6e3df6e9d21737f18495c0a17199f23d3598ed7f062de14c26577a75564b58121e6b3ed5b1e1d272a45d123210c9452e9550a894ebcf1f1317929 SHA512 aeeac645c17e62c233a737a1d673e229655d0f3e4768a52ce2657723b1874852c714a2f48a76a5db558870bd4645457afd9b38d6d3b3580450114db889e14fa3
+DIST thunderbird-68.3.0-rm.xpi 578048 BLAKE2B dcca59d4743ded7c7a8e90812135ed0ba1d73dfd8bbbcbe87d4553f4f3f01c5dfaac07dd5486b95db11b231822646fcaeb0ce363e85d04218784102cb03b080e SHA512 62f35e9cfc070f211a06c863e089365f773e40f4624905704c6a16db64a312e1560691b90db0a27ac029c41aff58c343af8b7441290d241eb394a53c11891376
+DIST thunderbird-68.3.0-ro.xpi 594840 BLAKE2B 2bb66a8532587711aea456e488f59e9e7cd8493bc8b56d95a9c541395709c6893738275579dde826bd006aa45ce57d963345372644aa8cf75f4da5fe0025a7b2 SHA512 3eef81b97a7f5cb1efb84a1685cc1cd023f2c2bd35f8a285fdb7bee56eddd0a12750aec38d3aa067a79dd32807ce997bb6694bf727eeff9dc55f2faac3d5fcbc
+DIST thunderbird-68.3.0-ru.xpi 683325 BLAKE2B 046b48b78753b9e421d3fa1e38115f433af12d6d9e48182656ca1de7142f7857b53bcfa464065da82a7c7caa35a61e8b02d14c84cbf22cc827e5e710240275e9 SHA512 31ab532dfc99df92f97d0b818477f23ed06fa3967de418f756c26c02a4a270b501560fca359bf91c61ec643e1ac3c185cbd49bb74f6dc194a9856af4d6bad76e
+DIST thunderbird-68.3.0-si.xpi 637404 BLAKE2B 288fa89fd0384127adb4308fd4243420ceb3fa8bbbac2e5e2aab374f820b393a8d23dc9cf806450635364b0b5c670ea8fd082a14bcb8db95f69d700021a0e7e9 SHA512 a2cb64f388a3a1f43585d8ed213718d10f88456a7e98ece05999850afb38490a05f7c8ee6ebf67565b0054217260c23782928370e6830c02c5abb869226629bd
+DIST thunderbird-68.3.0-sk.xpi 609751 BLAKE2B b370af76d4feb8286281c1b224813ccf77ae1881e6d305fc4477a59f4d3bb49e27bd52af80c7b02ed0f79f48094463d68062d092dfb81e21e12803db851d204e SHA512 148d483cb276d145c290789371a7473fc6df168866adb9c19ed9ed77c01214ff164271ea799021d2f50562c51703e0dacf5f4ea2d24019ab77d539440cc71fca
+DIST thunderbird-68.3.0-sl.xpi 590627 BLAKE2B cdf9222020d50262a11650d43f4b41b2fc40057bbc9b8bd7d1c9c58350b945d2dc70c6f854ca156270f765ef15b560f50d3709875df0f162342b95ff42e90cfe SHA512 982989131ed30d2765a140861208db58a8b87dc04c89da687d8e1e534b3221980a470c8944875bc4dabeec42258b705730ad31d9b7ed7b3bb8403bf8344006ae
+DIST thunderbird-68.3.0-sq.xpi 598899 BLAKE2B 42b9540a34a2ab14d5cbfb5b69b303edbb11c5597426b5af7d0936f0971e77c1397a7c9fc19aadf59929730247215f1ad27eb984622039f0a29eadb2ae1d3a67 SHA512 9c154f646af00d5ffe880f9bb32e185746cfa7edc9163b9081a201c4a94bf6be77e6d9d8926ffa08ea42987b7fe3c81d4927b5a4b7cdeccb66120d81a3be75b8
+DIST thunderbird-68.3.0-sr.xpi 624895 BLAKE2B 6316b26f8f9f604cd0a374ad4a39a2cc637420dab452e583a4a419061033658ea7bf60bb8e2355a0b6c6a08f295c50f85fce835362f050f5804cc8aea6115e5f SHA512 70b2aa3be55fb87c54e3d1b5ac237b5130784261060a24f824f1bc5df2777238b1d60f9493cd381876c0faa102414f6aff7ecd873f767e9cbcd1080d771a0815
+DIST thunderbird-68.3.0-sv-SE.xpi 591594 BLAKE2B 80919193b0cbad15f45995692c3600c89ae354f46e3d914c0cdb380fcd09a6b79e4c05c39c1a873a2e5ee24c8c3d72e03813e32c328e20b707e86920901d0fe4 SHA512 54132d25d21f4703415f222e1cae92f70052b6a59b8322fd14fae39a3bb34e4cb88f76011052bba583c770e14bc98535e45f79a50820da2ca853b7682d71b3b5
+DIST thunderbird-68.3.0-tr.xpi 599706 BLAKE2B adfbb20401c27fea4615f4dbf51b0b58a928d111c8c720bfdd03581d68077ca6de405f51d4a6e46acb6089df318ce93080ffb890ce6605d38c589d138f11f31a SHA512 2fd9ad18c6756fafd2227f258c1511df9d7b34715640c4e6b2473b4e3b0cdf1952f995d5ae1caabcfc7c9d3714e03c1d91a2e7c5cecaa16e4adb485bbe22f0b4
+DIST thunderbird-68.3.0-uk.xpi 671452 BLAKE2B 8d9d86cf679e873d5d185609dda6f73932bfb704a912549c9377d8bc445fef76bc40e1d24f5e3e0dc2b1c9d42347e91dba14d15f2b42600deb0c07266599b42c SHA512 21f24d163a8c250b3d329f152f0fa0ff8a5c69835810a81640cfaadce01a1b8214f7644719f1f63d531eac7cabee8e04d3beb55b826c4829033b1b01c98a9be2
+DIST thunderbird-68.3.0-vi.xpi 623422 BLAKE2B 33c456c98384ba76c83013a2ead8f15783dff7a12a33104a5576d111b4417afdc4908ad17d74651acc6601f5dcf59ebe1dd2c62dd829126ef124d52786454b4a SHA512 d6f9fe7daaf2552acec59c924daaf55bd5690ef83e0c9e0b1090c73bdf85ea5675ae5ed58858ec90a04b347c224fb13c588cbf25d601b9ddbc6fdb18ca780dea
+DIST thunderbird-68.3.0-zh-CN.xpi 626818 BLAKE2B ee3f4579e747a1e3938adc81ccc11512d12e3c928bd91353c61d2f0cb89ad76d06a154ec6e33a75f1e39609dcb51e7045e0a314975607f7f28231a7436e45ac9 SHA512 c42ea1b005a40ce56d8f7e40ee66e978f5a9fed68087ffc1e14f489cd585ff0522d084cdf9c1be2d34b615c23b97aa1e392775963f85c2c1a5fa9b06260b5024
+DIST thunderbird-68.3.0-zh-TW.xpi 627474 BLAKE2B c23263e7fe4674d4dd74a6caf10f67d94f35421fd9dee8449c39ac6d1384fb0f8cebd848f18f59fc3d8352ef0e47439167c5e1cc65cc4730ac669ca2b4e247a4 SHA512 b244d06d4a30ee404caa18cea07882eea3b3ac87315b376a669b4fe33129df641f9eabb4e7a304dbc2c2f8698814ab19471ca729f02fd8c40269c09d1cf85a2e
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.9.1.tar.bz2 52700511 BLAKE2B 9852b88de97e439729ec9cfbbcf2aaf942e0992ea5f05fb8a3ff715a1e4ac8138769e7336ac826afdc90971277be5702af846753e0deb24f01133297a4d828dd SHA512 707d48e10ce34363a339ce7db40d4a5b3ad2e56401ab335edf916ebf74e46fa3d81364f2cdeedc8f0f5829adbcb1ba56001399bd278a249d71827c93dd171b9a
 DIST thunderbird-bin_i686-68.2.2.tar.bz2 57255096 BLAKE2B a3f8c2b52d0c4366f016cbe566c01faaf92ea715383951d69a1d1060e023dec83cc49baaf439d0cb4600e23edcde1f5396c457ddae1ae8c9f57797de0a16cbc4 SHA512 cde3ac5e798a9471ea6108a4d4e333eeecede61af22b63723aa849b9a3aaf6fceea5dcd4be73bceab1bef28030fb264573264b93d52caa44105d11b3531d3427
+DIST thunderbird-bin_i686-68.3.0.tar.bz2 57943234 BLAKE2B 2ea917ce9eac5e50f51852083635eb1e33de76fb8b0aa4027f7e6a876b2d50125d2ebebc72d4891428be2cb2bec4f957e6172f40fd80c595c7dc2c330482773e SHA512 9173c566663b1e2e00e60538019e35b663ab14a54b1c2ff7a37c9897f83015975bee0296831d95ba34b51e9fd65ae3ec5c967edceed5fc79e3cad904ee4d2e9b
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.9.1.tar.bz2 50500044 BLAKE2B 37bdc0437cc955db334535a04eb484277fff5a2bdd3c6ee06b04a1d642677ef368272e446f59c8d84aaef7f7715e7fdeb75e05be678c5d5fb594085cba9b6a32 SHA512 109ae1a376a6e65ede652c85fda7ebd497b781717cef65d0e0462a4c3d76dcca69163b96acaf1259e347ede8826a647dea3c739c2cf38f214c2628f2b9b7fe19
 DIST thunderbird-bin_x86_64-68.2.2.tar.bz2 54734632 BLAKE2B b501663dd64c82d08b67dfaa2b7afefbad3d5df34c4a3be646bbe3155d14e89fd6e33eaad40ada45cb4684f8eea239de00773b13e25c68b2bf31f7d91a8975ec SHA512 3c410d90e2157fce862b189f566774dfe141947a562a5e3a5781896ad1d0ba3ef7b978557fadb94f69108aa1e3674339dc0ef2189f6cdf251285fcae04de909c
+DIST thunderbird-bin_x86_64-68.3.0.tar.bz2 55368896 BLAKE2B cf001a82c9b357c66cea573245d2398fc8861626da586c413dbde6c8452fe73288e1742b595cea163ac04cea8ae80b66e5e875cbbc420998a8f0de8d9c2aef60 SHA512 1dfdbcc84d1df6c7e1864b26f2fe25c253d6108f3661280fc29cff1ae77d42962322b224f3fc9f409a17e28167f38293427c5c1bd8fad674bb70c2019368ef13
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.9.1.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
 EBUILD thunderbird-bin-68.2.2.ebuild 5278 BLAKE2B 93d3cff46a616317a25905015f66236fffe5aa5233caa8a9c0c6947fb8ec3f33d919097cc2b7b5d4562859df1766cb94eaae28020f918a2ae74b41209932f55d SHA512 bc3e1a00d4dda52228883f0dec8a44801c89d7df35e5f1725cec4886696088faffc5b7f0671a785ea3620b269c8f87e8e7113b1fd08d6ee45dc5d8659461ad64
+EBUILD thunderbird-bin-68.3.0.ebuild 5278 BLAKE2B 93d3cff46a616317a25905015f66236fffe5aa5233caa8a9c0c6947fb8ec3f33d919097cc2b7b5d4562859df1766cb94eaae28020f918a2ae74b41209932f55d SHA512 bc3e1a00d4dda52228883f0dec8a44801c89d7df35e5f1725cec4886696088faffc5b7f0671a785ea3620b269c8f87e8e7113b1fd08d6ee45dc5d8659461ad64
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild
new file mode 100644
index 000000000000..fa8c278a92e8
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="68.0b6"
+
+# 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 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/~juippis/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="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
+	virtual/freedesktop-icon-theme
+	>=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
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	newbin - thunderbird-bin <<- _EOF_
+		#!/bin/sh
+		unset LD_PRELOAD
+		LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+		exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+	_EOF_
+
+	# 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_postinst() {
+	xdg_desktop_database_update
+	xdg_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() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 0ae35d38e7b1..13ddf9a06c61 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -122,6 +122,61 @@ DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e
 DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
 DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
 DIST thunderbird-68.2.2.source.tar.xz 334809520 BLAKE2B e532d8b48ea0872fc69a7b2fe418dca551b5dedf6276671dffb72ce5270fdcc7d63ef835ff4ddf92b870305267fc52dbbd3f3d00f154debd308b9a569ef00422 SHA512 96c9d7b7820091896b174e2c7924e426fa0fd2e6edfa8268ab502c1292a7456d3d864f97976cced0a5e9587bfa2dd92023df1a52f989729a92e0ca604e5ab5eb
+DIST thunderbird-68.3.0-ar.xpi 617166 BLAKE2B 81e86d3aa7dcf0e59f2746e92a8673a325325016206ae528b7aee7b710115fcea8b6b5cc7a27721069f4f5d047e8537956ea1c7c42c598f54f9e90544789f485 SHA512 eef8b1830ec2fce91c1adf8c3c6dcaa632de94d7ce7e48724d0026c4105a4b8e057b5bac62207ae24ad8733a8621e0ae9a13f1cb94d92d84f7eb0423eb23ac8a
+DIST thunderbird-68.3.0-ast.xpi 551298 BLAKE2B 30417f8854fe6d08e3cf6e8c0926734cf5197dda8075b413bfd86ffe441cfdef8a9cc60910a7bd30c02c79ae5534af7abb8dae77850d3eae4f35e85c49a216fe SHA512 08e6486b25e715991aeb28c3ee47f0216b1183d7aee7883f314e6b24c32ef34a6529dc960ea8452d2d3798ee7f24cf588a536a69d019d1f6fc85a101dcf5610a
+DIST thunderbird-68.3.0-be.xpi 646279 BLAKE2B 52285690a1891766dfe56a6f8f4aca8bd5b31f3e66d7a091eb74336ea35490e9258ad16908cd4ef519415518162a330708b9bb00b4b423b4426f25c01ea04a84 SHA512 d5d2cf16dadb1a3db3d4b5d00819142cd1e2b9fd6e2b908739f82f85c89c7af8813e68fbb3a382cd319b15107b9f948b54147bc777245db9ccbf1f149db72dde
+DIST thunderbird-68.3.0-bg.xpi 646226 BLAKE2B e2f0322c6d2eff45d93615b8a8bc6bece96cff3e908946703c37c2b03a7b8d1360ed520efde966720dab0eced6028e20c369d1ec400a5419126b8c89272a058b SHA512 99e8af121c42fdcd1fe734ef472e4eac6b5d1df8ff461f89dfb8a055a7fc8f7663cd99c0b2633ed719028014ebc0ffc80eb31267061ec8008874bcfb908e7dea
+DIST thunderbird-68.3.0-br.xpi 574850 BLAKE2B f9e8866b9839bada5fdb9f23c1e77fa70a0e0ccb17e73be6e0fa7f4119c329345ba35d09e82b073cc6c1a3bd6e04870dbec526d51d301588cb450e16c40421b2 SHA512 5b44fc79fd7adec90192b4b426e5a00d836f61d7c2271ba3276d4adbe761dad267d921760807316300ff74651953ef5be93bba80a3b24955e27e9fdda9d21e8b
+DIST thunderbird-68.3.0-ca.xpi 578439 BLAKE2B 479cda688b7756105e5e1b9063228fae6e357e635927e438fd20ccf71a80746aefaadfa897204378142f8af60c5904515b41747c1ee839cffd5099fec692c6a0 SHA512 0238989d3f310784cdf53a95b6ef1c873a241922f89cc8c66261e1f002e9f04d7f25d3234cf42979fe23841200af6f3af871122a471e4b8717ec9db5538a73e2
+DIST thunderbird-68.3.0-cs.xpi 603041 BLAKE2B af4ee01bfed89227b64c075191df822d5040a3c411bf6b303fe835419615b1aec1512188eb04f52780d826586d1d689d0b586affc2c3aed35d2526fc994987bf SHA512 bfb30e99456197158c1a715d2f468c97d990361916fc82f79cd28e94433ed2d669645d1285e8f614d8b19c9506a861ee9258fae0a28f90d59b871ae5b1277be9
+DIST thunderbird-68.3.0-cy.xpi 589901 BLAKE2B 08aed0d086b847c28e1845a06fd97700965d5c3325758c3959b045d1142df8c3be645e647b4f216d8e950ee064fa66ccdead3d35192443b000ef8965e920e3a4 SHA512 8d5ff3e083a9d22f03eda8d1e987f180d93b80c35920fc3a6596326cf202e449c808b01cfec2e9af84fbec496de679b92d53797c6fcf94f7c3bbab3b025c1f97
+DIST thunderbird-68.3.0-da.xpi 588349 BLAKE2B c7aac916287b574d9295e4010db7fa63a97b327c56aeb598e6781d8cec6d0ebd55d9cd02cc1e2e111d53ee377faf517f7b9cb754abee3d2a230bd03c3ae1a8bb SHA512 e1e1fe202bc0331b6ce6d34b590bc3baded447a4b1498e2219ac775a1a61403db391b30e2cc88bc3f84a29b539bb007880e194117c4a3779eb6a5ffd5ce4fd9a
+DIST thunderbird-68.3.0-de.xpi 597803 BLAKE2B 5e399b0c8ecf45d837437d9c1bb4d5bb2c8e8f4af027673fcfa25425371f109c39b67143effb44b866e614e175118c72f8d7d0dcd7afcd98c6ae6481343da02e SHA512 540a3d998a9e075dc0de3a82268b1c7e892b407a31be1fc4d0ac0af368306194ee4a86c191ee12ee024cb3268e9c77aed8e48462e36b4aca74dcd1be7d2b6cb5
+DIST thunderbird-68.3.0-el.xpi 699221 BLAKE2B eec5d10d16c84714f2a98b8ab25ad7a99bcedeabfecb217d3d17d353bb3b3b5569a7a7c0d6c260654a95e17fd9280ce62ad025adae0fb8b88f5a09a71a0fb1c9 SHA512 222687f2a4dfee344d06c3d66ec8f3718a9f59542889e4092de7e75873c03864b2fb820d8a268669b28d9e73532a35070e214a62bacbe47d1cd82c00651d18c3
+DIST thunderbird-68.3.0-en-GB.xpi 556402 BLAKE2B 95a1d459925ada987a3980e8745f885468574be08f448011750eb444053eb8863e8ddc03099c3226345430d12c6cffecd605d275043ec1fa599327addb26fc64 SHA512 45c7329aae7456e8dbb2a83db398e191f2589d518877af7762bb60dda8003cf7a04bb25e49d0155fee5fede87847d68075e8047b1ad11e251358fe7f8851b4b3
+DIST thunderbird-68.3.0-es-AR.xpi 596551 BLAKE2B 7b42bc7e3dc42c04bb52ee0f3282c42ba6c88208d474a6db345bc985f627949f6b5c7ed9b3fb55d13f229e5f60d80fe3dd73e801986ca67b5bc5ca4ba2c9b5a8 SHA512 c344fba459bfaae9dd09e89990832795c7f96335e4a15387bef172971e5952f231198a374e3c113fdd47be3d06c6d0101fa9dfd56cc31e592fef2990425df4d0
+DIST thunderbird-68.3.0-es-ES.xpi 518350 BLAKE2B 5fda6fe7f2ef0975ce9e239789e222eb1f28a80b9e39139bd180716aa5f675526932c584f73c43ffc742c8095aa30b28d425ab2dbd866a68433bdc4e3c8e4009 SHA512 118deaca4f293e611634d18d91662423573848b5e7a1cbf235f5c99b1914697c10b225ce2a72eb8b68f79f2416670b9dae1c0c562ba5c4f48783a4cc3c86bf92
+DIST thunderbird-68.3.0-et.xpi 573580 BLAKE2B 1e2aa2442b9222d1dc4d425a3178d6bbce27414fd1704b085d36a8c541671af9f5fe6f41669b7f9b130326cf473649d0321a21721214cecac2af642d63a70931 SHA512 8e1e07a3d824bb2bbfd5a1c631f561dae133026f853525bac9c4a6947a84ff4c287e724c8799dbb59cc06f73d90acb2a5809bb8cc279f20e7c90d7e8cfcef939
+DIST thunderbird-68.3.0-eu.xpi 579944 BLAKE2B d69724f69720613f82ca2471764ec9e664f9eebeffb95053517173f5eca7868e4477ba6706996afbd9a3f068db18387e054a9a770196b02461274cb2398069a4 SHA512 6986925ba9292815732d7e905e621011abe86f6b38605257e9497855033595a1d3175885cc54b6843d515732630bc5e4f4990ddbcfce371fefa1f98f8e80553e
+DIST thunderbird-68.3.0-fi.xpi 578417 BLAKE2B e14604c80a020b2d7ea789510a6d44114a1348390a2bd3094e526e9adee5f2bd031cbd6a8d1bddd766fc6c81b3d6ee12281af85c4fca6d85ebc6f277b222629a SHA512 2dc58cabd19dfd338f6e0331cd3b9b786096c368e706172a1863b06b9ae70cb56b858910e9da7e64fe33c4ac99f6c7fa35cc2beb138c1ace382b40cdb6e65792
+DIST thunderbird-68.3.0-fr.xpi 607809 BLAKE2B c204b9602918bffc8507283be28cd8c430a37320e30f9ea1911a5c2101a227cf7e61c22257da68c0bfa31a9e8bbc31dbd7a0b90ec3a47f6dc41918363b998b0c SHA512 5e9504b0285b2b5cf7f24a5080af49ec6826d65c528e68a3fae8114296a08b0a27edeabb0b2e023813ac07bfb81a13bcbce650fdc0e8e143f0226429e4aa808d
+DIST thunderbird-68.3.0-fy-NL.xpi 594466 BLAKE2B 800f464cf2db9ff8c3e80f224637b7c13a109b21f1d1c864d3aadda923cfbf722f7213a03438e263f2ab35e6d40a5e62f2aff89cb467982ec837132aacae747f SHA512 221a25f721207248567c85369cc13956ed0383fb9e5d39ead8e8680280970922e33ef719d674f3eca2aa6eba2b38086a9e4d17044bc9e6e1d0094f3276817b9f
+DIST thunderbird-68.3.0-ga-IE.xpi 588708 BLAKE2B 7ed184030e233c2a2454ccce81399830f8a352ab485e31f13a6ef2bcd0013810c05c1248989f155631a55a4c7565e6a1cef38ccec9383ca47e26c5666409c55a SHA512 544f1c28f0e3b92b32a999d08b98afff592f5266c9ba6bf2d1e4a9d931cf8fccd0eba0cc302ca60dd792449ee7545e153afa5d0d02247630675cfa5a070fc97a
+DIST thunderbird-68.3.0-gd.xpi 587108 BLAKE2B 9670e3bafc8aa5687ef3001a42e84f9eab2e172f689bbe73b29e4d9483969b5401b0a6c94ddcaf2659e769ed26e43422ff0952ad5cf82f084126816b52df844a SHA512 f501fb064b42e3d76e184899a8e5844b529c98153416c0496ebe07ca98bce90af52ffb6a7718587b8c4eb193b48a5f414f718845bf021a6dd2068d9f44560365
+DIST thunderbird-68.3.0-gl.xpi 568395 BLAKE2B c9de15881f5fccfcb8ff3126f9d7d53b805efd56a40791c3385ddf2085d897065b1cedd69a88ebf18a75a7fae4aab69bd8b0d1795bfc35e5dd39b4ecb793699f SHA512 383cff75476af0cb186254668f41d5141f8f211e776e26e5acd63a004ac798488774149c6218908b002e29e8bf0428dca82e6980200bab3c2e56ddad6a71f247
+DIST thunderbird-68.3.0-he.xpi 604786 BLAKE2B b14342ebb77aacb071196f0d4877a71c0429878cb2888742bf1d12c22a8b55cd9f32478e6d0dbb1c7911375d8a78f19aa39f75037345e8b091b6172d4ad646d7 SHA512 df4d77f6b6a71da7e4fbdf0599fff72aa59c2f366880018d6733b8e5ec02a520db2b9e036e02c6d0469d0a70ecb6d68746cd833f61c1d669a0ad403ea1143ff6
+DIST thunderbird-68.3.0-hr.xpi 583783 BLAKE2B f1975b0db4b4ced78365b6ba899552d1caf7d3e0a2af3f92d17ddd343d1dbd6d177ef91ebd29f548fcdbbb59602ba45d3a0056b1f98eec2591456f30b3125db4 SHA512 1545275fcaac9a6f76de634f6c3dc87579df8ac1600fb4eec937fc1425107007cac500225a56cec696e3d42d4fce4f505a277dcdaf31d04189c19f1912147c84
+DIST thunderbird-68.3.0-hsb.xpi 616033 BLAKE2B ad43045ce5b0c6c78c3f486a0d605d01e075f84aacb16651008654ebcacc2f5a62069dd62846380b96a0972cbd4efaa3d4cd41a57e300657bbcc49bbbc1d5b6d SHA512 51f4b53b82bd091e78c91e4cb1a1d7912ff01b9e28aaf7cb8b72ab2d6769bb147c249236563764532e44e42dfc733e467fae4d1277f11133cf00c5ff788aa20a
+DIST thunderbird-68.3.0-hu.xpi 618153 BLAKE2B 71e613cf955e75196f2768bd26d5f152189c9b0a1d4a715d58591d9e6bdb03a7fb11e523ce5cbf62085d50e7685ec700e86cb170860b68ef940346b847ecfa35 SHA512 3334539638c7bf627d71163b1d2cd22f23c380c5c041a2c1da613dbdb373b8e77deb1fff4ad5ae645bde3d076febf7a4287da1b2db7a53f87582f89189ddec7a
+DIST thunderbird-68.3.0-hy-AM.xpi 630522 BLAKE2B facb4ef4218a13defbb5ae768167af672981dd96ebbf0d51ff2dd684f2df13a4c37bdab30e639203c86fdbae50167a1e459d1b2cbc43e44e1d170dae55a2172f SHA512 704d58e597809ebbd36f947be136044e6cb00e0e1453b1308e53e4bf6f81c3be6ab021b2877fd6efd25cb9b2c2429a3c0def7e530420975e221bd720f68db61a
+DIST thunderbird-68.3.0-id.xpi 567746 BLAKE2B e52cb1c3fd595c1f6da9f84b63acf489476c35ff7a1f0ffd4090e59332adcb3a313bf799cb17dd85648874a5f26a4b5df1ba77a366eae5503450ab5338b181bd SHA512 4f611802354100e7ddc2a8c229deca1263213c33dd03abc00fb156af8f88a63b9f4f6212bba5e9e92ec9914f366af9380527e7e9c4adcb28512e1ee81cc60d9e
+DIST thunderbird-68.3.0-is.xpi 575439 BLAKE2B 9e9f62fa1db1cdb0e82e403e10a4197c17f039c293cf8a997ac1ac47a8f7f7a7b8881889b1180eef40def6117ee96c0e336725e42edbe5a16fea32e03431fccd SHA512 cf2eb20457709c4ef3597945efcb4629737fc6099ec5a40d627a36a4f74981010c9aafa2b15951319330f2a11c393f9092c909cbeb603c75edb1e3d8f8495b9b
+DIST thunderbird-68.3.0-it.xpi 489517 BLAKE2B 8b93474ff218f9edbada61065f82023852e51da8dd2ec244140b92d3bc29780c8b5e409b515d50bda2e3f0e0613134446261b44ef10209704e4d85475402b4d1 SHA512 c6a2583e5462b00846779ffc0ddef2833050ca4a4b3ad00310eca9169102e7e8914f482facfdf8f3c466d0b0ef49871a66cb040e9371cb54588497276c548153
+DIST thunderbird-68.3.0-ja.xpi 643574 BLAKE2B a9824ccc6a0c0fd319d2c2fea7f2c27f44d3c0fc6e1dbc2a2a729c1248f52e09badd15d29621ce9ceaaf675f65469b0836ed7a4a5554f016a465ba779f4b574c SHA512 d267b54fb2bd8448d7af659a363fdb9c622ea2ebd52377a1ca2e590be968350e9f2ac3d654821a90c835fb0f24454335cbab14d8088acb43ad3f1d9abeab83a3
+DIST thunderbird-68.3.0-ko.xpi 620527 BLAKE2B 5631ae1e44a0bd5c5ee44879aab50c35eefee28b74a18741f100631b942baaaf7902639c7ba1cd2905c9341bc67eb463d49fb39b996c4ac0e72839c5b96099da SHA512 166faf8d5e8592339d2f5fa357f7853ef903cb9f95918141129729a8831344fd8dc4d1aa7209b99d4ad71ef01958829414a0e77b94cf1010a98752b073e556f5
+DIST thunderbird-68.3.0-lt.xpi 603844 BLAKE2B 0e4ea29e0ba7b82852aa35ce0d47ac6e0a8a388bec9b5e532d41dec8cccfe169e3a15dd6212d6e7896fd93bf16f186337048948c4912978ccbc8c9df41b83a46 SHA512 06383a5eed292280c32280e631d72f9f26f451689651fd2f559c47205848b7b092ede326fd31f86bdad4c9e1bc093e83b6e3dbd8a02a9f0034d708736f61b77c
+DIST thunderbird-68.3.0-nb-NO.xpi 574020 BLAKE2B 752f053aa132439df58cc616f550e9ffa5809517c29c51c2c560d006768088f25e16be5c8247a75b2ced36a2125f3842dd2aab0091f707d80149cf14d35e4e6e SHA512 5ccf2e9e75f8d4b9761f7ce74305334ead26d9f44269a62f71c4085166dd4ed6b1af9e6147e3362b85cbc3d4cca409b1ffaa66b73682064af2113dbede3b9787
+DIST thunderbird-68.3.0-nl.xpi 581354 BLAKE2B 9e8f41d64a6c6ec581b22ce72a0d4326d1e5a61f2d2cb388874a08456196e41adaa76bb1889fd99681c32b40ea681f6ac403026c15d2d1abfac91252467e0616 SHA512 3d0e0ec787e78d69e3126dd52b1732f2e8e28c03d6173e96fb098cc24efc275a0706ff7c2dc58c275b934934aa7e24b6682f37067408b1228029439fd0609b49
+DIST thunderbird-68.3.0-nn-NO.xpi 574948 BLAKE2B 965223512bb4b923dbbb2d2dc7bde978d78c412bc0ca03a80a40adaf4e4e391e25ab66f266c1896b786b9178cffc51684dc0f69918488598defad88bdf716a9a SHA512 6e1e094588bfb1fd79188ef6334c5a2bd8617f2fb244ad8b8b14f925d1ba91614a565c6fcd8db56dc1d0404294d815d4411c096fdce7f464ba3195334aef53dd
+DIST thunderbird-68.3.0-pl.xpi 576084 BLAKE2B 1363605c702178199ab23e60b206617cbd72ec2ed8c5c2f2b28e301c4d7507c5a90bac427d440b71b5393c12e1f590dafbd267bd613fc8a8772842787548fbfb SHA512 89b54b8266e18b5696502d1ba6cab8e53bd1444f9677270e6fcbba597d73f0cc684b6f5ffe17f37064f4205bbad7b8ce559ae16b18e2825eb009cabc612a1fc4
+DIST thunderbird-68.3.0-pt-BR.xpi 589835 BLAKE2B c1e88c5907bbdfcb2a0e2fa97bb4abd56bd595bd7967d8fb5c1e2207624c0d7e2d8d06e81e5d08790eb56a3b21f923216d72194c43c4958180141d276ba884fc SHA512 d215892fd20f4f74bc9408de37e0caef2b53d4f9106fb8a9e751c247338a79d6b54957f104cb0172ced70ee86f199bd546d46ea7a38b98190bc82099ef123f7f
+DIST thunderbird-68.3.0-pt-PT.xpi 588101 BLAKE2B afe21532c5b6e3df6e9d21737f18495c0a17199f23d3598ed7f062de14c26577a75564b58121e6b3ed5b1e1d272a45d123210c9452e9550a894ebcf1f1317929 SHA512 aeeac645c17e62c233a737a1d673e229655d0f3e4768a52ce2657723b1874852c714a2f48a76a5db558870bd4645457afd9b38d6d3b3580450114db889e14fa3
+DIST thunderbird-68.3.0-rm.xpi 578048 BLAKE2B dcca59d4743ded7c7a8e90812135ed0ba1d73dfd8bbbcbe87d4553f4f3f01c5dfaac07dd5486b95db11b231822646fcaeb0ce363e85d04218784102cb03b080e SHA512 62f35e9cfc070f211a06c863e089365f773e40f4624905704c6a16db64a312e1560691b90db0a27ac029c41aff58c343af8b7441290d241eb394a53c11891376
+DIST thunderbird-68.3.0-ro.xpi 594840 BLAKE2B 2bb66a8532587711aea456e488f59e9e7cd8493bc8b56d95a9c541395709c6893738275579dde826bd006aa45ce57d963345372644aa8cf75f4da5fe0025a7b2 SHA512 3eef81b97a7f5cb1efb84a1685cc1cd023f2c2bd35f8a285fdb7bee56eddd0a12750aec38d3aa067a79dd32807ce997bb6694bf727eeff9dc55f2faac3d5fcbc
+DIST thunderbird-68.3.0-ru.xpi 683325 BLAKE2B 046b48b78753b9e421d3fa1e38115f433af12d6d9e48182656ca1de7142f7857b53bcfa464065da82a7c7caa35a61e8b02d14c84cbf22cc827e5e710240275e9 SHA512 31ab532dfc99df92f97d0b818477f23ed06fa3967de418f756c26c02a4a270b501560fca359bf91c61ec643e1ac3c185cbd49bb74f6dc194a9856af4d6bad76e
+DIST thunderbird-68.3.0-si.xpi 637404 BLAKE2B 288fa89fd0384127adb4308fd4243420ceb3fa8bbbac2e5e2aab374f820b393a8d23dc9cf806450635364b0b5c670ea8fd082a14bcb8db95f69d700021a0e7e9 SHA512 a2cb64f388a3a1f43585d8ed213718d10f88456a7e98ece05999850afb38490a05f7c8ee6ebf67565b0054217260c23782928370e6830c02c5abb869226629bd
+DIST thunderbird-68.3.0-sk.xpi 609751 BLAKE2B b370af76d4feb8286281c1b224813ccf77ae1881e6d305fc4477a59f4d3bb49e27bd52af80c7b02ed0f79f48094463d68062d092dfb81e21e12803db851d204e SHA512 148d483cb276d145c290789371a7473fc6df168866adb9c19ed9ed77c01214ff164271ea799021d2f50562c51703e0dacf5f4ea2d24019ab77d539440cc71fca
+DIST thunderbird-68.3.0-sl.xpi 590627 BLAKE2B cdf9222020d50262a11650d43f4b41b2fc40057bbc9b8bd7d1c9c58350b945d2dc70c6f854ca156270f765ef15b560f50d3709875df0f162342b95ff42e90cfe SHA512 982989131ed30d2765a140861208db58a8b87dc04c89da687d8e1e534b3221980a470c8944875bc4dabeec42258b705730ad31d9b7ed7b3bb8403bf8344006ae
+DIST thunderbird-68.3.0-sq.xpi 598899 BLAKE2B 42b9540a34a2ab14d5cbfb5b69b303edbb11c5597426b5af7d0936f0971e77c1397a7c9fc19aadf59929730247215f1ad27eb984622039f0a29eadb2ae1d3a67 SHA512 9c154f646af00d5ffe880f9bb32e185746cfa7edc9163b9081a201c4a94bf6be77e6d9d8926ffa08ea42987b7fe3c81d4927b5a4b7cdeccb66120d81a3be75b8
+DIST thunderbird-68.3.0-sr.xpi 624895 BLAKE2B 6316b26f8f9f604cd0a374ad4a39a2cc637420dab452e583a4a419061033658ea7bf60bb8e2355a0b6c6a08f295c50f85fce835362f050f5804cc8aea6115e5f SHA512 70b2aa3be55fb87c54e3d1b5ac237b5130784261060a24f824f1bc5df2777238b1d60f9493cd381876c0faa102414f6aff7ecd873f767e9cbcd1080d771a0815
+DIST thunderbird-68.3.0-sv-SE.xpi 591594 BLAKE2B 80919193b0cbad15f45995692c3600c89ae354f46e3d914c0cdb380fcd09a6b79e4c05c39c1a873a2e5ee24c8c3d72e03813e32c328e20b707e86920901d0fe4 SHA512 54132d25d21f4703415f222e1cae92f70052b6a59b8322fd14fae39a3bb34e4cb88f76011052bba583c770e14bc98535e45f79a50820da2ca853b7682d71b3b5
+DIST thunderbird-68.3.0-tr.xpi 599706 BLAKE2B adfbb20401c27fea4615f4dbf51b0b58a928d111c8c720bfdd03581d68077ca6de405f51d4a6e46acb6089df318ce93080ffb890ce6605d38c589d138f11f31a SHA512 2fd9ad18c6756fafd2227f258c1511df9d7b34715640c4e6b2473b4e3b0cdf1952f995d5ae1caabcfc7c9d3714e03c1d91a2e7c5cecaa16e4adb485bbe22f0b4
+DIST thunderbird-68.3.0-uk.xpi 671452 BLAKE2B 8d9d86cf679e873d5d185609dda6f73932bfb704a912549c9377d8bc445fef76bc40e1d24f5e3e0dc2b1c9d42347e91dba14d15f2b42600deb0c07266599b42c SHA512 21f24d163a8c250b3d329f152f0fa0ff8a5c69835810a81640cfaadce01a1b8214f7644719f1f63d531eac7cabee8e04d3beb55b826c4829033b1b01c98a9be2
+DIST thunderbird-68.3.0-vi.xpi 623422 BLAKE2B 33c456c98384ba76c83013a2ead8f15783dff7a12a33104a5576d111b4417afdc4908ad17d74651acc6601f5dcf59ebe1dd2c62dd829126ef124d52786454b4a SHA512 d6f9fe7daaf2552acec59c924daaf55bd5690ef83e0c9e0b1090c73bdf85ea5675ae5ed58858ec90a04b347c224fb13c588cbf25d601b9ddbc6fdb18ca780dea
+DIST thunderbird-68.3.0-zh-CN.xpi 626818 BLAKE2B ee3f4579e747a1e3938adc81ccc11512d12e3c928bd91353c61d2f0cb89ad76d06a154ec6e33a75f1e39609dcb51e7045e0a314975607f7f28231a7436e45ac9 SHA512 c42ea1b005a40ce56d8f7e40ee66e978f5a9fed68087ffc1e14f489cd585ff0522d084cdf9c1be2d34b615c23b97aa1e392775963f85c2c1a5fa9b06260b5024
+DIST thunderbird-68.3.0-zh-TW.xpi 627474 BLAKE2B c23263e7fe4674d4dd74a6caf10f67d94f35421fd9dee8449c39ac6d1384fb0f8cebd848f18f59fc3d8352ef0e47439167c5e1cc65cc4730ac669ca2b4e247a4 SHA512 b244d06d4a30ee404caa18cea07882eea3b3ac87315b376a669b4fe33129df641f9eabb4e7a304dbc2c2f8698814ab19471ca729f02fd8c40269c09d1cf85a2e
+DIST thunderbird-68.3.0.source.tar.xz 331088404 BLAKE2B b5de4bd1e3d21eac506d16f8085f70f22636eeaeb242ffe71bc22a3a9a20f0e93afade1509d34924ed7bb477cac0209e395694fd658acfa977ac4332af338e3a SHA512 94474f91a4e7b927b94698340c31015fda6f25533ec2a4aad0712bd6d2f9a528184345ed7ddb0ff25e207375391a5c6252506538e4a4992614cd152db28d8cd5
 EBUILD thunderbird-52.9.1.ebuild 10467 BLAKE2B e8864d5147e5f25b5621d6cff3bcbdc24ad651e0d895976bee609d0a8ba69fb65df8bf8b0778d4c7daf29ace635a147bcb5060ca38c1a33e319cb8fcd4f76192 SHA512 51e0f56a5bc314e65b9263553294c705a8e15a3689364cccbcb3ef059fcbf694020c3da32fe214619503e0ca5dbfe54ba9a9f889ab649252b58fcdce1148ca52
 EBUILD thunderbird-68.2.2.ebuild 25000 BLAKE2B fc526921bdea90b3bdfaace702b48e479a84a6a66a440fbf892225383a0be8d7f870b6cf1f984a0b714cf84b15e254c995553497456bf5a434d5dbf6a0b0d676 SHA512 621f11feaa7ae4ed6716892af56dee302399cd80d755a0aa9240df2cd33fc7f4c0538ea7bc88b76ff4effee5114261b1235b4c8685ea973c1ad6eb48b8251c12
+EBUILD thunderbird-68.3.0.ebuild 25028 BLAKE2B 1320d8fb866ec586166fff9b983a4b3dc410b53353f5e687020f15122df81083f1953e74e24203ab505cf099fbbcc5dd599a4a03eda6d45d0c467de49727a9df SHA512 aacbe32f16490d2e9f34dd29c4c18c82a99105f9107f6e11f33f19069edf567268192d10c15f9969aa4f6e7723340a1e1987a7c24394eee3d42e9958876f5869
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.3.0.ebuild b/mail-client/thunderbird/thunderbird-68.3.0.ebuild
new file mode 100644
index 000000000000..9ca623c2f8ff
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-68.3.0.ebuild
@@ -0,0 +1,779 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.5"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
+ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
+sv-SE tr uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHFF="firefox-68.0-patches-12"
+
+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=9
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
+	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo
+	pulseaudio selinux startup-notification +system-av1 +system-harfbuzz
+	+system-icu +system-jpeg +system-libevent +system-sqlite
+	+system-libvpx +system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 virtualx multiprocessing
+
+CDEPEND="
+	>=dev-libs/nss-3.44.1
+	>=dev-libs/nspr-4.21
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.8.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:9
+			!clang? ( sys-devel/llvm:9 )
+			clang? (
+				=sys-devel/lld-9*
+				sys-devel/llvm:9[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/rust-1.34.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+REQUIRED_USE="wifi? ( dbus )
+	pgo? ( lto )"
+
+S="${WORKDIR}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			die "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use lto || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply firefox patchset then apply thunderbird patches
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
+	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
+	eapply "${WORKDIR}/firefox"
+	pushd "${S}"/comm &>/dev/null || die
+	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
+	popd &>/dev/null || die
+
+	eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	local n_jobs=$(makeopts_jobs)
+	if [[ ${n_jobs} == 1 ]]; then
+		einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
+		export MAKEOPTS=-j2
+	fi
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/comm/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Bug 689358
+			append-cxxflags -flto
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened ; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --enable-ldap
+	mozconfig_annotate '' --enable-calendar
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/comm/mail/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/comm/mail/branding/nightly"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/default48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
+	done
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+
+		# manifest.json does not allow the addon to load, put install.rdf in place
+		# note, version number needs to be set properly
+		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
+		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
+
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# thunderbird and thunderbird-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
+	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index f66c25d5c7b0..0c5ebca783ba 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -2,6 +2,6 @@ AUX trojita-0.7-gpg-tests.patch 1465 BLAKE2B f336368c8166987dc096991a0855a05d833
 AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db4b84f7a5dbc67ea0494b188d9ff79ccf096faaedc6a179167bc9394ced0203e9df69cc6368694e885fbb61836 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1
 AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
-EBUILD trojita-0.7-r2.ebuild 1913 BLAKE2B 045e1f76dc240bdb7f8b9205f44c98a49642dbaba21d697f2b41c302d12253070822b3617b13faac108a88307b43df793ab8a576c257d051bbe1edda07effdcc SHA512 b52d541396a5c99310af90ded525aae4af885b8a897202bba0d2386cffbdd8b7ff4c81584f05d84497a46fc99d62eb6c983a6f130ee666282824c67b29d4b8a6
-EBUILD trojita-9999.ebuild 1788 BLAKE2B 46f2c14468e64aaac068daf7674d3cd2fdad3393d2a9010b92a9038c0bc6cc143c4d30b7e0653fd488e8eaf00346d5746e45afb6446f813907247b1c44060be2 SHA512 5ccb01b7721f00bb085b9fc94a02d554d090bcd0867d4d875b56361efb23ac3cd4ef6608124f0f4cc67006bb44dae4352d89e41276e5eaf97673e35ac79a9d2b
+EBUILD trojita-0.7-r2.ebuild 1937 BLAKE2B 1997e18e832f849041c5f157e1755b14804682a836f93cd5a27360df5f99a4188dfc26505b063a57b2c5c4c828f8b566bf27347d80c20e963c9595e0e30d696b SHA512 70bffb1b5b4c73f253aedd41288e5674cf143d1123c0549334a8c75a4326d3006d471ffa869a3e1ec05185ba66f57d2baae9e406b2cee8a7474e29ce8d6e002e
+EBUILD trojita-9999.ebuild 1815 BLAKE2B d7038634ccc3e1db47caedb9a05fa3587dd4995ee80dda1546219296468f2c7747c7f02093bbd768b43d486365edbac3a17503b9957984c6150ecc7b5d1e1033 SHA512 9b903c63fbf1e8011b9370bcdb2788551f2fd96190b3247ee1c83cedbfacd33e84214401bfa22e39601d6340708bd7cad10a8edb924d21e3e6d7df685597b91b
 MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index 9f0e744cd9c8..19df3d885167 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ fi
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
 
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index fb3c38171e0d..f6b3d85cf534 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="http://trojita.flaska.net/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password pim +spell test +zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"