From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 22 Jan 2019 10:09:44 +0000
Subject: gentoo resync : 22.01.2019

---
 www-client/Manifest.gz                             | Bin 6703 -> 6709 bytes
 www-client/epiphany/Manifest                       |   4 +-
 www-client/epiphany/epiphany-3.26.7.ebuild         |  82 ---------
 www-client/epiphany/epiphany-3.30.2.ebuild         |   2 +-
 www-client/firefox-bin/Manifest                    |   5 +-
 www-client/firefox-bin/files/all-gentoo-2.js       |  12 ++
 .../firefox-bin/firefox-bin-60.4.0-r1.ebuild       | 179 ++++++++++++++++++++
 www-client/firefox-bin/firefox-bin-60.4.0.ebuild   | 185 ---------------------
 .../firefox-bin/firefox-bin-64.0.2-r1.ebuild       | 179 ++++++++++++++++++++
 www-client/firefox-bin/firefox-bin-64.0.2.ebuild   | 185 ---------------------
 www-client/google-chrome-beta/Manifest             |   4 +-
 .../google-chrome-beta-72.0.3626.53.ebuild         | 131 ---------------
 .../google-chrome-beta-72.0.3626.64.ebuild         | 131 +++++++++++++++
 www-client/google-chrome-unstable/Manifest         |   4 +-
 .../google-chrome-unstable-73.0.3664.3.ebuild      | 131 ---------------
 .../google-chrome-unstable-73.0.3673.0.ebuild      | 131 +++++++++++++++
 www-client/opera-beta/Manifest                     |   4 +-
 .../opera-beta/opera-beta-58.0.3135.30.ebuild      | 116 -------------
 .../opera-beta/opera-beta-58.0.3135.45.ebuild      | 116 +++++++++++++
 www-client/opera-developer/Manifest                |   4 +-
 .../opera-developer-59.0.3187.0.ebuild             | 116 -------------
 .../opera-developer-59.0.3199.0.ebuild             | 116 +++++++++++++
 www-client/vivaldi-snapshot/Manifest               |  10 +-
 .../vivaldi-snapshot-2.3.1401.7_p1.ebuild          | 119 -------------
 .../vivaldi-snapshot-2.3.1430.4_p1.ebuild          | 119 +++++++++++++
 25 files changed, 1001 insertions(+), 1084 deletions(-)
 delete mode 100644 www-client/epiphany/epiphany-3.26.7.ebuild
 create mode 100644 www-client/firefox-bin/files/all-gentoo-2.js
 create mode 100644 www-client/firefox-bin/firefox-bin-60.4.0-r1.ebuild
 delete mode 100644 www-client/firefox-bin/firefox-bin-60.4.0.ebuild
 create mode 100644 www-client/firefox-bin/firefox-bin-64.0.2-r1.ebuild
 delete mode 100644 www-client/firefox-bin/firefox-bin-64.0.2.ebuild
 delete mode 100644 www-client/google-chrome-beta/google-chrome-beta-72.0.3626.53.ebuild
 create mode 100644 www-client/google-chrome-beta/google-chrome-beta-72.0.3626.64.ebuild
 delete mode 100644 www-client/google-chrome-unstable/google-chrome-unstable-73.0.3664.3.ebuild
 create mode 100644 www-client/google-chrome-unstable/google-chrome-unstable-73.0.3673.0.ebuild
 delete mode 100644 www-client/opera-beta/opera-beta-58.0.3135.30.ebuild
 create mode 100644 www-client/opera-beta/opera-beta-58.0.3135.45.ebuild
 delete mode 100644 www-client/opera-developer/opera-developer-59.0.3187.0.ebuild
 create mode 100644 www-client/opera-developer/opera-developer-59.0.3199.0.ebuild
 delete mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
 create mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1430.4_p1.ebuild

(limited to 'www-client')

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 76cb2f1a8b97..df9264f60ca3 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 5bb613125249..794891479860 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,5 +1,3 @@
-DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0
 DIST epiphany-3.30.2.tar.xz 4528100 BLAKE2B 3b711df8aa3166c26f639658de188e730f346be7c9bdfc65a5064804c1b0e22a744aec6c559c4131125e8fb34e7bb80636f559c7257cca3ad044c6b810bbe657 SHA512 4edaa042357ad44f2069412508cff9524e6e397da868b78768b493d03d77d16807d78f074eb1a4b18fcc1143d3a63d21f3eb1c0f126a31290320016c76c5130e
-EBUILD epiphany-3.26.7.ebuild 1926 BLAKE2B 213faa2400f2c1eff31f7d37d37230ee8022642b60d19eea97cd4d037a72d296902e18b2358878aa4722ad5b6255de06fcaeb70a7c3a190e38e1cce5f8463c57 SHA512 c3c5887d9a71d936214cf20e921207d161a2f43b79e041d9639979afc64529a9654c40c2b5c08d5031a54d572170d9446284a6ea1c9c8cd43b6ea265f3a346f9
-EBUILD epiphany-3.30.2.ebuild 1695 BLAKE2B 9c3b6e730ff2141f7bd1addc2e04eff84509e614c1b614e310c8f8075d4ccc7955503d4e9df855c4f1c5c58be04bf3f38af85c380d0ed60312c9caf324f5454b SHA512 0628662659077df17154c1cb965fd07e75c6ac312d2a0cbd043e0d4b23b0b157c9ee1be6e6cb95caeaa4d7352afb86a314cfc4b7a3afb5eb5f293342341574ac
+EBUILD epiphany-3.30.2.ebuild 1694 BLAKE2B 47368aa0a559b18e0f35f6e5987e492a9f47a04c2178cb6c205651341d5e6231eced514b6b4924338e121b18c73510624219ddc8e0fc5423f3a2cbf0c92620d9 SHA512 4eda289d291d0e81e38380d6b74f67211f20a5d391d7b81e9fb5c331893e584388446effb55498eba92a2dafc10d22a50c5d490961c61414cf862748386a0460
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.26.7.ebuild b/www-client/epiphany/epiphany-3.26.7.ebuild
deleted file mode 100644
index 98a2a339ceee..000000000000
--- a/www-client/epiphany/epiphany-3.26.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.52.0:2
-	>=x11-libs/gtk+-3.22.13:3
-	>=dev-libs/nettle-3.2:=
-	>=net-libs/webkit-gtk-2.17.4:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	dev-libs/icu:=
-	>=app-text/iso-codes-0.35
-	>=dev-libs/json-glib-1.2.4
-	>=x11-libs/libnotify-0.5.1
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	dev-db/sqlite:3
-	dev-libs/gmp:0=
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-# paxctl needed for bug #407085
-# appstream-glib needed for appdata.xml gettext translation
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	sys-apps/paxctl
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
-	# ephy-file-helpers tests are currently disabled due to https://gitlab.gnome.org/GNOME/epiphany/issues/419
-	# So this patch is currently without effect. Retest with PORTAGE_TMPDIR=/var/tmp once re-enabled upstream.
-	#"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddeveloper_mode=false
-		-Ddistributor_name=Gentoo
-		-Dhttps_everywhere=false # removed in 3.28
-		$(meson_use test unit_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/www-client/epiphany/epiphany-3.30.2.ebuild b/www-client/epiphany/epiphany-3.30.2.ebuild
index 07d03ef129ac..d189facc12e7 100644
--- a/www-client/epiphany/epiphany-3.30.2.ebuild
+++ b/www-client/epiphany/epiphany-3.30.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.52.0:2
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 515e9e48c1f6..179248119f7e 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,5 +1,6 @@
 AUX 10firefox-bin 32 BLAKE2B cd6d8dd86d0c8ec95d468b10faf65a7076dc1946f13e719f34092a15e095d6800d92b162e6370c32f1b0f0326fc50ab5bb324c849234bda61d80a705c9d09fb5 SHA512 24f2c370316540b70b2053e2ac0c8ca67714c928d570c9df9dbeb3b179f29b78e7f6dbdad6e452ef312b796f68f4d7105c92f027e75a56f07084ea9ccb58ab69
 AUX all-gentoo-1.js 500 BLAKE2B 2860ee21769b18b4c6dfcd4e5ff3a09aa5ffab60c9f7745a0c86c5d158a80fe6fc4c4e27959916eb3fa2ab2bd591c7669f1a6266048b949ec93b7a20ae8da840 SHA512 bc6e9fb408d81e03455f96a426cbc1a2a653e732eb8759e7d577b7eadbe27b211bcea483babd81b58e66e06afe371697263b372dc45faeb5b87da78d687c37be
+AUX all-gentoo-2.js 472 BLAKE2B 0600a8ed7fb5dbadaa6c897db41af18410a75201dcc0e7db51d6ce0b9cb96dfd28322f41853fc2c7d5af72cde7f50fa6acacbe37a306fcf4d43e9689381211b8 SHA512 f2331dcf2825533d7032bb687e7aa43046a08dbd79974b24055a969958efcd03c400c2ca0038ea29be42955e06288e44f61146aa627896230b0879e076a9fc31
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX firefox-bin-prefs.js 305 BLAKE2B 864d8545cbff81d9a1a7d615d3a244c9060c646abf0fbf4d09fad2c9dd2b312d0fedb97b0fae7efb60def0e5494069d12a8e9e6d1d638744d77535eef8ac4fcd SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e
 AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd310f3f82de2b0fe07412d9768f6be2f467e3e315d89f501b1fe2cc319ffa92f072f4fa6cf6e2af4c2d20 SHA512 409ec95a1ee449e2a0a915358fb9c8c3e4bcec8026cb503f1b7dcd815bda9ff5745158ed01cc190c9a0adf5b4e9d644efe5ee3e0232bd8419324c1b6600c863f
@@ -263,6 +264,6 @@ DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf02
 DIST firefox-bin_x86_64-60.4.0.tar.bz2 53244850 BLAKE2B 73e576e7bf40fb2a08781a6060315220be2219f01cd89f6a15bc07749cdd7e62c7a908dd05487751f023c34ac9743a545ebd171679007bff32df4f60bc7d4663 SHA512 a68277c61c6452f95b8a2c470e8204874df8238cae6035c31c79a0ceb18835b5d7960b93ad1316fb0a963525b0297909252e4376c4f6a42c80dbc1e5beb24c17
 DIST firefox-bin_x86_64-64.0.2.tar.bz2 59315788 BLAKE2B b5a7aa38f47aba3cf2361c635605f2486fb594c8f4222aa104785ad3ba43297e60a29fb8b4ec53406c9ce3f2ec01d65cbfc26e4aa04e1103210e0880f81faf1f SHA512 d6fce66e5f58fddb695c6acad01963d71bd19ac543daefc35cef499abc49ee690d2e5067c3dcdb43e0cec62676d4df9f8ef8e683fc9953325e2bf52a2c27e92c
 EBUILD firefox-bin-52.9.0.ebuild 5498 BLAKE2B b41af46ad84a043be3957ea1032fe35b38b7f5f03f966e4723e6e33f7a87f706da13e19cf05d3d5cff775e5dffd5817702b88d6b3361b2fef34b0daf3d06eb7e SHA512 47254987ef534c0ff7b1514334c26fe7636efe60a1a4735beb111242fc393664eff9a05e45975d6b6d7db3e8b3da68f2d886fc58b253f4e0640edc4c0e03c30b
-EBUILD firefox-bin-60.4.0.ebuild 5610 BLAKE2B 08e8524832d193ea938897244cd3124497300359e60d7e2cdd666c64d149aebce1937ae7d2f98f9fd29a09ea45ed595e86767d43d857e611ef03dc8e95a2a3a5 SHA512 554a444f08d0fd1871fb55153641ddf20383ea79e8bd1e6ba7071db3337a2d3c2abf55d1846f36d430359bab86ea7783e9ade02008b608d23bd8650d39039b06
-EBUILD firefox-bin-64.0.2.ebuild 5610 BLAKE2B 3bd8c48638fed3f25382136e6bd83f5592b26ff47957a5fe985fd43ab689a6c6bb464e92f0825a6fd1cfa497dd87ff0f5b4f57a43f7b7c5cf0e754d84d610659 SHA512 6d62c8748cf00373d549ad82d7a556bb02fd4ad8a66f55d960508efee720a6a2c6b8c02a31441fd97c6185e4a40a3c1bc6df10596a41727bcf6d137ba4a865c1
+EBUILD firefox-bin-60.4.0-r1.ebuild 5381 BLAKE2B a83d9422f9edf5d18401746e24ca114025024721a87b7ee7b62605593189ec5104f7e938ecd6dc1529b285705278d481b9f43f08b31539db4b1308531c14090e SHA512 5d6851b82b4272afbaae0d16e2d76d405178988d6f0af55c30b68a88829274459133be8c6af71fff92d48516ddc4d37ffb4d2593b0172d88b52e164f842de5ac
+EBUILD firefox-bin-64.0.2-r1.ebuild 5381 BLAKE2B 64c73a62f6470a8be7e278a99eaecb086897e98932e90f660c69cc96d9d9178cf6981e1e3016fe5a44c9bfef4fd8a5e00a05e0218230fb6bee0ff85c0646b372 SHA512 2d9f7a895aa2753b3abf023cedbfab4556cc2ecff7d4e43a8c5e2a952f15288f731e17389227755289301fdfc555f4be50880dd969e99b5c56e5d97a6cb8ad91
 MISC metadata.xml 587 BLAKE2B f38f7c9fffdc422e11b9fd2d8aa2f9c4cab6b91cb5616a3fc324038bfdf720bcce97a80a22b012e61d3d466ac5569f76a29512ac8e7e209efea1bf6d3dce05b4 SHA512 c74cebdc88753d406ab9edd9b51f7dcb17dc1ce5eebc3d6d674d2e54d9af1619147e07a110629a5df003a0c506002e470563d36521a1708c40a10221a26c421f
diff --git a/www-client/firefox-bin/files/all-gentoo-2.js b/www-client/firefox-bin/files/all-gentoo-2.js
new file mode 100644
index 000000000000..29e34ca753ad
--- /dev/null
+++ b/www-client/firefox-bin/files/all-gentoo-2.js
@@ -0,0 +1,12 @@
+// Ensure preference can't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+
+// Allow user to change based on needs
+defaultPref("browser.display.use_system_colors", true);
+defaultPref("spellchecker.dictionary_path", "/usr/share/myspell");
+defaultPref("browser.shell.checkDefaultBrowser", false);
+defaultPref("intl.locale.requested", "");
+
+// Preferences that should be reset every session
+pref("browser.EULA.override", true);
diff --git a/www-client/firefox-bin/firefox-bin-60.4.0-r1.ebuild b/www-client/firefox-bin/firefox-bin-60.4.0-r1.ebuild
new file mode 100644
index 000000000000..ebbc9c131293
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-60.4.0-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=1
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko 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/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# 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" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${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
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-2.js all-gentoo.js
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-60.4.0.ebuild b/www-client/firefox-bin/firefox-bin-60.4.0.ebuild
deleted file mode 100644
index 371ab74243bd..000000000000
--- a/www-client/firefox-bin/firefox-bin-60.4.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=1
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Missing when bumped : be
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
-ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko 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/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+ffmpeg +pulseaudio selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# 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" || die
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${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
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Disable built-in auto-update because we update firefox-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-64.0.2-r1.ebuild b/www-client/firefox-bin/firefox-bin-64.0.2-r1.ebuild
new file mode 100644
index 000000000000..0567f8c5f39f
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-64.0.2-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=0
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko 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/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# 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" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${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
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-2.js all-gentoo.js
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-64.0.2.ebuild b/www-client/firefox-bin/firefox-bin-64.0.2.ebuild
deleted file mode 100644
index 0fbbe4c781d9..000000000000
--- a/www-client/firefox-bin/firefox-bin-64.0.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=0
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Missing when bumped : be
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
-ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko 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/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+ffmpeg +pulseaudio selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# 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" || die
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${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
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Disable built-in auto-update because we update firefox-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index dd162bb17c18..9a2c5e31ae83 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_72.0.3626.53-1_amd64.deb 58359656 BLAKE2B ffdca1e247ac37081f465bffc16c8e20eb184347379ac7552829237406c677c3c0628a207f58e488f6d064bec54b4f73a6260e341968af8cc1beb493c0aa0c2f SHA512 8751aff6c603188bbb2d89dc2973186f4ef478fab8fab64f8c331bbb08d51383747e17f155a362713b49bbb4c172f6a5015854c621f03b9739d25fe26bef3a4a
-EBUILD google-chrome-beta-72.0.3626.53.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-beta_72.0.3626.64-1_amd64.deb 58378464 BLAKE2B ff5b17955f508349074fb1f005d2062e0efd633787df4696685b00a0433b156568c62a8a29cf8d800dd81541391d7e427119949f5fd76b52b6e9b635cb8a9571 SHA512 c294f289bdc93a2323a607b00eb5a0ae0e5217bb76604c3a5e90d480f3129d2eb77bb0150af6fccec5ba2c9ebe2ef9e3e7ab2cd6048019542c865a1aad63770f
+EBUILD google-chrome-beta-72.0.3626.64.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-72.0.3626.53.ebuild b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.53.ebuild
deleted file mode 100644
index e75218fcde20..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.53.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.64.ebuild b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.64.ebuild
new file mode 100644
index 000000000000..e75218fcde20
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.64.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index ec23ce205eec..44e79ab7938a 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.3664.3-1_amd64.deb 60498524 BLAKE2B 5a8bae4e27f52add82a166a79bbf817bbd1a6002cd9b6b8a6382430861ba53bbc242e25ccb813dd537ed05866d02ff36f62530a3f1b961853ea8b078d33afc64 SHA512 e4afbfff8f017ffd162f1dc1057823f097a0205236581de32903fb6afbf1e30117c857bada2728d6f71144d0980c8e6ed13b83b75138212b38f71f754d6ca02e
-EBUILD google-chrome-unstable-73.0.3664.3.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-unstable_73.0.3673.0-1_amd64.deb 58449494 BLAKE2B 112287121a6fd309b05a40fe6c5c0d557253ed5a52ede6618a3a767c154d70e8265e9fcca1b720f18a48b9d5a9089496169d191f9158586dfecb5fa4ec0aef32 SHA512 c2bcac1d792cb4f602b1b08483b788efbdf4499bc765ee88125f357b4f8fc1e0f170ce1bf05ea52631254382724fe8781e4cdb768805d5a4a4a49ae6719af7fe
+EBUILD google-chrome-unstable-73.0.3673.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.3664.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3664.3.ebuild
deleted file mode 100644
index e75218fcde20..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3664.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3673.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3673.0.ebuild
new file mode 100644
index 000000000000..e75218fcde20
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3673.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 95a1c0e876b9..b63d821a2f00 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_58.0.3135.30_amd64.deb 70660872 BLAKE2B 2f18f3e17095f77e6d4087df70373b5147ace2c7dc03e4c5363147f3b3c7bdac38e1763c33ff7cc587be51a52f9e0af8b1a02008b1274b929c47b5aee0f7ac53 SHA512 a41c27360242fef945ae51f82ebce480c5c5d16ceedb7c379c83362d0e9fb5f3cd6baf3dc040e13dcb7988c9d048ea07416237a52d0cc1290a315489ddf42ef0
 DIST opera-beta_58.0.3135.37_amd64.deb 71184580 BLAKE2B 1dbe7aa5f52cda02b69be045fcc30c474582a48a0b720d4b1567e91e117f8b3e64c8ae4ccaba4c2c3d2f89ef300a58cc9638a36d737d56e060a3442bdea3cbac SHA512 2aa35696b408977f8d981cec88126debb5c704c00b26b291a74b0f8011125dafbfce30b2e211b0d87e18c3a75bf81b2b5441f6e144325ed90dbc8eb7f2b9b16d
-EBUILD opera-beta-58.0.3135.30.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+DIST opera-beta_58.0.3135.45_amd64.deb 70850556 BLAKE2B 65b20bd6d1d9ccf3fe746cdaa86c61e9028fce15a26864e293d599f1757ea4de20ca554fa1b4855159ece096136f4f94d347e4328cd208a60ff4cd1231ffb07a SHA512 df09653f5ebe8681ceb85094d54a03843bd679482c40f3ba650c33c29007f7976c906a115fcd00e4f019d8fec4dec3825483c035b01ad0fbd7bdea3a0aeb09bb
 EBUILD opera-beta-58.0.3135.37.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+EBUILD opera-beta-58.0.3135.45.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-58.0.3135.30.ebuild b/www-client/opera-beta/opera-beta-58.0.3135.30.ebuild
deleted file mode 100644
index c09ad3685d1c..000000000000
--- a/www-client/opera-beta/opera-beta-58.0.3135.30.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-beta/opera-beta-58.0.3135.45.ebuild b/www-client/opera-beta/opera-beta-58.0.3135.45.ebuild
new file mode 100644
index 000000000000..d6081fb28694
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-58.0.3135.45.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 1f8a97e616fe..ad52738c6574 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_59.0.3187.0_amd64.deb 73236498 BLAKE2B cc1ebaf1705da1dac521905a519ba1debb4a2a712a7f3240dccb77a352a75091da9dca74e90fa642790ee9031fae848626ef345459b2e763849fa86738dff2a1 SHA512 1bfa59afbc5ace1059364cdcd3bcc58dfe0b03aee80c3473386b0e7f5b864e8c96ef5e99862807c38ddc8a699c164180ea67cb52b03221edf9c10814f794a2ce
 DIST opera-developer_59.0.3192.0_amd64.deb 72188416 BLAKE2B 4ac927a7add23f8bd8b0feace60c387815f6653ab9e49633578a8dc599b252275b403e412153cf74c9af17a48817de5fff01254c954c48748136b5bbd32bb30e SHA512 e1f9be8afb80ebe378b2269635c4fb464708a72fa71fa9cccce3d72b0b6d5f9b982dd892ff9e32fb6e2ebff764603147d7fc2c954ff399b214d98d36651ae345
-EBUILD opera-developer-59.0.3187.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+DIST opera-developer_59.0.3199.0_amd64.deb 72324110 BLAKE2B 0d02cd25fb7174895a45628867de10a94915873f3f0ad83392524b4072ff3777e46044048be3ce405aaa67b400465429feddeb7639082861eba3975d06b2c9ef SHA512 471d1906d6955bed44c841edf2b10c17c9646b40b0cc23b11d5ca821d8754733dca275a820361e1f0c1219a807e83c482fda468fa99d4cb3168113bf684d0c57
 EBUILD opera-developer-59.0.3192.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+EBUILD opera-developer-59.0.3199.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-59.0.3187.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3187.0.ebuild
deleted file mode 100644
index d6081fb28694..000000000000
--- a/www-client/opera-developer/opera-developer-59.0.3187.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-59.0.3199.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3199.0.ebuild
new file mode 100644
index 000000000000..d6081fb28694
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-59.0.3199.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index e5d46d263067..123780981634 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.3.1401.7_p1-amd64.deb 59257968 BLAKE2B 68b88dbb6429a2ac367b6d1979017bb4c0fb3021562d800a1dc72a4c1ccac3202f013f53305e2d9fd00e71c762ed00754387ca4cb511c3b9cb1118a11be77c70 SHA512 7c27b693279d5effc0ddc002a66bed30050ae8f3cbeb8a73a26ac60758bea6586f5f46fbae7c8a691da8bfabefbe2e710204eaed2cb7573bc89e8dfed8e9929f
-DIST vivaldi-snapshot-2.3.1401.7_p1-arm64.deb 51056662 BLAKE2B 7f0482296794f47a4ae313d584cddc5e354ce924be5b5003f6c6675030174b6748289e64ae15565065195ec5d40c92ef6ba7e605bf265e52a795df529ccfc4d3 SHA512 9003455db6f53a49ce22dbd2333a1cc63f4a0bf6f5f905ebf701c90d1a082b9ec9a88d3deb96895c90d2a4c859b1c7e80bf8a3b832e49a1b511f5381e606fc95
-DIST vivaldi-snapshot-2.3.1401.7_p1-armhf.deb 51876552 BLAKE2B dfbd0f5dbfeada178b139852db99f92b990e65de80e2a1b87ace3bc512604e53d35cb8d433fd8feeff5af92c0b7e137491aa1a7fc191b777c0097339514c1784 SHA512 cd1b451f32b9a7ecb1bb9d95b1a6fa42ba8f041ee76799e69d6a1d2751ff76cacc6a2bee57fb5027dab5ccea0f4e3096f4a04c1f0edf4d7038aa7b91ff9e0094
-DIST vivaldi-snapshot-2.3.1401.7_p1-i386.deb 58125218 BLAKE2B 329cf66570385f844570d21f32bbbdf81cd650fdc23a17034ee9fa054a7086b91d86ffb9354b669cf58c39d19248a4f1cefe5caa6ff54a1c7a0e6c4b919d5035 SHA512 247621ccd9aa26d48c5df8660c9b5f0398646e9182b5a2f12668493246284a428e35b3efc5ab47e06b5d7e446d45868b929c45334b0cb09a3923693abbc78e04
 DIST vivaldi-snapshot-2.3.1420.4_p1-amd64.deb 59807180 BLAKE2B ae908e23686a6c949e3313a48fbe5dd24508118724f9ec5f7e7ddedf03cc410b7f726d55e716e575303d7b1c01ca6d20c7aeceeaf01edaf05d2c8969b2db9826 SHA512 61709fccab0ca8f94d41ab91e092e5a27417d50482bced77c2e7cd18148851590c514d886db185dd185eb0d7111702f8abd959ffbc832f2c694d39c18424910e
 DIST vivaldi-snapshot-2.3.1420.4_p1-arm64.deb 54573736 BLAKE2B 6020c6941acb0a21f090d03bb8357897addc39872a83d27fc375baddeb29602939bb7ea28fb67a32fc0aff166341db5dea7a31f946f102a5f6d8035f7ec56f44 SHA512 3f42a13396d68cb129e3f55c55e0e89942fc664c920859a2072ecbf0fb4aef142cdd7664f28024ca3c4872797b4ff028a3fb6f9f9820a7f89e769ae94c5084ec
 DIST vivaldi-snapshot-2.3.1420.4_p1-armhf.deb 52310938 BLAKE2B 807b2f08dbf26cd6a608dbf99fded16fd7bcad64302895378d41caf026a16d562a03e133e7fe782d1aa087f9e38a14dbfa81facd6d3154d828c7e7b19054c895 SHA512 66a909ceafeb70990ff3c84369de6b2f84bb809d1a3eeeb2202b5fd8313707075c0f526913b72d794f63e6086c4891294e2f14cb45d83bf00e0fc2da63421348
 DIST vivaldi-snapshot-2.3.1420.4_p1-i386.deb 58078194 BLAKE2B 141bac99163e8f4e1819eb4be51d44c268820c2599ea6b00db0d13aed1d12c20e10d312f27bf5c837006c3bd701e7cbe521123c8d91222ac60dc746fb4d15b89 SHA512 ba48e4ad9cb0c3d6448f4c155bcf9f3172fb932949d5299cdf55a582769886d34f32de22c7993249b22d5076ddae82bed5a18d3a55213c9fda6062964793e2d3
-EBUILD vivaldi-snapshot-2.3.1401.7_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
+DIST vivaldi-snapshot-2.3.1430.4_p1-amd64.deb 60070842 BLAKE2B 3e8916863074ba212d3ff3675d2ee107ab537509cecbebb99319f37929ae9bb1053377bb3369e409f0fd6044431a4e029d62dc7de938edc77889185572dd0b23 SHA512 7ea0728954dba05bb69e6a73bceada063e7a4b78fce02ae11bf4f7870a66d27a6f6749cb945a4706ef70bc03e5063fd5e5aabf0933953d37c241eb864a030e4a
+DIST vivaldi-snapshot-2.3.1430.4_p1-arm64.deb 55566018 BLAKE2B ea2ac73e8750b7d8da4a51e528f64e766db78d01fdabbe7b4099b08ab0ff4b34f6712eece6a65666348b3cd7ffa463ec83ce2bab68e548b9afd58be100d7caf8 SHA512 22e3596cf883fadb6a2e54ce4f14f91c41c0f979c4598730345241b759570f2a4951c786a34f256141265e0ae46e19b56b64cc2d20db68fbb8bdc6691c30c716
+DIST vivaldi-snapshot-2.3.1430.4_p1-armhf.deb 52620910 BLAKE2B d13e4deedd9b65b4837ad934a57a0981e0cc6e47a2243a423ab23e7802b3fe4c7ce9bbcc91936c3c9a6685194a6c9bcebd2f80a13ef0f8fab8eb742d1021b0ad SHA512 703ac9587c0d1f0c273ced6211072f8e53fbe6cb6747cef8a4171d6ce2f683859dead80eb20bd0ef140fe5b41d697762f244282ffddf5678793bd6869f5de053
+DIST vivaldi-snapshot-2.3.1430.4_p1-i386.deb 58168494 BLAKE2B 78774db95227fa1e2da19c647ed2d65319a74036ac7ed05f4d51c4518003cfa74b9dd356c6d91b5da3bb77eb055a593a94fe8e74ed8285ed6988ab33dd0dfb5e SHA512 f155cfbd3825b70387d45696cd8a10d8d37345bd2a3ed59751e3e8529369028c64abd80dda59e8d9517b53422569680143053fbb95cb3aebe3bd7f748b627f5a
 EBUILD vivaldi-snapshot-2.3.1420.4_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
+EBUILD vivaldi-snapshot-2.3.1430.4_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
deleted file mode 100644
index 91bde2d57460..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1430.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1430.4_p1.ebuild
new file mode 100644
index 000000000000..91bde2d57460
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1430.4_p1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
-- 
cgit v1.2.3