gentoo resync : 20.02.2019

16 files changed, 791 insertions, 11 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 896fa5aa91a4..ea285c75fe79 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5f782f821a04..1f005dfc9e3c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,6 +4,7 @@ AUX chromium-73-gcc-2.patch 2193 BLAKE2B c1a165a02428a4c033a5266d8cd607b54f2f5c9
 AUX chromium-73-gcc-3.patch 3683 BLAKE2B 5da3b1a107a67afe837a6baefd74e68e1f643e5e2f6edb6098a77015bf4a7b819f7cdc5947aec95dd7243243fcb970a0dde73d0ce355d9beaeeecbe189aaadbd SHA512 93173033df16138b94dda215b088dd63937f738536d6cbcc4133258502e1f5bdda45bcbbd95250bc7f781839544c3d45e2dfa8aa4477a0617cfaa723e9140085
 AUX chromium-73-gcc-4.patch 3500 BLAKE2B 0446dc3d5a073d0960fee4338a59452002734dd0f7bb9afcc9a8e56f70ae5bf755e3a5e772a2682df2734e928f87906630ed87d2a1ba4c3114a9665983ead970 SHA512 c3f505fe943460774a4f5269cad878b37cae45edae2838e6fec8228f5d7c77cb0435a1952fe0230a33e57798ebcc5cd5f0640ae67c301d9983224bb7f81ff70a
 AUX chromium-73-gcc-5.patch 3388 BLAKE2B e8a2940ad9e6e23fe62d0897e5f24c38e9e9b75a08326ea0109eace1f3be8afba269d207a208289e0c9bfbf5be165e345594b97f2733ff0d895c6e054105b714 SHA512 524b3a0f9fdcb5a78a9e94a1e6ba8bfaa632471cb3cf3b2d4d32704744154ebec2b81178234259e2d1486694395c707050696874527375290564672417e64daf
+AUX chromium-73-gcc-6.patch 4452 BLAKE2B 0798c713701fcf438a388e47d89de454e27e7376494192630cc7bbf9edd4690163ba3ed450e52629a4adff67ce36a09c01dc95f450a5bb603bfcb02582a2c164 SHA512 f5d8ab6bd3e4cdb4aee6a7b7ecb552b675893c8902425b2451032372a2905ef2aef983e1a0660ca891dfaf5603c7ce79d979068ba8aafa2c5735d9051f7dc58e
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-compiler-r7.patch 5729 BLAKE2B 66e7b417d685a3371684a4e173bfa2e6fa49415311ccbd16b60806c3b9f70c805db13c973861033444336d6f714270e5953f961bc54d42fca645c940ba30b706 SHA512 5c6ec5bae53c7b2a1b409a9b4ce8f2e7b1cf95421647b3c1ab49e6f3886aefdb858980065cd7a214e89dfe348f4a5b557c304a94bd7681f5bf4c73c74328d1d7
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
@@ -13,5 +14,5 @@ DIST chromium-72.0.3626.96.tar.xz 686361344 BLAKE2B 92a001d99d418b0305235af91097
 DIST chromium-73.0.3683.27.tar.xz 710016024 BLAKE2B 1346c418fdf749b22beb598c37b4c125f8a5f07169155e05c9633d86872d7009416671d2155b4ef42713e1b22ae52c78ec295a7da7e0bd5ffcdb5f3ef79851fa SHA512 91fc8a6876b3508718dfa68ca6be9a8eb660d3447363d34da7ddf80cd9fe04ee97124f9c9dec484139155bcc7661f7cec4fe334b876b64eb06c5a8742c08b035
 DIST chromium-webrtc-includes-r1.patch.xz 57820 BLAKE2B 8e113680254b4834abda72c335a8f0af7211c5982c91e52372945f9a57c5558bd6772300ffefb475b450c40ffe66cd627aba34d33af101fe402815c2a16fe6c8 SHA512 cd4562ec32a044925afc65d9cba62310acc515db7cab0ee3aa0f3afe11672b3e7046ca937d8739c4feca436af7d9cf0f7860716a397c8aa5d5ae647b5eaf1ac0
 EBUILD chromium-72.0.3626.96.ebuild 21700 BLAKE2B 793ef258d4423b785dd41fa15b861c8db66ed27abcf7a5d8764a99832d8ad107591481b4c14c21376bccaf004eaa49a2d480bd3236eaf7f2a448daa419d54e63 SHA512 9ea70082194f2f2b2f54f945714d27eda8bdab849df1c75d81dd52f8274263c9fc035cfefc1437af99af356edf533c55c18fdef3a9d28facb62644f962b22426
-EBUILD chromium-73.0.3683.27.ebuild 21764 BLAKE2B fa37558f107f35d1092f1d975a405026f4d878fb426a9a90c57ac006438d5a8f074487672dc912fd2eaca14e7df3cd218bcebe6874c5cdeeeb46139a48e21c0d SHA512 11c743495868d37a85458049f79a2e1c9676e3e60355429faa002a9c47fbb59bea266643d106cbfc362d5e502ed0620fe2c87727d12dd2b21b817fa362830519
+EBUILD chromium-73.0.3683.27.ebuild 21803 BLAKE2B c7a0581ad915bfa6914bd728c7e46bd5f82254352149e03d56a086bb9cee1c5ad732f8bf002f4d79a4b3dd7ac542f6c1863f70311169b62c2c704d37cb3bfc19 SHA512 3bcdab0c443854a0f1a41d8ec2a23fadea82d9d1ac89df6ba00eea2e12885c6b4cfb350b30960db88474ba56e27402a7f6e751a4ab246cc8ce9851430c7e8b69
 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-73.0.3683.27.ebuild b/www-client/chromium/chromium-73.0.3683.27.ebuild
index 551c1a943fd6..2c9e1dc2113e 100644
--- a/www-client/chromium/chromium-73.0.3683.27.ebuild
+++ b/www-client/chromium/chromium-73.0.3683.27.ebuild
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-73-gcc-3.patch"
 	"${FILESDIR}/chromium-73-gcc-4.patch"
 	"${FILESDIR}/chromium-73-gcc-5.patch"
+	"${FILESDIR}/chromium-73-gcc-6.patch"
 )
 
 pre_build_checks() {
diff --git a/www-client/chromium/files/chromium-73-gcc-6.patch b/www-client/chromium/files/chromium-73-gcc-6.patch
new file mode 100644
index 000000000000..3cd72ab318d5
--- /dev/null
+++ b/www-client/chromium/files/chromium-73-gcc-6.patch
@@ -0,0 +1,88 @@
+From cf4c534f04c223f8a9d65407852e2a531a6d7fb6 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Thu, 14 Feb 2019 22:22:21 +0000
+Subject: [PATCH] chrome/browser: Replace some forward declarations with actual
+ includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes the GCC build which was failing like this:
+
+    ../../base/scoped_observer.h: In instantiation of ‘void ScopedObserver<Source, Observer>::RemoveAll() [with Source = TabStripModel; Observer = TabStripModelObserver]’:
+    ../../base/scoped_observer.h:26:5:   required from ‘ScopedObserver<Source, Observer>::~ScopedObserver() [with Source = TabStripModel; Observer = TabStripModelObserver]’
+    ../../chrome/browser/ui/views/extensions/extension_popup.h:115:70:   required from here
+    ../../base/scoped_observer.h:45:20: error: invalid use of incomplete type ‘class TabStripModel’
+           sources_[i]->RemoveObserver(observer_);
+           ~~~~~~~~~~~~~^~~~~~~~~~~~~~
+
+This is caused by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89311 ("Brace
+initialization needlessly invokes destructor"), i.e. having something like
+
+    ScopedObserver<T, U> observer_{this};
+
+in a header declaration requires T and U to be fully declared because
+ScopedObserver's destructor references them. In a few cases, T was only
+forward-declared.
+
+Bug: 819294
+Change-Id: Ie5b9dc2745e27d4532c5539e3845a8c9147a0595
+Reviewed-on: https://chromium-review.googlesource.com/c/1472576
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Alan Cutter <alancutter@chromium.org>
+Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
+Reviewed-by: Alan Cutter <alancutter@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#632385}
+---
+ chrome/browser/ui/views/extensions/extension_popup.cc           | 1 -
+ chrome/browser/ui/views/extensions/extension_popup.h            | 1 +
+ chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc  | 1 -
+ chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h   | 2 +-
+ .../web_applications/extensions/bookmark_app_tab_helper.cc      | 1 -
+ .../web_applications/extensions/bookmark_app_tab_helper.h       | 2 +-
+ 6 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
+index 3f0985d383dd..57d16aba9e9f 100644
+--- a/chrome/browser/ui/views/extensions/extension_popup.cc
++++ b/chrome/browser/ui/views/extensions/extension_popup.cc
+@@ -8,7 +8,6 @@
+ #include "chrome/browser/devtools/devtools_window.h"
+ #include "chrome/browser/extensions/extension_view_host.h"
+ #include "chrome/browser/ui/browser.h"
+-#include "chrome/browser/ui/tabs/tab_strip_model.h"
+ #include "content/public/browser/devtools_agent_host.h"
+ #include "content/public/browser/notification_details.h"
+ #include "content/public/browser/notification_source.h"
+diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h
+index 3661b5bda950..9018efa0fea5 100644
+--- a/chrome/browser/ui/views/extensions/extension_popup.h
++++ b/chrome/browser/ui/views/extensions/extension_popup.h
+@@ -9,6 +9,7 @@
+ #include "base/compiler_specific.h"
+ #include "base/macros.h"
+ #include "base/scoped_observer.h"
++#include "chrome/browser/ui/tabs/tab_strip_model.h"
+ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
+ #include "chrome/browser/ui/views/extensions/extension_view_views.h"
+ #include "content/public/browser/devtools_agent_host_observer.h"
+diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
+index 2a3ea8e4f91f..ac44a4f05dec 100644
+--- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
++++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
+@@ -8,6 +8,7 @@
+ #include "base/macros.h"
+ #include "base/memory/weak_ptr.h"
+ #include "base/scoped_observer.h"
++#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
+ #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
+ #include "chrome/browser/ui/views/frame/app_menu_button_observer.h"
+ #include "ui/views/controls/scroll_view.h"
+@@ -16,7 +17,6 @@ class AppMenu;
+ class AppMenuButton;
+ class Browser;
+ class BrowserActionsContainer;
+-class ToolbarActionsBar;
+ 
+ namespace views {
+ class MenuItemView;
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index a03891323862..6c02e2b4b513 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -4,5 +4,5 @@ AUX falkon-3.0.1-qiodevice-main-thread.patch 3340 BLAKE2B b2778d6c25f0d27d683156
 AUX falkon-3.0.1-qtwebengine-version.patch 2404 BLAKE2B 95e31533b7a377fc51fdd711f9ee2564a7a3dbcc4a9e65c8055c6ec5f7d2aa1fcff4d2120c74eac5e529423269eb95a15b528bf42b703efc3565f61d8607c123 SHA512 be5b8810c6453df4068a161e06492b1274c9f296856070506d494a547b32afb521ca920a86b68f4b5a5c1819851cc68b8923a264d4a20bc88c6a7cecd2a10ff6
 AUX falkon-3.0.1-webinspector.patch 3178 BLAKE2B 1c24ff92127cfa529c13b88f6e969a816d000d92d896601b5ff50548bfdce2966d7d9709312e6f9b518ad1d4314fb79bf3f7a01bca4f6110ce24b9f19a364982 SHA512 5ff6dcc9e494226a5a23657378ef170abfc4e315c2cf68a373ca57f91aa5ea38712a0c34e4239acdeff9b7af2b73300cdc150451e50b158318709544e7ced40f
 DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
-EBUILD falkon-3.0.1-r1.ebuild 2069 BLAKE2B 34d0679e614d775e1cfcc6c053264aae7f19e9e740ec19ce0906ecb8e60eceeb0b44fff722a98480dacd637d30c47d049448989255bb7c2761f7abd91a055931 SHA512 209f57bc27cad945d6d40754fc4dedfed334ccfb6f5909ee6cdf0ca3234d7cc2d35af44acd4905ce9ec0017a4340453953c30d3a23f8c496ef1404649f3ae0d4
+EBUILD falkon-3.0.1-r1.ebuild 2076 BLAKE2B 036b50adbfd2a441ac16317ac729aac9f6e2337e37f668ec3f0ed7dbf4d6ce4c3771d30481c3a86ace0d8e0546d5707ff199d02538bbe7d24857f99d6231314f SHA512 e385c794e9b8a0c04d412e93dfa008587e83c3d8ca6604c3c0832ba57537689b34070303168ca6f33975a0a0eb910cf59c741702a9bca88cd8982a5d43dd13cb
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.0.1-r1.ebuild b/www-client/falkon/falkon-3.0.1-r1.ebuild
index 3c30194cf4e8..46eecff477bc 100644
--- a/www-client/falkon/falkon-3.0.1-r1.ebuild
+++ b/www-client/falkon/falkon-3.0.1-r1.ebuild
@@ -15,7 +15,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="dbus gnome-keyring kwallet libressl +X"
 
 COMMON_DEPEND="
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8aab19589ca5..13ec05b6040d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -191,6 +191,7 @@ DIST firefox-60.5.1esr-zh-CN.xpi 543592 BLAKE2B 71491bdc05074e4fb0ee83f75419572a
 DIST firefox-60.5.1esr-zh-TW.xpi 541917 BLAKE2B f6b1526592720161f57dd3122cafa88705ae40a26c0817ad982ae39928c21f715a743686b50bb6e8b3941e33f22902bfe3c483326a18d6c9b26e3e7b08d2d4e1 SHA512 ac21bcf797670fd54dfc74ef696f32371eef7af379030f1a5a97f3f14ab53c377bc4932de05b230fb0a868efd04ea6ee52104dd1bc3e1bb56682c7e0c92c960e
 DIST firefox-60.5.1esr.source.tar.xz 268112444 BLAKE2B 1aaa93f2dc24a5f63c8dfbe801fec2660afa560dcf09b8269e7a52d7494e8e44165482c5bb43d1a3c1b17ae24f2328afde4d450cfb3f53a265bf18a85343b472 SHA512 5fe63dfad06775877219e7a384936c29a9db4b86d4b7e465265ac77c3a1fdb52d830e40e91dd756125103481dc414cb6baebddc4ade0450ac499146abf70b91d
 DIST firefox-65.0-patches-02.tar.xz 14432 BLAKE2B 8c363071e04e2aad4d60ab9cb84f1a421e9c88c7679446ad6481f004939d79a54b53d30905576db438f975728266aac78391e9ee42c249275a104e83b58e3c6c SHA512 81f3fa5072791a39000bbe107b1759fd459c50606a5f9e649816152fd9f8867e0b0e24462ef96df9df901597cbe9cd3cfd8142685391e365cc6d7aeab18678a5
+DIST firefox-65.0-patches-03.tar.xz 14868 BLAKE2B 754958e4cd313edd6f5aac95273fbf45f8b1412444c41cb5aa8ce4d97f74a4f84204c68b21fb56d683b414984c4a819b02e4943b3e6a97abc015cebf6fc9b75c SHA512 4f62bc7f8fd55f648bea7cbffb1b69771c9ad995688ae2507e83790355f35ee4ac4f65eea06f875bc95503521b23f88c05dc991df613ab0deaad2cf7093234e7
 DIST firefox-65.0.1-ach.xpi 447455 BLAKE2B fdc82d9e2cdfd32c8b627d029150625f376772bf0fd2794060dea7c3cf534034be1463c344e8b5a8b547fb40107ef94fd23264eb8fa00db45945f4e795478c3e SHA512 741006e297bb3584bb84272d7768073cba04f15f41d4cc9599e73b7e27d85b652e757287bc6cb3997d07467c57ddea90163412fe8cbf33fa70fb3908f77e9ecb
 DIST firefox-65.0.1-af.xpi 437790 BLAKE2B 27aa7c7e6270c8f76f14a43cdfc1ff4e4370d295749f10b49b5e2566366c1319a433b0e5c6f57a5feb380ff23ffec378151c27954e8a1ec39634cf654680f4d9 SHA512 b429d15d3fdbf447696991619bd712f3d00fc37ccb9108e994a8a5df06238d7adbb2add7be07b049a003b6fca5ec3b7ab68ad24c1325eb354ad57e70445dbb92
 DIST firefox-65.0.1-an.xpi 465003 BLAKE2B b00e87a90f0433fb28d6226791f921b1f4f9483b507ea980b697441b609e5140a3ebe4bc144cd888ff1dd71b8281e3b6e8f198cfdcb1cf4b789cd3ffd076dc4d SHA512 67f259cccfc7d9e977c903ff0e7e2053eec3f334b9358e6d11365f20add43804323cf6b07524e7d6f6c257a3b2036a980fbedb4df9d6b099948b81fbae80ea51
@@ -285,5 +286,6 @@ DIST firefox-65.0.1-zh-TW.xpi 492969 BLAKE2B 1b768b05b1e846dfdfe0f3d9a9a38c5f775
 DIST firefox-65.0.1.source.tar.xz 276816148 BLAKE2B 63048b175ff6dbd6d6ac1043530699b68e6e187758adfa67892d41b1f1760b943ed77290350b31043ba5721acbcaa099f11282a874463b48872b5c77c995eeed SHA512 cc76a83f6430f501c2260c6b35b5e48f045f5b180daf03375e9ab114a9afd67dfc0146ddb81cd29be4617aadb66a332ed5ebc625cb500df9579e412ed4909599
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.5.1.ebuild 13127 BLAKE2B 08fe3ce38b2f59d20fed0b2e2e87906872e25091295845fe38d8952e63762fbe7d0543646749ff8b56d1d22157cb6f5cc2c5d5ce12dde820aa994c15cfdc9216 SHA512 d172d93fcf51b39d5cdffaea9a80ae3fd45cc5a14c453f348c83e8910b08b1db92543ecd23c850b28d7174736e075b411fc14bfca1c1ab48777ac38f3e016432
+EBUILD firefox-65.0.1-r1.ebuild 22571 BLAKE2B 195729f13a8294f166fd198182ace55806542e3c42e1187ff1266e3dd3e8b07ab10c3d6aa1219b4a5d3af10961cb2f12281d2f32ef9bb264b87a9fcdfdbf512a SHA512 b580a170a50188c33207307c19a17b468685da50dd25642aa0d353598799f2bedaa1f2eb8d6e85a14fc2c7d494af034331d7efe8b8ec4398cd93095fee3329c4
 EBUILD firefox-65.0.1.ebuild 22571 BLAKE2B 0b4ad5e97a040fad2e6a355b9455b9432d625ddeb27b2265ecb0406bc2a9031a211301d825201cc9aed830effdf7ff18e2f723719833279df73d7d5890a27887 SHA512 1cec836738853c09e0198095da21b6ff0fd06d3037d5ddcf1566e772a60a10c272ecbe058c85df5dc1693a18176e76f16a2d4d8fa9d745f7aceb6916f7bbffd5
 MISC metadata.xml 2397 BLAKE2B 6c0f67d6732ec78321497ebbe547620e91ef12b5a635826307085eb7f288429f0bda54a79205ebbe2e3ccde2a775e33ecea8011a66adddaea4a1de42501d6724 SHA512 7bed3ec1b0ee7a8f2e13284516b00f2996a260d3521aae52d61ea56b0c0588993718d3a74bf68e8bcf384b1451452b4c97b188ab360cc0653321415f4bdaa03d
diff --git a/www-client/firefox/firefox-65.0.1-r1.ebuild b/www-client/firefox/firefox-65.0.1-r1.ebuild
new file mode 100644
index 000000000000..00d8836e37da
--- /dev/null
+++ b/www-client/firefox/firefox-65.0.1-r1.ebuild
@@ -0,0 +1,688 @@
+# 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=""
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-65.0-patches-03"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+		mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2 \
+		virtualx
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
+	+screenshot selinux startup-notification +system-harfbuzz
+	+system-icu +system-jpeg +system-libevent +system-sqlite
+	+system-libvpx +system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.41
+	>=dev-libs/nspr-4.19
+	>=app-text/hunspell-1.5.4:*
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
+	system-icu? ( >=dev-libs/icu-60.2:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? (
+		>=media-libs/libvpx-1.7.0:0=[postproc]
+		<media-libs/libvpx-1.8
+	)
+	system-sqlite? ( >=dev-db/sqlite-3.25.3:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.1: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.6.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	clang? (
+		>=sys-devel/llvm-4.0.1[gold]
+		>=sys-devel/lld-4.0.1
+		pgo? ( >=sys-libs/compiler-rt-sanitizers-4.0.1[profile] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.30.0
+	>=virtual/rust-1.30.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 )"
+
+# Due to a bug in GCC, profile guided optimization will produce
+# AVX2 instructions, bug #677052
+REQUIRED_USE="wifi? ( dbus )
+	pgo? ( lto )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# 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() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		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 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() {
+	eapply "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# 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
+
+	# 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
+
+	# 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
+
+	# 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
+
+			if ! use cpu_flags_x86_avx2 ; 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, 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 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
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	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
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# disable webrtc for now, bug 667642
+	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
+
+	# 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
+
+	# 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
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS} -O" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 ${_virtx} \
+	./mach build --verbose || die
+}
+
+src_install() {
+	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
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/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/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${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
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/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/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist ; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# 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
+
+	# 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 "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${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
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index d814625fac4b..f63e2decccf9 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_73.0.3683.27-1_amd64.deb 58749710 BLAKE2B 2747ee00aa2a7b795f7a59474d324e5494009836f2bede7208319e442d15b96868df1294ce6a314caf937aa4442481e8cd8194b7c500ebbe46c1f539c412cbea SHA512 06831e1a6a1f6458f50a4e3ebe395c6c4223a69d9d278f8ca9b0bd54421c7bd18dee3a2d0e96af2b98b9c0340173dd5b8b040cc322441bce72de0a0d33eea285
-EBUILD google-chrome-beta-73.0.3683.27.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-beta_73.0.3683.39-1_amd64.deb 58736852 BLAKE2B 9a89e2ae51b66190fb4bbb32bba302620905fd09afd60c060766fb46bcfd5a44d11698b1913cee9111c4c9d5f1257204eb05c93ce9c113eb1ca839ced4e819aa SHA512 be55420f0984a0e39766548943b4803981c397f44d0fa2ecfa2988aabb596e94c149e3e115b77e6c665a27490b21750328acf15aa0c44fd8f09087589d66463c
+EBUILD google-chrome-beta-73.0.3683.39.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-73.0.3683.27.ebuild b/www-client/google-chrome-beta/google-chrome-beta-73.0.3683.39.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-73.0.3683.27.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-73.0.3683.39.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f7f42cac9dbf..4361292e639a 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_73.0.3683.20-1_amd64.deb 58798594 BLAKE2B 096d84d156773c1a87bbc56a078c3099ae43e46931bbafbcb6d749f333df04dd317e882c3a73121391767de6b10410d7152757608ac59dfadaefa1621d8aa0f0 SHA512 d962b392e5b4466d92aded3a32f4c2c9e6f9ec2fb85591c8421acb1cb3646fb1a3c40565eb2012a3b8cb98300ad6d071b393f162af9594fd3b718529dd062903
-EBUILD google-chrome-unstable-73.0.3683.20.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-unstable_74.0.3710.0-1_amd64.deb 59244894 BLAKE2B 077344268986ccf30853ebce2cc98fff60e751a950f2187f8f7886d6b15e303ae4a4fa7055748a0ab13ab9d0b5f895d88dddd1e56c15cfe20616bf10237de32c SHA512 da65a9312af8b05f77e60cfc99b70c3fe332afdf9c642e6dfa519273851faf7e1ed0b8ba8044f18e1ca6fc51de85b3e1887a2d39661a139ca2122ef31538167a
+EBUILD google-chrome-unstable-74.0.3710.0.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3683.20.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-74.0.3710.0.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3683.20.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-74.0.3710.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 0b775c3e86ad..84a54cb7b3bc 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_72.0.3626.96-1_amd64.deb 57127360 BLAKE2B 2f21778cf761b298fa854230db19fd3a773715db0f6676b6ee5818278d7420dabc3660582bd1f86c90572fc6c4c099eeb76a000510cce753359224a477f99af8 SHA512 4cfe35edc23261cb6aaea9b199ce71df6073fe85ea7cc3e861e31dbc5569ce3a12c88427a24cf1a7705e86ab0aa6da36e329c5489042f1df7abd04e7ad5f04f0
-EBUILD google-chrome-72.0.3626.96.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-stable_72.0.3626.109-1_amd64.deb 57273356 BLAKE2B c99fb96e19dc6c57663863a11d23b38923321e2a723c602de853a74f819decfa8a6127944841616cbe39f85b0e4a940fb408106b56301c934e7f367966d561ff SHA512 b506d494de70c54c4c6edd24575a8587002529ef4e3f1804c8e76fb7e2e657b4ceeef6b417a793438b79f3fa1c6e395243fde09c8012478a4b23640a497de7bf
+EBUILD google-chrome-72.0.3626.109.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-72.0.3626.96.ebuild b/www-client/google-chrome/google-chrome-72.0.3626.109.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome/google-chrome-72.0.3626.96.ebuild
+++ b/www-client/google-chrome/google-chrome-72.0.3626.109.ebuild
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 30beb3d26e43..7259c48da874 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -2,5 +2,5 @@ AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b
 AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
 AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
 DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
-EBUILD netsurf-3.8-r2.ebuild 4336 BLAKE2B 0f4fcc1b36355c32d69a91f2a2a426496f67185c0761e3b74850ee565f9f2bd06edb7f2e3968d70b9949eab0a27ebbfec243278992b190b4e85b26dd28bc4f19 SHA512 3daa2197d1a5c020971b5c784106d2a424a85e3bcfb875836e22a077011800ea2832e909eb77f5a7e8a602d6e0649d2cdffc19b9120dcd94e3f6ca617b4136ac
+EBUILD netsurf-3.8-r2.ebuild 4343 BLAKE2B ede05e4ca99524d22916a42aef50576933621f9112767dbb8d6621d8d5bd23c8dcbb5136d130254595dbc50b8a9bfa9aa72f6b148f514cca61faf81e7071e444 SHA512 a89a6689d9a7e57346c0306bd6fe9a1cc94f48e82015f9303698fce5a8da26bb115999a2413c3ea57e9e2525cd19e3c8a5264c16faa4fc1df9552e5dca651bcd
 MISC metadata.xml 1597 BLAKE2B c9efbdb25d4b5ef227d6f7112603d1b57acf5646b1edc80696a0dcba41b7e0d88288283e24f9c2853130613b5688934e791d16444eaf999d5a89cc15c7e36704 SHA512 b18e8d58c160298eeda1be2f82c5ac5cab43eba6fd5164b72cd49100e6dc09db92c62de9bdcfe8c6158f825c8d437051036cc851d61f0c9c8e781dac8c9a1de0
diff --git a/www-client/netsurf/netsurf-3.8-r2.ebuild b/www-client/netsurf/netsurf-3.8-r2.ebuild
index 404eeb76a378..e2c03b5e2c98 100644
--- a/www-client/netsurf/netsurf-3.8-r2.ebuild
+++ b/www-client/netsurf/netsurf-3.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
 	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_sdl
 	fbcon_frontend_vnc fbcon_frontend_x"