Revert "www-client/torbrowser: drop unsupported package from overlay"

This reverts commit 1d935ad5992be0858dd4752c4b63ea149ac4f132.

Signed-off-by: Jory Pratt <anarchy@gentoo.org>

8 files changed, 1120 insertions, 6 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8aaaacbe..08ab3050 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,2 +1,93 @@
-DIST firefox-74.0-patches-01.tar.xz 14504 BLAKE2B de4b6ed539b86f3a4b791e6a296a8cb29d1b132fc8ade47e3fdc3f8cd26bf7726ee8b8a760593c284574eac331ac671236ad4a11c40e94a921557cf627fb7c62 SHA512 494086495280889015419906fb64eadd03329193ca5e29dc9be68cabb3cd55c1c65bae156b70e27cd2856b935ce60131a30865cba8072b68433242fb17dbda1a
-DIST firefox-74.0b1.source.tar.xz 327804268 BLAKE2B 505ba27a82142d505de8a6b5748cceefb22337b650e9327d6c6c0a76a1cbc1963ec043e3ea3ed20c13cf3f829c87316dec1570ec8ac9117a3f16f4a3d3fc8b67 SHA512 6554ea7f62ac6e6f6c14388f801002ce2b142753683bc6f1c2109c006b103009f754e2fc64a1c66bcc62acdbf74e7bed88e51f301328b5b167a850c91e67c48a
+DIST firefox-73.0-ach.xpi 496809 BLAKE2B e32ca18bc5a9c9c6e812c71554bc4bb5ed7e03419c3ece37543578d26b5062d88feefba1253a9e2e724d3f7930b1053ed81f60da85cae25ba44ee7dab795e3a4 SHA512 008554c13b704bd0d206a07979efa211ecf9cd1c65abd90ffb2970ca3dfa5d9cbda6ad623318c8ac72279323d9d18e9fd68078ec7e3bae93b0293b2ccb0a5912
+DIST firefox-73.0-af.xpi 455398 BLAKE2B 2c4feb63782465f0bcb37ecac4f5838fc4cdc0fa1a7d9f40769e1075befd567fc5d07fc1c9ec283b08ecae684fcd6174f1f1b0056245e52e921e6e93487efa9c SHA512 b62205ad3aebc7b01d00b11f40e2017f6b69260d1161c7290d82590ed122c69d6a96ae27293e72996fe6a0b55e059fe58a4409fd3c25cdbe8d8c89c3097b0abd
+DIST firefox-73.0-an.xpi 509030 BLAKE2B f11acbb95acfddc08f02a6331929019b1e2a0959aad23a780265057e4381b2c443644f749ae0e218db81ae0d44958b94cd3ead0a2d270e5a06594be8379ea268 SHA512 f5beb2cf8120fd22a5e43059e3d3a4e28c588907c83de2ace08182bd6a170d46dbd492d572047f55e1d765d0e10da79735cfd7bae378cfd58cce58106d868421
+DIST firefox-73.0-ar.xpi 579684 BLAKE2B d8ad0b769fd9ced57d76d867eca236bc97f16440edb78d9245d2de71630a829791e62c40d3b88ad03cf3f438861dc459ecc63e2fc0929661271434367140316f SHA512 8878859a0cdaf02d19c5170cf361b8268e5adb99f3be1391c0b6ba5964da11fe8d8326dddc05529e2ccdf3d1dafa0fadcfe63ae347229aa8882a5df84dfd6425
+DIST firefox-73.0-ast.xpi 499597 BLAKE2B 5527e1bf105c594ea1ed9e6d7b53f06190aa93b484db7ef802807d1d2e22feccb98a82cb5431100690721d60542d2f73c336c7f7a0a8c5837c68d8565318e6da SHA512 fedcb7c438365f0ee849b5ad9fae90996f7af4635de10d2df1568ad31437185f230a81263e86299d7c944a0ac86b0ec87b379c0747f86f554957b1020d571a62
+DIST firefox-73.0-az.xpi 530756 BLAKE2B 664c8f16f67264024be19110eca51ddfdc2b010999bad38481d3edad23b1eb27361ec9885aeca7d9bc630dfe71c689df4684e59eaad2a0170219f043dabbc40a SHA512 f2c76c679ed472bb7f5773da487d91f09cd71e259ddf6316ded4ea4ea7c07eb9625937a5973bb1fc4451317522846f4ca1026a905580ff255cd2326405ed056d
+DIST firefox-73.0-be.xpi 627336 BLAKE2B ac834f093054c52f56896826257a71ccf0ff99713eb3a6b9e1d3597bd2875873fabfadf1b5356878a05d33874d2a6f79f764151d699ae348b7ac3c412f214df4 SHA512 a7c8e589e31489946d4990d3949a6bd8865e5e4afcb95453b55d8ab5e06df6e6f02faaf566ae28939eb5c55b443d385e610f816c93b0a6c157ce4c5cc5ee5a35
+DIST firefox-73.0-bg.xpi 589238 BLAKE2B 8f573c6843ab72d9959360577e4284d5c0e98b8840265bc2b356f80f99668c63aa92344a7885d76a2fc488c881a8a196277a5f4325b41beed98e26c601927f17 SHA512 ec0b4ea6fe51b630fc68a58ff7ba4055f36b4a1599353d08bf6130a564f05c80a4104d07ee7aff3152c364d20c27273383f572f33be1c91987b655723ebc9c30
+DIST firefox-73.0-bn.xpi 623490 BLAKE2B cf7e9d60ca390a9fb849770fbfa565f5fb6005559509bc71495a74e23aaafa3bd127c8018c0e00daccd5357088441129a06056bfaab145c6645fa87d8fcf53e1 SHA512 03288cfbcc9969263b175fe808e2047068df7843416c8c6f99261c0673d8b5b39b838894a1288c3a24acdb753aeca8ba4b17a5870e6557a2a0e4db80c6ad2d6a
+DIST firefox-73.0-br.xpi 538363 BLAKE2B b638fdadf800a281899e6485bb37f11d59ddc04d9b96ed0bf019fe966f2338bc0aa48843a6d490716d9a5ba3a7d18838a791d8b29257d9780222c4c8b167a1b8 SHA512 766a005505501ee4f4f64db57bea1f3ed2eebb26e2a88722d0180d35f5c547ac371aa32183300f00a77bf807b2ddb92ed527ca5bf6d021050ccc901e34e773bb
+DIST firefox-73.0-bs.xpi 506600 BLAKE2B 07fb0301d06e253333a6429cab1628b83902ba3fcd5dd3f8348b4f74ec6cb51237ce9db656f3991c63c528511716a8d7ad476d44eb1332907e209bbfaacf6f96 SHA512 175332af992d7d0e64b7070a0a05b7b9b29596baee3a2c7c27b60134b85e33af27af3273e144e5ba49da0e5083339789ff5e24fabc4714a6d45836255fb7c004
+DIST firefox-73.0-ca.xpi 539909 BLAKE2B 17938cbd5e9f5bd8c49decae73e0cde56d063259a99fad3f4a30a93f583d0a5f5e450cd3f4482f53a5020b9d4051a9d0828148a16d2b1636db5060b5e9cbdfca SHA512 6209b55db46fc243c9639ace9548373157d8f0eeda94691575615c541a16bdcd13f67ed05169ab5f6a1854e05d226a4a3863dc153eec2c542990f40152ec99eb
+DIST firefox-73.0-cak.xpi 567852 BLAKE2B ac059a33ec33c2085c784988717faa94d6583cc7fe33f15e2f85d0c1a0b9dc5493011e0cc1eb5b0001b6c97c38ad53dac4949f6247f366c6cd2cb78d9dc7d019 SHA512 82bb8abcf31fd120e2c044e93c8330e569f911ded02d28950129d4e4ce02fa3cd9526b77e7d9745e5c8305ed81bbf1bf52219d885b69b9ceb89b3900df322622
+DIST firefox-73.0-cs.xpi 563327 BLAKE2B 80614a8e0e431a0b47e182c4034fb919856980039cb799d933703db80676a2e3fc6aea099eb0b9e2f35df88154fd5d2affb72def188b9ed4e8769036b57d0347 SHA512 146339e3be72fd037e8ce6582395411fd2457d3f14757dd3ed52832145634aab3a193470055a1adf860590c5a352303a588bed05f4f3e61a47c275d233b62f68
+DIST firefox-73.0-cy.xpi 543935 BLAKE2B 0e6424ed31c3a235232bc894422c881158e004e115175345933d19edb74c4b53d30a66c9c8cc1a5b41a05a61c176d89547846cc5a3ee42958b535888a7737c9d SHA512 c314bb0f62121dd821eb003be3017f1157878928155d617318c6ece6b98f39bcfb6259b03740d4e5e2139697fcc3027fc7975dd7029d5140a7820ffe97c92a99
+DIST firefox-73.0-da.xpi 527903 BLAKE2B d1ebd7f61d5bcc44384d90ae0fc6267e2c4e9edc9d0b0faea94b70e06f2538002853c1d92edaa75f336066a42ac6285d6b1a32374bc60b2b88ce4c792c1530a4 SHA512 42a4464c906311e9894a115fd9810f9c5cbd93e4b4d4fa592e068fb6e7ba689f6f0e172688c283945ad2d03e72da0426b545cccc937fab70cb1d8d33c4fd97a8
+DIST firefox-73.0-de.xpi 559770 BLAKE2B dd960c7a62e2933630db65cb0251b08a5a34fd89575af44924fe37348628d906f28597a201613dd7d81c8b96eab12c2c090f94b03fa8b41859a9fa1c117dc58c SHA512 45de87361bf5250fbbacbec94fbaee819dd89931184f08c7c2e2731a585527f2004a23c385d8355cc31d226d4e7c6816a8bda88b778cc61cad7fd29962826014
+DIST firefox-73.0-dsb.xpi 569986 BLAKE2B d3b77cc30096f6461747f9999acbe2a9b89f1d2562b75a14db2d32dc227b34590490e90e1fa7121a90402dce45fd4e0fb50ca7c340f96b4b3982c7e0167fcc74 SHA512 836ab876b810ce209c7d330acab01b6299bda3a712ac60e71662639958f9f7d857d6dcbb0ea12a356895f66d396591772d21bb3cd8275dbecdeffd6b787d1df0
+DIST firefox-73.0-el.xpi 632334 BLAKE2B fda69cc5aae32a14f83c181c2ea49d6801632917f025115e8beec6642c91da3d9746fff5058185cc3a6996cc72f8d395d9379f16d65ebdd39c2d517cecebdfe6 SHA512 83a1b6565ba69444df9e5cf2bc05d801c52b0e8d98becb989d2af59fb9701472b75f568e48aa7f98af7c6868d920c03120478e5082a73e76272527864d33139f
+DIST firefox-73.0-en-CA.xpi 513503 BLAKE2B e52cb00331f9688885e28e69aed8f8d2dd32f923ee21ec7986b784122914100eb65aca9d26477a7bd89fc5828c25649a088e9c17bee167b81058192f5ca9e261 SHA512 987f58949a1876793be8f9f345fb0d096044754d6bd7fc88f5f41356a44bbe1c858d4ecc97403e2b568e6ca72900f53b790f980b17bfdfaa67265d3d09551a56
+DIST firefox-73.0-en-GB.xpi 512038 BLAKE2B 62ea76699df8b0c70419d18f03f54c6a0af551640a2476bd45c21f0141c0647022ad1986755d3463fbcb535d5a89318f0a6cdee48923aea8786b8cfe7f1f4e75 SHA512 221f1f283c18eb4a8fa44996db3cb75a916ae48cbe8204bc94f4e73b39ef181428047602e9dd3346981e78a47335be06513e5c5ce5103aa666dc2bc34016ec88
+DIST firefox-73.0-eo.xpi 540728 BLAKE2B df1b636a3e00ed9e496a21920fab01b8e20fe03a5faaccebf65569add03ae4839e8263b32b2ffea9cf82197d07f4e9ecd8ef0e1ea7bbabf94ab8aca7a55cd816 SHA512 745aee552f5df3eaf042541e4efea9d847b2f76fd78d96a875e416c9b16e7b40e2444342d3bb3824b0aa62c00a7a12dfdb3d8961e8ec57f40b0b5d118ed791f6
+DIST firefox-73.0-es-AR.xpi 549334 BLAKE2B 5eef0ea140156349ef79c02ae1bc4e252dfd9d9092b70a888339e3212bd6098b02f6acbadfc074939e4bee7515a47a5ac8eccaa094eeaae04123334fa7a2d212 SHA512 e1bce369b97576eca89113ac0e9293be36379de7d65f82def7da4ea9ead8cc586901bc4399dcec7eabb2be9f98ea42adeaf7f320d9281c6256709d9193bc9fb1
+DIST firefox-73.0-es-CL.xpi 549351 BLAKE2B 5db04657c0dd56d632ba787cd5d8091fd2443cf4343b8ecf4bebbb5d9ca0154d521470c566673a8e368e7240b18b478206be732efebb0802e1b2c37a96fd5590 SHA512 a7a3f48eda0e59033d5501a1c0b84efb1bf97c1c59605a8e4bc231b0632d604f23dfcce59f99cd158b9aca9ee8e79d00570ea7562b0f748d15e0469456d85039
+DIST firefox-73.0-es-ES.xpi 527433 BLAKE2B 3b1d1bbb0d8a8095cdb25db09cc7b7aeb9f8f6e464a21591b4d413d08bcf37645bfb367db6d7614e3453048776fc010db86e93a3b53b2cb7e8c4773a46a31aea SHA512 3367242ce5f3e84d4eb7367ed0641b16ce15a8f75f8f42be2c366c5a20571d821757c23f99657f623fa481056335842c2ec07c3a23ee46663daaa8ae4308db83
+DIST firefox-73.0-es-MX.xpi 553278 BLAKE2B 685be2e19e74239291376c24fa85bc6387a4ff27b739c0f06d9fc7643d8c8c6067850c070036f2e204c757404b934d6abfe5a0bc6a6e0f262c0e7cd035eac896 SHA512 62d1bc98b232a4019e9fa51474f7e42a2344b3e071034994379390fdf41694dc15dfa9f545f219a77a1c63d57037a929b992b10e936c8ba735962d103bba815a
+DIST firefox-73.0-et.xpi 529035 BLAKE2B 198e3e5335e9be9efe62dae6f384abb38dcbe6b014a39d6ab29758b34f536cec9a3e00fd191a9125e1888956e453bc35c404c6bac97f6258074074d3e2ecfb62 SHA512 8abd91a4cf395d379d8d855568337fc9222b8b4ded2804a57b23b542c579b8e0203e91dda28c8e54a2527aae64427dae0ec302b7f1c83d0b01e1438e1358d994
+DIST firefox-73.0-eu.xpi 540281 BLAKE2B 452284c5e7adb1388580ddea41948c9ae4b485e4936b123aa06d425e5c36e015f0a39a9ea36934ed4ad432ebb68898c3f243de210b21000f35f026807a9aa5c4 SHA512 04399ade2987247c5471258d1592f9c1ab6b7b3dccd1eb97a1e863a35009b1c3d9059cef8ebac473cf12930aa0b76906cf4874bc86fa3a660c43b57b6848edfa
+DIST firefox-73.0-fa.xpi 588294 BLAKE2B acb494a7ec421764e75ad85eb4441034af8e9cfc723328a0229ee8abb45a8942d070fd6631d1fb31b1b3f27b76e71aa1c1acd343eb000b04f057f44bde516e1d SHA512 7b887ac2e7f98eb0cae569282641403d8dc71bac3af3678731061e4e2926e4b29f87d694e38a6b29c7a42a8fb4161212f56e72d356c70a849fc65ae6ed42a14c
+DIST firefox-73.0-ff.xpi 507392 BLAKE2B 978446c7308c0e18890b6fc24f9974d5382389b7c6a485e324f64cea19d63f1c5e0d9dd059a8f9ce44d3be2bf06a385eb6608d9e610888bd086e157d11ae363b SHA512 67b8ba94c020ee0e6bf6875c6cfb195ead0232ab137c106dc84c942c8e25a23384cc1ad20d12869e67f0fc9f2c770fb9f81d3fad4bef3c73b8d5814f58339713
+DIST firefox-73.0-fi.xpi 535785 BLAKE2B 04f87dfc5b19609f707529a50f9b0b150b22068b1ee9d327336c879aef0056c35a3120a3d4eccb4bc2478df193dc782cfe22b4baa0b9eaccf0440e6d03ab8386 SHA512 a4dd5125cb6451975602d5a81f26c6139364091971a15b51774f2dfb88802d9058ad18442cf3160583f30d3c9f3d14b6783aeac77b4a0364abbdac42052fdd82
+DIST firefox-73.0-fr.xpi 561601 BLAKE2B 4a050dac2f8ce72238cde35f1e980a86145bcf4078b5bf540e65e35dd25d5a54683a1ff60b33aa44469a4657edd807af23f342b2d95363970abf732b166c59b6 SHA512 90380a81674cd85fac0a57b51ed87d23f4c8c6dfce1f2cfa0fb368e288c05e070ae356258aa8f3f1fd6d8d978ecd478efd550cbb6ccccd5aa9ccc72e71b7ae07
+DIST firefox-73.0-fy-NL.xpi 545149 BLAKE2B 316623a8cc687b4c67ff86ae05fc14d9e584e47942dc8adb88aaa73dec964f6ff61e1be5ba1ea32fe22fd61c59dc37159f6a79f3109fa0a09b0f6c458a1d406b SHA512 ed68ac5119c131e8896894fe44ff33c476a3ccc52b3256445391c245e3f0df8812910a8c34857d1bfe131eb60e7712970a1df66050b69da175e73a558936c3fb
+DIST firefox-73.0-ga-IE.xpi 506193 BLAKE2B edb523d59841e2388c9374bc6e5c914d31f67db6c046fc6e6df90087f17eadf7760f0153d27a1980378c627917665a6d995d68e2923d6f3fa44dbbbf91468e21 SHA512 03597eb7ed2488532a24c7d943e9cc44d5d7487ba4db05f624eda2dd277bddb6d6a692408b047969a4ca4dd82651e472f56d684c6fb8f9f65fc1bc6b89c90a88
+DIST firefox-73.0-gd.xpi 532099 BLAKE2B ad1ca2b01746ab3ad44250692e37ac80516b6a0bf4bcf934b407ae577e4552ba2501a5c2c5bff82a234a635839e263dfba64c8f0f81b8c6b902663b6dbb4af89 SHA512 0d55caa644d0d4102277055d3e41a8e23df22560ac598ababde4b57d1c55dfe9a796f984a43945d23da645f90e26a5f7afb0c6cb0843ca6db787ca321d0f2c34
+DIST firefox-73.0-gl.xpi 507863 BLAKE2B e0f4456111ace39568bcb67c770ecf1bc36a9d7a65961ae182310d7cc94f06c6c8223078c66b5151a49272f1d0cac82f395472d43ef6ebd52fd28e6762378974 SHA512 cdd9c956f8e97103f97d42a1beb5a0719eac65dc159d056bbaba45ce6ad914f4b24dce958a7be98b736911c573ccf77d3b78691499dad20d89c60aa719306ce3
+DIST firefox-73.0-gn.xpi 563110 BLAKE2B 3e89cb9089631615ffef27b4a2fd2d7983517d6282f9a2a546deb5360e3bedfcbd34069e1e65e94934ed9df4847ec78b49b5d7035b0ce4bcad149e8a00b88073 SHA512 ecd29cc743859ee93f2a4817d82094127cf22e81dc0536ecc8a5b839f2b7b95938f71467aadd6d38ff86a91e0c5c93ea13b05c0c74405b2d658cbd88df85b3ae
+DIST firefox-73.0-gu-IN.xpi 601746 BLAKE2B 3664634acfa136e8bb407ada607d0cfdd0d800ffa901e75f6e99535e94b6a8eb9b86582e2b13d1cac903784d67d8bc916c52c22e72b86de233264c73fb9716e9 SHA512 366d61eaa5715c60d0e862fe10676920ab18de687784525fd4b3bf99925661c32e6f5365d9028858edb1a7991ca12e079ddd4fa2cfed2451dc710f731310150b
+DIST firefox-73.0-he.xpi 558658 BLAKE2B 456167a1c78a582f59283a0d10e71db9c1c05d1bc8b9d421a22dad3942f21f0c64580149ea85744d1115fa2b08c41132417fabafd33a710e0c5847084bd01777 SHA512 3edcc9d0ca453630102d8f3820e31dbf7b398f639566f4cede8b0784d3d6f13258680b6cad807e6baefe45e45765fb7c57178b1415df97c431af1028a1dadf0e
+DIST firefox-73.0-hi-IN.xpi 607640 BLAKE2B 4d1141245c999466c14f2f701934feb94aa86d3d0767e378ea2d72679ba36bfd7f6f00f57f48b183621739dbfca3bb1b4bdb79bb7dd05a55fb1fa6eefbb4064e SHA512 ebcbf8ee60eb5620489e725cb27accff29172a824bc253bcbe39e5afa030fd516e7a8d48bac3a00b171fbc5b1fdc9b0babf930c33bc46dbc862106b739c28163
+DIST firefox-73.0-hr.xpi 541768 BLAKE2B 2497c0bc8e24c3d750ab1b3a75232a13a0e5c8e28c4e3c54405b2f8b1b9ab2361450e3245dfaafa63e5157e4f6a9a5a777cf1587896867360fd03ab11b59d9ae SHA512 19f043cc64c62c4867807313e5aaa5a43b372e25c9c61f85414f7f11cc99acc154ad71552c592da67756f1b388c3da4f39f4746e7e39f0615c8fabf2b3ff54e7
+DIST firefox-73.0-hsb.xpi 563992 BLAKE2B cc7bd26efed93bdd468111de0693a07f5f2bcd445305a6056bc9171683cde56668acbe64b872d8841ef2212732bf643dbb553e30424ca7e72d2548f864d47fc5 SHA512 a18e2bc8157af7f535c2f7502d74d3f23a623ccee3f5087876aed39b1387520b149d07ce193bb3b1094c02998e8e24e4a48968e5a6c8ac7c25f5cd1e8261dc36
+DIST firefox-73.0-hu.xpi 569565 BLAKE2B 183d7117fb9f99dcde10fa904e9bcbe3346d9a88b25b923d7f8fabb531726ef97c3e563d6c851c2aa0104ff06c24d35a281e3e1b58104de374c7b4e8ed83e8bd SHA512 9f035821173e428773453e40ef6e3a6b3397afbaf29e2749fd308cc084940617c3c8d714f4efdf9d60ef0df7cc846427abd4e82aecd72d9e771ab0c849d154ff
+DIST firefox-73.0-hy-AM.xpi 619861 BLAKE2B 9e3a6ec6a0727e51468ea19c6cc5e4e182a7bfb5e7ee32f982d5ea28d1d12b824b6e416cdec6da5aa9a47e2ba57e71a8701aae2d834617bfb91335a9e29f5bb4 SHA512 8ed1fc8bf47e638dd54312e36da003bf557dc371139d54ce44f5fd16d637731e3cd7b1b137ef08fea74ed71da0abde660f2550deaeea678be3238181280d6370
+DIST firefox-73.0-ia.xpi 529936 BLAKE2B 544a88a1c82e5f3fd1b959e2ee8c9d155877cc1563a872a7f65f137374f1c76d661909072488f2292c04f1719bff4e488b3f9e6cc8d6141b8b5092f0bcf57813 SHA512 ffbd41cc114f25e2d8250b032bba4b0e976c69838f2c5f1d4cf475189f3ee0e7e467d6573af11ab33c8d262b778203acf51c88d99f1e9075d7ee0887db41f664
+DIST firefox-73.0-id.xpi 533270 BLAKE2B 4f0d9c26db95d6917fc1eb34bc6782125e7de1270e33f7209538522f928dc0fce76e961a609e7953ac7a5060d312fdbf0cf1eb9cb1e4e477842581727d760bd9 SHA512 948da8efb6cc5922fd576744fed9663d725acf22582a1c04af093a81fa81e6f16a0b9f95ff17a8133a8e082785638091c99de728acfbe59eb8997de5673508ef
+DIST firefox-73.0-is.xpi 520200 BLAKE2B 3be5fceee9759186483db782c82217b7b34d9e712153b4a7442cd82a70e4ef846bdfc4edfc341aafaf11544c82c3fa3639955dc6b9ae7e4d42487356b105478f SHA512 9ce2d846d09fb89fb4c45f85ccd2be6280eba4af1421248cafc9422c9fc9002a370a2e4edc03f57e906121a4851b2eb1307a128b2b5b13755cb042170290e536
+DIST firefox-73.0-it.xpi 427997 BLAKE2B 69bd187aedd2cb3271664b6f47b29f1ead9899124e8b5ba97e2302d4499d69b609748df943e8f9c415e4466cf79cf45660c116e6292f7d6a86d3e83af297b547 SHA512 19ad8b07a72d8192fab31e9129a072f50a1dff1c8efa89ff32f58ff952cc4315077e811bdced03963f9a0f5ec79cff65c226ccf7e7a53cada2120d13dab02cb3
+DIST firefox-73.0-ja.xpi 588816 BLAKE2B 9584a5da696d08f1a4e3a65110b91d69f8a90c5471e2d5184a13d3118cb6affa98d5900e6419e0acdd9d682cf1e0b367d857e79fa39c3128c8edf7bd51634c8e SHA512 8739e918909df0ec81cc91b1385edbfc82a236cb52dbf9ec4c7f5e701cc73054dde68501172db49e0b1a807c2babab423a11affb1d1da8b330ad3811f779a2ab
+DIST firefox-73.0-ka.xpi 590611 BLAKE2B 97372a3749a895dc6d1ec68a8e6d385151a8077a6b4065f8239bda152613492af7362958a8f718fbc1656c0572d40b75be3130d02433dfe8dcc76d1b0d2e7171 SHA512 1ade57f7702e4227c79c6a0add37ab8e76e00b59c0c325952d4c6a375a42b8d95f4cc29b9c636cbceac73313975baec7c7837798a6bdaed18d86e4dbc3430d79
+DIST firefox-73.0-kab.xpi 548511 BLAKE2B bc27c230803248ce5c1087f64d9080ebeb899524238fe6f4098a22d8d4c407546ed4c0ddd9692f64dff2de338447fbfe2d618b09430789b2e7077a7c8dd172cf SHA512 20c8f30240b9860626c8e997127dc676a1ca167ae5cd7aebf6142bf761fd8b3b4703eaa4a7402921d7277ecf02bfc98c5f7d0d5de9f551bce81471f7d9d43e01
+DIST firefox-73.0-kk.xpi 621500 BLAKE2B cc6bfcd2047dce61ccc29ce467a099e35b3bbdbcfc5706a9e05a4be201ff5f837b1888d6c771d8df6c026ad89c233d1d813a5830f2380b279fcaf30d22c791eb SHA512 75e26098a17e20dc72f774cf55a814b237a7a498fcf2e3fa0dec379bc107a7241288c1b71b6aa065b347891ef4f3c438b5b56acdd175ce7243398313403df345
+DIST firefox-73.0-km.xpi 573134 BLAKE2B 746f558c146b31b14931e806452f8b8d1e6474462bd213e6a37685f4492a5382096788bc1206dc66bc21e8d3598c36b49347961854199481d00a8678603aeacb SHA512 2b23754da34dbfd9190f89071c468b0d364f7153b64bfad07dee7db050d5a554d0277b3ed48068d37e56b55681447467d7a52592638e2692bcc921cc58dd147d
+DIST firefox-73.0-kn.xpi 565619 BLAKE2B 0b8df408f65d9971d294e46e09155ea01f3ddb28a36ddb6c0b00668c030cd1307f1065f9d42b65b23968f9340933a16a9309e0b76cb9e005673d3e2abfa482a2 SHA512 a88a6a0c8134ab959eed75d8c9d1580a42f20e292f8a1e2513ab2038c3a0aae118358e273d83ba637accec70a6a99ba3bf9fcde3da69420b46e58dfd505b7191
+DIST firefox-73.0-ko.xpi 577217 BLAKE2B 334df27d614b09acf730514ea26fd80d1e1c209bb45efe761bbfee92f20071c7e580338c7610625d4d130e59d3c59d76f7b065bc4370b424fafd81ed1a7f935b SHA512 219327929f543c7d05bd58da687b523e94d5edec632a4ebac5ccb6b7d52c401eae9bb1276c16fc4849637b918c34779ad6427c7aac711185f2d16641efa0b73a
+DIST firefox-73.0-lij.xpi 513298 BLAKE2B 800f8fc8f7bd4fc6b2c51c30f3adfbd5bdded94f43def3e6223496e0e1655cf5a745d231144ea8cb9afc21686c3034773755ef79d055bc68dcd2e0fc4265517a SHA512 d4e59752317e1cec6d875d1022668f52f3d1a1b5a7ef29fd6635b0868f581238543eb98009b2cfe891b24d37220f93cbcef3b9d439ec60961d3a777f335f2d95
+DIST firefox-73.0-lt.xpi 566298 BLAKE2B f8e48bf5843eed12d4d1e8631cffe3d168d7d97b720933e5d160f126a5e2ccbd6af708809ab1c630f75d7fbc280ca002fd3781f86b773f0d59bf988a6ffb37a0 SHA512 38dfc75c997dea1567a16777669ea3e1bf0439436e52e77040dfc5a889f89c64083d7bfad6cc9872347228b31011bf31eafa58c4ccdaf88ceddad9619a324866
+DIST firefox-73.0-lv.xpi 519864 BLAKE2B c3eaee13ca8e1fbd11b917ffb3e77df4a92aa7dbad8099bfe389a3950fb7da0586f764271f4ef2a31136329919ccdd750275edf4a56d3bc444c4a911a8196ac8 SHA512 2f46741d94120560bb32880dd9853e06e52b3288c65161a9b0103d3213c85cf760947509182d562abd4e1a9c333897f821e159860ff5a15da3b3346f374495ba
+DIST firefox-73.0-mk.xpi 494045 BLAKE2B 0b8384f4b52bb6e093d7bc39ab8636e233b362c362f98f1f30f6a266ca8dbc3d4f598cbb8a55a384a021859a8487fdd70e6c23f2497214fe511e12d01aac7984 SHA512 3c38684a799c8b4f61fa3210dfc919074d865ad80ed4f42f58a93ab2e65f9aa7a3586115e071d01450210a1d7d3733d482d57c0e223d523cea2a1b5bb06cd5d4
+DIST firefox-73.0-mr.xpi 598579 BLAKE2B 39c4d358342df9641982db51ffb0ddecbadb11f7da789f7abfe50fd1effd24475fdd27ed39e00dc02247b7c229ab0c17c8fcdf944dd8abae6d7a390b7d53c8dc SHA512 8357e9873c5ef85453f2acc83e9850ac63a55b664fae1622101699445019f6176360a9ccfe2ebb63dadf5731a396d846db46788a81cb7045a7b608e3018a2ebe
+DIST firefox-73.0-ms.xpi 502900 BLAKE2B 1d1f30bda8772b4d7c337a0631c968f338a473d7cb4ea823189e89de58053a7c0a50670b93d9a39ff6cb8bc1ad54606d4faedc9a4c35f989307c55f6426fd55e SHA512 daa1e7893111dccde1ab50355ba4dd4ca93a241efa8db89f0e5090c412e9e495a052064e23670b1e9379a6813a459fbfe5882949367b248de1c29cf9dad77096
+DIST firefox-73.0-my.xpi 567253 BLAKE2B 30fdc28e708717c287fa95ae71d3d95dc9f010fca66e5dd872511f9cf84619d2dbbe95b78f05e7819348a71fda646311b20797de69866310027e0db00f431723 SHA512 04edfc8ee943a767f6dee5b884faa7f7966f841d6700e1496452dddc0131188414772b4b7165eaef1595c51806665a07fc1e8ba1c8374c6f33b3ac1c5d93d0d1
+DIST firefox-73.0-nb-NO.xpi 531604 BLAKE2B b1678cc64e34fe78992799d6959bb11f0cc677e12f68cb9fb8792e91dd8450e449284fa16461b6b787fda2af03d1e20a4fc28a9e48fe3a408d02e935f8f93868 SHA512 b98aeb4038f52df67de24966fe187a847b3733a6f375cefe7bc769ba9b812fcfc0fa458b61f55e95698abdd68a779e44d7bbf88943655d19f69bcb60f782ba3f
+DIST firefox-73.0-nl.xpi 533582 BLAKE2B bb8164d4315dd9184cbdea9fed3cd033370e8e185267ac3b4c0942debbd098b3306f1e3b913c4b719730a4827a8a0a64e8e888c1015870ab6fa6ea472bdd4b11 SHA512 46071d43bce690619eea8613fef0319c5046ebae0792fce0d67945a4b88c71c6ce87c28023aaa7d71d8934bb8054af6cc8cccbeaea93131f1b7853020950c9c5
+DIST firefox-73.0-nn-NO.xpi 533023 BLAKE2B d112da9688b6a99a5048e7bc1d190761e10c1e8ef2824d72c977cb8f80ac2aa7e3839b540b5bed4a5cf52ceb948ed7e80c6e333664bc1750715d97e9eb538c59 SHA512 8212f671ae3ebcf69749a07d7a05088b3e3b95dc373abdeeceb818ea402955b8c4138c5dca4e07c6be59770e9039ba445e2b882bfca0d1472cfc68ad16c6f1ec
+DIST firefox-73.0-oc.xpi 533792 BLAKE2B 01fe9128ad3466152f5496e0e2b27b47879662d88eaff6a4a58eee20c686d0b74a37e8b665aa16cce32cac569c6ac2375e63caa617d5ac2f07f299348ba067d2 SHA512 c6a299ffc2d1dcd8b3bc91bac088152fb541a01a963a2416ea6cc2a590af56b166919d1a99b8bbdcc3fa87cd965970ba229e553f219be4b52a743e964a5b3e66
+DIST firefox-73.0-pa-IN.xpi 583985 BLAKE2B 38ff20e819ce9581fcb6ff467c75e47ed70bbbac6975645a7bea149d6957149e75b2ef97594c09d8131b8c96819184c436987bd2f860447793b1c1fab3958e8c SHA512 ea8373a07380d63805f08dc9ffb86587af0540b1ccb4abf388c8dc239dcf734b573171e70a348865b3baae81e905b5282e169f544232583eab06aff511a93fb2
+DIST firefox-73.0-patches-04.tar.xz 20756 BLAKE2B 91dbb2454a5f4a675f13cac38f2455faa35f86edb2d1b8ed2d1df619176dc55563711fada925481f2fe5772148c12788a646ccec2e91b0e5c49c120d0541d224 SHA512 89662e232aa51eb9e42f0d9765f95982768054e03bb3c8f89a6522040e7b2ced1f002de021c36041aeb26e3ba4db39e604d7b58f83031e4769ea056633e09019
+DIST firefox-73.0-pl.xpi 546881 BLAKE2B 13644387d8e999262293a4050b003077acb2cceefdce92ecd6a0c4c2f362db22fb1581ca446e1d5e1eb51be405b20b49058251ebd32ec3749b04d288b407eb9c SHA512 b245f63b4dc651ec327f4666bbe39d88a51ae5f55792025cb88529faa4065d2b684c4dc47e41dfc0a5e432f27efae5351bba57e58bf317920383dba7090f643c
+DIST firefox-73.0-pt-BR.xpi 535110 BLAKE2B a87c32cdbf9ba723115f4237c4ca94137e3bbd6473c772299c527c2c2bd4f3c0e56d1dc8c95b7eb74524968fba07ec3fe03ddb71be7f35aafa3195f2c0ec113c SHA512 c9ef3c05b42649f48779cc50c7961304c7cdfcf4c0da883ac59e84415f8723e22722f84a95fe498112734a5fc8c835a76ca6b3b5ce4a34885d464ea7fc222de7
+DIST firefox-73.0-pt-PT.xpi 545611 BLAKE2B 83c8976562f7cade133b8628d95f0c114955f5f1f221e231eeafe194d27a3797e34236f34a21bb519ee4b4a70b3eda344d11e1f5ff295ac85ffb213495d8bda2 SHA512 7fca523ec773817a10953a7cc7631f9c1d5bf05ff3e906dec7e925c037b515931b406fbccfc546ae54de3c37bf84e1da4ada01bcb45c432bb7d1f2b46752e521
+DIST firefox-73.0-rm.xpi 539299 BLAKE2B 26f53819e29943d299c8f9fb4f4f4567bbd4c560849c26a8b6358c72cf60d02d0a57e6b4e87956547bcb8f3c5d8ab877d97cc1ba7c77e3a6628c6c556b063c2d SHA512 3d79c7f32b973ff8b89aa1b9e44b67fad6b85f6d54954561543a5ead5a0f03e42683c5b201e9c9698f92917fddabb789994e3aac875557924a7b55874e5d383c
+DIST firefox-73.0-ro.xpi 552384 BLAKE2B 538d3041346f8d0393178cda6f81b97b99409f3bda7b0894c04217e1ae1c11bd83bdff327ea41493f0877af1ba594b808ede069a8646eedcbd340d712b2b7b53 SHA512 f6226c9f8fd2655b2f6a2a01c7e57395ae25cbf6ea6e06c9d1b11ba246a03270376407dc781e409cbca22cb1924d737f944ebab677907b9289d0542a47312aa8
+DIST firefox-73.0-ru.xpi 629286 BLAKE2B 8272e3257bb31619afef56616a2cf550b04737428304dc664344823d510ce6496c5b17187ae21b57b138d40156e65ff5f0cfc71a44dbc3a86132d0fdd02ca236 SHA512 cb6744c555a47f5529904e14ed2ac6d2231ccdf53f7b6752c0e8ea420ec7f4dc48c92258a4d8980be190139bb24c71fcc0f35329c8f09f5e2ce4a486c64b7087
+DIST firefox-73.0-si.xpi 543080 BLAKE2B 7919124b9ff1b03bca734dbd880438706c39f9af775a7ccbc9644101e721541294d838bce488a9a2725397f9a5fa5d3669047de4aa56b97b63bb1b15fb976caf SHA512 3e36d765e075aab2150ba14e9fbd5c711f6033374ceb678529cc26990c95b471a9645bccbfe20be0ed59b6ec27caba4e992b43eb4f3827117427dac0af36efd8
+DIST firefox-73.0-sk.xpi 565452 BLAKE2B 92ed81f91aefb945bb6372e79bfa3bf3438c7384e077b3b3b874fc4db2bea82bdeba06199e34d296d021e7fae2939f907922ed387458d8791c5b00ae0c6cf69d SHA512 0ab92f273f5025fe4822a8891dcd55451de56dd8415ffa7f97af1df4d6a9b162087761a8587429e2206d7f0be6c0e2fad252287bb2b3ed1f3ede69d3296f3169
+DIST firefox-73.0-sl.xpi 545345 BLAKE2B 6a49eeb4776eaf4b3daf62679ea8bb6da7fc7747729d7af6be0b40cdabfa1e12d23b6c7e0eba1feb6f8f2cd5a93612d33c2a0e1d85f9e1e6cf29dee4b86d4839 SHA512 bd0d89f3ac560dd1ecf39414238b40ce954ea897bc1442756b6b273108792416aef2b76848bfb7aca302ccf24d6f344cca158ecad44fad14ff4598ba13591f79
+DIST firefox-73.0-son.xpi 469523 BLAKE2B 50caf3f3d7bbdf1da62556e3c2468bc413d3333a3fd118f8be6a9ba18416194e5b9817ef56155b7157ba29bd1f649703676a8fc810ba2c92e3c041c2914b8ac4 SHA512 8f8a45a53e8c992e1136b74050ab06fe55c48c20ec6c3ed744bf54d5ab96e05e8e1befe8c6dcbc76e51bc06e989470aa4439d594b85106ff6101b92a5ef76dbc
+DIST firefox-73.0-sq.xpi 558155 BLAKE2B e87cd5cf56b45348e472249b31f61e2d9517894e2b0613e3e98d4cc97a3fc819078e39fc07def55b84306262e0493427ea5027220a2c86f4d18e833ec0d4a735 SHA512 15c00dc3b95577f8323467aa0543613eef191d4b3f2b9f9bb8e4223a9586becc85589ed65b5ceabf0d7ce6005f81eaeb65a21963fb79b61742f70a0a658255c7
+DIST firefox-73.0-sr.xpi 563124 BLAKE2B f7b3af25107427c5b9b431da2e74795cdf1463b30feb896be03489f5ab6716499f8bf39c361440f0213e93224d62274b4e3857e0c1f5b8fef49fa6054ee2c34e SHA512 647770d9a51274add002480bb9a1ceb3496d81fdcead2f72edb979b7f6edaf867d941371a6b9a712ba799faf8a5c426d78f97e97a7f4bee044fe1cc12da98abd
+DIST firefox-73.0-sv-SE.xpi 543344 BLAKE2B 2e918e4335569ef69a25e6fb8079f33b25bd585b904eea53de161ef40696059844fa564ef71f4ab71e577ae35bc040773f8c6cc286a2a7532eb8460f9bdea6e0 SHA512 6f82eac01117d0a36d171691012e3fd6ada14180e4b27259b1bc5a2636a0f3b641bfeab1a8d6e409647b8b16df17a52a3bd293faac92fcfd53edfc97e83b8e39
+DIST firefox-73.0-ta.xpi 572049 BLAKE2B 14be21d4736414dea47d9e83ee44f486dce0842480181dc09e656bbc2370be751810e7f60e7d1aff3340173a0f5915f331da5220af1bad370af7a8256d90cb0c SHA512 c4ed8a336963b7403980c49f3f0ed98124b8c80a96c767237436cea23d85f8ff51b2fa563f44a870896ce2eaed32f433c59117907e46c34660613a068796550c
+DIST firefox-73.0-te.xpi 591172 BLAKE2B a19810cdd706ccecd67a6271625444aa23b1d529580658c889b0ab42aa82434b1ea4bdb7d378dc210d85eeb54f266f7dcdd79f5cc57ff995dc9862601b1c682d SHA512 d2d5f64054fa890f9bf834e77bbf6d7b95b0263aa0112f5b8ce349c853ff4763dc619f8912d696c2748bdc1cca5fe63ebae9ff82582e33923ce3a55f56d860ee
+DIST firefox-73.0-th.xpi 606026 BLAKE2B cd504c5348f3975f031b9bc56bc758816dd6d96b281cd62ff67f03278b1e4bc553abe5915533658273a93fb1fd47cb555ee339f6297dff8244807c6d7a21b186 SHA512 35eb880367cad3807cff0c11624b2a16f104215a738def68a04448b838f4e6a201aacc5e77ab90f5652c6fc58124b4bf1667ad117d5009e603498ff34c53ae64
+DIST firefox-73.0-tr.xpi 557165 BLAKE2B 1a19de476068172d7f5ae417d763137fe0e997fef724cfb1ed4ecbb2d2ff1539fd07f50e11ba9fc92d5a5ccd8a84238b008cf4e20071dac48d47bcd0cfba62d5 SHA512 50b4190acdde1f684512085a9482f04f2b76df53f9651d3f81d1a82d226e0b349c04b0b94f67af9b2c940eb6131c67ceddcf55edef47248725ea2b98b0eaa537
+DIST firefox-73.0-uk.xpi 618646 BLAKE2B ca2f564119eecd81a198b49c13187d7572778a955cb2c67cd285ad8cfd1ddcc482a923f431ec1a966d44af2775c8a9997f72bac48e225b028113c8f59e96e113 SHA512 a1997270d892d15afff731968aa804d0917e40be3dfa6a13204c30c6d7f12ae018345be426279404ddcce102d0f304af98db402f949d044665bd153950bc96a4
+DIST firefox-73.0-ur.xpi 587613 BLAKE2B 344e50c34a355ebdaf7173ab3bfadb8f86e964ea595400ca0df0cb488328ba722dc45ae63f37dce0be1261c451e0834ccffd3859ebe11d93618dadf5fdaf8b55 SHA512 bf65e1bd805f5e6c77a5a89e30677e8b25b9f212332a48eb417e42af627f590ab69e9ba7f558313f3f584c324ed17a738b2a2e503f5ea1809dfba717a68ab226
+DIST firefox-73.0-uz.xpi 505194 BLAKE2B 336e9d9c37e5643ba155a15368ed91b216d3c6384fb646bf3ede1fbeada7849775318174bd63ba9d707a172b4e68eb7c299d5462c4dc6c87cd26283032512d83 SHA512 055026adf07f9de5439ff7ba09be8af246b908c26188dadb7a8d282ac30fd25c74070f37c53d92c399a8870ba30329df3b6bced66f30e2be6567b7ae421e82b8
+DIST firefox-73.0-vi.xpi 572669 BLAKE2B e17735f8c7f57d1331c31130b949f19f72de36b93203d85dda3847bfa22f64b8573f063a868801fb9bf938324743b6697be6c739f2a145106d241c1b56cf7d2c SHA512 71ff4b945c076caaec6ce32d0ff8d0fa37cf6dc5d9331062d499208bdc980bf7c251a8aa0ea2920fe6fa5e4076cab0abea4e28be2e1d7a529bfdeb9b190a19e7
+DIST firefox-73.0-xh.xpi 473977 BLAKE2B 3dc2bfeffd2a5c6fe91a0b592c99af987c2977afbd7d8194c4bee2f641121d4af1f969e9b91fe9683fe95f111e585e2968a29abe6d74c4d3ecfab4313fa35f00 SHA512 e738b5918091809a1e9aa9a0dd9431e882a3e773d4ac8c05569cabc8f0953f547bff91d42b204f314c7672b1b7e33cdb6f971289133798b3265e936108425807
+DIST firefox-73.0-zh-CN.xpi 579408 BLAKE2B 3bbe33dffbe82ac9cec337f56fa65ca2edacaa50be31d6d337b5eeaa63de0c383a64b476c9907c236bd750ea8c1d0fe549130739088b98814c2294bb3ead634d SHA512 af858d84f014d76a2814cc4eebff4a1562a9c63adcca82a20c6c3257a74ba2395a9e452abe27325f1ea84e151117bd8f7d366d8671a27e483bc234e1cf8205d6
+DIST firefox-73.0-zh-TW.xpi 578021 BLAKE2B 0c6d4b777f57e5b9671f13b19e191da929abd97950c81eeb94cdae7e10b853db487d54980c9480315bc05dc23323c262f7893b76f06111ab10a09cd21ddabaa8 SHA512 d0c46dac102a1f3db238b89591ff00b3bef5cfd45d49e869fa871fcfa663ae57089069123eeabf3c2b4bee254c0fe2fe574e6050e64c80a5f1277076b7f6da2a
+DIST firefox-73.0.source.tar.xz 319387000 BLAKE2B 3c414c0e8f5737e2e50d2f42d7543c85061d289774b9daa73a39458649d8c7b09fc992d45d529c8a3874c0bbdf04ac4533b5522dabcd013f4ceb65e27c8e14eb SHA512 e10a8b48ae532d855ff50761cbdf2a6d94b2bad58a5e18d040db43d3424cbb068772f4d91c0aadd6c40b13e3d020e0e712955a1a12b41fda6333197fc34aa19a
diff --git a/www-client/firefox/firefox-74.0_beta1.ebuild b/www-client/firefox/firefox-73.0.ebuild
index 1fb00ca6..28c97932 100644
--- a/www-client/firefox/firefox-74.0_beta1.ebuild
+++ b/www-client/firefox/firefox-73.0.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
 fi
 
 # Patch version
-PATCH="${PN}-74.0-patches-01"
+PATCH="${PN}-73.0-patches-04"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
@@ -71,8 +71,8 @@ SRC_URI="${SRC_URI}
 # remove harfbuzz graphite dep until new working patch is generated for system libs
 #	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
 CDEPEND="
-	>=dev-libs/nss-3.50
-	>=dev-libs/nspr-4.25
+	>=dev-libs/nss-3.49.2
+	>=dev-libs/nspr-4.24
 	dev-libs/atk
 	dev-libs/expat
 	>=x11-libs/cairo-1.10[X]
@@ -129,7 +129,7 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	app-arch/zip
 	app-arch/unzip
-	>=dev-util/cbindgen-0.13.0
+	>=dev-util/cbindgen-0.12.0
 	>=net-libs/nodejs-8.11.0
 	>=sys-devel/binutils-2.30
 	sys-apps/findutils
@@ -311,6 +311,9 @@ src_prepare() {
 	# Must run autoconf in js/src
 	cd "${S}"/js/src || die
 	eautoconf old-configure.in
+
+	# Clear checksums that present a problem
+	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/backtrace-sys/.cargo-checksum.json || die
 }
 
 src_configure() {
diff --git a/www-client/torbrowser/Manifest b/www-client/torbrowser/Manifest
new file mode 100644
index 00000000..ccc59e04
--- /dev/null
+++ b/www-client/torbrowser/Manifest
@@ -0,0 +1,4 @@
+DIST firefox-60.6-patches-07.tar.xz 37404 BLAKE2B 5516ff768bee0253131381fdba3e08785ab31bb29e44ad7f7e2956fb7624fafc9bf22f892ddbd0617e5e7d18500686a9975a60ea77d23a2853f35936cd142030 SHA512 3c4160e632155b0a239e22d0c1b1c701545b0f6d0915f9bdcf3b8431cee1abf650191ffafc5c3224a61279c8b1b52a80444c811a3914e16127411991c963292b
+DIST tor-browser-60.6.1esr-8.0-1-build3.tar.gz 386385947 BLAKE2B ad979d6ceacf10588abd1d90bd4c561b5cc3a22a1296f32ee479f3732bb09aa84909cceb248d962aaac07faefbf34112fb8a914fcb74f6f5cf44205dafeab5af SHA512 5a49ded40cee8fecf57e716f4eb7f3df960ebfee2565dc8f26f1bad19a38e963be8e697a63c14fdc615d56bdcd429aeee20564198d199be499e978ba9cf47e63
+DIST tor-browser-linux32-8.0.9_en-US.tar.xz 76801980 BLAKE2B 7b3c65e77e010f62ecbfd96632db1918046f677a1dce59caaa5d8329fd0c89da7b18766461af732ac4352f450afc6b5affe8ad812250a2e22a7fc2e7796f46cf SHA512 f5f5a454e6c97dad9c56471d921eae84a922a5208608ef06d8ef6c4bd0215c08df94b24dbedf61b3557a2aa8773d963b449da7b1bb782bbe58165526d05f5ec4
+DIST tor-browser-linux64-8.0.9_en-US.tar.xz 75266932 BLAKE2B 881dc32d4a52eee3035dc0817255cc45eaddb24f78070fcd5b5697626bc0815209103f9457df0ba3eda4149b59c1ace8a3d309a75734e90bd8a75fd568d92e57 SHA512 239703e2791481ab1ec14b38633541bceb422040101b04e84a4a9adc96f7dbef9ffa98b61a40c0533157d0c93dd4e9df36ced03ddb50490819fb8d0d19ccc5a3
diff --git a/www-client/torbrowser/files/icon/torbrowser.desktop b/www-client/torbrowser/files/icon/torbrowser.desktop
new file mode 100644
index 00000000..ecfabde7
--- /dev/null
+++ b/www-client/torbrowser/files/icon/torbrowser.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=@NAME@
+Comment=Web Browser
+Exec=torbrowser %u
+Icon=@ICON@
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser
diff --git a/www-client/torbrowser/files/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch b/www-client/torbrowser/files/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch
new file mode 100644
index 00000000..3559402e
--- /dev/null
+++ b/www-client/torbrowser/files/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch
@@ -0,0 +1,425 @@
+From e5b0afd7fee16e7f755095b8b85296fe401fb04d Mon Sep 17 00:00:00 2001
+From: Poncho <poncho@spahan.ch>
+Date: Wed, 30 Jan 2019 09:55:48 +0100
+Subject: [PATCH 2/4] Revert "Bug 9173: Change the default Firefox profile
+ directory to be TBB-relative."
+
+This reverts commit b82691c60b6a3ade6939b0f68f28de1e3c120292.
+---
+ toolkit/xre/nsXREDirProvider.cpp       | 147 +++++++++++++++++++------
+ toolkit/xre/nsXREDirProvider.h         |  12 +-
+ xpcom/io/nsAppFileLocationProvider.cpp |  97 ++++++++++------
+ 3 files changed, 181 insertions(+), 75 deletions(-)
+
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index dbbaffd2a15f..00ee37ce9b5f 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -32,7 +32,6 @@
+ #include "nsArrayEnumerator.h"
+ #include "nsEnumeratorUtils.h"
+ #include "nsReadableUtils.h"
+-#include "nsXPCOMPrivate.h"  // for XPCOM_FILE_PATH_SEPARATOR
+ 
+ #include "SpecialSystemDirectory.h"
+ 
+@@ -215,6 +214,9 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult) {
+   nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false);
+ 
+   if (NS_SUCCEEDED(rv)) {
++#if !defined(XP_UNIX) || defined(XP_MACOSX)
++    rv = file->AppendNative(NS_LITERAL_CSTRING("Profiles"));
++#endif
+     // We must create the profile directory here if it does not exist.
+     nsresult tmp = EnsureDirectoryExists(file);
+     if (NS_FAILED(tmp)) {
+@@ -230,6 +232,9 @@ nsresult nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) {
+   nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true);
+ 
+   if (NS_SUCCEEDED(rv)) {
++#if !defined(XP_UNIX) || defined(XP_MACOSX)
++    rv = file->AppendNative(NS_LITERAL_CSTRING("Profiles"));
++#endif
+     // We must create the profile directory here if it does not exist.
+     nsresult tmp = EnsureDirectoryExists(file);
+     if (NS_FAILED(tmp)) {
+@@ -1332,42 +1337,84 @@ nsresult nsXREDirProvider::GetProfileDir(nsIFile** aResult) {
+ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+                                                     bool aLocal) {
+   // Copied from nsAppFileLocationProvider (more or less)
+-  NS_ENSURE_ARG_POINTER(aFile);
++  nsresult rv;
+   nsCOMPtr<nsIFile> localDir;
+ 
+-  nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+-  int levelsToRemove = 1;  // In FF21+, appDir points to browser subdirectory.
+ #if defined(XP_MACOSX)
+-  levelsToRemove += 2;
++  FSRef fsRef;
++  OSType folderType;
++  if (aLocal) {
++    folderType = kCachedDataFolderType;
++  } else {
++#ifdef MOZ_THUNDERBIRD
++    folderType = kDomainLibraryFolderType;
++#else
++    folderType = kApplicationSupportFolderType;
+ #endif
+-  while (localDir && (levelsToRemove > 0)) {
+-    // When crawling up the hierarchy, components named "." do not count.
+-    nsAutoCString removedName;
+-    rv = localDir->GetNativeLeafName(removedName);
+-    NS_ENSURE_SUCCESS(rv, rv);
+-    bool didRemove = !removedName.Equals(".");
+-
+-    // Remove a directory component.
+-    nsCOMPtr<nsIFile> parentDir;
+-    rv = localDir->GetParent(getter_AddRefs(parentDir));
+-    NS_ENSURE_SUCCESS(rv, rv);
+-    localDir = parentDir;
+-    if (didRemove) --levelsToRemove;
+   }
++  OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef);
++  NS_ENSURE_FALSE(err, NS_ERROR_FAILURE);
+ 
+-  if (!localDir) return NS_ERROR_FAILURE;
++  rv = NS_NewNativeLocalFile(EmptyCString(), true, getter_AddRefs(localDir));
++  NS_ENSURE_SUCCESS(rv, rv);
++
++  nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir);
++  NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED);
+ 
+-  rv = localDir->AppendRelativeNativePath(
+-      NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR
+-                         "Data" XPCOM_FILE_PATH_SEPARATOR "Browser"));
++  rv = dirFileMac->InitWithFSRef(&fsRef);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
++  localDir = do_QueryInterface(dirFileMac, &rv);
++#elif defined(XP_IOS)
++  nsAutoCString userDir;
++  if (GetUIKitDirectory(aLocal, userDir)) {
++    rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir));
++  } else {
++    rv = NS_ERROR_FAILURE;
++  }
++  NS_ENSURE_SUCCESS(rv, rv);
++#elif defined(XP_WIN)
++  nsString path;
+   if (aLocal) {
+-    rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
+-    NS_ENSURE_SUCCESS(rv, rv);
++    rv = GetShellFolderPath(FOLDERID_LocalAppData, path);
++    if (NS_FAILED(rv)) rv = GetRegWindowsAppDataFolder(aLocal, path);
++  }
++  if (!aLocal || NS_FAILED(rv)) {
++    rv = GetShellFolderPath(FOLDERID_RoamingAppData, path);
++    if (NS_FAILED(rv)) {
++      if (!aLocal) rv = GetRegWindowsAppDataFolder(aLocal, path);
++    }
++  }
++  NS_ENSURE_SUCCESS(rv, rv);
++
++  rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
++#elif defined(XP_UNIX)
++  const char* homeDir = getenv("HOME");
++  if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
++
++#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */
++  aLocal = false;
++#endif
++
++  if (aLocal) {
++    // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache.
++    const char* cacheHome = getenv("XDG_CACHE_HOME");
++    if (cacheHome && *cacheHome) {
++      rv = NS_NewNativeLocalFile(nsDependentCString(cacheHome), true,
++                                 getter_AddRefs(localDir));
++    } else {
++      rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                                 getter_AddRefs(localDir));
++      if (NS_SUCCEEDED(rv))
++        rv = localDir->AppendNative(NS_LITERAL_CSTRING(".cache"));
++    }
++  } else {
++    rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++                               getter_AddRefs(localDir));
+   }
++#else
++#error "Don't know how to get product dir on your platform"
++#endif
+ 
+   NS_IF_ADDREF(*aFile = localDir);
+   return rv;
+@@ -1537,23 +1584,39 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+   }
+ 
+   nsAutoCString profile;
++  nsAutoCString appName;
++  nsAutoCString vendor;
+   if (gAppData->profile) {
+     profile = gAppData->profile;
++  } else {
++    appName = gAppData->name;
++    vendor = gAppData->vendor;
+   }
+ 
+-  nsresult rv = NS_ERROR_FAILURE;
++  nsresult rv;
+ 
+ #if defined(XP_MACOSX)
+   if (!profile.IsEmpty()) {
+     rv = AppendProfileString(aFile, profile.get());
+-    NS_ENSURE_SUCCESS(rv, rv);
++  } else {
++    // Note that MacOS ignores the vendor when creating the profile hierarchy -
++    // all application preferences directories live alongside one another in
++    // ~/Library/Application Support/
++    rv = aFile->AppendNative(appName);
+   }
++  NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #elif defined(XP_WIN)
+   if (!profile.IsEmpty()) {
+     rv = AppendProfileString(aFile, profile.get());
+-    NS_ENSURE_SUCCESS(rv, rv);
++  } else {
++    if (!vendor.IsEmpty()) {
++      rv = aFile->AppendNative(vendor);
++      NS_ENSURE_SUCCESS(rv, rv);
++    }
++    rv = aFile->AppendNative(appName);
+   }
++  NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #elif defined(ANDROID)
+   // The directory used for storing profiles
+@@ -1563,6 +1626,11 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+   rv = aFile->AppendNative(nsDependentCString("mozilla"));
+   NS_ENSURE_SUCCESS(rv, rv);
+ #elif defined(XP_UNIX)
++  nsAutoCString folder;
++  // Make it hidden (by starting with "."), except when local (the
++  // profile is already under ~/.cache or XDG_CACHE_HOME).
++  if (!aLocal) folder.Assign('.');
++
+   if (!profile.IsEmpty()) {
+     // Skip any leading path characters
+     const char* profileStart = profile.get();
+@@ -1570,16 +1638,29 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+ 
+     // On the off chance that someone wanted their folder to be hidden don't
+     // let it become ".."
+-    if (*profileStart == '.') profileStart++;
++    if (*profileStart == '.' && !aLocal) profileStart++;
+ 
+-    // Make it hidden (by starting with ".").
+-    nsAutoCString folder(".");
+     folder.Append(profileStart);
+     ToLowerCase(folder);
+ 
+     rv = AppendProfileString(aFile, folder.BeginReading());
+-    NS_ENSURE_SUCCESS(rv, rv);
++  } else {
++    if (!vendor.IsEmpty()) {
++      folder.Append(vendor);
++      ToLowerCase(folder);
++
++      rv = aFile->AppendNative(folder);
++      NS_ENSURE_SUCCESS(rv, rv);
++
++      folder.Truncate();
++    }
++
++    folder.Append(appName);
++    ToLowerCase(folder);
++
++    rv = aFile->AppendNative(folder);
+   }
++  NS_ENSURE_SUCCESS(rv, rv);
+ 
+ #else
+ #error "Don't know how to get profile path on your platform"
+diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h
+index 6b92f3812882..5060b33cdded 100644
+--- a/toolkit/xre/nsXREDirProvider.h
++++ b/toolkit/xre/nsXREDirProvider.h
+@@ -48,15 +48,15 @@ class nsXREDirProvider final : public nsIDirectoryServiceProvider2,
+ 
+   void DoShutdown();
+ 
+-  nsresult GetUserAppDataDirectory(nsIFile** aFile) {
++  static nsresult GetUserAppDataDirectory(nsIFile** aFile) {
+     return GetUserDataDirectory(aFile, false);
+   }
+-  nsresult GetUserLocalDataDirectory(nsIFile** aFile) {
++  static nsresult GetUserLocalDataDirectory(nsIFile** aFile) {
+     return GetUserDataDirectory(aFile, true);
+   }
+ 
+   // GetUserDataDirectory gets the profile path from gAppData.
+-  nsresult GetUserDataDirectory(nsIFile** aFile, bool aLocal);
++  static nsresult GetUserDataDirectory(nsIFile** aFile, bool aLocal);
+ 
+   /* make sure you clone it, if you need to do stuff to it */
+   nsIFile* GetGREDir() { return mGREDir; }
+@@ -90,9 +90,9 @@ class nsXREDirProvider final : public nsIDirectoryServiceProvider2,
+  protected:
+   nsresult GetFilesInternal(const char* aProperty,
+                             nsISimpleEnumerator** aResult);
+-  nsresult GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal);
+-  nsresult GetSysUserExtensionsDirectory(nsIFile** aFile);
+-  nsresult GetSysUserExtensionsDevDirectory(nsIFile** aFile);
++  static nsresult GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal);
++  static nsresult GetSysUserExtensionsDirectory(nsIFile** aFile);
++  static nsresult GetSysUserExtensionsDevDirectory(nsIFile** aFile);
+ #if defined(XP_UNIX) || defined(XP_MACOSX)
+   static nsresult GetSystemExtensionsDirectory(nsIFile** aFile);
+ #endif
+diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
+index 2aa5482f5789..f1491595a8ea 100644
+--- a/xpcom/io/nsAppFileLocationProvider.cpp
++++ b/xpcom/io/nsAppFileLocationProvider.cpp
+@@ -14,7 +14,6 @@
+ #include "nsISimpleEnumerator.h"
+ #include "prenv.h"
+ #include "nsCRT.h"
+-#include "nsXPCOMPrivate.h"  // for XPCOM_FILE_PATH_SEPARATOR
+ #if defined(MOZ_WIDGET_COCOA)
+ #include <Carbon/Carbon.h>
+ #include "nsILocalFileMac.h"
+@@ -248,8 +247,9 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
+ // GetProductDirectory - Gets the directory which contains the application data
+ // folder
+ //
+-// UNIX and WIN   : <App Folder>/TorBrowser/Data/Browser
+-// Mac            : <App Folder>/../../TorBrowser/Data/Browser
++// UNIX   : ~/.mozilla/
++// WIN    : <Application Data folder on user's machine>\Mozilla
++// Mac    : :Documents:Mozilla:
+ //----------------------------------------------------------------------------------------
+ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+                                                         bool aLocal) {
+@@ -261,45 +261,49 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+   bool exists;
+   nsCOMPtr<nsIFile> localDir;
+ 
+-  rv = CloneMozBinDirectory(getter_AddRefs(localDir));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+-  int levelsToRemove = 1;  // In FF21+, bin dir points to browser subdirectory.
+-#if defined(XP_MACOSX)
+-  levelsToRemove += 2;
+-#endif
+-  while (localDir && (levelsToRemove > 0)) {
+-    // When crawling up the hierarchy, components named "." do not count.
+-    nsAutoCString removedName;
+-    rv = localDir->GetNativeLeafName(removedName);
+-    NS_ENSURE_SUCCESS(rv, rv);
+-    bool didRemove = !removedName.Equals(".");
+-
+-    // Remove a directory component.
+-    nsCOMPtr<nsIFile> parentDir;
+-    rv = localDir->GetParent(getter_AddRefs(parentDir));
+-    NS_ENSURE_SUCCESS(rv, rv);
+-    localDir = parentDir;
+-
+-    if (didRemove) {
+-      --levelsToRemove;
+-    }
++#if defined(MOZ_WIDGET_COCOA)
++  FSRef fsRef;
++  OSType folderType =
++      aLocal ? (OSType)kCachedDataFolderType : (OSType)kDomainLibraryFolderType;
++  OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef);
++  if (err) {
++    return NS_ERROR_FAILURE;
+   }
+-
++  NS_NewLocalFile(EmptyString(), true, getter_AddRefs(localDir));
+   if (!localDir) {
+     return NS_ERROR_FAILURE;
+   }
+-
+-  rv = localDir->AppendRelativeNativePath(
+-      NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR
+-                         "Data" XPCOM_FILE_PATH_SEPARATOR "Browser"));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+-  if (aLocal) {
+-    rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
+-    NS_ENSURE_SUCCESS(rv, rv);
++  nsCOMPtr<nsILocalFileMac> localDirMac(do_QueryInterface(localDir));
++  rv = localDirMac->InitWithFSRef(&fsRef);
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++#elif defined(XP_WIN)
++  nsCOMPtr<nsIProperties> directoryService =
++      do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++  const char* prop = aLocal ? NS_WIN_LOCAL_APPDATA_DIR : NS_WIN_APPDATA_DIR;
++  rv = directoryService->Get(prop, NS_GET_IID(nsIFile),
++                             getter_AddRefs(localDir));
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++#elif defined(XP_UNIX)
++  rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true,
++                             getter_AddRefs(localDir));
++  if (NS_FAILED(rv)) {
++    return rv;
+   }
++#else
++#error dont_know_how_to_get_product_dir_on_your_platform
++#endif
+ 
++  rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR);
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
+   rv = localDir->Exists(&exists);
+ 
+   if (NS_SUCCEEDED(rv) && !exists) {
+@@ -318,6 +322,10 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+ //----------------------------------------------------------------------------------------
+ // GetDefaultUserProfileRoot - Gets the directory which contains each user
+ // profile dir
++//
++// UNIX   : ~/.mozilla/
++// WIN    : <Application Data folder on user's machine>\Mozilla\Profiles
++// Mac    : :Documents:Mozilla:Profiles:
+ //----------------------------------------------------------------------------------------
+ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot(
+     nsIFile** aLocalFile, bool aLocal) {
+@@ -333,6 +341,23 @@ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot(
+     return rv;
+   }
+ 
++#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN)
++  // These 3 platforms share this part of the path - do them as one
++  rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Profiles"));
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++
++  bool exists;
++  rv = localDir->Exists(&exists);
++  if (NS_SUCCEEDED(rv) && !exists) {
++    rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775);
++  }
++  if (NS_FAILED(rv)) {
++    return rv;
++  }
++#endif
++
+   localDir.forget(aLocalFile);
+ 
+   return rv;
+-- 
+2.19.2
+
diff --git a/www-client/torbrowser/files/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch b/www-client/torbrowser/files/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch
new file mode 100644
index 00000000..a4e6ae9f
--- /dev/null
+++ b/www-client/torbrowser/files/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch
@@ -0,0 +1,189 @@
+From 0e4105afea7b10cf20ab20cb41b187d7d690ff46 Mon Sep 17 00:00:00 2001
+From: Poncho <poncho@spahan.ch>
+Date: Wed, 30 Jan 2019 09:55:25 +0100
+Subject: [PATCH 1/4] Revert "Bug 13252: Do not store data in the app bundle"
+
+This reverts commit 2ee4d81a2fbcac90996f4f4a99633a0b2d7019bb.
+---
+ toolkit/xre/nsXREDirProvider.cpp       | 43 ++++++++++++---------
+ toolkit/xre/nsXREDirProvider.h         |  6 ---
+ xpcom/io/nsAppFileLocationProvider.cpp | 53 +++++++++++++++-----------
+ 3 files changed, 55 insertions(+), 47 deletions(-)
+
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index d811da50b63d..dbbaffd2a15f 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -44,8 +44,6 @@
+ #include "mozilla/Preferences.h"
+ #include "mozilla/Telemetry.h"
+ 
+-#include "TorFileUtils.h"
+-
+ #include <stdlib.h>
+ 
+ #ifdef XP_WIN
+@@ -1337,18 +1335,34 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+   NS_ENSURE_ARG_POINTER(aFile);
+   nsCOMPtr<nsIFile> localDir;
+ 
+-  nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir));
++  nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-#if !defined(ANDROID)
+-#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+-  rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser"));
+-#else
+-  rv = localDir->AppendRelativeNativePath(
+-      NS_LITERAL_CSTRING("Data" XPCOM_FILE_PATH_SEPARATOR "Browser"));
++  int levelsToRemove = 1;  // In FF21+, appDir points to browser subdirectory.
++#if defined(XP_MACOSX)
++  levelsToRemove += 2;
+ #endif
++  while (localDir && (levelsToRemove > 0)) {
++    // When crawling up the hierarchy, components named "." do not count.
++    nsAutoCString removedName;
++    rv = localDir->GetNativeLeafName(removedName);
++    NS_ENSURE_SUCCESS(rv, rv);
++    bool didRemove = !removedName.Equals(".");
++
++    // Remove a directory component.
++    nsCOMPtr<nsIFile> parentDir;
++    rv = localDir->GetParent(getter_AddRefs(parentDir));
++    NS_ENSURE_SUCCESS(rv, rv);
++    localDir = parentDir;
++    if (didRemove) --levelsToRemove;
++  }
++
++  if (!localDir) return NS_ERROR_FAILURE;
++
++  rv = localDir->AppendRelativeNativePath(
++      NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR
++                         "Data" XPCOM_FILE_PATH_SEPARATOR "Browser"));
+   NS_ENSURE_SUCCESS(rv, rv);
+-#endif
+ 
+   if (aLocal) {
+     rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
+@@ -1433,15 +1447,6 @@ nsresult nsXREDirProvider::GetUserDataDirectory(nsIFile** aFile, bool aLocal) {
+   return NS_OK;
+ }
+ 
+-nsresult nsXREDirProvider::GetTorBrowserUserDataDir(nsIFile** aFile) {
+-  NS_ENSURE_ARG_POINTER(aFile);
+-  nsCOMPtr<nsIFile> exeFile;
+-  bool per = false;
+-  nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(exeFile));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-  return TorBrowser_GetUserDataDir(exeFile, aFile);
+-}
+-
+ nsresult nsXREDirProvider::EnsureDirectoryExists(nsIFile* aDirectory) {
+   bool exists;
+   nsresult rv = aDirectory->Exists(&exists);
+diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h
+index 6fe9d9ecbce5..6b92f3812882 100644
+--- a/toolkit/xre/nsXREDirProvider.h
++++ b/toolkit/xre/nsXREDirProvider.h
+@@ -87,12 +87,6 @@ class nsXREDirProvider final : public nsIDirectoryServiceProvider2,
+    */
+   nsresult GetProfileDir(nsIFile** aResult);
+ 
+-  /**
+-   * Get the TorBrowser user data directory by calling the
+-   * TorBrowser_GetUserDataDir() utility function.
+-   */
+-  nsresult GetTorBrowserUserDataDir(nsIFile** aFile);
+-
+  protected:
+   nsresult GetFilesInternal(const char* aProperty,
+                             nsISimpleEnumerator** aResult);
+diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
+index 3906c6590090..2aa5482f5789 100644
+--- a/xpcom/io/nsAppFileLocationProvider.cpp
++++ b/xpcom/io/nsAppFileLocationProvider.cpp
+@@ -27,8 +27,6 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#include "TorFileUtils.h"
+-
+ // WARNING: These hard coded names need to go away. They need to
+ // come from localizable resources
+ 
+@@ -250,14 +248,8 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
+ // GetProductDirectory - Gets the directory which contains the application data
+ // folder
+ //
+-#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+-// UNIX and WIN   : <App Folder>/../TorBrowser-Data/Browser
+-// Mac            : <App Folder>/../../../TorBrowser-Data/Browser OR
+-//                  ~/Library/Application Support/TorBrowser-Data/Browser
+-#else
+ // UNIX and WIN   : <App Folder>/TorBrowser/Data/Browser
+ // Mac            : <App Folder>/../../TorBrowser/Data/Browser
+-#endif
+ //----------------------------------------------------------------------------------------
+ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+                                                         bool aLocal) {
+@@ -265,25 +257,42 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+     return NS_ERROR_INVALID_ARG;
+   }
+ 
+-  nsresult rv = NS_ERROR_UNEXPECTED;
++  nsresult rv;
+   bool exists;
+-  nsCOMPtr<nsIFile> localDir, exeFile;
++  nsCOMPtr<nsIFile> localDir;
+ 
+-  nsCOMPtr<nsIProperties> directoryService(
+-      do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-  rv = directoryService->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile),
+-                             getter_AddRefs(exeFile));
+-  NS_ENSURE_SUCCESS(rv, rv);
+-  rv = TorBrowser_GetUserDataDir(exeFile, getter_AddRefs(localDir));
++  rv = CloneMozBinDirectory(getter_AddRefs(localDir));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+-  rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser"));
+-#else
+-  rv = localDir->AppendRelativeNativePath(
+-      NS_LITERAL_CSTRING("Data" XPCOM_FILE_PATH_SEPARATOR "Browser"));
++  int levelsToRemove = 1;  // In FF21+, bin dir points to browser subdirectory.
++#if defined(XP_MACOSX)
++  levelsToRemove += 2;
+ #endif
++  while (localDir && (levelsToRemove > 0)) {
++    // When crawling up the hierarchy, components named "." do not count.
++    nsAutoCString removedName;
++    rv = localDir->GetNativeLeafName(removedName);
++    NS_ENSURE_SUCCESS(rv, rv);
++    bool didRemove = !removedName.Equals(".");
++
++    // Remove a directory component.
++    nsCOMPtr<nsIFile> parentDir;
++    rv = localDir->GetParent(getter_AddRefs(parentDir));
++    NS_ENSURE_SUCCESS(rv, rv);
++    localDir = parentDir;
++
++    if (didRemove) {
++      --levelsToRemove;
++    }
++  }
++
++  if (!localDir) {
++    return NS_ERROR_FAILURE;
++  }
++
++  rv = localDir->AppendRelativeNativePath(
++      NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR
++                         "Data" XPCOM_FILE_PATH_SEPARATOR "Browser"));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   if (aLocal) {
+-- 
+2.19.2
+
diff --git a/www-client/torbrowser/metadata.xml b/www-client/torbrowser/metadata.xml
new file mode 100644
index 00000000..6c812064
--- /dev/null
+++ b/www-client/torbrowser/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>4nykey@gmail.com</email>
+	</maintainer>
+	<use>
+		<flag name="clang">Use Clang compiler instead of GCC</flag>
+		<flag name="custom-optimization">Fine-tune custom compiler
+			optimizations (-Os, -O0, -O1, -O2, -O3)</flag>
+		<flag name="hwaccel">Use hardware-accelerated rendering</flag>
+		<flag name="screenshot">Allow to disable screenshot extension in global profile</flag>
+		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
+			and <pkg>media-gfx/graphite2</pkg> instead of bundled.</flag>
+		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
+			instead of bundled.</flag>
+		<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
+			instead of bundled.</flag>
+		<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg>
+			instead of bundled.</flag>
+		<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
+			instead of bundled.</flag>
+		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
+			installation with secure-delete enabled</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-client/torbrowser/torbrowser-60.6.1.8.0.9.1.3.ebuild b/www-client/torbrowser/torbrowser-60.6.1.8.0.9.1.3.ebuild
new file mode 100644
index 00000000..4582ae23
--- /dev/null
+++ b/www-client/torbrowser/torbrowser-60.6.1.8.0.9.1.3.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+MOZCONFIG_OPTIONAL_WIFI=1
+
+LLVM_MAX_SLOT=8
+
+inherit check-reqs desktop flag-o-matic toolchain-funcs eutils gnome2-utils \
+	llvm mozconfig-v6.${PV%%.*} pax-utils xdg-utils autotools
+inherit eapi7-ver
+
+MOZ_PV="$(ver_cut 1-3)esr"
+# https://dist.torproject.org/torbrowser
+TOR_PV="$(ver_cut 4-6)"
+if [[ -z ${PV%%*_alpha} ]]; then
+	TOR_PV="$(ver_rs 2 a ${TOR_PV})"
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+TOR_PV="${TOR_PV%.0}"
+# https://gitweb.torproject.org/tor-browser.git/refs/tags
+GIT_TAG="$(ver_cut 4-5)-$(ver_cut 7-8)"
+GIT_TAG="tor-browser-${MOZ_PV}-$(ver_rs 3 '-build' ${GIT_TAG})"
+
+DESCRIPTION="The Tor Browser"
+HOMEPAGE="
+	https://www.torproject.org/projects/torbrowser.html
+	https://gitweb.torproject.org/tor-browser.git"
+
+SLOT="0"
+# BSD license applies to torproject-related code like the patches
+# icons are under CCPL-Attribution-3.0
+LICENSE="BSD CC-BY-3.0 MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="hardened hwaccel jack -screenshot selinux test"
+
+SRC_URI="mirror://tor/${PN}/${TOR_PV}"
+PATCH="firefox-${PV%%.*}.6-patches-07"
+PATCH=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="
+	https://gitweb.torproject.org/tor-browser.git/snapshot/${GIT_TAG}.tar.gz
+	-> ${GIT_TAG}.tar.gz
+	x86? (
+		${SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
+	)
+	amd64? (
+		${SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
+	)
+	${PATCH[@]}
+"
+RESTRICT="primaryuri"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.36.7
+	>=dev-libs/nspr-4.19
+	>=net-vpn/tor-0.3.3.9
+	system-icu? ( >=dev-libs/icu-60.2 )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="
+	${RDEPEND}
+	amd64? ( ${ASM_DEPEND} virtual/opengl )
+	x86? ( ${ASM_DEPEND} virtual/opengl )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${GIT_TAG}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/${PN}"
+
+BUILD_OBJ_DIR="${WORKDIR}/torbrowser-build"
+
+llvm_check_deps() {
+	if ! has_version "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}"/firefox
+
+		# Revert "Change the default Firefox profile directory to be TBB-relative"
+		"${FILESDIR}"/torbrowser-60.5.0-Do_not_store_data_in_the_app_bundle.patch
+		"${FILESDIR}"/torbrowser-60.5.0-Change_the_default_Firefox_profile_directory.patch
+	)
+
+	# 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
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# 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}"/browser/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
+
+	default
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Add full relro support for hardened
+	if use hardened; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	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_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=1423822
+		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="${EPREFIX}"/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Use .mozconfig settings from torbrowser (setting this here since it gets overwritten by mozcoreconf-v6.eclass)
+	# see https://gitweb.torproject.org/tor-browser.git/tree/.mozconfig?h=tor-browser-60.2.0esr-8.0-1
+	echo "mk_add_options MOZ_APP_DISPLAYNAME=\"Tor Browser\"" >> "${S}"/.mozconfig
+	echo "mk_add_options MOZILLA_OFFICIAL=1" >> "${S}"/.mozconfig
+	echo "mk_add_options BUILD_OFFICIAL=1" >> "${S}"/.mozconfig
+	mozconfig_annotate 'torbrowser' --enable-official-branding
+	mozconfig_annotate 'torbrowser' --disable-webrtc
+	mozconfig_annotate 'torbrowser' --disable-eme
+	mozconfig_annotate 'torbrowser' --enable-proxy-bypass-protection
+
+	# Rename the binary and set the profile location
+	mozconfig_annotate 'torbrowser' --with-app-name="${PN}"
+	mozconfig_annotate 'torbrowser' --with-app-basename="${PN}"
+
+	# see https://gitweb.torproject.org/tor-browser.git/tree/old-configure.in?h=tor-browser-60.2.0esr-8.0-1#n3205
+	mozconfig_annotate 'torbrowser' --with-tor-browser-version="${TOR_PV}"
+	mozconfig_annotate 'torbrowser' --disable-tor-browser-update
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS="${EPREFIX}"/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Default mozilla_five_home no longer valid option
+	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach build --verbose || die
+}
+
+src_install() {
+	local profile_dir="${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default"
+	cd "${BUILD_OBJ_DIR}" || die
+
+	cat "${profile_dir}"/bookmarks.html > \
+		dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	touch "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		printf 'pref("%s", true);\npref("%s", true);\n' \
+		layers.acceleration.force-enabled webgl.force-enabled >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	# Must ensure we use bundled nss/nspr during signing and not system
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	# Install icons and .desktop for menu entry
+	local size icon_path name
+	icon_path="${S}/browser/branding/official"
+	name="Tor Browser"
+	for size in 16 32 48 64 128 256; do
+		newicon -s ${size} "${icon_path}/default${size}.png" ${PN}.png
+	done
+	newicon "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${PN}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run torbrowser on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{${PN},plugin-container}
+
+	# Profile without the tor-launcher extension
+	# see: https://trac.torproject.org/projects/tor/ticket/10160
+	rm "${profile_dir}/extensions/tor-launcher@torproject.org.xpi" || die \
+		"Failed to remove torlauncher extension"
+
+	insinto ${MOZILLA_FIVE_HOME}/browser
+	doins -r "${profile_dir}"/extensions
+
+	dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# 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() {
+	ewarn "This patched firefox build is _NOT_ recommended by Tor upstream but uses"
+	ewarn "the exact same sources. Use this only if you know what you are doing!"
+	elog "Torbrowser uses port 9150 to connect to Tor. You can change the port"
+	elog "in the connection settings to match your setup."
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}