gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /www-client
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
45 files changed, 3474 insertions, 1405 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d0e4ee74d8ad..93d77bf94948 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 912db61209c4..89eeeb80ce73 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,15 +1,20 @@
 AUX chromium-86-fix-vaapi-on-intel.patch 1719 BLAKE2B ec015786c717b81fe90f959679fe309faaf631ee5290ee470c02d28b83a72ba3984a8c1ac97d986569029942d3fc176a14d3415a7f3a1e8c70fb1917bf779d77 SHA512 0297d26fef8f18054f2a6d01b5224f6a1e6ec8359785f3c5411b5f5cf9c7ec194f7074632327e07e1a424e5d4bbe3b67f7276849aa8f1bbc5708cd68785b3887
+AUX chromium-87-icu68.patch 17395 BLAKE2B 1d56b01c2072bcda771b4598e243c8d884de82ab8fc662cdfaa278d6bdec91dac35fcf4dad9c2b23c7d0c9a3d705053cff39fb19e4a76143193ee44069c4c7f7 SHA512 8da89b318806939197d4c9b289aede7aa2bab82d9f0f3dceedcae0812102ef6705c1ab3b5579f0b7e776d164c50d8e33d8ce6bd46eee9ca03fed79ba1d53c4bf
 AUX chromium-87-ozone-deps.patch 442 BLAKE2B 679f82c94e0716200b0483c13e7fed89a549a5689640a64ad8b04ff6da4e484d6c5f29a0daeec29f5330b0483632b8d63d3d4fbe93aa8262363f136f3f4bf5fb SHA512 31bbaf5fb3d9629ee036a88725ffab3a724f6593790f5041c25496225ac105cb06b9b97c3685fb6d2d9d7bf75020a93a452a28e81eb817bce502a0c245c3085d
+AUX chromium-87-v8-icu68.patch 7185 BLAKE2B 556e8894e0e1e4037911538fa6cf52870de8f67bfeb2113683363f63aeb7eca29e955eeb942b3e3ad312ce72f46106b5aeebae9112e9ac3400ea77721edd21d6 SHA512 07900185169a6812394aece7594fc16c37693b3019aed4d27bca936f6cfe46392fe9c579724e7a8c6a4a660145fd978eaf27f9b4ad42d7f8b395d03a2518ffe5
 AUX chromium-87-webcodecs-deps.patch 1011 BLAKE2B 45caba9cb8c65c0f72844f441ee0f0333bc7172ed26e40b1af43190a9aefdc4d7e1d8ad807cd3e45f890edeb4be88555d0ef61cb6d6f359956eb02765861e1e3 SHA512 26831bbf4b6d9b7227fcd179641faa9e14a23995bd1d99cf1ae7eb1170d42eae883ef27a88bd23e8dddfb1b043704e0acc3b2de421d4ef9b9c986495cec75d8f
 AUX chromium-88-ozone-deps.patch 1548 BLAKE2B 6a9b2b19b1563503d749394921a43c53c33be7e9b88572c7e2e95affccc5e79737c28b9c1c6ae7c4a139e05a802052b4375d51264492f78dde5717f760368d8a SHA512 e2e8304efa772c2cdc2a891335f9d2e914885d563967fef71d7e2f443eadbfc502480cbd1fdbc1b32a59cd17684d3044d2ee0c4ad5dac5a4402c1667e13d66e5
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-87-patchset-9.tar.xz 6036 BLAKE2B 4dd9aa0e88f11a9104cb13e73607c3b4fcd7e9cb556034472e2fd46158db6e7505b22c098df1c7cab6c7ff06ba6dc45914dcab58a405e0eafffa58d8b0cafbbf SHA512 c036ee20b4906bdb1b3104ecacf30a092ee3662ec10754bf2b168f1b7e1dbf593216e4dc70f8264540fadf91a33b48a8b8040028966dfcc8d8be99807b5f1b99
-DIST chromium-87.0.4280.66.tar.xz 856464608 BLAKE2B 5e386c8043aac6c55d3f16ffeabc36571999b265559f3e1d3eddfd972fb3fb3c0fba4d9c6a23a94bcaa6bcec1f4892c04fb301d18cc76f997ce5696908f0c9dd SHA512 8bf31b012166fb1fd35107020608cf77e6a31038a583423541c64aaf1c91bca0767ca111dcb4dd0f57c9c19c347375bde6b6488c56e309bd2871998c26b8b32a
+DIST chromium-87.0.4280.88.tar.xz 856266548 BLAKE2B 06a29a6c1e8cf71eb2db6e93a009feb8fd0b7ee676ff2c1dd31d2d72c597e5e84d979dbc64b7cb3f80ee0c51196f60a56157a27b679cab7f779baee61cd1928a SHA512 ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a
-DIST chromium-88.0.4324.11.tar.xz 857506624 BLAKE2B 4ba54ceb848d9d7b9d3b9d5dc2a1dc80ea7da49150beb4ee5509f51db7d85cd72de79803ed25be52d0e6f8ff176a7154d05be5f36d604c4efe0a5b86c2fcd533 SHA512 736d77ba1c100cb6a0e6518920acf839f15213eaaa5f350f304c8ce9afbbeb47195b9927609ac01829e04f11f23cd2f8ab06493c1b14639c5b57f3ef5d01d5ee
+DIST chromium-88.0.4324.41.tar.xz 856996692 BLAKE2B 9272e3374ece9678d7487034ca1953c9062cabd0120e51030815bba7ee1d9bd3a2f8a86f45db49157665aeea5eec75807ee4f59219397d7065620e29f5b33ff3 SHA512 4aa9a4412e08166900c1d91ebd4a8dddfc38945aac9de04dbfcde101c713a0b2be38983c779bc5c4d2c361043fb3b92a0ece57adb5ab1548b08a135c9103dbe5
+DIST chromium-89-patchset-2.tar.xz 7016 BLAKE2B 6512f6d35420a7df1d897b1ca4b157511436a6cb918a433a147cd6e405bd98c112849c65587b3f99b3ce824cdb2d24ade424e2cab898bf9006c141ff6aa72ff1 SHA512 7c6aff43f8f4b36a43012a352d61c4f77ad5eb64ac02b9a2561cf7ec18bacd64e94af94a970b9ba93b416da13a8dee3923634dc48981785c1e0ea9d48427270b
+DIST chromium-89.0.4350.4.tar.xz 884498160 BLAKE2B 7e34647c9df6e8c00c9202329bc861a2b9d036eb74975f21d65c9daab8d25c792bbaa71a2e293a30831598ea035765a0ff87b1a87de73537ebd570d0b4528cd5 SHA512 e6db4cd4bebb438c5c32e140e4afed5a6b8ab99e832c83d7f1a37c9014649bd5a6483223c6d0e3414355fa9af98abccb570bfcd05a1f67e4b77fa2cc67aa12e3
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-EBUILD chromium-87.0.4280.66.ebuild 28343 BLAKE2B 7565e185f098864c10a969ab44f77854bdad5305cd3ce42556937cc78bc816931d3da82c8fef0919ba13301ff12a32b296310a107de12051bc54981c7623bdef SHA512 ea2c7ee60d54c49e39a52aec5a61e859cb340f25f59343fed5d6d5c72ee55e61d388c85d9b87e41a39737bf2178a9564f448881f8c17631864902fb1309d9ad0
-EBUILD chromium-88.0.4324.11.ebuild 28444 BLAKE2B 337947377c4e0746eaee86336162500b74f682fff2952bb6abcc28d5fa531f4bf34838a3cb5ff8d1463c600c403adee86fa2be84699610f438798329569381df SHA512 bef0f659aa91254b0edd2bd61848a5c56824fcfafc8ca39549d6d9834c0c56290af18f6f9a15508048c8c2b876f71bfba52d9589dbcbd462285e35b0edb1b0ce
+EBUILD chromium-87.0.4280.88.ebuild 28506 BLAKE2B 4e3562a19d4f1e7235de2f8a833c5a9fa24b9149df0349f480c0246aba0b584ebda882db046e2dd3b613ebeac8d426eb0291abc7fa639db9dc00a5008cb6949c SHA512 d6de21d42f47f6832ce44a1b445011954a982177bc30f561e56c51aaf616ba7cfa13687b76a6e5fc2974e50db996cd6b9034615d53b287cc7af5a7f4cbde0efb
+EBUILD chromium-88.0.4324.41.ebuild 28524 BLAKE2B 2e61c317688184d73e470413f5db0db98a4aff0bd9e0213ce40a62f9ea2e85f3fdf70ebc82480073e22fa115b00a6a5b1d436b17180b5df59cf762ebc42a5a4d SHA512 e0f8572b7e221676f87937c291bcb13f5f62165fc4f8c487e92591beb44f66083305b5b03e169547c35ecb1f189fdeebe71c74552ef518d6232c5934dec23317
+EBUILD chromium-89.0.4350.4.ebuild 28519 BLAKE2B 03bdde31a8c1d9ed7463099e426c851985eb31aa49a91cc53a253e1fe9d8b41e982d50da7834cbc870061e5d4ca1a55b96e7c71067707dcd3c1a626f8ebfb662 SHA512 3248f212e12ac1362037c5a63c8cec677a24d6259d6f5e9d0577eae5cf6090549e3a3ec151b0586c62df6f964f3c2ffa23e4a8bcdf783f8e4770cffb880461ee
 MISC metadata.xml 1475 BLAKE2B 656bb8ec2a3bab8ceac368327564ab10c872fab191877bd4e0385a7fe6ca82a6fb468016d257498429875a9b377b61844c2e574d13d699bd91302f5f5b928288 SHA512 3b1422398b7055411ca01b4d6c4bcbbf639fbde0eb8cc312d59cae518a500f4bff9ff3df01145f36e7e229396a0ea60d07c1b6e872f25f332ce807d80a8aad2a
diff --git a/www-client/chromium/chromium-87.0.4280.66.ebuild b/www-client/chromium/chromium-87.0.4280.88.ebuild
index 40f01bffb8c9..70b0438058bb 100644
--- a/www-client/chromium/chromium-87.0.4280.66.ebuild
+++ b/www-client/chromium/chromium-87.0.4280.88.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
 	js-type-check? ( virtual/jre )
 "
 
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
 : ${CHROMIUM_FORCE_CLANG=no}
 : ${CHROMIUM_FORCE_LIBCXX=no}
 
@@ -231,6 +232,8 @@ src_prepare() {
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-87-ozone-deps.patch"
 		"${FILESDIR}/chromium-87-webcodecs-deps.patch"
+		"${FILESDIR}/chromium-87-v8-icu68.patch"
+		"${FILESDIR}/chromium-87-icu68.patch"
 	)
 
 	if use vaapi; then
diff --git a/www-client/chromium/chromium-88.0.4324.11.ebuild b/www-client/chromium/chromium-88.0.4324.41.ebuild
index 205802462603..f4abb901d7fb 100644
--- a/www-client/chromium/chromium-88.0.4324.11.ebuild
+++ b/www-client/chromium/chromium-88.0.4324.41.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
 	js-type-check? ( virtual/jre )
 "
 
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
 : ${CHROMIUM_FORCE_CLANG=no}
 : ${CHROMIUM_FORCE_LIBCXX=no}
 
diff --git a/www-client/chromium/chromium-89.0.4350.4.ebuild b/www-client/chromium/chromium-89.0.4350.4.ebuild
new file mode 100644
index 000000000000..0c3836c16132
--- /dev/null
+++ b/www-client/chromium/chromium-89.0.4350.4.ebuild
@@ -0,0 +1,900 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+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 check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="2"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="
+	component-build? ( !suid )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libxcb:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			dev-libs/libffi:=
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+			x11-libs/libxkbcommon:=
+		)
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-10"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-10"
+	DEPEND+=" >=sys-libs/libcxx-10"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-68.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+	)
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/schema_org
+		third_party/securemessage
+		third_party/shaka-player
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-cross/spirv-cross
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tint
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	if use wayland || use headless; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		myconf_gn+=" ozone_platform_headless=true"
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" use_ozone=false"
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is missing in tarball
+		# (https://groups.google.com/a/chromium.org/g/chromium-packagers/c/2ID9c4j6UkY)
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
+		elog "inside Chromium or add --enable-accelerated-video-decode"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/files/chromium-87-icu68.patch b/www-client/chromium/files/chromium-87-icu68.patch
new file mode 100644
index 000000000000..dfea967dbaa9
--- /dev/null
+++ b/www-client/chromium/files/chromium-87-icu68.patch
@@ -0,0 +1,400 @@
+From 4d16e52a5e6771c4aa5f892e14486bf0e87027d1 Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang@chromium.org>
+Date: Tue, 20 Oct 2020 00:11:50 +0000
+Subject: [PATCH] Prepare for landing ICU68
+
+In the landing process of ICU68 we found these need to be changed
+since ICU68 no longer define TRUE and FALSE for UBool to
+avoid C++20 problem.
+
+Bug: 1138555
+Change-Id: I64fd98c99864aa86b07280537a780105cb0eabbe
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2473522
+Reviewed-by: Frank Tang <ftang@chromium.org>
+Reviewed-by: Colin Blundell <blundell@chromium.org>
+Reviewed-by: Dominic Battré <battre@chromium.org>
+Reviewed-by: Guillaume Jenkins <gujen@google.com>
+Reviewed-by: Jungshik Shin <jshin@chromium.org>
+Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
+Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
+Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
+Reviewed-by: Marian Fechete <marianfe@google.com>
+Reviewed-by: Matthew Denton <mpdenton@chromium.org>
+Commit-Queue: Frank Tang <ftang@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#818713}
+---
+
+diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
+index b225f1d..20debbe 100644
+--- a/base/i18n/icu_util.cc
++++ b/base/i18n/icu_util.cc
+@@ -327,7 +327,7 @@
+   // https://ssl.icu-project.org/trac/ticket/13208 .
+   string16 zone_id = android::GetDefaultTimeZoneId();
+   icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
+-      icu::UnicodeString(FALSE, zone_id.data(), zone_id.length())));
++      icu::UnicodeString(false, zone_id.data(), zone_id.length())));
+ #elif defined(OS_FUCHSIA)
+   // The platform-specific mechanisms used by ICU's detectHostTimeZone() to
+   // determine the default time zone will not work on Fuchsia. Therefore,
+diff --git a/base/i18n/string_compare.cc b/base/i18n/string_compare.cc
+index c0e83c6..e4fb687 100644
+--- a/base/i18n/string_compare.cc
++++ b/base/i18n/string_compare.cc
+@@ -18,8 +18,8 @@
+                                              StringPiece16 rhs) {
+   UErrorCode error = U_ZERO_ERROR;
+   UCollationResult result = collator.compare(
+-      icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
+-      icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
++      icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
++      icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
+       error);
+   DCHECK(U_SUCCESS(error));
+   return result;
+diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc
+index c769b57..c085f5e 100644
+--- a/base/i18n/time_formatting.cc
++++ b/base/i18n/time_formatting.cc
+@@ -240,7 +240,7 @@
+   icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
+   measure_format.formatMeasures(measures, 3, formatted, ignore, status);
+   *out = i18n::UnicodeStringToString16(formatted);
+-  return U_SUCCESS(status) == TRUE;
++  return U_SUCCESS(status);
+ }
+ 
+ string16 DateIntervalFormat(const Time& begin_time,
+diff --git a/components/autofill/core/common/autofill_regexes.cc b/components/autofill/core/common/autofill_regexes.cc
+index 02254fa..1cf12f3 100644
+--- a/components/autofill/core/common/autofill_regexes.cc
++++ b/components/autofill/core/common/autofill_regexes.cc
+@@ -43,7 +43,7 @@
+ icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) {
+   auto it = matchers_.find(pattern);
+   if (it == matchers_.end()) {
+-    const icu::UnicodeString icu_pattern(FALSE, pattern.data(),
++    const icu::UnicodeString icu_pattern(false, pattern.data(),
+                                          pattern.length());
+ 
+     UErrorCode status = U_ZERO_ERROR;
+@@ -71,21 +71,21 @@
+   base::AutoLock lock(*g_lock);
+ 
+   icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern);
+-  icu::UnicodeString icu_input(FALSE, input.data(), input.length());
++  icu::UnicodeString icu_input(false, input.data(), input.length());
+   matcher->reset(icu_input);
+ 
+   UErrorCode status = U_ZERO_ERROR;
+   UBool matched = matcher->find(0, status);
+   DCHECK(U_SUCCESS(status));
+ 
+-  if (matched == TRUE && match) {
++  if (matched && match) {
+     icu::UnicodeString match_unicode =
+         matcher->group(group_to_be_captured, status);
+     DCHECK(U_SUCCESS(status));
+     *match = base::i18n::UnicodeStringToString16(match_unicode);
+   }
+ 
+-  return matched == TRUE;
++  return matched;
+ }
+ 
+ }  // namespace autofill
+diff --git a/components/autofill_assistant/browser/string_conversions_util.cc b/components/autofill_assistant/browser/string_conversions_util.cc
+index 212bafa..1d00d68 100644
+--- a/components/autofill_assistant/browser/string_conversions_util.cc
++++ b/components/autofill_assistant/browser/string_conversions_util.cc
+@@ -39,13 +39,13 @@
+ // |target|.
+ bool AppendUnicodeToUTF8(const UChar32 source, std::string* target) {
+   char bytes[4];
+-  UBool error = FALSE;
++  UBool error = false;
+   size_t offset = 0;
+   U8_APPEND(bytes, offset, base::size(bytes), source, error);
+-  if (error == FALSE) {
++  if (error == false) {
+     target->append(bytes, offset);
+   }
+-  return error == FALSE;
++  return !error;
+ }
+ 
+ }  // namespace autofill_assistant
+diff --git a/components/signin/public/identity_manager/identity_utils.cc b/components/signin/public/identity_manager/identity_utils.cc
+index 1c414e2..014d674 100644
+--- a/components/signin/public/identity_manager/identity_utils.cc
++++ b/components/signin/public/identity_manager/identity_utils.cc
+@@ -33,7 +33,7 @@
+ 
+   // See if the username matches the policy-provided pattern.
+   UErrorCode status = U_ZERO_ERROR;
+-  const icu::UnicodeString icu_pattern(FALSE, utf16_pattern.data(),
++  const icu::UnicodeString icu_pattern(false, utf16_pattern.data(),
+                                        utf16_pattern.length());
+   icu::RegexMatcher matcher(icu_pattern, UREGEX_CASE_INSENSITIVE, status);
+   if (!U_SUCCESS(status)) {
+diff --git a/components/spellcheck/renderer/spellcheck_worditerator.cc b/components/spellcheck/renderer/spellcheck_worditerator.cc
+index ec16fef..3b1f060 100644
+--- a/components/spellcheck/renderer/spellcheck_worditerator.cc
++++ b/components/spellcheck/renderer/spellcheck_worditerator.cc
+@@ -442,7 +442,7 @@
+   // spellchecker and we need manual normalization as well. The normalized
+   // text does not have to be NUL-terminated since its characters are copied to
+   // string16, which adds a NUL character when we need.
+-  icu::UnicodeString input(FALSE, &text_[input_start],
++  icu::UnicodeString input(false, &text_[input_start],
+                            base::checked_cast<int32_t>(input_length));
+   UErrorCode status = U_ZERO_ERROR;
+   icu::UnicodeString output;
+diff --git a/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
+index 6d66a7c..d73192b1 100644
+--- a/components/url_formatter/spoof_checks/idn_spoof_checker.cc
++++ b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
+@@ -368,7 +368,7 @@
+     return Result::kICUSpoofChecks;
+   }
+ 
+-  icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
++  icu::UnicodeString label_string(false /* isTerminated */, label.data(),
+                                   base::checked_cast<int32_t>(label.size()));
+ 
+   // A punycode label with 'xn--' prefix is not subject to the URL
+@@ -711,7 +711,7 @@
+     base::StringPiece tld,
+     base::StringPiece16 tld_unicode) {
+   icu::UnicodeString tld_string(
+-      FALSE /* isTerminated */, tld_unicode.data(),
++      false /* isTerminated */, tld_unicode.data(),
+       base::checked_cast<int32_t>(tld_unicode.size()));
+   // Allow if the TLD contains any letter from the script, in which case it's
+   // likely to be a TLD in that script.
+diff --git a/components/url_formatter/spoof_checks/skeleton_generator.cc b/components/url_formatter/spoof_checks/skeleton_generator.cc
+index 9628626..9a77901 100644
+--- a/components/url_formatter/spoof_checks/skeleton_generator.cc
++++ b/components/url_formatter/spoof_checks/skeleton_generator.cc
+@@ -116,7 +116,7 @@
+ Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) {
+   Skeletons skeletons;
+   size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0);
+-  icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
++  icu::UnicodeString host(false, hostname.data(), hostname_length);
+   // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
+   // there is no point in getting rid of diacritics because combining marks
+   // attached to non-LGC characters are already blocked.
+diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc
+index 95d5a82..b6d8e5a 100644
+--- a/content/zygote/zygote_linux.cc
++++ b/content/zygote/zygote_linux.cc
+@@ -557,7 +557,7 @@
+   if (!iter.ReadString16(&timezone_id))
+     return -1;
+   icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
+-      icu::UnicodeString(FALSE, timezone_id.data(), timezone_id.length())));
++      icu::UnicodeString(false, timezone_id.data(), timezone_id.length())));
+ 
+   if (!iter.ReadInt(&numfds))
+     return -1;
+diff --git a/services/device/time_zone_monitor/time_zone_monitor_android.cc b/services/device/time_zone_monitor/time_zone_monitor_android.cc
+index 818670a..f57f972 100644
+--- a/services/device/time_zone_monitor/time_zone_monitor_android.cc
++++ b/services/device/time_zone_monitor/time_zone_monitor_android.cc
+@@ -34,7 +34,7 @@
+   // See base/i18n/icu_util.cc:InitializeIcuTimeZone() for more information.
+   base::string16 zone_id = base::android::GetDefaultTimeZoneId();
+   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createTimeZone(
+-      icu::UnicodeString(FALSE, zone_id.data(), zone_id.length())));
++      icu::UnicodeString(false, zone_id.data(), zone_id.length())));
+   UpdateIcuAndNotifyClients(std::move(new_zone));
+ }
+ 
+diff --git a/third_party/blink/renderer/core/exported/web_view_test.cc b/third_party/blink/renderer/core/exported/web_view_test.cc
+index a6b9552..36809d91 100644
+--- a/third_party/blink/renderer/core/exported/web_view_test.cc
++++ b/third_party/blink/renderer/core/exported/web_view_test.cc
+@@ -4868,18 +4868,18 @@
+ 
+ TEST_F(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithMutateDom) {
+   // Test dom mutation.
+-  TestEachMouseEvent("mutateDom", FALSE);
++  TestEachMouseEvent("mutateDom", false);
+ 
+   // Test without any DOM mutation.
+-  TestEachMouseEvent("none", TRUE);
++  TestEachMouseEvent("none", true);
+ }
+ 
+ TEST_F(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithMutateStyle) {
+   // Test style mutation.
+-  TestEachMouseEvent("mutateStyle", FALSE);
++  TestEachMouseEvent("mutateStyle", false);
+ 
+   // Test checkbox:indeterminate style mutation.
+-  TestEachMouseEvent("mutateIndeterminate", FALSE);
++  TestEachMouseEvent("mutateIndeterminate", false);
+ 
+   // Test click div with :active style.
+   Tap("style_active");
+@@ -4888,10 +4888,10 @@
+ 
+ TEST_F(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithPreventDefault) {
+   // Test swallowing.
+-  TestEachMouseEvent("preventDefault", FALSE);
++  TestEachMouseEvent("preventDefault", false);
+ 
+   // Test without any preventDefault.
+-  TestEachMouseEvent("none", TRUE);
++  TestEachMouseEvent("none", true);
+ }
+ 
+ TEST_F(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithNonTriggeringNodes) {
+diff --git a/third_party/blink/renderer/platform/text/locale_icu.cc b/third_party/blink/renderer/platform/text/locale_icu.cc
+index 92fb99e0..f991b51 100644
+--- a/third_party/blink/renderer/platform/text/locale_icu.cc
++++ b/third_party/blink/renderer/platform/text/locale_icu.cc
+@@ -169,12 +169,12 @@
+     return g_empty_string;
+ 
+   UErrorCode status = U_ZERO_ERROR;
+-  int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status);
++  int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status);
+   if (status != U_BUFFER_OVERFLOW_ERROR || !length)
+     return g_empty_string;
+   StringBuffer<UChar> buffer(length);
+   status = U_ZERO_ERROR;
+-  udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status);
++  udat_toPattern(date_format, true, buffer.Characters(), length, &status);
+   if (U_FAILURE(status))
+     return g_empty_string;
+   return String::Adopt(buffer);
+diff --git a/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc b/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
+index 5bea007..0e8c60a 100644
+--- a/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
++++ b/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
+@@ -312,13 +312,13 @@
+       text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
+                               ? static_cast<int32_t>(offset)
+                               : 0;
+-      is_accessible = TRUE;
++      is_accessible = true;
+       return true;
+     }
+     if (native_index >= native_length &&
+         text->chunkNativeLimit == native_length) {
+       text->chunkOffset = text->chunkLength;
+-      is_accessible = FALSE;
++      is_accessible = false;
+       return true;
+     }
+   } else {
+@@ -331,12 +331,12 @@
+       text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
+                               ? static_cast<int32_t>(offset)
+                               : 0;
+-      is_accessible = TRUE;
++      is_accessible = true;
+       return true;
+     }
+     if (native_index <= 0 && !text->chunkNativeStart) {
+       text->chunkOffset = 0;
+-      is_accessible = FALSE;
++      is_accessible = false;
+       return true;
+     }
+   }
+@@ -347,7 +347,7 @@
+                               int64_t native_index,
+                               UBool forward) {
+   if (!text->context)
+-    return FALSE;
++    return false;
+   int64_t native_length = TextNativeLength(text);
+   UBool is_accessible;
+   if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
+@@ -371,7 +371,7 @@
+     DCHECK_EQ(new_context, kPriorContext);
+     TextLatin1SwitchToPriorContext(text, native_index, native_length, forward);
+   }
+-  return TRUE;
++  return true;
+ }
+ 
+ static const struct UTextFuncs kTextLatin1Funcs = {
+@@ -511,7 +511,7 @@
+ 
+ static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
+   if (!text->context)
+-    return FALSE;
++    return false;
+   int64_t native_length = TextNativeLength(text);
+   UBool is_accessible;
+   if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
+@@ -533,7 +533,7 @@
+     DCHECK_EQ(new_context, kPriorContext);
+     TextUTF16SwitchToPriorContext(text, native_index, native_length, forward);
+   }
+-  return TRUE;
++  return true;
+ }
+ 
+ static const struct UTextFuncs kTextUTF16Funcs = {
+diff --git a/third_party/blink/renderer/platform/text/unicode_utilities.cc b/third_party/blink/renderer/platform/text/unicode_utilities.cc
+index 2cefd53..b8c4515 100644
+--- a/third_party/blink/renderer/platform/text/unicode_utilities.cc
++++ b/third_party/blink/renderer/platform/text/unicode_utilities.cc
+@@ -300,7 +300,7 @@
+   DCHECK(U_SUCCESS(status));
+   int32_t input_length = static_cast<int32_t>(length);
+   // copy-on-write.
+-  icu::UnicodeString normalized(FALSE, characters, input_length);
++  icu::UnicodeString normalized(false, characters, input_length);
+   // In the vast majority of cases, input is already NFC. Run a quick check
+   // to avoid normalizing the entire input unnecessarily.
+   int32_t normalized_prefix_length =
+diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+index b625735..fb8ab05 100644
+--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
++++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -327,7 +327,7 @@
+   DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING)
+       << "ICU ambiguous alias warning for encoding: " << encoding_.GetName();
+   if (converter_icu_)
+-    ucnv_setFallback(converter_icu_, TRUE);
++    ucnv_setFallback(converter_icu_, true);
+ }
+ 
+ int TextCodecICU::DecodeToBuffer(UChar* target,
+diff --git a/ui/base/l10n/formatter.cc b/ui/base/l10n/formatter.cc
+index e4446d4..684ead8 100644
+--- a/ui/base/l10n/formatter.cc
++++ b/ui/base/l10n/formatter.cc
+@@ -234,7 +234,7 @@
+                        int value,
+                        icu::UnicodeString* formatted_string) const {
+   DCHECK(simple_format_[unit]);
+-  DCHECK(formatted_string->isEmpty() == TRUE);
++  DCHECK(formatted_string->isEmpty());
+   UErrorCode error = U_ZERO_ERROR;
+   FormatNumberInPlural(*simple_format_[unit],
+                         value, formatted_string, &error);
+@@ -250,7 +250,7 @@
+       << "Detailed() not implemented for your (format, length) combination!";
+   DCHECK(detailed_format_[units][1])
+       << "Detailed() not implemented for your (format, length) combination!";
+-  DCHECK(formatted_string->isEmpty() == TRUE);
++  DCHECK(formatted_string->isEmpty());
+   UErrorCode error = U_ZERO_ERROR;
+   FormatNumberInPlural(*detailed_format_[units][0], value_1,
+                        formatted_string, &error);
+@@ -283,7 +283,7 @@
+     base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id);
+     UErrorCode error = U_ZERO_ERROR;
+     std::unique_ptr<icu::MessageFormat> format(new icu::MessageFormat(
+-        icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
++        icu::UnicodeString(false, pattern.data(), pattern.length()), error));
+     DCHECK(U_SUCCESS(error));
+     if (format.get())
+       return format;
diff --git a/www-client/chromium/files/chromium-87-v8-icu68.patch b/www-client/chromium/files/chromium-87-v8-icu68.patch
new file mode 100644
index 000000000000..2c274dc1abbf
--- /dev/null
+++ b/www-client/chromium/files/chromium-87-v8-icu68.patch
@@ -0,0 +1,192 @@
+From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang@chromium.org>
+Date: Tue, 03 Nov 2020 23:20:37 -0800
+Subject: [PATCH] Update to ICU68-1
+
+ICU68-1 change the output skeleton format. So we need to change
+resolvedOptions code for 68 migration.
+
+Chromium roll
+https://chromium-review.googlesource.com/c/chromium/src/+/2474093
+
+Bug: v8:10945
+Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431
+Commit-Queue: Frank Tang <ftang@chromium.org>
+Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
+Reviewed-by: Shu-yu Guo <syg@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#70972}
+
+(ported to work with <ICU-68.1 and rebased chromium)
+---
+
+diff --git a/v8/src/objects/js-number-format.cc b/v8/src/objects/js-number-format.cc
+index 45b0eab..d18b133 100644
+--- a/v8/src/objects/js-number-format.cc
++++ b/v8/src/objects/js-number-format.cc
+@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate,
+ Handle<String> UnitDisplayString(Isolate* isolate,
+                                  const icu::UnicodeString& skeleton) {
+   // Ex: skeleton as
+-  // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name"
++  // <ICU-68.1:  "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name".
++  // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name"
+   if (skeleton.indexOf("unit-width-full-name") >= 0) {
+     return ReadOnlyRoots(isolate).long_string_handle();
+   }
+   // Ex: skeleton as
+-  // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
++  // <ICU-68.1:  "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
++  // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow".
+   if (skeleton.indexOf("unit-width-narrow") >= 0) {
+     return ReadOnlyRoots(isolate).narrow_string_handle();
+   }
+   // Ex: skeleton as
+-  // "measure-unit/length-foot .### rounding-mode-half-up"
++  // <ICU-68.1:  "measure-unit/length-foot .### rounding-mode-half-up"
++  // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
+   return ReadOnlyRoots(isolate).short_string_handle();
+ }
+ 
+@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) {
+     return Notation::COMPACT;
+   }
+   // Ex: skeleton as
+-  // "measure-unit/length-foot .### rounding-mode-half-up"
++  // <ICU-68.1:  "measure-unit/length-foot .### rounding-mode-half-up"
++  // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
+   return Notation::STANDARD;
+ }
+ 
+@@ -562,14 +566,23 @@ namespace {
+ 
+ // Ex: percent .### rounding-mode-half-up
+ // Special case for "percent"
+-// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
+-// rounding-mode-half-up" should return "kilometer-per-unit".
+-// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
+-// "year".
++// <ICU-68.1:
++//   Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
++//   rounding-mode-half-up" should return "kilometer-per-unit".
++//   Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
++// >=ICU-68.1:
++//   Ex: "unit/milliliter-per-acre .### rounding-mode-half-up"
++//   should return "milliliter-per-acre".
++//   Ex: "unit/year .### rounding-mode-half-up" should return
++//   "year".
+ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
+   std::string str;
+   str = skeleton.toUTF8String<std::string>(str);
++#if U_ICU_VERSION_MAJOR_NUM < 68
+   std::string search("measure-unit/");
++#else
++  std::string search("unit/");
++#endif
+   size_t begin = str.find(search);
+   if (begin == str.npos) {
+     // Special case for "percent".
+@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
+     }
+     return "";
+   }
++#if U_ICU_VERSION_MAJOR_NUM < 68
+   // Skip the type (ex: "length").
+   // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+   //                     b
+   begin = str.find("-", begin + search.size());
++#else
++  // Ex:
++  // "unit/acre .### rounding-mode-half-up"
++  //       b
++  // Ex:
++  // "unit/milliliter-per-acre .### rounding-mode-half-up"
++  //       b
++  begin += search.size();
++#endif
+   if (begin == str.npos) {
+     return "";
+   }
++#if U_ICU_VERSION_MAJOR_NUM < 68
+   begin++;  // Skip the '-'.
++#endif
+   // Find the end of the subtype.
+   size_t end = str.find(" ", begin);
+-  // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+-  //                      b        e
++  // <ICU-68.1:
++  //   "measure-unit/length-kilometer per-measure-unit/duration-hour"
++  //                        b        e
++  // >=ICU-68.1:
++  //   Ex:
++  //   "unit/acre .### rounding-mode-half-up"
++  //         b   e
++  //   Ex:
++  //   "unit/milliliter-per-acre .### rounding-mode-half-up"
++  //         b                  e
+   if (end == str.npos) {
+     end = str.size();
++#if U_ICU_VERSION_MAJOR_NUM < 68
+     return str.substr(begin, end - begin);
+   }
+   // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
+   // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+   //                      [result ]                           b   e
+   return result + "-per-" + str.substr(begin, end - begin);
++#else
++  }
++  return str.substr(begin, end - begin);
++#endif
+ }
+ 
+ Style StyleFromSkeleton(const icu::UnicodeString& skeleton) {
+   if (skeleton.indexOf("currency/") >= 0) {
+     return Style::CURRENCY;
+   }
++#if U_ICU_VERSION_MAJOR_NUM < 68
+   if (skeleton.indexOf("measure-unit/") >= 0) {
+     if (skeleton.indexOf("scale/100") >= 0 &&
+         skeleton.indexOf("measure-unit/concentr-percent") >= 0) {
++#else
++  if (skeleton.indexOf("percent") >= 0) {
++    // percent precision-integer rounding-mode-half-up scale/100
++    if (skeleton.indexOf("scale/100") >= 0) {
++#endif
+       return Style::PERCENT;
++#if U_ICU_VERSION_MAJOR_NUM >= 68
++    } else {
++      return Style::UNIT;
++#endif
+     }
++#if U_ICU_VERSION_MAJOR_NUM >= 68
++  }
++  // Before ICU68: "measure-unit/", since ICU68 "unit/"
++  if (skeleton.indexOf("unit/") >= 0) {
++#endif
+     return Style::UNIT;
+   }
+   return Style::DECIMAL;
+diff --git a/v8/src/objects/js-relative-time-format.cc b/v8/src/objects/js-relative-time-format.cc
+index 267343aaae..64d56a1c12 100644
+--- a/v8/src/objects/js-relative-time-format.cc
++++ b/v8/src/objects/js-relative-time-format.cc
+@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New(
+     }
+   }
+ 
++#if U_ICU_VERSION_MAJOR_NUM < 68
+   icu::DecimalFormat* decimal_format =
+       static_cast<icu::DecimalFormat*>(number_format);
+   decimal_format->setMinimumGroupingDigits(-2);
++#else
++  if (number_format->getDynamicClassID() ==
++      icu::DecimalFormat::getStaticClassID()) {
++    icu::DecimalFormat* decimal_format =
++        static_cast<icu::DecimalFormat*>(number_format);
++    decimal_format->setMinimumGroupingDigits(-2);
++  }
++#endif
+ 
+   // Change UDISPCTX_CAPITALIZATION_NONE to other values if
+   // ECMA402 later include option to change capitalization.
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 1a446f7d5561..5de73ccdc35f 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -5,6 +5,6 @@ DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a5
 DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
 EBUILD dillo-3.0.5-r3.ebuild 1293 BLAKE2B 019a0535baead78934decc1e7840031d9147c95663804db672565825fdf02d8a26e6685eb3c36ad781defbd28ecf8537649ce96a0660ebbc4f5be26f43154703 SHA512 b670000f0b732c520a177c8dc047c6737edff432be389268094df54ab3cd3b7914272845d9a3d39ec49b8443adac54ca036eb047ad5d3665bdb7131e0749b68b
-EBUILD dillo-3.1_pre20181005.ebuild 1199 BLAKE2B 09e1bf6a220bc19a03f79c54b0d7f49bf345aa9d53424f691e4b2b4967a0fcad7eca6af17b6927321522af4deb3599936e88e333723d968b87bb288e4a1e1ffa SHA512 e3683e3ac46bac4947a1a87a2aeacb01647dddcf9b5fdea58fe0bffc4db6f7a621169f4180d41a3760f6c8ca0ed8a750202853e487b7f22af3f400cb7ce888d9
+EBUILD dillo-3.1_pre20181005.ebuild 1206 BLAKE2B 6ee03439127d10f70e4dfece3858ebd688d4a58af83b2e935a54f031c254c5e2716c2044cc1325cc38b431d6df56e7851d1ed8cc00c8d79868d8b04b20b24e0e SHA512 59b926338f5335d13bc72322216fd5169a7dd9a912470c70159188aabff5fb42cde86fa23047b69c1b1596a529fda3a480309f2b33b658663e47bec6df2d5c08
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
 MISC metadata.xml 348 BLAKE2B 4574707b617c7f7567075d5cee2ede78364c7b5b5ed11977e2948b2df2afc27506418b20db8bbbc371f1e9e2ef095d2376c869ddba3374a0e76ebdac4de9fc84 SHA512 e2ba8ac70b1ac89f257e92f457b20bc4fb9b407b5f49d1026c54dcd0d833f149e3961c732dcfb54d8d4886f417d480f49e76e89b93045a88ce1efed015739892
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index f918f45287e4..a1bf0879c638 100644
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 675d2e82be4f..643e0e14c72b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,5 @@
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
+AUX distribution.ini 1090 BLAKE2B d1ec76caf937a8d3d0898979c236b8cc39004d2d2c467da16356350fa59938f75f43a2b6830783ea4193cfb896a0d39c0b147527e0459ea5b4e6963b6e1b363a SHA512 6b7221646aeb7c8e08dcb800e54263407ec6cc8529dcc4438d52b36a5bb59431396a561958d405a33d0f455720fc1621adae4a667ec04e612c8b142eb6e80092
 AUX firefox-wayland.sh 110 BLAKE2B 60875713743e7a65b0c5a7649b8a016dc5005b723640378c4b60ec29f017d7a227cdcddf3b77faa2cae33683b1b8dbf0688968071d9936def4bda4f66ca0aef1 SHA512 58d6b3fb5e9af26ce9c55d0da304eec65a5380ddd58e16dd28cc80ec035a9d1b88bd3815cb74a6999125d1540e77a42182c15e142803b326ddc9c3626e8cb484
 AUX firefox-x11.sh 104 BLAKE2B 8d374235286fac0cfd113f851b0f48e9b23685f6890c6a959e4a071c6c2a58fd274aa7a88c750496420ce6918c06825d2c03cb159638db6567e3d773f3168cf7 SHA512 59cae56b34507f463c4480a7335ea25070beb450e3c93d3adcb782e070cb558544f05c7a784419d48f33cbdca7ed7b2c740c361da8ea081d0323677ffcef79ef
 AUX firefox.sh 3103 BLAKE2B 43066a1aa148d2162f7c6ac422dd6983d7c4504ff09271da2ccd22adab9f834b5343e7970271ca995e2a85c17455988cac0d6235cfab40eff033ac29d33efb08 SHA512 7d443dc42bae690d22437be1cd025d8b21c7d31debdde1995495e6cab8ceb94ab0bcd63513ed5f68fefd2e1991db414c7134bb621f3079772e60e4ac9876903c
@@ -103,7 +104,7 @@ DIST firefox-78.5.0esr-zh-CN.xpi 564767 BLAKE2B b5c3e773c3bc58ba80180bd018467df1
 DIST firefox-78.5.0esr-zh-TW.xpi 564724 BLAKE2B d55faedb630ecc2629d1e2b1adcfd4cde51d119fd4599d25ef0800e5875efea65db5102fec36366b6531791f16d0f94e8e0dee0bdc18868ad9bf5208471d65c3 SHA512 95e4fa378cf07927b13a9b0e9d37d6320c4cba26f26df6dfab65fcfe1ddd21d38cb5a387663c8c96b6b3e2015999af4d355c0b672848f874101c998abd117047
 DIST firefox-78.5.0esr.source.tar.xz 333995288 BLAKE2B 35140afb6b4d15052858e7864753ca74099edb24ed5e459f1f48114f0946f5e007486b5561ba9a545566033d71a69f0e6163dd17204cab717c441323972f089e SHA512 0d16013342b6e8d67adb5c111177ea4796db4fb593da8aa254d0d95bdf33fad798c2dbb235d44db4177c32dd2d7b3ac26b938b476342753ee8d6c83d968d0281
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST firefox-83-patches-05.tar.xz 151860 BLAKE2B 48377fb34eefe768f765ea5c5f450195d1a35f2c964271cf3ce6e34fcfb9c90d7d0578a37ca65c306a5e89d4e3d72aa44c07f7357fae3e1e40fb29b6d9017437 SHA512 05cac5322c7f9feb6a228797072572f163d320f3032f25664fe1251ad17a868373ee81d71971dd5d2bd3c7577498071d4f40713fc8251c3ab41654da73a94ed4
+DIST firefox-83-patches-06.tar.xz 152572 BLAKE2B fdb8cff136379320ee35b17300a91d800dd7a0cba938fcc9687a8b0da5bdfe04826d3cf7398ec8c3184a64f44d39fc44693c2cd6c3ebed138f84536be8e68ce3 SHA512 c195036f84071db1c6ba9a2f9b2044826d7e094bd2525dd149666df308e7ddb39c923ed13bde0812aec3904504dd913ef9fd3f443c098d86c6c0d51ce172c3c9
 DIST firefox-83.0-ach.xpi 463987 BLAKE2B 2173c637ae155ec474d18250adf8cd67ff7732ed9ecc7533004296934f82dfdd2f83f5f59dbd6b095b519bf5d3caf888f5e07913004a27771a13376ac080978d SHA512 cb1644bb1451311923bcbbbafe727fe8b35c33cf9643dceac603e802b82a2684451f9005ef6bfdd1ddebde01548926eb62dcd511e1f8a960248ea5b74f5f72e0
 DIST firefox-83.0-af.xpi 431349 BLAKE2B b4f912e706b464728e779bfc3cbdb7304bd763c55347140c32bdf309b3b4869ebc4bc1433f5cf5c970774f69aabddc4b5f5fce568dc32c50c4aaf90e9d07e13f SHA512 076e9084ae00dda0cfde5b09cf2dae7ed8994543c8de645a70b2f116d01da9e024159114d4d6ef21ce134b7d7cd16b95678121b41300ec5174a36112d41da4ed
 DIST firefox-83.0-an.xpi 511284 BLAKE2B 0b6332b8dcb254bf9df13fde4e34d01c2ef6398c329cce630a0b05a91b1f4ef02c8177f1726f489e8526ffd9fa9e822a010bfd6a669f5a598e7ed60f8328a278 SHA512 43559e760a96092b4c4bfeab6830f021e69c8c7c56a187f49109ea94443372e6323d503f1f175df1d77c685fcbbab2077f7fb02dd031804cde8a7dec2aa1d988
@@ -200,6 +201,104 @@ DIST firefox-83.0-xh.xpi 430120 BLAKE2B 5cb1701736000f4404ce780c5aa18eb37fbab384
 DIST firefox-83.0-zh-CN.xpi 564100 BLAKE2B a9b89639386f0775dd1a6ab99551a2e79fbafa66801c6252084659f26dd7974d0aa86f70dcb404e5dde43deacb584c1ff19393302200fcab726bacdb86054c16 SHA512 c41654386aeecaa7691524dd563e07235b8f5962debcdbfe59a586292ebce3086a275c47873678d788462f6a5111335cb7fe0d293d11b4585ce7ffdc69a7822b
 DIST firefox-83.0-zh-TW.xpi 564079 BLAKE2B b985bd680dc620313cd217beffa87935a546e528a37854fb20a7f4cdebdbf50fd4858ac91f13bf31eca947d09de1a2a0b9956ddf5acb6978e3a7a7d8628be0c0 SHA512 d5eb2a32cf4a5dc675adae6590c5201023387df9a8854ac4814b601c413c3785ae2e694dc5b4d231e2d1686b386cde202066cd2f11c1071dc29eff81c51e3abb
 DIST firefox-83.0.source.tar.xz 351331940 BLAKE2B b3a805288f4d644f7375c78ebe771c26d59c57f6aad71877abbfe60563c06af5f162b8894cb624cec12a5c72542ffad97e6f8f0cfc3fba0506d4e246a41911e1 SHA512 4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6
-EBUILD firefox-78.5.0.ebuild 31480 BLAKE2B 28e48cc16ddb7884a7267b52db5a319ef91388ac107997f307c5197143b2382900a301821ad7c3fa3596c4f94080c98c773304985c33bce6eea60e36dfc6bcc2 SHA512 9a4070b9c3ca3b55323fff941047bec87eaa24cd843bd4b49e3afda7bdc96302e7988340fbbd5e3e03e588bb2d592c4754a258db5ce7abed8730a94e4c0eb222
-EBUILD firefox-83.0.ebuild 31429 BLAKE2B a6cd8d0417930f3ddd6140852bee83b77fcb48e0dbbd558f9fb10f97f85a81fa0cf987b5a85c4df801e26d5aca7c0b7658c6e9a85273075ac478a01d5d770645 SHA512 a61ec11e74bcd5244f56d89c0eebdba1cb2f06c64a0e1daffa2e3d55769135cac6f42aa5795215a1842439839e322719f1ed7796bf893f16e4fc2657c5e9f121
+DIST firefox-84-patches-02.tar.xz 89512 BLAKE2B e1fbdfd2f2a0a128f4107d2db67e4abb1781c35704c1364c5f5527f8100c9063648b5cfc69086923b3c204fb883570ed901268cbb3fda2880ce923eaf7b2dbaa SHA512 ba96ab662c6b19be7ab99870363816b6a10da29d4743a2196e39c1b5ae2f20de28d652249484a3dc2ea259e0e9393b034300b84fd42f28755610550ba29db7f2
+DIST firefox-84.0_rc2-ach.xpi 461782 BLAKE2B 84bdcecd194a37a5e7f2bfafb56de4e2b1f322efec36a4a5b3d861e340b063c6d739751cf06c09b746bcd9910aa6b5df24738f3b576b792af88f9b3ceb94d770 SHA512 f8c912dec04d784bff81fbd32bb7cfbca83c187f4ee7f730cad3224e6a9f981d89b321f97b7efa1559f4da5c67877005d708188b63952ab0763b3159d421957a
+DIST firefox-84.0_rc2-af.xpi 429055 BLAKE2B 15fced40a0c0f0626d75eb90ec4d8309b32204f262b03a0c2df00941530dc98bf28c749369adb144b74f0bae60cdbccc9159ae89b06ddee53a82d42af8d7def9 SHA512 c3126d78b838d0839b673dd113653f851152fb14e88c45536f3012089d2c48c5d01e0e113ef69da7638f702a6fe8430c920e4a805b6e2641e58871c880e80e0c
+DIST firefox-84.0_rc2-an.xpi 509097 BLAKE2B 9fec3c5f31e37a255944ca0aa6e085de425615c2af58ea9092a4242737c9b13837d72d3d6dcb596dfc6cc0e1d651c97d98c8a507b653b9c35aa1eeeac204c2ac SHA512 b7588064c7ef173f3ebf1fc72a1a5fb295f2e223d9cd00e3a116ef05d614bf14bbb11be806f57c8e4a7f70da155a4ab959bada7be5bfcfe9767526c1f510fa6e
+DIST firefox-84.0_rc2-ar.xpi 560423 BLAKE2B 0115df8011b679a413032f86935822dfe00397326bcc94e3f6d61295fc395ec1cc3ffb5a362f0a34e04dd907fb9d43538faa34c8a340a4d185488eca567513b1 SHA512 ef27f556f03d441041aebf2bc99b588c3024bdc8c4ae1746c30eab12e61a83cbd926763beae0ca7b528f693641c4f41fa0747562719c8f80e5db1f36e2b9b956
+DIST firefox-84.0_rc2-ast.xpi 457475 BLAKE2B 5ac57b38823025182fcb118798e433d41e0bb2c34c4434fc1d45cc2900c5f3e7258b0d5740008c1275637c8d53bb42a29f648422c99222b7abfc20825e1069d2 SHA512 2e4231166b598c31fa66e2be3243b09203678ec1f7b9d793e92e5a3c1a0408ce7be184361c46c8a30ed1dbd69bc987efc044131919c8d61d93c5fbaa29963286
+DIST firefox-84.0_rc2-az.xpi 498628 BLAKE2B f216718470d8330a3fde18f99f9bb5b5deeaaafce272416f97e01e0084b6cfca2aeb3ae1699c0564fa326c7d6a7afcd2840304a543270da295e73cd512535e50 SHA512 eac3a0f0f794de2ca1e236733fae8350e994e7410d3f59e500a74412fee294225884179222c14f5880d5a92b847ee7094626bba332b0809972347997c96ab92c
+DIST firefox-84.0_rc2-be.xpi 606518 BLAKE2B 7a8cd9e2357e7daf2e5f38c92f6b865a9162a8c80f71be9242f8e33e9beb85b149f15199ecc11573a45fdf1edad4772f3e6d33855e3aa230d7b23c790e7b78ff SHA512 38df8548454f6698c9cdf2704aefa2de37abb31b0b511843621846e71b8202acb7a76abdd90e75c379da1f3b26eebeabe34b8acde6cc4867752e31492d581cbf
+DIST firefox-84.0_rc2-bg.xpi 556446 BLAKE2B 4f1cc20d59da4d05b2bb79b64820169d96a72f2821e7949d670007d4e67b2a3c29c5591b2ab8ad934f91ac328baf0baea3a104b28c117383678cc16b69328f13 SHA512 46533e5376ef90f31aab2dd5c2ea0a3a4f06e4db71356ecd064918fc6da3355c48cd7e6de1ddb0e4b0c450cb7896918588cb295762d12e9cdc881338114c4ab8
+DIST firefox-84.0_rc2-bn.xpi 573381 BLAKE2B 937eed4b5998d8fb414e3f592f3866580b28f87398b33ca620a59154cdb63b9c1dde57a4f05913621d70e4bed09a763e2b022ba8ec42b394779ed18738a211cf SHA512 1eb83c0ab9047d9c610a6bfac6749847687afd6029a737de4dcf256ea02590d723da857ee9e2062accae6b93eb66bf204aac479605405faa619b490ce6398dce
+DIST firefox-84.0_rc2-br.xpi 514068 BLAKE2B 329021f731c9491f751f8fcde0ffac1725dea2b75c1e8435ebb8857b3ad6066aecc8a42e87b1a71c5da2be6b0340fd26ee49976c4277a1fe8510684e506ee894 SHA512 cf2e9b139b816f240e8887f517357b38879921b134e92fc76321967e9faec6e57ab729917c136dbadcefa4f959f59f2f72bef641c0ffc3ddd82f6e765aba8f06
+DIST firefox-84.0_rc2-bs.xpi 465259 BLAKE2B 5ff4d7f0108e546c11236c8c0d3f2388384d29292df7f307a940d32edb9ab665b31c4e954f6044441f850747adbaa95177a1c054efc193eec9a38ba82e6d6ba2 SHA512 ea94c6682936980ff6f4a4dd6913a4e7f86ea20e94e1e4a5280aa0f7878f63e6a2c7be0993ac47628f019eef1b8a22f37f79968ebef1e50e59563a5fd2a8666d
+DIST firefox-84.0_rc2-ca-valencia.xpi 518024 BLAKE2B 6f92f54d0145227874e0961f6231d5d4a30ace615cbb32901d964dd657c7127924a91b4cdc2ec07111845e68297174eb2f98a6c686ec8b2aa709414f163c8537 SHA512 bb4d2495272c55de39cc80290dd471b89b8dd2f4927f4ec5c104055e14d09d197a4af9c99e6a846cfe628d0abfc0ec5b1a432281fcc4668a33bcadbcd498402a
+DIST firefox-84.0_rc2-ca.xpi 516048 BLAKE2B a2f62b92130384113a9d65fbdd75cf7ccb29817b93f51d153c81c74ecb2636f980f374c3c219a25f38763185fa8797f86f0268683095bc3afd0a57972bb1aa60 SHA512 e684febf56ed3d40219cf2ca958406fcdaa0a16168cd9082cbbd1ba22625c0250f2fbfc724840f08a94d7f7823123a1b4c2bca7b955aada5679d877295ffe893
+DIST firefox-84.0_rc2-cak.xpi 549485 BLAKE2B 74a7c9c06a7c4fb2235ff5fe51ec17fc75c7ffdf58bab72d83559112e55606eda022e5751f113e3ac2fbe51dd8f08f3415bac4161a71e77b4acdb6ac6733d6a6 SHA512 1df79fe13515590090d66bb316183179f542da6f06d6dee577aec200a066cf4b4edddb9a49a5b48f302a4393f1451abbdf15f669e7ad63f918c899ee6b7e6b44
+DIST firefox-84.0_rc2-cs.xpi 540237 BLAKE2B 911d963b0075fb742b808127bfec3004b1dd98e759b36e0fa75899a42a4830e3bde4c585585b3b3c7bd9db350f847dd9b6ddc641974b37341e5951efd841427f SHA512 99ecaca08256882ff399240ca6ee28e2d0f90495e3513f66578811ed6a7173b28dfb10e80864a04e2f2d90748f9d2d8edfdcab0c79a661f84b2c296375eaa657
+DIST firefox-84.0_rc2-cy.xpi 528806 BLAKE2B 49e20f57044aafd440fb8e373362e1624c261651114e1c00cc1253a8e164274ab409b2d23cc0d81c1715fac13fc3a9a96742de06f81b27d82036e449332025b6 SHA512 e5cd1effd48b5c11b3ebf90f41683be05eac91a696c9b17d0080a2eb6da8ac304e01f52819be35377323198a73c9961ec5ee1a3b79ffa2b4bdc8e567550b25f7
+DIST firefox-84.0_rc2-da.xpi 520967 BLAKE2B 9e4eb274e1ff5111725e702f4d17f10e3ee115fd5662d184dc78dfb7a43d6c203806138fb71daf9ec650ea7623ff0ec25eeb2ecb850ac6d47cb573d0d061f3f8 SHA512 11083848657ef34574ce60a53b031ed50428d8c014044e4c23359351c5557de1147a1ce65e211b8bd50b7da9a06c78a600fad0a1de073088149501df2074a491
+DIST firefox-84.0_rc2-de.xpi 540878 BLAKE2B 81781f04940cab3384f687e02f670141f85a4748cc45487e85355f1bc7f69138e6b83c60dc449d9113631dc0966859629d2b196a7a1525f7361963ece317aad0 SHA512 4609df0d2a1cc37860f906fadd730050f85a6e1abaf63d40c10ef823be233f795879b0e425a48533ee8b51fef18d290922cf31251916c5272a70fbcc0a8a5d16
+DIST firefox-84.0_rc2-dsb.xpi 552194 BLAKE2B 8dc5301f09ec189c7dbe2f2b92e77d65b2a7bb567edc8cd718eb19e461726c1adb2f28a65231781658b2cc9db1e765559ef8fa2d3c9b968be32710af755f9844 SHA512 665b70959e6664d76808b197f192972904b7646daec8e18e8c3f3e53414e0d016c05f0fc1a1a03c5cc9573b865690cc7be606cf69cf857b6c28791a252adc154
+DIST firefox-84.0_rc2-el.xpi 623759 BLAKE2B 16dfb6ad3a6b031a2191703f891f163b03dfee795f240dad820180f2bce703a67c649fbbf32d8b4ba089c8225004585a3499227ccfdeb63b17f0e63084f127b7 SHA512 5dd6b636521050ed39bc5ce578cf868004f3df4ae4e928b9fbb6e8ea43ae1b7d10c117763f900ea3732723848b1a24bd7199cc8ae57d9e6c7cb363816b8db479
+DIST firefox-84.0_rc2-en-CA.xpi 495297 BLAKE2B 6eda43e4fabc0b810db0d5fe73fd9b75af7eda741fd0e9ea02044d19126f70d73444476ad3147c579840d06749bea9bd73dd2b4fdd5e049b121ffcd17653b2f7 SHA512 1376f97986e9f3cc1ab5ba3c35f411fb9a2fadc51ce69262e2854f9cf15849e015219fe30695a866d195522cda6f92d30351265bb070c334555c7d3a4454d0bc
+DIST firefox-84.0_rc2-en-GB.xpi 498711 BLAKE2B 71ee131bd910db8263a1693ee4b85d119684f8db9014b8c999b4e7b5132f9d7bebc2d1fa0aec6dc7cf1115e6e078a3dcce8db276f0415987e696afd899cfc1af SHA512 1cb5291fa3940a9b264d3d76a375484e311f211c3788d08fcc184af26422f7f011caafc6c12257b25cc406fdc1496a1af54dab19fba3b6858aec095092b86847
+DIST firefox-84.0_rc2-eo.xpi 523250 BLAKE2B ecbd12fbf7177f7115335493b35d0c1ef9f0f80047ff7c1cdda81e6d071b7dd7ab5b194c6c3b4d982c2699a38a2c9fdf6a698588bda390c528160b1a6434785c SHA512 388b85e1210fec6c7bda8ad24d5823f2bce3f64d5c5a9786c0f3f18265c505d2741cf6771cb115a28829ac82d2107f4cdee00ee80a058e2a093517deeb38f14a
+DIST firefox-84.0_rc2-es-AR.xpi 533690 BLAKE2B 2b0650474173567d19fe748d3c7efbb05236db428c79862f81ea27ad28566422710414d5a5955aaf5de311886a08f1f9a27bee3bddc3e668ba82d099b7cf29c7 SHA512 c118b299a49262382e92e8d45af703ed8a1698423bee1ebfdaa45621362b81d75a83ea6795b76a4b4deb11786cf304b66ccdafaea339683d69e49fe4f6eedec6
+DIST firefox-84.0_rc2-es-CL.xpi 533179 BLAKE2B b5ffd7c0ee7b430c91b06fa67d2d693a6d8f756e66e622f442987e3ff17608d9ce165e066bf5831573acc186e987dc78a8ed1a187e96eae5a8f146310a7478af SHA512 8f72436d4b729c90f45dbb54e63a3daf649edd32ebd9b41f0bcfbac4c588de0a27ba3c1919a0e24b63ce5eb78b584a4d6d4849e25526135784b49c00ab413c13
+DIST firefox-84.0_rc2-es-ES.xpi 523075 BLAKE2B 18686c0e2fffa39c57477b3af7ef41af841360528291ffe69134c485b770104ea3fc9111728f181589bb7bf573a2be12563c6b4b0ec7fa987cc8166942ea851f SHA512 dd352069488fac98e6d0e25fb3fe22c8de27b5a98017282465862688bf80b1a269d35067ec29fbee7821fe0cf37ad2ac48f2f78c330f057b65c12d8efd57d63a
+DIST firefox-84.0_rc2-es-MX.xpi 531352 BLAKE2B 23f40903ab55599da3e7b05993fb8592123f534adc16f72bb20511a1c3e4968eb2517bcda7674640e0e73f1871c8bde9285a0a67896272fc49e555e5ce88071a SHA512 41f763658f5c2d695e5dcde060720d44a0525cf90a4cf388e0176c84e34f88318924ee2bc3cb6ed7bc4c17c0d6cebf5ed2c6a2bc68a88b7636095ac54614db78
+DIST firefox-84.0_rc2-et.xpi 486956 BLAKE2B 9e1cac6ea7282b9feeb3490ab2af13a7d1bd811102cdbc6d8e5f0d515c3bea4d29dbb96b51af1855016dd074c06a48780a6066d7220e503d31e0094e4139a731 SHA512 c2147c091c15cb23bb46fee8f49b75b83b6a52d9365bcd547346ff88ace5abdd8fc8fe8803d3a406e50c76372963dd1384512fc4a95a697d3592505885b25a63
+DIST firefox-84.0_rc2-eu.xpi 515146 BLAKE2B 76c18f939759f3a5c9ffcd15ebb20989981d8afbd558800a9053eac8232cf6f4e3ce5835b977013556498613aeb768e079849a21f007987e73f5f0a3639bd793 SHA512 8b2d1433602759866bde880be814bbb72c425800484dd3e14c7a4297f3cd5438643e8566083725b74f43547108ddf4ed55b8be8c92531ef6a156d4e77ba8de80
+DIST firefox-84.0_rc2-fa.xpi 539669 BLAKE2B 3dcd55ae21ed195fa8cadb7175eeaf6a1eb885c5a5823d8d0ca745f3f05b7d4823bb7ace5aac711bce60ba14a88de28176e57acc9f839faedf933a3edca5cea0 SHA512 5f12a0ab05d16f72d353340eb5703ee2b0271e6474e7dd7b6cec2f09f7cbecfe1f03e7fb21271f64f5cdd29eea6ad3c7f5129111fd5847977c20d2d0976af1a1
+DIST firefox-84.0_rc2-ff.xpi 483215 BLAKE2B d8c2ccfe15b11849edbccfd4c845dc6a2fd84790318dc35adf814e2fd92eef69bc9c9511c9ff9e285c765a99501aa69169d8fe182553ffdc47b19693deeea03b SHA512 0479ff9398a13a14f5d4b29010ea7ece976b9247d0428b84019f3fb1678641026164b16fdfb055ed2dfddce2d558d235309e15ad6a19974aa18d4349ee4de3b3
+DIST firefox-84.0_rc2-fi.xpi 520032 BLAKE2B 9ed493a7b8803973a7b409eee2cb12942d66f91a7b1fd660fadb0476cb085d357c17657b35f8ca550a05c6b89d93b00956e5a65a99d7919a8f39af94e13ab7dd SHA512 dd6e3e07befb8bf70140c7d2198234caf6bba80ea8a06ae90316f4378d701e3e1ceaa4c1dffd6f5d61812bb706632b4ca44b5c0e20551c35e8c28d00615a918d
+DIST firefox-84.0_rc2-fr.xpi 544370 BLAKE2B 588c217b9e63d3a38cfa8636027faa4c1a9d576afa4ca8dc10d7b5566e4bc0a9c8e42e47ba7077d99a61ab851270f627b099d32019506208afc0825d3766af4f SHA512 d64371fc05bc15345dd90dd4737d709086d7ded2503ec7da7cb35eccc302381239429d1274c1e1ba0d7cf82b4c978efdb22bd4837011986c4197804c8b26f354
+DIST firefox-84.0_rc2-fy-NL.xpi 530307 BLAKE2B c6096e2c2b35305038d830c00c7dc73e8ae3d579255beeed14383c7b62f5ddff9adc692d826fa20cbe5f531e384f8f88e471bc66a89fde656fa0c7c8559e8906 SHA512 0b21d7fb5004e55c1c4be688bb3383ff3059d751fd23fca745a773ec627a06b1d7f56fd3e0f486394a397c722c5441ee1c755af3fa86d11640b567cbe8208caa
+DIST firefox-84.0_rc2-ga-IE.xpi 468075 BLAKE2B d759b55ffb0f398a9deb762c39ffea012ec85d87b455643eff3c1ef1b3a44577107fbf1ef8956c0d74d5e1bdc7581a1bd7473dcf1fd312c914ed023e839df445 SHA512 eb437b5d6c4089fb131f3d5f229aa373e5cbbd076f8bbc45549c344e2948751514827ec0d3d448a363b92bd131d62671f1ce10b663e1dbcc01c1fd983adbcb16
+DIST firefox-84.0_rc2-gd.xpi 493516 BLAKE2B 1037c3f205641bfe885f5e600727448860232a651deba578c0610d3d90ba50130886283df77b0626a027e3ecf7222709a94dbd0501d0cd44fdc2a8fbe5150d74 SHA512 543ec33966725dec1372160d8d3ddaba7ae451e8b21a6bc518ad597650f5733c8d5ceb223060fd69281bf1ae3ba23a2dfb883d9cb754cfe92c8649040108cc32
+DIST firefox-84.0_rc2-gl.xpi 525668 BLAKE2B 74c39adc9f6db31312791d10ac3d940a23cb555a9f3050217314def36cd2a9fb3c6a4a6a006d247dac5e15cfcf5521ec6c83e6cd68efcfd3c632ff674449a68b SHA512 7743f39ed34ae15424ea765efa8856b3dbc58796ff4364092f3f8c7975c720e176119fab05556344204d40305004ddd21ee884c9e65ffe855a3bd62602b04ae0
+DIST firefox-84.0_rc2-gn.xpi 544450 BLAKE2B d5be0167e742bba97b47f40a06c6b1ff486413f3fb805b4bdcfc0ca21c739503f77844a60adb38419863503cb79d76ba15c53ac7175ac38b5e30dc226a5b29b9 SHA512 faa90574a4f47676f9c5b356abf1de6a285c1b7366916a5e624324987c007b3373dffac6c8f0fc4029a88dac9c08183e4b1112b507cd19a054ddde1200334bff
+DIST firefox-84.0_rc2-gu-IN.xpi 542131 BLAKE2B b9cd3c18a81985c0c2ec8368f92e061e5467c008dfa07a0f731e327b802c1e6ae785722d2047a78553d2eb179312ebfdd970304f885996ae4b64fabb575bdaaf SHA512 917bff4e7804602abc0d7bebef64a32fe88505f4e674fb4e933fab809159e3524dbd74245fcf3ee4d219e05482e2a365e94d32435fc60ea1e0a6306132cc319c
+DIST firefox-84.0_rc2-he.xpi 545459 BLAKE2B b8e362c1934fbf3252376ea8e48d166cfd789c579a2e3de84e75dc12063545a40bc53a27015c457d31e07ab8850721f73daa8f4c33eac51b42f54f3ad6966349 SHA512 bb08fff90162da945d638ca91972e4171f70ce8bcdee2bf4da4f090812b2adbddea0fc2e3d723f4a13918238c53a53035203c7a791ebc8332e96960bbc1d389b
+DIST firefox-84.0_rc2-hi-IN.xpi 568117 BLAKE2B 8558f28a8de278d7dc930cbf1aa0dc0c59a07dd42d54df6209309b24da1d9bb5ddbe6b4656e7ea9fe3d5166214a0b76d5c2492fcc4b5b85bda2d826a2c66f240 SHA512 99bac65dc1507ee222de42f510bed1131775a690a03e77f75526c052728bb23b3deef8257ea04f0f41aa69c634efc11f663fec981c5b5d0fb9077d923170bfd3
+DIST firefox-84.0_rc2-hr.xpi 521280 BLAKE2B bbd3a3e7df2d4b94606bf93dc9bb7488c44e5ae2c510106791cbef6276fb175af6e827d49e48eb8c991547a6cc2b81f2aa92c4562417cb5f4272b711e4f2c776 SHA512 942dec01e67dd7fc33386e953177c2a58d545bcf3ba877633a9f235e61b5f90cab93c20de930e9b7fae7629f72f60eef719267e406962f62e907ab4e7ca7e9a9
+DIST firefox-84.0_rc2-hsb.xpi 548608 BLAKE2B 370a625b4e0f62e4512dd04813274eb6305343c8f89a0722983cec4a669d70b09f65a6f24a322dcfd90cf86cebc039a0fabe38b884c83ad8cd12cec3ef29a0dc SHA512 353425b683c0f399b44b2fe82a6683fe2723283a9e6297d2c1f19a483657a94294fe94d809df9215c9e7b31550e08166ae0c78631d6f62c55742b972695da873
+DIST firefox-84.0_rc2-hu.xpi 552400 BLAKE2B d92610afa9a2e8646e58cd648bc79980cb4017784b8ff0820908af3a086504ca6acbb03d7cbb4cd46358b4905ddbb6aa5b86423fe132453091d071948d177088 SHA512 34ed86b42507a227e8539ad05537b36019abb125991af9554938dfbc943cbf34bac596b5255a9064f40ce71ab9da06d3371267a5af082cebc14d31d862bb14d8
+DIST firefox-84.0_rc2-hy-AM.xpi 588505 BLAKE2B 169fb77296381b8fc2bf35b2bc3168607831fc5d280f499128cc5c21e5a94d3576c66f9abc8a33b9692693306cabeccffee08c0443dcb0bfca0a26e032007b89 SHA512 9f561276069db8d22ea0dca1b2d7d01d16be40f0ceb6355d04a0e112e10458ef51d7fe20a4e4f305d81192b2a84a8ce4409a9a397605e58f63d2cd7a21e1dc8f
+DIST firefox-84.0_rc2-ia.xpi 519833 BLAKE2B 37c6b380fc6893e7b69d992702d3ab0ae1d8bf8c3b69b73924152f1920c211efb82ed36f216536e003b350d4ed8338233865104c2dac5f8743f510f51a4aee69 SHA512 5e4f997591c833b6ea7a9a95fbad6b9e81f466d5c63a9354af392925e351a0394cdbe019f1d196441aafb53dbb5e1e3e2b05ff6875b5b0145769137f31c045ea
+DIST firefox-84.0_rc2-id.xpi 508516 BLAKE2B 7f8efb44922e23c12ae76fffd74361608985a7ccb6c27d7bc8d63c9bae44dd29c8fff111c5bd8a5d0080603eaf55d477f473ae051bed8d30872c109cbeb53797 SHA512 107d956cfdec21ac694392677368650288dd12dd8d0380f64eb11b389d6465bd77e79ae21c1e988fb7d34e7bbd63786bd9e170dc66b885211c7e3cd53d8e338d
+DIST firefox-84.0_rc2-is.xpi 478791 BLAKE2B 0724bd45c1238d1618c2fa061054c670302dfa435bb4acc8844c25d1f10b1e55d0c9540a860ba0f6ce9a78df71c00bb1286463c3369f9239714e29b27d544554 SHA512 1b1eed4361ac49f1bff034daa55e61c8b1107d3799921ececad5b50cb83c6a405e3d435c0556836a642517a68aab57016aabfb6d20c7291d4a3d4cd4a5facffe
+DIST firefox-84.0_rc2-it.xpi 448146 BLAKE2B 3091bb6885e6a9f789599cf4ea8ee6a7d6325f6331f854d26aff5f893485c0a31b751c5bf0551e31892e5ee8fa634ab4a4b252eb65539a5296c378ef8e0da7bc SHA512 1417fe583b15d8ee2828203c68bdc678aae42307c25808a2fd42cfd7f3807100ff1ee95ba24296c64c4d56a34a9b5900158ee9dfc7d5f0e377cbedea69386ca2
+DIST firefox-84.0_rc2-ja.xpi 578212 BLAKE2B 234fdabde2b7fbe6111b63b95913d81df3716f7a19b8971af7def7cb5c0f8dcb0b2d9a40f7248934a921be1ba9784f09a7da7b9c76bc20f73e21cdf54fed7251 SHA512 bafe651eb25111285fb7aea9b5a521888f765308e936717a03007869e5a12072264fb62478d57cc35688bf2fb0f27d48ce11c48287dc1bb7481bb400e6734be8
+DIST firefox-84.0_rc2-ka.xpi 579062 BLAKE2B d1529de4eacdadb92a63fc44a48852ef97bef9f906a942ac0f7fc88f5180a94164c7a3c8ec2ec9844d1b4111bad896f5c4107c0265b08062f59eaf2cd3e429bc SHA512 56ced5298207792b70095af56c995a6132ee01b3cdb93e7e16931242ee551f5b2e669ceb364a8c4de0be6308fcca6241a2ce809457dc9b1671089b1eb0879b19
+DIST firefox-84.0_rc2-kab.xpi 538415 BLAKE2B abbef783d3be5aa8ca03ccf39158d76da9acfae4449c7a0bf4d31f70fb1715fdf2267d32145f05ff22c10062e5c0ed581fddb2261bb27524f9a0b313df39ae31 SHA512 c52331ef04493704ecdfed737f219b0ce6c315d693a61d1cf6a96cd42898e61c5f1591b76356aedd7f4d54c913b1ac9e27e5ef91fbc27c71801bb6f89ce834d8
+DIST firefox-84.0_rc2-kk.xpi 591073 BLAKE2B 67c7b0ba48e421959d4c8d78ced6f2a8d46ba7b8b48335f5c2eb18ceaffc2009ce0ebc76b3bd5d9156b12df3bd3052ec58ee9d4b858f86c66f93637ccb12d4ed SHA512 a9fc80442d21e32579f4b9c762ff7b5dc2ee0c6c9b5bda989e47395f4429a799186bedf851eb3c459fa484fd90101e081acca944e4b46492d3d7c0d9364ff0d0
+DIST firefox-84.0_rc2-km.xpi 527421 BLAKE2B 7da031efe0c190825e552174d0353037534685a51e1dbcf59c78794c4022648f48b5dcd8b5a62969b29182021e1fb74ccc115e25ab3dd403205ddfebbfaf2d43 SHA512 1ef08876acfc5ca2b373b4c2ca3170e16dc051b9adb6b39556af1459dafbf11f59ee75e0813593edd9595d415276dfc95313ba4a91d4783e074d6edd9fbf0694
+DIST firefox-84.0_rc2-kn.xpi 506722 BLAKE2B 6e5593a54ac53e5b043d0213efc19e807091c35f2baa496c545a4720cf04f42c8869bfeb8140a2260118d88d05cbe70a476c026477d2a0f49476f7e8102ffb7e SHA512 3af28d4dc181684e31fea418a8f7f73c44502ff94f700205bc3902b4020d17d6e6897c9ba13491dc69a9924fd059c88cbf5fc2c36615683ecb645494d400c0e5
+DIST firefox-84.0_rc2-ko.xpi 564760 BLAKE2B 901ae4704cc773229a57ea5fc5c0a0c57625a72da1b31103794e9d71b74e89ae35d6be6189cb29ac7a3abb0b016cd04308e0ed71103849f57c2a32622ff9c825 SHA512 768bd3f3a98b08ba64ffbff81e5ac8edaad7952782b9950118275ed031b95b496f84f44c2a68f57cb3a98e71aa71d372fe6437328790035651837c6a8276dedc
+DIST firefox-84.0_rc2-lij.xpi 476801 BLAKE2B e3197e4a1dce7c0e0bc7671fa91e4caae87a424997372cd59d759f931af37da447feb532cbaf58a761703fc1b38a2d08e95caf1d9945b90cf0c047627fe80c43 SHA512 620eddfa2a5d4924049619a8c2e423008d0ac0bd237cc46cb1ad6652cfac47fda1550c75eeb6af8e60f912c0953d05621a8b5cf5e91bb659680022d6cb5a3cca
+DIST firefox-84.0_rc2-lt.xpi 547521 BLAKE2B 9c162d0274be61db4ad13c442f6b19b13c10b3db313d35316c9fe5e012334ead7bd0e592526a584f677589ed837ac16efb335f8148a05fb169d54f41bdaf4579 SHA512 1d4475f26914402122a02afe1251f9af6cfc5da73236488499158201b7e0287ad54c35e173aed0e1f96fe65199aaec5826ffca4a70048ccb8733c7b532f78b53
+DIST firefox-84.0_rc2-lv.xpi 470838 BLAKE2B 0723004f21ffbb9e07758b38fba0f93d9b484e31e06d95dec66e53d4cb8e472cbf1196dcc3866ac7370a29b0b44062cfec608b5690fab6cbfaf68a73022b01cd SHA512 d10508bbdd9ae7405e5919274355004aca5c808a03e1732f599c17d8bf0df707c126639d86d3b9f715c118af980a7dbe14dda5108ff2859cb1967b167fdcd37b
+DIST firefox-84.0_rc2-mk.xpi 459831 BLAKE2B 2864907c22e4bc0545a414410f0887ad8dee7776d5c8c8c3d99289cf9ee25477960278ea86bcfc17aaa77f5fcd36457b66461151f7e0df9a924b5a169ecb58a5 SHA512 6debaa3f9da853f4e60b126829a5709ad993c6bc8ca8a1c949af20fff4f7d3866bc3c72c36bb52b61fac9c7a63f006696af0150a7b8a204ad0b2a8cefd496275
+DIST firefox-84.0_rc2-mr.xpi 541986 BLAKE2B 247dc8533e4da3b2f2dc2917acb2972b71a3cde024ce328328292175dea118eb317577890b0ce829e25e16e0c30e0a82a49816767a38894b01146939d6a32eb9 SHA512 89fa00cc2f35be93706f7c2b8ab4dcbacf736f7ccb03b9ec7bd185b33c8794dd7e40f9510a825ddedf52115664830cd59ecc86ef3b2693e2f2023f8adda4a8e7
+DIST firefox-84.0_rc2-ms.xpi 454818 BLAKE2B 81f519f36280ac37f0d59a908a67fee6191f6091a6f59cd381b27fa5597d72a99e861d39d81f3bb4d394b1b129551c1319e29c04b2e63e5394c4a07915b40cc1 SHA512 2ae0d055d0eeda776ec1f1fa6c3d1e5560249c9ee9a072a224f77fe2402097ac7f3b763a3e4cd775536283492705c6bd59415a820f7173bb1300e7cc46f384a0
+DIST firefox-84.0_rc2-my.xpi 526534 BLAKE2B 3be79cf648741b353f91ab0c42ec4b71f3a26b9980699bf214cf2c5fcbe026c34cf72dd70bdbeb3d744260b41d233b907d9ae94f17f674e265c741577129e7bb SHA512 212dcd854747921d6847ba7a2c6bc8e5023be82eaa9828c04db6fa21e688ba23664d39da7e98d80459f486b04147ec20ad2dbdd25b3667116d15b2490cb55f8c
+DIST firefox-84.0_rc2-nb-NO.xpi 516940 BLAKE2B d0e48a82940544de259b6dfeb4282bef74b99c8331529e0bc48858480ee3c587438c2ac4795bfc468418ad10e8224b84ef18816e59e17d69b1078dd21c83a04b SHA512 434b590d37f6e6afe4b06ecf75b0d90fd0027f4c7b3f30b6504e5bd299a70541fb3ddabfd055d63d37e28c205c2f2d23ff18961be7157ebcd83ec4d56841c08e
+DIST firefox-84.0_rc2-ne-NP.xpi 483422 BLAKE2B ab8ff7c5d7843ab09f2fbe38861de1630c638ed209aad6d8fe50f5c38f04d4bea213f4f9dd8574e12ce4811435e9f2fc5eedfff4a4e1aff55ab7fc23b1ce1a46 SHA512 a242b814d5784a706e66b4fe1acc78c1975832c9505cf2cba9ff6cb7c874ccb92d7de5a1529490e653d68b27c11a65563a15eb8fa5b6b760799884e5d0ac23e5
+DIST firefox-84.0_rc2-nl.xpi 524180 BLAKE2B be5f35999738efe1541ee995ae20b69dbc971e88f24f9a3eb45b34bc87ce191299063f24344512ff605525825ab7044f658cbc32918d5849717ec837f25796f4 SHA512 ee25952eb92355a715955b10fd316855c07f3ce98d36a539c4bf8524d87d2b4a11442263dfca98be61037c6033566d72ca59c08ce6ab265d715eb7321b37ebb6
+DIST firefox-84.0_rc2-nn-NO.xpi 517871 BLAKE2B 498ccb8a7eba3a18ae17a2c21aa25e6edad271e52b0aefcd6d10251eaca59e425d097c162858d36f4f69dec6bf427854760c54d6527949284b955b21534da767 SHA512 2ebf336b522b02729451d1935c8ad5cd641ee7b35dbe45212ade6cdacbd521f8a98347fa726142c4bcba7244b038d814939647939d67386d2177f732d08da094
+DIST firefox-84.0_rc2-oc.xpi 540039 BLAKE2B 94976b7c70a8a7c23c4b19845764bf9f46d9bf43fecbfccd297486446582d7180f9b1275f97ed14c0ac7cb3a3e3d8621549efd745db73f20838e0fdb40581760 SHA512 de3d81ff9444aa3fd5e430e627cd0661291e7726f72d6eb4f3dedb798be681d6727ca91570bd8dd476d272e2a7b9f3c0e30c900c53a837ebf3dc5b75e583ee78
+DIST firefox-84.0_rc2-pa-IN.xpi 584968 BLAKE2B e24b11578e837c8782ab79469c99c122fb3afe99f43657d28a6b05d995d5125ca3402da29a340046b98b9e9eeaa5eb2d45b247fbe8919a903a3363d4001acf61 SHA512 2c5a93d2b1c7b1bd62690b584f9fae0b99fe1da8ddc893f7b48bd49c98d7e1e9e32103d5908d1f980b4480b6ea93c51d4f33764dc2b13371377f178887ab043b
+DIST firefox-84.0_rc2-pl.xpi 543364 BLAKE2B bd878fd34c11bc8b36ff8c6436fbd2ba4283efb090bbc1372f31299cc1a0430835b7bc967ad4ce924b21ba95beb8e75a2b8f86bed67807522fc21cde57f98420 SHA512 9de676a9afdeae49334b894150c33ebf91b9cd6db78c35a5824ca207c0a422a30a49719db57ba67c25d8e2cbe270e51426aa03a9d68827aa7deb9941854c4308
+DIST firefox-84.0_rc2-pt-BR.xpi 525590 BLAKE2B 56693b298ae9e6754f8d3ad802882a59bb8d016f12a6a8e7840394be513ae4e1a1a2be677eb8c43a1b1e029bd3fae88806a7426df22c55d5876295b7ee9372b9 SHA512 fbf57b157d4d474522ba4cb31b774bebad799ec75b4afbf68fa4ec11d1b6bb41623598783fa975423df685024a57a7eb70211c5fade64afb598c31b7e7ab2cfa
+DIST firefox-84.0_rc2-pt-PT.xpi 533301 BLAKE2B 15d9eed4fee4a3fba9c83ad0909f313b00502c70c31dc802da03c8b4d356b8e7922c7b919f98ef64c7cae6484b9e7d030d83a5840892cd8d81516339e0836c80 SHA512 b102094758758c7662c459b40f8d181e034770fe6f34142167ddb916ab3f133dcbd45ae9538b604555f3ed5ccb1c1f2616ee64d50253c5bf833d15eae0dc7f83
+DIST firefox-84.0_rc2-rm.xpi 524840 BLAKE2B 93f6b85342a3d001632c1b55c743ef2d20b865ce5014418710d6c5de57e451962d1ce10a1180ecd451e15d91e14834c363f4d5905fb4d660361b4f071ee93f5c SHA512 c2d31fad67a619abeac29209e8180ede92957c99725f7f491a63b80469583b9b035c243a0ca66ee40502ec8836c163e6193b8c1aeaa96f9770ea1e3c3f91c5d9
+DIST firefox-84.0_rc2-ro.xpi 532974 BLAKE2B fb955c802812ede28c21ef3e4b443cfa44b9605b657536341b47eb78112398aa1663636ba2ee36663fc46f1bee62e4c2132d0edbbe14acac4625c1b8470db9d0 SHA512 3cf8f3ae2e8d8f9f43a49fe96a9964c777ccc07f3611b9ca89f8e76c0d73c54ff343a2bf246cec60761ffb5d2c0ea1c0a0ee0f58aa6cca52a8f1bab596655e36
+DIST firefox-84.0_rc2-ru.xpi 611900 BLAKE2B 53c020614b0fab742c516eebcd460226fb21194525704f48ebfac0f25a654018eac4496cdbc55423698793221b9aeef4828f5c8ff3d37ccb228d7d467f50223a SHA512 7d19e6098368efaa9d8ca1c20dc49c9c72cd290018e3404c2b2d8e3549b7a7bddbdb3fcd295f36e9c8d4d4728eb23388d6ba1e41198979e4f80261dfde4c5f7b
+DIST firefox-84.0_rc2-si.xpi 492927 BLAKE2B 39491dff0af8598e80607498ab8c44bfc380aeab3e528a2eaf133c7615d146da00e80cbed68f1596a98d32340f0cb665faea3aa3a1bc9a353814491a28dff6e2 SHA512 753dce591d24e01e5af2cc11ee8079e13e28245ea4b9c778c4b5d9d52e30f1ff071157b1cf6b06df28881f67f7074bb379d62dbdccd8867113c9ea338e3b38cf
+DIST firefox-84.0_rc2-sk.xpi 538496 BLAKE2B 4466298c0ec6cd8d02aa9dcb0566e0a1f9c94cf3364387bb8139d6e3c526a80e67dc85d9d607e50d2fee03d05946289b97d37b99a3c5648aaad6e064bf1fac35 SHA512 975d0581d9128eb1946fc9c8ba63e1908a9d3f082160e1c9094e7b4eeddbb58ebd4ad18d321817960ffd2afaddc12d49e5ea6e87489eed4542fbfafbfe401c23
+DIST firefox-84.0_rc2-sl.xpi 521132 BLAKE2B 89435b3e5162e9b30ac2c665da3f28a11bfec1b3b971a8ab888dd7a425d809a7585ac98a9dd39435f413d5bf5b31e1bae112a03807328410c3626e42b7c19b04 SHA512 9c0753928253308aa5aef1a9f1141823be100c407aef8272bd6a0ff52a673e7aca314f2593093cea511f932b0f828f3f738e5cee9e7c475c76efd762511d5013
+DIST firefox-84.0_rc2-son.xpi 425706 BLAKE2B 612eba3a59a8aef0802f83235c4ff7193a7d848de93cc3c3274bc46a48806053703cfe282a033194eb6e2689fd1839201f61240dfded06bd54f247b3a0b39d5d SHA512 c9d5392360adb6d807b930a310e9f5f74d5a42d776d0036c0f97775329210a9c9dbedcf9eae311ca1d7e8943969e177eb56b097c3738ed79f2181ee9c67dd9c4
+DIST firefox-84.0_rc2-sq.xpi 542777 BLAKE2B 6a7fe46253d7d51dfcb0d24c977e2b7d393f272eb60b6ea331d3e73e3b5d354d2e0856382a93b14401b1a94d9d6993f2f56169f7fb98781a45a441c38b761037 SHA512 eb690797b435a4cf1695f284c7670df464e06805946fcd3c46c78333bbc77f1f4ce43d98cc4641cd55bfe9a338e7a3f897500134b3189f7bbdb740e81066523f
+DIST firefox-84.0_rc2-sr.xpi 563739 BLAKE2B 1a9b5d9c42ad064b984d3410a6575cc070929b4d0953e985ce81bcb3090fe71ac6b277e1ed6372bd21be5347bb8e3b9788231940ec356fe461fde36bd0b358fe SHA512 7738ac3850bf2deee37706d26b1b1465116aa4f0718f0e181f9ff04809973d2081b2da7a3345c2cafb573a036db8f578e9f8fdc4a9bf634001d157304e9222ca
+DIST firefox-84.0_rc2-sv-SE.xpi 527548 BLAKE2B d7f7cb47dadd89fc67f590522175930502d32bde3f92edb8ca375c691b5a2ef87f9da6fb1af04160fc5c3bea2235843ff52cac4b7b5203eb88172f090e573129 SHA512 5329549635fd5e0c99000222cfaf825c0fef3a2b254336a77a6bc2e2fe83db7fa061da2e1d74ecc76de9366c7ec75f11510e4726ad9cfab1d9f839429138fa76
+DIST firefox-84.0_rc2-ta.xpi 521655 BLAKE2B 801b313100539936969a74f031c915fdae8198a38758a44f8ff16b340bdedcf36fe25b8e8a63de5c1e071acdd6c1896ee48a77d45b40d7c01557a69a5e5f8be4 SHA512 b67ef0540b2f2ca5fcc4c2120da29823d8b8a5af0dde9f28478ae7eed33836d9a08570786c41221d3f6253387de00912c4185cc611a91a9369c2f2122d614f1b
+DIST firefox-84.0_rc2-te.xpi 558090 BLAKE2B 57c0f5ad039d14115eae693f1e6c2bdcacc9ccec08cef7bc4d2dd87f3cf445807dc23e9bf61d6034a1aac7140fee9ec386fea3343cfde4dd3360f032412aa9f1 SHA512 8936046547cb24c3ae804f3ee93df93001d4bbbe31f2cabbe003fb79fd6a67bf2c30171c6bd8839ea3b480ff4b572fe21a7069b3ad4407041f380f70da08e271
+DIST firefox-84.0_rc2-th.xpi 592811 BLAKE2B 3d9554114eac7eda4bcad197bbf5d32109847c77ccbb88275b8367b0eff8badb61ea608efc7de670dfd4df413bb472fd82ad596c3b8a9dfc10ece2169e7ce3d7 SHA512 f3c3bea3f08781ae1ee779994d7c6ac96e70da3f1b580737520edc103673c4b70e6e3089ba4f91424d3b3ff4fc51c8a206666cd0f559c4e8abd1c3ca0c938e19
+DIST firefox-84.0_rc2-tl.xpi 519350 BLAKE2B 9e2b84d5a18b3cb6b8068967d0cf09dd743650bcc97404a80d442316b1aea4414f41a82e67d45764293da15ca645f9434aaf10fb74f42f7be59bd107f45ee2a2 SHA512 30b1a44d64503da7a189ac76481762ddaf4e7062d81a056d283b9c4d3c3d0656084e2b82e8d9e6ce8214036edc67dcbf08db5b806b13e2cc51d792298c4811df
+DIST firefox-84.0_rc2-tr.xpi 537927 BLAKE2B bb52a4ea6b92b42481b7d91bac34a16f6aeac946a44bce52222ba3e5a40fd17f9dc64dffc3dbe959a32b2e9c12ccad7004654e7c28a9fc114b3a6a32e287234f SHA512 32cd31396108437aa01535f7fe87c624e57ce9bdfdd8ee1d2aa66853c01a120ee70d3e6442ec98db67fab71719de5cec33645f15a067a6753d4e545e266c7402
+DIST firefox-84.0_rc2-trs.xpi 500696 BLAKE2B 749a78732edd365445ae57fc64bd30c01cfbfaffa383773274ecf44cc4b11d7277169b5d180e9ee9d1cd0be10478fbcf56c6a8f04f87450571a47026047adeb7 SHA512 e04b3318788ac04ea3dc64784b6aad303c4a6d6ca9b181ad4c341d022efd2695ae19286f539a828af280c67f5f5fcc32e18f0340781dd949ad7c0abc9af00c48
+DIST firefox-84.0_rc2-uk.xpi 606079 BLAKE2B 1afa9118e7cfd1b96aacf5ea582a9c6ee4fcb053087b3d935bb5310b418a81867224bbb22ad18ccba9d08227d4d44c26110da1848dd2b7e47fd15b8b79326012 SHA512 ccfe395b1296ba9a914c9ebb3dd014dd5c891e599cee7809450e22d96e6a6221cbf9cbc529dc49d18bc7b81ec5fd1ea6a9119cbba88414b931cc9d16af5e44f9
+DIST firefox-84.0_rc2-ur.xpi 558462 BLAKE2B 401b9b261f960987ed937109326861553cd5e994eaa2f9232545259b856d3495f9ccf3e503bd8893432e2f149aeb843d667e3da5bc3287f70792d46bb8fcecb6 SHA512 47c0f45d6ac53011272c5e3fe0e560bb4e0d89868010c1281acd7a0759d9dc2991d2a10a228b872c8e001fa0ade7ff013508cabb4592c0779c52822bab2f4d2b
+DIST firefox-84.0_rc2-uz.xpi 478526 BLAKE2B ccb3a55b07d0326468e41d4b01ab5e983dee2763dfd84090033a2ba7eca478103905d86b0db68928c0d4b7f6a1b766a18f39be50854d604ed835e10140f44465 SHA512 29c055c97bca182473ef561438b2de83286e8253ed66eba0c8635e90ab75f12c3fe508dccda827c8121c23688c69e975efe04061b3c2dd8e913418d75ac36f51
+DIST firefox-84.0_rc2-vi.xpi 561447 BLAKE2B b4d42fa556b6b3643de0bff443b0778e8a91a02e709aa99d7e507b30b3f09410a28239eb95488066af7a524a3c1e129091afb84d1d38d36c6faa583be136c277 SHA512 c2f92d1aa0a9249e8b5a6ff6b12e46e5b9fb87ee33d733807310d0b03d03f7ba7439bccc27f445a0b3922e4a2477c0d22109588f24769126ce71a0cc04c4f3a6
+DIST firefox-84.0_rc2-xh.xpi 427849 BLAKE2B b4bf4bdaea6efca72aa902ec4032fe6990ffc32eeba773d621b8aaf650026f7e29f033006350d0ae38dd214f6c4ee759283e008b14d84033e2b9565ec0b2fd6c SHA512 b23714474dd1c10645de3aa3b1bd720c351e51e9e83de9415652d3de0748114ae6340a2585eb220b6b00438310f2b7f35cc5ac3a9ddca800031df046fb6fcf1c
+DIST firefox-84.0_rc2-zh-CN.xpi 562146 BLAKE2B 93fd6fc15bb902c6256384402fb8e7293282e21d3ee1ee17f7d76d332b164737babd92ef65795425f86706bf5c1d7431cb5f37ce2622394d58c2a2797e66da52 SHA512 a8a52bc1f67b65577eff153fc1da6dca9b5620bad829f797d0bfdabe69de727f3efd07001e9398b8e8fc0370b017f851209591751f518ae5eddb616948cb73d1
+DIST firefox-84.0_rc2-zh-TW.xpi 562084 BLAKE2B 2f591031e66d12c35caaf84f81745bc6dcecf89e24115a41cd6fd33844850bf254d74d1b8372e3653b5e38cbd0620fade796dda7821f1782af01f88129dee1f5 SHA512 7776cbe144bf54a82ef56c8cad81ffb2b6596ffd0a32bb9a55eec0c0fff3c7ac412d9375c8dc31d0505a298eeb723b16324e108848e0c5270c9fa608ebea27cd
+DIST firefox-84.0_rc2.source.tar.xz 364652156 BLAKE2B f2d3ce699f78d7534975f422c3147bfdc69cba6af071844341146da29e943862d8089f86221ccc712c40b0b0b70e3ddc6bc0a901451279faa11dbaa4a10b8ffc SHA512 470ee3fa7f2e7489925942997bb66a3161537abe43182dd898d66bf9a2ff2c7efd85db93f7494e238ab5760fcfea12c69a55657c9667d8e052604f9624b70160
+EBUILD firefox-78.5.0.ebuild 31481 BLAKE2B 3cfc52b99887edb2770b466fec58891a7e2065a017dab523752c280e0b1da5d84038f13a6f18a67f168fd2ad0ec38d78f3ac8c3ae250fb1c0765d24a4662caaa SHA512 031fb6e118cef270b861d6fa4fd428fcc63d35dca8115ce9b56f9367142551a889c5f676a249b80b5b06875256e7040b339e45796d70fd0d7e4c3855e2d284c3
+EBUILD firefox-83.0.ebuild 31430 BLAKE2B a2db6f3717ecc60ec77a14cd120723abfa6c022e36cf2053d56be2aaf7a0fb4b57a311a572d54bb5dc159302bf45783a278abc610e242eeb087c45b637160193 SHA512 0f5a2ab47cc65ecd1a6bb701a1b698ceabca875b1d2ec1ee3f7c4daf7bd0e1fa8e6e056d7d4c11ac8211972c9d44757766619cb36fd9164e42b8c1ec780822cb
+EBUILD firefox-84.0_rc2.ebuild 31634 BLAKE2B d7523037788769e648999c02517a7ac8145759ed29a9ad4c1d0b41281ca51d9b7b18801899b85b15178c90068a39f3f0f24f91403ebd392d3dfc3dcea322abf2 SHA512 4f308fc34b0012600ed510a9ebb29c993806f9d0fd6d485c4a3fb3ba0fc1e9ce1c8616dc127efa920cdb83541eaf607365c7071e767ef97ec2f5d56a76b22210
 MISC metadata.xml 2063 BLAKE2B 4c632fd591403d8045cbf3448fd459d82b0433351305fb12322b6a1157c279311ad1a9fcba9af4576f336035f841a95b82ee7a5602d62f1b741748df7443a861 SHA512 75bb3db236d0941e6632def252cb0b90cb374fc4f1dd66e499522e446c5fe8186f57a9898cdade933da205c12b0e70d4e1bdec0d8bfd9689d37d03667eb92f5f
diff --git a/www-client/firefox/files/distribution.ini b/www-client/firefox/files/distribution.ini
new file mode 100644
index 000000000000..680512e3da32
--- /dev/null
+++ b/www-client/firefox/files/distribution.ini
@@ -0,0 +1,42 @@
+[Global]
+id=gentoo
+version=1.0
+about=Mozilla Firefox for Gentoo
+about.de=Mozilla Firefox für Gentoo
+
+[Preferences]
+app.distributor="gentoo"
+app.distributor.channel="gentoo"
+startup.homepage_welcome_url="https://www.gentoo.org/"
+
+[BookmarksToolbar]
+item.1.type=default
+item.2.title=Gentoo's Bugzilla
+item.2.link=https://bugs.gentoo.org/
+item.3.title=Gentoo Forums
+item.3.link=https://forums.gentoo.org/
+item.4.title=Gentoo Packages
+item.4.link=https://packages.gentoo.org/
+item.5.title=Planet Gentoo
+item.5.link=https://planet.gentoo.org/
+item.6.title=Gentoo Wiki
+item.6.link=https://wiki.gentoo.org/
+
+[BookmarksMenu]
+item.1.title=Gentoo
+item.1.type=folder
+item.1.folderId=1
+
+[BookmarksFolder-1]
+item.1.title=Gentoo Linux
+item.1.link=https://www.gentoo.org/
+item.2.title=Gentoo's Bugzilla
+item.2.link=https://bugs.gentoo.org/
+item.3.title=Gentoo Forums
+item.3.link=https://forums.gentoo.org/
+item.4.title=Gentoo Packages
+item.4.link=https://packages.gentoo.org/
+item.5.title=Planet Gentoo
+item.5.link=https://planet.gentoo.org/
+item.6.title=Gentoo Wiki
+item.6.link=https://wiki.gentoo.org/
diff --git a/www-client/firefox/firefox-78.5.0.ebuild b/www-client/firefox/firefox-78.5.0.ebuild
index b51fe3274150..71e7c1a06287 100644
--- a/www-client/firefox/firefox-78.5.0.ebuild
+++ b/www-client/firefox/firefox-78.5.0.ebuild
@@ -61,7 +61,7 @@ KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 SLOT="0/esr$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
 	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
 	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
 	+system-libvpx +system-webp wayland wifi"
@@ -73,7 +73,7 @@ BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
+	>=net-libs/nodejs-10.21.0
 	virtual/pkgconfig
 	>=virtual/rust-1.41.0
 	|| (
diff --git a/www-client/firefox/firefox-83.0.ebuild b/www-client/firefox/firefox-83.0.ebuild
index 600da29c9394..734f512873fe 100644
--- a/www-client/firefox/firefox-83.0.ebuild
+++ b/www-client/firefox/firefox-83.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-83-patches-05.tar.xz"
+FIREFOX_PATCHSET="firefox-83-patches-06.tar.xz"
 
 LLVM_MAX_SLOT=11
 
@@ -61,7 +61,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 SLOT="0/$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
 	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
 	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
 	+system-libvpx +system-webp wayland wifi"
@@ -73,7 +73,7 @@ BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.15.0
-	>=net-libs/nodejs-10.19.0
+	>=net-libs/nodejs-10.21.1
 	virtual/pkgconfig
 	>=virtual/rust-1.43.0
 	|| (
diff --git a/www-client/firefox/firefox-84.0_rc2.ebuild b/www-client/firefox/firefox-84.0_rc2.ebuild
new file mode 100644
index 000000000000..3c6ce4f48f08
--- /dev/null
+++ b/www-client/firefox/firefox-84.0_rc2.ebuild
@@ -0,0 +1,1125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-84-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.15.0
+	>=net-libs/nodejs-10.22.1
+	virtual/pkgconfig
+	>=virtual/rust-1.44.0
+	|| (
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			sys-devel/llvm:9
+			clang? (
+				=sys-devel/lld-9*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.59
+	>=dev-libs/nspr-4.29
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US 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
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# 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 \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# 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.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-google.key" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	unset XARGS
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		# During PGO, build system will re-run configure.
+		# See comment in src_configure for details.
+		unset XARGS
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; 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
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index e6abf8f87703..5983c9e01af2 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_87.0.4280.66-1_amd64.deb 72746672 BLAKE2B 730d100753aaeaac9254794e4bddfd9871bc5499c02faa75965089d935bc69f7f39a7d9db5ea278a0600c3a062d30ad96edaf3b15ee254b300e8dcfa44fb6d13 SHA512 23158dc27fac73b093663dae01568eafe898d3c9335206d8814c747a30df564930152c2139013d393b71f477868f5206c2642ef4ac481ec9ba89a10cf4b74260
-EBUILD google-chrome-beta-87.0.4280.66.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-beta_88.0.4324.41-1_amd64.deb 72773484 BLAKE2B 1979a488243fd01347830036c1de01caac4e0d9bf627e674e0388ad3c2c0364be572eb294e534758a110e0452a96d70089de325985920880c93f67077f48fd1e SHA512 586ea356f1e1e0e06afe44eb3d90c6cc418f98f72ced0029cf961e1c201e44c72b903cc5244b998bd86f2a604e9ed4ceb7f8f0ec1bdd58a9518d88ce0c8c5bf1
+EBUILD google-chrome-beta-88.0.4324.41.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.66.ebuild b/www-client/google-chrome-beta/google-chrome-beta-88.0.4324.41.ebuild
index 5a9c327ca88b..5a9c327ca88b 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.66.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-88.0.4324.41.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index b68a687d8a99..7f2a7e7e431b 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_88.0.4324.11-1_amd64.deb 75169984 BLAKE2B ff582bc5eed34ca53d7b4780993de7039dcb672f97b59565b39e474a49ad1907cfcfa1f009f0310c3989751ec12aeae9dc225fafaab244fbea15dff031316fe0 SHA512 bd3d5641588adc0abe6d9340b5ae690a3d41ddf4319cae038abebd99b646dfbbcac319ff798b6935da55518f26141f12446c9b424c09af59f5f6c91f737a4845
-EBUILD google-chrome-unstable-88.0.4324.11.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-unstable_89.0.4350.4-1_amd64.deb 78080688 BLAKE2B 24cfb274aea768cc36718a8be07a91c4bb496a3f9218864ab4f3f0c9dcf0d50f8a8e725f5c27ab77c66de01b18c5527cc460c72617e1e766e684f7c871795909 SHA512 ad5daeb4e982173fa40bb405c0f7470d3988288c8adbf22c5dfc282c997d5ebfbf69b3916077c37a141b03abb38f2eee799a79ca8e4f0428413a8976fe53e54e
+EBUILD google-chrome-unstable-89.0.4350.4.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.11.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-89.0.4350.4.ebuild
index 5a9c327ca88b..5a9c327ca88b 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.11.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-89.0.4350.4.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index be7fbe2f479f..ab19f07c9699 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_87.0.4280.66-1_amd64.deb 72726412 BLAKE2B 81902234ab4c7df0994eb98aad31f526b05b281f46920e64af492a5f885e1dc6619979006b3c34c2954f952f1327b57e0013edd2bfc634167be94d660aa5402a SHA512 c4c173a69d59c05f5b3b159fb3ed3a6b09e880083adfe07cea45b9f7a592dc3eefca70676b5bae66e679f1030c7459523f99dd61c9a28f676bc7a91d5f72662d
-EBUILD google-chrome-87.0.4280.66.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-stable_87.0.4280.88-1_amd64.deb 72446160 BLAKE2B 308e73cd83f3f760bb5f6cc6dd077f3b6af9c986493bef76b6aba505bc8105746752df26e05e7d557ea45bf1986f61ab0011b85a6613ba05033f4c93764ac42b SHA512 19eea1d1be171cab60ce5135572da9388b4b72e313118478b53f65c0bf2293733809282736b98ef828a208b7426e5191258f8c666cba7510b8bf5c92d0010a47
+EBUILD google-chrome-87.0.4280.88.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-87.0.4280.66.ebuild b/www-client/google-chrome/google-chrome-87.0.4280.88.ebuild
index 5a9c327ca88b..5a9c327ca88b 100644
--- a/www-client/google-chrome/google-chrome-87.0.4280.66.ebuild
+++ b/www-client/google-chrome/google-chrome-87.0.4280.88.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 952417a16b32..23587b4fb862 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -3,5 +3,5 @@ DIST links-2.20.2.tar.bz2 6474383 BLAKE2B c69c421a85114b3dc0d7f2b37ce5454655b426
 DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
 EBUILD links-2.20.2-r1.ebuild 3523 BLAKE2B c274db743c6eb206a7576800b5a86d60568d456488b550b6b1977844fd4ec9768e423af9c2ecefca7c75508021289a6c948a819eae7766f5af30d75090d861b9 SHA512 1994bd36ddfa75cb55b093acb0bb3b36b282634c1f65842c4bcc9a64d76c295ae988fb714a5ea278661b898d2509f5b39f98c421c10c663c1b1db81c5e1eab5c
 EBUILD links-2.20.2.ebuild 3414 BLAKE2B 1cb7231e2c4b73d134f0e4109b57d340311e32196c3cefd8f2fd50bea8af94f18946bfb3bfbb510e05d94ec122bd06070b35ef38525645665bd29c9720dae013 SHA512 7c493d283ec1a272b8f85e8bfc60c68f1e501aac5507882626effa974904de8aa8bccc3f87d71516ebf202e29257ba6c0cfb7d95663fb13696d4a648a6c5234a
-EBUILD links-2.21.ebuild 3515 BLAKE2B d2be2a67ddae90164d6ab13d34208c24bdc0b6b5945f870cb8315615d83d7e63138fb6ff8185d338854a63cb0ea44660f4e9afcfa4210d5b6446571c33cfa22a SHA512 c9717b9fc834f04e33c89c45c951edc76f70d4c565102273a12485cab4e79387bece27d1053e3b64b5549f7de34756d7d155f6bba977f3c6453000ba1ae52b26
+EBUILD links-2.21.ebuild 3521 BLAKE2B ffe9e1eeeca13c18b4cc13b35b94e512e77c719a49e9b4b9616f8624db221f7681bda7ec4d0c0d85f995e5a4ce10072c3d073b223d04fa21dd6cb04bf87e1e3b SHA512 fe080499cf28d1ef860a486a523a93e2e45baf9cda650ca282e5ab6e009d73e05dfc7e864660811961fae66440975c9b175479e9241d624ad104c7edad6266f5
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
index 27fe5438053e..6d23dac483b0 100644
--- a/www-client/links/links-2.21.ebuild
+++ b/www-client/links/links-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index b184b966430c..fa8a386a539a 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,6 +1,7 @@
 AUX luakit-2.2.1-make.patch 1349 BLAKE2B 9f13f93b00908d15fdad63fa4fcaff607512237f6d0a065fff54cf3726bb6274b0e3b163a82d2cf11f01f18990bc0a80dc5d2cc11a16d2a8b834db9ab7f35ff1 SHA512 d7a9250ea33748514f942f38198bedf2bcaf19756c9d75014e6bbb781695443e3b0e280b621db785b0f907bbd80e3971a53d8131e0ab52a136aa72c90db64d1f
 AUX luakit-2.2.1-pkg-config.patch 779 BLAKE2B 6ab9e9d8af10f8d8dde8f01a77481f16aaf285718e4fe520d026b6054b175a72b5bd880793a3379dc3cc500bb3889e2f429fdaabdd5d47f261ddfc5b40e5e29e SHA512 f51ba29b41841cb1dc1b5cf4917182b86c9aa1e71ddc8b834314e70700ac805660f87f49c3a5ce3a8b093d1ee49305c008f72a37fbefc0edcbd9ad77ce8f5f95
 DIST luakit-2.2.1.tar.gz 488845 BLAKE2B 2bed592f7d56fc4b5bad4fee3563805954c6211222e25344d01430ef9f2921c240e9cb3c735564fae66d0739d50da41a90309c7dba3ba9f4631d880b9a47e4b1 SHA512 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
-EBUILD luakit-2.2.1.ebuild 1630 BLAKE2B 73071d403c2feb97802203dffd15ae9c5997b7b5032a48291f76090e90107ea9dbb44f1289e46af214f3b494f6cf4c7f57f4bea483fffc28155132166151d120 SHA512 ee87b2487742f5a50e4a0df20ee840b8ba71c7734d1f91affda285686caf4fc264fe71588f7088293e126caf3d1326b86c4b630041b4ae3a21f35cb27891285c
-EBUILD luakit-9999.ebuild 1586 BLAKE2B 25845834617ac142d7caef22cd31cf4af803e8a0e96a5a6d87a257ca81be7340ec54e644e775d044cdb94b5df74d0be17a98063737ab83334c6b4b16550ce525 SHA512 e58c31f0952a9c95684fa20a0ff20ea063f68d8337baa3413b57b9e9507b281dc9053801072fb9825882e137d08160197a349574d583926a281a5a34d5a63fc8
+EBUILD luakit-2.2.1-r100.ebuild 1808 BLAKE2B b64746204bd249fc2a35c532965b7909ee11acaf709ceccbef3804fa6c0bbf420b7b9c8590e1a00b0ba6a499455d50537746ea25978db48141d7075eee1a8bc8 SHA512 d57e14f33c89c833e2a99d4c34f1dbac141a08b67791dd99c6887ae4fe3d285b217c2b8272404f71859a2f3442c7246d560f29f3945a19c4966d8e5810846038
+EBUILD luakit-2.2.1.ebuild 1711 BLAKE2B eb1c46ee3e45568e21e88ac3bbe98bf05a9adc15945569dc7384c7f475411dbd2a4f22073a3e1a56ae53a43abd133d488fa0034aaad9f2262695e75c76a80092 SHA512 c20851c61dc01dd68e41a85158abd035f47d7daaa458464aedccb5035927e4f41e03f42029da9d9570b700b50bda27ca72b67c1f42bfa18e70807ba6402aed33
+EBUILD luakit-9999.ebuild 1764 BLAKE2B 75e0e59243d4b1b9170272814323717b31bcd5b3805fc9c4c34d0cd487df0db7e5127471748196c99f82c91a8257aaa7aaed8c3bcd78223dd546926fe1c3cbc1 SHA512 8b9eab98e5883afd7cbe50c52f6773c34449b3f6b4970bc00ce738a3a0a22457f19f9a014640e3c4d27992dc46ef8b6eb54347e7a08b80ec5fa6b5265d04fd87
 MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
diff --git a/www-client/luakit/luakit-2.2.1-r100.ebuild b/www-client/luakit/luakit-2.2.1-r100.ebuild
new file mode 100644
index 000000000000..4c0f4d8faf9d
--- /dev/null
+++ b/www-client/luakit/luakit-2.2.1-r100.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs xdg
+
+DESCRIPTION="A fast, extensible, and customizable web browser"
+HOMEPAGE="https://luakit.github.io/luakit"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/luakit/luakit.git"
+else
+	SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	net-libs/webkit-gtk:4=
+	x11-libs/gtk+:3
+	${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		$(lua_gen_cond_dep '
+			dev-lua/luassert[${LUA_USEDEP}]
+			dev-lua/luacheck[${LUA_USEDEP}]
+		')
+		x11-base/xorg-server[xvfb]
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-make.patch
+	"${FILESDIR}"/${PN}-2.2.1-pkg-config.patch
+)
+
+src_configure() {
+	export LUA_BIN_NAME=${ELUA}
+	export LUA_PKG_NAME=${ELUA}
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		${PN} ${PN}.so
+
+	use doc && emake doc
+}
+
+src_test() {
+	local failing_test
+	for failing_test in test_clib_luakit test_image_css; do
+		mv tests/async/${failing_test}.lua{,.disabled} || die
+	done
+
+	emake \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		run-tests
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		PREFIX="${EPREFIX}/usr" \
+		XDGPREFIX="${EPREFIX}/etc/xdg" \
+		install
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
+
+	use doc && dodoc -r doc/html
+}
diff --git a/www-client/luakit/luakit-2.2.1.ebuild b/www-client/luakit/luakit-2.2.1.ebuild
index efeb361d7b9d..6821a2d84cd7 100644
--- a/www-client/luakit/luakit-2.2.1.ebuild
+++ b/www-client/luakit/luakit-2.2.1.ebuild
@@ -55,7 +55,8 @@ src_configure() {
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		${PN}
+		USE_LUAJIT=$(usex luajit 1 0) \
+		${PN} ${PN}.so
 
 	use doc && emake doc
 }
@@ -66,7 +67,9 @@ src_test() {
 		mv tests/async/${failing_test}.lua{,.disabled} || die
 	done
 
-	emake run-tests
+	emake \
+		USE_LUAJIT=$(usex luajit 1 0) \
+		run-tests
 }
 
 src_install() {
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index e249169925ec..874b328f3b3f 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs xdg
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs xdg
 
 DESCRIPTION="A fast, extensible, and customizable web browser"
 HOMEPAGE="https://luakit.github.io/luakit"
@@ -17,44 +20,48 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc luajit test"
+IUSE="doc test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-lua/luafilesystem[luajit=]
 	net-libs/webkit-gtk:4=
 	x11-libs/gtk+:3
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-lua/luassert[luajit=]
-		dev-lua/luacheck[luajit=]
-		x11-base/xorg-server[xvfb]
-	)
+	${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
+	')
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	test? (
+		$(lua_gen_cond_dep '
+			dev-lua/luassert[${LUA_USEDEP}]
+			dev-lua/luacheck[${LUA_USEDEP}]
+		')
+		x11-base/xorg-server[xvfb]
+	)
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.1-make.patch
 )
 
 src_configure() {
-	export LUA_BIN_NAME=$(usex luajit luajit lua)
-	export LUA_PKG_NAME=$(usex luajit luajit lua)
+	export LUA_BIN_NAME=${ELUA}
+	export LUA_PKG_NAME=${ELUA}
 	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		${PN}
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		${PN} ${PN}.so
 
 	use doc && emake doc
 }
@@ -65,12 +72,14 @@ src_test() {
 		mv tests/async/${failing_test}.lua{,.disabled} || die
 	done
 
-	emake run-tests
+	emake \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		run-tests
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
 		PREFIX="${EPREFIX}/usr" \
 		XDGPREFIX="${EPREFIX}/etc/xdg" \
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 46f6fb94a612..43035eecc5ac 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,3 +1,5 @@
-DIST microsoft-edge-dev_88.0.702.0-1_amd64.deb 88571350 BLAKE2B bc270cb7f0620c314bd6fcfa2ea47027d65f0176b000bd0dc1fdffadf427892f4fca834ecebff3a0ac3a39d60c129e7d129399d2036c4eed98a5526561927538 SHA512 36ab87ac82faf0b4d4b6b28558e9ed7efd41af07f849d16394167f852aeae8f1f60ce687e303c9ec0c34494357efee79090e4dee40f5782927cef6470c4731da
-EBUILD microsoft-edge-dev-88.0.702.0.ebuild 2359 BLAKE2B a86c2ba483cd1281f04bb7550e4e011b7040108bebadb9dd5585500f8cfa158a9ab168679b027340d1b3fcc1c664c04d1b7babd2fb88ed2842c8a7a00e8a57f0 SHA512 c1ba5fc6f667b28dcf8c0041dbb622e030f1f00b665bf229e2ae5ee2dcb448f458be1df697d41041f527097a946229b6d1eb1e14215e0408de841fc8744a4ab1
+DIST microsoft-edge-dev_88.0.705.15-1_amd64.deb 87945596 BLAKE2B a770aa4edc4f11d350b7ff77dcc7d953115c815caebac5d9858f8ed5e24ec14d4f407ae3ad7f97d32f78849f024c91b75278c21eecdd8197f0c375253fcca653 SHA512 ad388d4b784e71db4f7e30f2f5ee36d3e8abcd7e2c3cac351e68d1a81476017d1c3e784fda2aaf59ec98b537d6ab3ee90aeb8e77597c3204122c6770149b427e
+DIST microsoft-edge-dev_89.0.723.0-1_amd64.deb 89214260 BLAKE2B 9cf78e3e6e77e7efbe78e830e84fcb767508e3f6d2872846b48525d50445d468b53351b1837387a803226f94785eec06360df305bb27e8bee378ee813d085516 SHA512 699e9a2005dcc5363921b05b077d34094550e543cf960f1ee531c9c3f16c77971945c380a4e200451ab95c41ddd484d525b8e50934f5c25df8d3e5e499f440f6
+EBUILD microsoft-edge-dev-88.0.705.15.ebuild 2359 BLAKE2B a86c2ba483cd1281f04bb7550e4e011b7040108bebadb9dd5585500f8cfa158a9ab168679b027340d1b3fcc1c664c04d1b7babd2fb88ed2842c8a7a00e8a57f0 SHA512 c1ba5fc6f667b28dcf8c0041dbb622e030f1f00b665bf229e2ae5ee2dcb448f458be1df697d41041f527097a946229b6d1eb1e14215e0408de841fc8744a4ab1
+EBUILD microsoft-edge-dev-89.0.723.0.ebuild 2359 BLAKE2B a86c2ba483cd1281f04bb7550e4e011b7040108bebadb9dd5585500f8cfa158a9ab168679b027340d1b3fcc1c664c04d1b7babd2fb88ed2842c8a7a00e8a57f0 SHA512 c1ba5fc6f667b28dcf8c0041dbb622e030f1f00b665bf229e2ae5ee2dcb448f458be1df697d41041f527097a946229b6d1eb1e14215e0408de841fc8744a4ab1
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.702.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.15.ebuild
index 41108ab2bece..41108ab2bece 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.702.0.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.15.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
new file mode 100644
index 000000000000..41108ab2bece
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	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
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 67e5bce38d7a..fc33f4b2017f 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
-DIST qutebrowser-1.13.1.tar.gz 4027485 BLAKE2B cb19fa2baa447776e0d03128446619eeacd1049b30fcca26008e0cccb10594d1d32037643b3834297adef637328444aad33d84383bdc49307528321cfa2b846d SHA512 a3eb3845a896a88f755e4e7d336d86a8740be66ae94a8e19fb4739148ce1e66aa9fddec04df9308a51c8ef922fa28e3683bb911dd3ba7c91816c26ea92665cfd
 DIST qutebrowser-1.14.0.tar.gz 4144761 BLAKE2B cc220990c119904c18932b7f240e428fd36baaf42a592f8fe15e9a1b1e5506cf82291ac0365fd43c75ffa78b403cbe35616f8bd5b362a686db389f5ab7a02345 SHA512 7330b685b5852c7700738bf1063121c6cb19b190143e4b98680563ae1a6ce7affaf9691db8c3a4e3686172be7da26ce841709dbc5d31a941326d7432c857cb25
-EBUILD qutebrowser-1.13.1.ebuild 2140 BLAKE2B 518be42090995d3cd5a53f264fd1353b0785db1bdda30d14329ce2a8a30e53036625f3052b7d1d85314c3702cae750f00dcafb7a856cf64ad02da8dc8cf8a8d5 SHA512 5b4c289f695bdd1e00b5fb40deb1a9cc4df2e346c44609b6c35824f3a9b77d756382f9ac59eb67698533a1493341816ab7d0357efaf0ccf101a5499a3997fcc0
+DIST qutebrowser-1.14.1.tar.gz 4161759 BLAKE2B 5ea4d032cb8137af1ac9add9fe85b7dc0b8d9c78c838bd91b09444035f3e433d7cfd75672fbaafc1eceb2a0e1bac8f54b8419a7ff0d7c3b272d588818194a260 SHA512 2902b1f320c80601195f0a87b4cd1ce6dac7e79df82df692b08d00f1f0be449fcc7d7a855f4fc2cc5773f3b2142f508b0dfc6612778c416401f1117acc081de8
 EBUILD qutebrowser-1.14.0.ebuild 2656 BLAKE2B 2d6f001242e06437e6cdb3001c4c30091e3adc07bebee2b729e063e5332629298d51d3646cccde0e3b89f1d908e976d1ef94bc59441dc4952e55085da091440f SHA512 81a4f618a7363656ee3ed85dc5316cee186021b9dbbaaf2c760cf08d037bda50bec2908ba7973ad69a3e61fe6018f35c606b182abf4aed929795f4059dc3a295
+EBUILD qutebrowser-1.14.1.ebuild 2652 BLAKE2B 3c34ad5ba9d0914e0a866f5fca2367fd563f98b4599942a8a5cf9d595f97ed76859401760cdb387dce76aa1a56dd4a9234e67b460c3ae2c22c575356641b5c7f SHA512 7c3805af57693dc5c72da7ea1c7ffd5f019363c82d45be3bce4affc85d25da3c2aa2411622994cec9aed9ce13121562d3151b340f9285fb05e6ec9706767b05d
 EBUILD qutebrowser-9999.ebuild 2244 BLAKE2B 38963dd9a4e547e53158da94d53ad56dc15b97234a532bc9bba46ae9775f21b8d8375c834b392b7d1a82f9764deaa521cce79b06554397a589ea9d5df28899d1 SHA512 d21fa64d00ec358918c1d17e6e06bf88b08c986895d2c10dac1e97bce11bdd4aa041ed0f435d058824df86a6bb05d29302cb37d765332df5e9ffa5f5fb884c61
 MISC metadata.xml 712 BLAKE2B 1ecb84f337927d3b9fa2f827a2296457322823c647ee033d803ae044f6d7bc6045d8e811e3c28024c45130ef3273f223605b8d604fe3da4e47751d9e0a9b2bcc SHA512 4e0ce844dd53b7beb6da2baab54adedaddf2bd075eac4904da20d9aeef0f75007a4e53cf3fe2954462c5f7e717cf7008fc6b878402fa787549766e9175e2d056
diff --git a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild b/www-client/qutebrowser/qutebrowser-1.14.1.ebuild
index 6034e2d0d813..2b939071df40 100644
--- a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit desktop distutils-r1 optfeature xdg-utils
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/cssutils[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
 	dev-python/pypeg2[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
 	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
@@ -48,14 +48,28 @@ python_install_all() {
 	doicon -s scalable icons/${PN}.svg
 
 	if use scripts; then
-		# Install only those userscripts that have an explicit license header
+		insinto /usr/share/qutebrowser/userscripts/
+		doins misc/userscripts/README.md
 		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/dmenu_qutebrowser
-		doexe misc/userscripts/openfeeds
-		doexe misc/userscripts/qute-keepass
-		doexe misc/userscripts/qute-pass
-		doexe misc/userscripts/rss
-		doexe misc/userscripts/tor_identity
+		doexe misc/userscripts/cast \
+		      misc/userscripts/dmenu_qutebrowser \
+		      misc/userscripts/format_json \
+		      misc/userscripts/getbib \
+		      misc/userscripts/open_download \
+		      misc/userscripts/openfeeds \
+		      misc/userscripts/password_fill \
+		      misc/userscripts/qute-bitwarden \
+		      misc/userscripts/qutedmenu \
+		      misc/userscripts/qute-keepass \
+		      misc/userscripts/qute-lastpass \
+		      misc/userscripts/qute-pass \
+		      misc/userscripts/readability \
+		      misc/userscripts/readability-js \
+		      misc/userscripts/ripbang \
+		      misc/userscripts/rss \
+		      misc/userscripts/taskadd \
+		      misc/userscripts/tor_identity \
+		      misc/userscripts/view_in_mpv
 	fi
 
 	distutils-r1_python_install_all
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 3490c35fa1b2..ac217260cc8f 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,18 +1,9 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
-AUX seamonkey-2.53.2-sysctl.patch 465 BLAKE2B 6b0bf4f97b6f603d196a8a34c77820389719e9ba300837d5fc826b001794571fb0dada62a85241d99ab84de7ef1cefa3593a2f184101e1f63202a6b766fc7d8c SHA512 3c7b2ee7896f66f370996ee7ccd6961a17c0e1748bde7b0f7bfc1acfaba3ea9c4de6b9980aa4bb83a21961d0e7b3972bf8a96e47e147432c676ede70ba23a399
 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f
 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2
-DIST seamonkey-2.53.4.source-l10n.tar.xz 12110188 BLAKE2B 6bf25f25bd72e35252824221d6ecf43f910cae65e21e2e15b628d9340256a3196b11a20522ce6284cee28a92141907ddcd5366427c356e57fb1a0015a064a2c2 SHA512 a5ac165412d3391206b7bcb2e7112693ce272e47e6cd2da321a60f52799fb04ac0d1ea84fb535ba73ef8d9faf5d582b314d2890768fd440136c830f3c88777cd
-DIST seamonkey-2.53.4.source.tar.xz 294513316 BLAKE2B 79425b0d15f99e30bd70871c28636ed8c567703b7048a46534fa971debbfeb90dd05880feca49354cb818c4a127cbc1f3ff17729784f90de91ba82db6da5fa59 SHA512 3450d6251f309bee96aa792cdce66b946d841089e0031ccbcf606845b1e0c951d58a8117a9e61e2d2435c1df614110944e5eac7ae9bd08429146bfe7334137fb
-DIST seamonkey-2.53.4_beta1-patches-01.tar.xz 39676 BLAKE2B de7742e6c286ca21403d003e22e3eba56e4d59c3f628c9768b47bac148abefbabfcd0510c89cc319c29e0775e316922c680d3de3dbfc542cae4f1f4942773124 SHA512 e97d6de074041f17cfe935995ce7116dee4249dc736315c82ed3878a92189d09542f141f65499ecdfd8621638d130b6d5786ab6033f3f794a805e136acefec3d
 DIST seamonkey-2.53.5.1-rust148-packed_simd.patch 45781 BLAKE2B f028f56c68d03ee5231457dd233fe046cae7170d808a3db1c27a7c11f5cc97539df22ab1c05f305fed918d0a8a9ad2be53a9972b42607811ea2e60e3b56d6015 SHA512 74eec456b7aa872d682962b7585f74705b4ad4cbd27cfa11f5c6c2dfef303706dac414e72df882ba106df31305db79ff73158cdeba960bf74cad962e02fa3931
 DIST seamonkey-2.53.5.1.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
 DIST seamonkey-2.53.5.1.source.tar.xz 285624492 BLAKE2B 1785872f9b5e3fdd92cc9d9b53f503e923451af116cc8c0581b6e61cf542d8fff7a4139f57c6d3db55865caa2f1292eaaa8125fe05ca1e18cc0ee02376c5644a SHA512 6ee8a1c5b81ede02cabcfc7b650805bab661b2898fd0f6d7c0ae1f99da19930efb69f25ce7374888cac6333e669ec79d72705fec69cfe617054b9daacd31297c
-DIST seamonkey-2.53.5.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
-DIST seamonkey-2.53.5.source.tar.xz 285387556 BLAKE2B 34f0a0b24f15f13bd8b7975a863a9351e2d29494bc374f5d525d3c2720a834fe328320aaea88556abb76e6b131c756a107c3ee9275c2a65da582a6beecdc94f8 SHA512 d2722a8864bcdb58851447802576877198e1b71a76a0be04df9ccabd449bdbdd200402ca10041bcab21eca757edc8e6a1c3dc7ec3244cca119f2d1c8979d3a9b
 DIST seamonkey-2.53.5_beta1-patches-02.tar.xz 44096 BLAKE2B e0c31af11b3bf88f572703403f186bda71af0c26cd52a99b773dfd765961c430f2d516bba266871b28e5848d5c0f9e9df1a074b05f4b5da7323fd9042c25054e SHA512 434e4cad74d659f46a051207bf43087ad780e40c29b465a9c4c8e7366e9d8b197da20e5ffbafadb8ddb3f1754ad81b75f3d7a899adadd3bb8a7b83e501cfaf9a
-DIST seamonkey-2.53.5_beta1-perf-guide_checksum.patch 40647 BLAKE2B e94e892e5b696a57087a91060c79de649bd0bc053ad5d9158017870e37b3b478e5e30cace2fb07c72d6e29954c7678dcfea7f2039369c78a390b6e29d7419d07 SHA512 1f77ca1109d454db3065fe0af7ad87f7bc69995ec9f4141858746019623608f09f3c30510bd5a1a9123cafdaa328fdbc98750875daa727a98590cb0537343b51
-EBUILD seamonkey-2.53.4.ebuild 16358 BLAKE2B 1161161dc7dff0a25d2aed4db14f37d11f597762e331a9ae0cda7ef2c0ea7f34b0355597709cbf173ae1a3ffb5092aa7142046dd7bfcd768119386073270c276 SHA512 a09ae794c9e4d54f207d959973177675e2b88c976b0915cc3472ad7efbd83793520618d2f3eb6866c83f67adaadcf601f7713dc7b397fd78f42f430e1612bb2b
-EBUILD seamonkey-2.53.5.1.ebuild 16676 BLAKE2B 7a2c5d288dc388d35ec8a8b481d76c93e04676682e1dee78eeea2fe9594e196be63b3e177c82a3b53d705ed5fbc8aa9cc754732f24c8b1b63fd7ada637e0790e SHA512 8029da2f784304981eadd3dc66a4a278d943a36336792dc0cf5eb2c33c69010b74af198fb7abbea998d9135841d2372d8bf641869b86c97675735dd5ec723cda
-EBUILD seamonkey-2.53.5.ebuild 16684 BLAKE2B 51b990b4745c2e0bc7886edf133a59f47d56915604da3d5b45f03dc58d3ed35cc1255c5d536f3f716e9974fda5c882559e4444ffecddb8ef5694a3bc70b2479f SHA512 4d1ced80caa86c6b2eb94c0134a34d72b47f441094e3dd2d976cc8ced4bdcdbed12a4bc1d8b384527d07ba7913fadb0400ff39c1a1ec7b07e8d6e37ab6a0627f
+EBUILD seamonkey-2.53.5.1.ebuild 16674 BLAKE2B f984187931a806f8deceaf3ffedf2097b4b8d4a80a425aac09ca5fb1b6e19de078bfb01d92b23614d0f4b9d7379af5f96df4309b05818209024d3d6b6d5fe4ff SHA512 af7ecf1a2c54788addee4840bac84a7c2641075ea212de6c770dda407177b1b661d2e9ce829be0be1efe72c597caef7fa6e2104f8a94a5ea90ead1230f122151
 MISC metadata.xml 1903 BLAKE2B 24d0d1914eb2965b065dca44093fd7162a735190082874f1230f090ba1f5c7728531a5e5c5bbec6e23036d51a1d71fc0d95d19ebca3fd68e82261e981b7fe402 SHA512 98c0c07a83d496ff6ab274787d6d76379fbfdd352bb58177f20dc53055ef6d426819cf67860b5e6d57941c9cd3d6f439365d135c7235cecb8d654733b0bb2799
diff --git a/www-client/seamonkey/files/seamonkey-2.53.2-sysctl.patch b/www-client/seamonkey/files/seamonkey-2.53.2-sysctl.patch
deleted file mode 100644
index 4ad673bed603..000000000000
--- a/www-client/seamonkey/files/seamonkey-2.53.2-sysctl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://src.fedoraproject.org/rpms/seamonkey/c/f3de8ae056fcb36615add0e6311cff147fbdd827?branch=master
-https://bugs.gentoo.org/736892
-
---- seamonkey-2.53.2/mozilla/memory/build/mozjemalloc.cpp
-+++ seamonkey-2.53.2/mozilla/memory/build/mozjemalloc.cpp
-@@ -220,9 +220,6 @@
- #include <sys/param.h>
- #include <sys/time.h>
- #include <sys/types.h>
--#if !defined(XP_SOLARIS) && !defined(ANDROID)
--#include <sys/sysctl.h>
--#endif
- #include <sys/uio.h>
- 
- #include <errno.h>
diff --git a/www-client/seamonkey/seamonkey-2.53.4.ebuild b/www-client/seamonkey/seamonkey-2.53.4.ebuild
deleted file mode 100644
index ccb1e27b3bd4..000000000000
--- a/www-client/seamonkey/seamonkey-2.53.4.ebuild
+++ /dev/null
@@ -1,530 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# note - could not roll langpacks for: ca fi
-#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
-#	    ru sk sv-SE tr uk zh-CN zh-TW)
-MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
-	    ru sk sv-SE zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-fi
-
-S="${WORKDIR}/${MY_MOZ_P}"
-SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
-
-MOZ_GENERATE_LANGPACKS=1
-MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
-inherit autotools check-reqs flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 nsplugins pax-utils toolchain-funcs xdg-utils
-
-PATCH="${PN}-2.53.4_beta1-patches-01"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="amd64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+calendar +chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal
-neon pulseaudio +roaming selinux startup-notification system-harfbuzz system-icu
-system-jpeg system-libevent system-sqlite system-libvpx test wifi"
-RESTRICT="!test? ( test )"
-
-SRC_URI+="
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-DEPEND="
-	>=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libffi-3.0.10:=
-	>=dev-libs/nspr-4.23
-	>=dev-libs/nss-3.47.1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=media-libs/libpng-1.6.31:0=[apng]
-	>=media-libs/mesa-10.2:=
-	>=sys-libs/zlib-1.2.3
-	>=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
-	>=x11-libs/pixman-0.19.2
-	media-video/ffmpeg
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=dev-libs/dbus-glib-0.72
-		>=sys-apps/dbus-0.60
-	)
-	jack? ( virtual/jack )
-	crypt? ( <x11-plugins/enigmail-2.1.0 )
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	pulseaudio? ( || (
-		media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9
-	) )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.9-r1
-		>=media-libs/harfbuzz-1.3.3:0=
-	)
-	system-icu? ( >=dev-libs/icu-59.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
-	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-			>=sys-apps/dbus-0.60
-		)
-	)
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-mozilla )
-"
-# Convert to BDEPEND once the ebuild goes EAPI-7
-DEPEND+="
-	app-arch/unzip
-	app-arch/zip
-	dev-lang/perl
-	sys-apps/findutils
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-"
-
-# 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
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-pkg_setup() {
-	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	moz_pkgsetup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="16G"
-	else
-		CHECKREQS_DISK_BUILD="12G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local l10n_sources="${P}.source-l10n.tar.xz"
-	unpack ${A/ ${l10n_sources}}
-
-	mkdir "${S}/${P}-l10n" || die
-	cd "${S}/${P}-l10n" || die
-	unpack ${l10n_sources}
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	use system-libvpx && eapply "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
-	eapply "${FILESDIR}/${PN}-2.53.2-sysctl.patch" #736892
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local ms="${S}/mozilla"
-
-	# Don't error for format with gcc-9
-	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die "sed failed"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/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:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# 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}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
-	# (this is hard-coded in the build system at present rather than being based on configuration)
-	if ! use chatzilla ; then
-		sed '/extensions\/irc\/locales libs-/s@^@#@' \
-			-i "${S}"/suite/locales/Makefile.in || die
-	fi
-
-	eautoreconf old-configure.in
-	cd "${S}"/mozilla || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/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
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	##################################
-	# Former mozconfig_config() part #
-	##################################
-
-	# Migrated from mozcoreconf-2
-	mozconfig_annotate 'system_libs' --with-system-bz2
-	mozconfig_annotate 'system_libs' --with-system-zlib
-
-	# Disable for testing purposes only
-	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Must pass release in order to properly select linker via gold useflag
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Must pass --enable-gold if using ld.gold
-	if tc-ld-is-gold ; then
-		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-	else
-		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-	fi
-
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-
-	mozconfig_use_enable startup-notification
-
-	# wifi pulls in dbus so manage both here
-	mozconfig_use_enable wifi necko-wifi
-	if use kernel_linux && use wifi && ! use dbus ; then
-		echo "Enabling dbus support due to wifi request"
-		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	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)
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-
-	# 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
-
-	# default toolkit is cairo-gtk3, optional use flags can change this
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	# 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}}"
-
-	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
-
-	# For testing purpose only
-	mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/mozilla/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-	##################################
-	# Former mozconfig_config() end  #
-	##################################
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Linking fails without this due to memory exhaustion
-	use x86 && append-ldflags "-Wl,--no-keep-memory"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# sm-specific settings
-	mozconfig_use_enable calendar
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Required until mozcoreconf-v?.eclass-es are finally fixed...
-	sed \
-		-e '/--enable-application/s@comm/suite@suite@' \
-		-i .mozconfig || die
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
-		if use amd64 || use x86 ; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	mozlinguas_src_compile
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake DESTDIR="${D}" install
-	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/${PN}/default64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	if use chatzilla ; then
-		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
-
-		# remove the en_US-only xpi file so a version with all requested locales can be installed
-		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
-			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-		fi
-
-		# merge the extra locales into the main extension
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
-
-		# install the merged extension
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
-		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate ; 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
-	fi
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}
diff --git a/www-client/seamonkey/seamonkey-2.53.5.1.ebuild b/www-client/seamonkey/seamonkey-2.53.5.1.ebuild
index 4f900ed860ae..c7411c533012 100644
--- a/www-client/seamonkey/seamonkey-2.53.5.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.5.1.ebuild
@@ -39,7 +39,7 @@ PATCH="${PN}-2.53.5_beta1-patches-02"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/seamonkey/seamonkey-2.53.5.ebuild b/www-client/seamonkey/seamonkey-2.53.5.ebuild
deleted file mode 100644
index 4043d78b6ead..000000000000
--- a/www-client/seamonkey/seamonkey-2.53.5.ebuild
+++ /dev/null
@@ -1,541 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# note - could not roll langpacks for: ca fi
-#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
-#	    ru sk sv-SE tr uk zh-CN zh-TW)
-MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
-	    ru sk sv-SE zh-CN zh-TW)
-
-MOZ_PV="${PV/_pre*}"
-MOZ_PV="${MOZ_PV/_alpha/a}"
-MOZ_PV="${MOZ_PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-MOZ_P="${P}"
-MY_MOZ_P="${PN}-${MOZ_PV}"
-
-if [[ ${PV} == *_pre* ]] ; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
-else
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-fi
-
-S="${WORKDIR}/${MY_MOZ_P}"
-SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
-
-MOZ_GENERATE_LANGPACKS=1
-MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
-inherit autotools check-reqs flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 nsplugins pax-utils toolchain-funcs xdg-utils
-
-PATCH="${PN}-2.53.5_beta1-patches-02"
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,sqlite,libvpx} )
-IUSE="+calendar +chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal
-neon pulseaudio +roaming selinux startup-notification ${SYSTEM_IUSE[@]} test
-wifi"
-RESTRICT="!test? ( test )"
-
-SRC_URI+="
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.5_beta1-perf-guide_checksum.patch
-	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Convert to BDEPEND once the ebuild goes EAPI-7
-DEPEND="
-	app-arch/unzip
-	app-arch/zip
-	dev-lang/perl
-	sys-apps/findutils
-	>=sys-devel/binutils-2.16.1
-	virtual/pkgconfig
-	>=virtual/rust-1.34.0
-	amd64? (
-		${ASM_DEPEND}
-	)
-	x86? (
-		${ASM_DEPEND}
-	)
-"
-
-CDEPEND="
-	>=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libffi-3.0.10:=
-	>=dev-libs/nspr-4.23
-	>=dev-libs/nss-3.47.1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=media-libs/libpng-1.6.31:0=[apng]
-	>=media-libs/mesa-10.2:=
-	>=sys-libs/zlib-1.2.3
-	>=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
-	>=x11-libs/pixman-0.19.2
-	media-video/ffmpeg
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=dev-libs/dbus-glib-0.72
-		>=sys-apps/dbus-0.60
-	)
-	jack? ( virtual/jack )
-	crypt? ( <x11-plugins/enigmail-2.1.0 )
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	pulseaudio? ( || (
-		media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9
-	) )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.9-r1
-		>=media-libs/harfbuzz-1.3.3:0=
-	)
-	system-icu? ( >=dev-libs/icu-59.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0= )
-	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-			>=sys-apps/dbus-0.60
-		)
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-mozilla )
-"
-DEPEND+="${CDEPEND}
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )
-"
-
-# 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
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-pkg_setup() {
-	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	moz_pkgsetup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use debug || use test ; then
-		CHECKREQS_DISK_BUILD="16G"
-	else
-		CHECKREQS_DISK_BUILD="12G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local l10n_sources="${P}.source-l10n.tar.xz"
-	unpack ${A/ ${l10n_sources}}
-
-	mkdir "${S}/${P}-l10n" || die
-	cd "${S}/${P}-l10n" || die
-	unpack ${l10n_sources}
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	rm "${WORKDIR}"/firefox/4000_sysctl.patch || die
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || die
-
-	# Shell scripts sometimes contain DOS line endings; bug 391889
-	grep -rlZ --include="*.sh" $'\r$' . |
-	while read -r -d $'\0' file ; do
-		einfo edos2unix "${file}"
-		edos2unix "${file}"
-	done
-
-	use system-libvpx && eapply "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
-	eapply "${DISTDIR}/${PN}-2.53.5_beta1-perf-guide_checksum.patch"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local ms="${S}/mozilla"
-
-	# Don't error for format with gcc-9
-	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die "sed failed"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${ms}"/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:" \
-		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# 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}"/suite/installer/Makefile.in || die
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
-	# (this is hard-coded in the build system at present rather than being based on configuration)
-	if ! use chatzilla ; then
-		sed '/extensions\/irc\/locales libs-/s@^@#@' \
-			-i "${S}"/suite/locales/Makefile.in || die
-	fi
-
-	eautoreconf old-configure.in
-	cd "${S}"/mozilla || die
-	eautoconf old-configure.in
-	cd "${S}"/mozilla/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
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	##################################
-	# Former mozconfig_config() part #
-	##################################
-
-	# Migrated from mozcoreconf-2
-	mozconfig_annotate 'system_libs' --with-system-bz2
-	mozconfig_annotate 'system_libs' --with-system-zlib
-
-	# Disable for testing purposes only
-	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Must pass release in order to properly select linker via gold useflag
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Must pass --enable-gold if using ld.gold
-	if tc-ld-is-gold ; then
-		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
-	else
-		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
-	fi
-
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-
-	mozconfig_use_enable startup-notification
-
-	# wifi pulls in dbus so manage both here
-	mozconfig_use_enable wifi necko-wifi
-	if use kernel_linux && use wifi && ! use dbus ; then
-		echo "Enabling dbus support due to wifi request"
-		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	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)
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX%/}"/usr
-	fi
-	mozconfig_annotate '' --prefix="${EPREFIX%/}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX%/}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-
-	# 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
-
-	# default toolkit is cairo-gtk3, optional use flags can change this
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	# 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}}"
-
-	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
-
-	# For testing purpose only
-	mozconfig_annotate 'Sandbox' --enable-content-sandbox
-
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-av1
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/mozilla/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-	##################################
-	# Former mozconfig_config() end  #
-	##################################
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Linking fails without this due to memory exhaustion
-	use x86 && append-ldflags "-Wl,--no-keep-memory"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# sm-specific settings
-	mozconfig_use_enable calendar
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Required until mozcoreconf-v?.eclass-es are finally fixed...
-	sed \
-		-e '/--enable-application/s@comm/suite@suite@' \
-		-i .mozconfig || die
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
-		if use amd64 || use x86 ; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake V=1 -f client.mk configure
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
-	emake V=1 -f client.mk
-
-	mozlinguas_src_compile
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX%/}/usr/share/myspell\""
-
-	local emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
-
-	# Copy our preference before omnijar is created.
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	echo 'pref("extensions.autoDisableScopes", 3);' >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	if ! use gmp-autoupdate ; then
-		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-				|| dir
-		done
-	fi
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
-	emake DESTDIR="${D}" install
-	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/${PN}/default64.png ${PN}.png
-	domenu "${T}"/${PN}.desktop
-
-	# Required in order to use plugins and even run seamonkey on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
-
-	if use minimal ; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
-	fi
-
-	if use chatzilla ; then
-		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
-
-		# remove the en_US-only xpi file so a version with all requested locales can be installed
-		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
-			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-		fi
-
-		# merge the extra locales into the main extension
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
-
-		# install the merged extension
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
-		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
-	doins "${T}"/11${PN}
-}
-
-pkg_preinst() {
-	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate ; 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
-	fi
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 0f7fadfac256..b16443bf7b27 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot_3.5.2115.31-1_amd64.deb 76755116 BLAKE2B c753133052355dee546149f2fb6a157e9c2327d1921dfdfd426911fd41c422d1dfb519ba2e3ca0dfc9ad1ef76ac3f256fbfcc116df3c628da05fd47e1c11555d SHA512 70d3fb8ff41dd22a2561ba301f206520ea3971d525aa2d8d41a061f6b2df1c36923090a4df27e4bc1e556fac8989865c95ebd1187f00f68610a14bd2517d2812
-DIST vivaldi-snapshot_3.5.2115.31-1_arm64.deb 69011568 BLAKE2B 07ea92f1324511b7e2089765f6a3f5d6bb29edf7629d82216c4fa444c67cc9bc26219e8776c1234073b9ebcbcd9a241c0210f906ce87d66c444e1804d656dab7 SHA512 e74c9db0c09f5d0bcdcf4a2f03ee6b8d36ad72ee8d87b3f30ff1a356cd7ebd911b38eceaa8e3300e5a001cdd67c5a58e8213fe8c738da789e65bf1a16902b66d
-DIST vivaldi-snapshot_3.5.2115.31-1_armhf.deb 68096004 BLAKE2B e7e3adc1df568a0af47a93b88cd7ecafdded85b0cddd48b31287b5d7818dfe4d8d76861cc359ab0a09d2ef458b8a1d4055099ee7ae88a7eb7f4615241ac55007 SHA512 be77ee3eaac939be1e561002c3a04d3195fee01eb2aa6f2e57234f03983e669d38614f71455341edc6e9370ff23d45d0393304b77cea1240519a4621def2f0e4
-DIST vivaldi-snapshot_3.5.2115.31-1_i386.deb 73552004 BLAKE2B fb959512a0c4f8b98f117c03fb2e2c10c76c6c6f768e099b31d5fede51676605f4a0b53a5c9cabde90e28f24215acc1397464cb5afbc2a9665e3feabf8298cee SHA512 9936f968e2f0a6a40cdfa516ca53b63d1134ecada3e9fc78b68769f436658d658703d35f762005a8546bee9c6c469ac16b6ed78ff60baecbf24944aff3f48810
-DIST vivaldi-snapshot_3.5.2115.4-1_amd64.deb 76735612 BLAKE2B f3acf308816272d5f2e5c8612141423dbc32fa0b14a22d5980db0fe7eb06586e4bc85a5e7073c1cae1bc82deefed38e80de298f63251c3e362f61b580969d8b9 SHA512 3ef95ad76885c6b4cf0d28c2f6aaf7c0affe1a5826fc318d44d2ae37507feea796a639caf0cbe788df52b94affa6a909e0c6551877d16c0664a6bbe9c276c0c3
-DIST vivaldi-snapshot_3.5.2115.4-1_arm64.deb 68981904 BLAKE2B 713bda870eaa2e25b0636778b8ba95d47ed750a3b66b0d7e02cb52690ce577d98f0c3fdd65d8ee32c2fcd8a93c7488377e774d018c277a858f2f1613f947f807 SHA512 8ae76a9cd010729fef458321e93ed9e7c359a3d81f767490766545a855dd66e32c6de6406216e73106ffc3dd4ab662fcb1e5372a86fb1bd6d5503c1815d39e84
-DIST vivaldi-snapshot_3.5.2115.4-1_armhf.deb 68073008 BLAKE2B ff91480512edca9b120fea7152772ff3f566f14df75263f912a019c64f92106428ed926d89712b651ae0a948d1c76fb8ea9dbecab28152eb71aa0016213aa6ee SHA512 734c6beeb98793ce942de220f103f2bcf1675c2bfd03192ed7ff30e8ba6aed17e3af75ffe8e7a084ec2174e0a5a3383bcd8c3fe1d26383b4216e93b061d2e934
-DIST vivaldi-snapshot_3.5.2115.4-1_i386.deb 73553096 BLAKE2B 62c8e7718671bd0bfec37be3f33da682abe7706a19743714f9aa3dc31f6d384bbf9e86558570033a0d65318d2bc8ae51a358f01332bbe12bdefd1b087ec8d1e7 SHA512 2fa625a33d5790fc7580bd395f63680432fc3642aa98db5f88b497492d9b888412afed296b38db76939edd1710f31b589f0442f602e4731d0740f71854c62293
-EBUILD vivaldi-snapshot-3.5.2115.31.ebuild 3119 BLAKE2B 2280d8cb71ddda8d59bacd6b1302e2096ac7a74b5754f962bd8492ee321b5916ce3ebf999d12f6d0be52620a362bcb40d86d87ea31aea236eb0f8e4a13dd08ed SHA512 2a5c2b58435f1f871c6a7c83a82d642dda5e7b8d96d98f509b6c2b11573829cd58f5ccf64a3fee74c692d11921bed361791b3e6d304502a97c89efafb8bd02dd
-EBUILD vivaldi-snapshot-3.5.2115.4.ebuild 3119 BLAKE2B 2280d8cb71ddda8d59bacd6b1302e2096ac7a74b5754f962bd8492ee321b5916ce3ebf999d12f6d0be52620a362bcb40d86d87ea31aea236eb0f8e4a13dd08ed SHA512 2a5c2b58435f1f871c6a7c83a82d642dda5e7b8d96d98f509b6c2b11573829cd58f5ccf64a3fee74c692d11921bed361791b3e6d304502a97c89efafb8bd02dd
+DIST vivaldi-snapshot_3.5.2130.3-1_amd64.deb 76854688 BLAKE2B 398fce098dbdcade6b79aea2495692f4ad98102438aa46fe74cc0f2d7130d71345b6fbfc94952d038c25f9193893563b9f2b139766f1f9b3cc73a045236ae773 SHA512 fb7ac8052904e4baf7b1399557c222f203dc0279f93bc61f4445f5a1caca57904b8408a13605adf3c3ed0ccbf8471859f71175e5a45d1b9cc782f22f382884fa
+DIST vivaldi-snapshot_3.5.2130.3-1_arm64.deb 69099100 BLAKE2B cfa821a9959eb577e83ca6a7d1043b018fae3b593a00ad7814c5f41924e8ecbf7ab8ab1d0a4ab7c392e776648d9c2d4943aacf466cb74176e12a297c20f3eb43 SHA512 57057d09e258bd348339b2f18b84cdff0b87c20c1d8279d02682a9cc50ce6d4be5ff3559a692448e406b44016e9409c8681f55fe7d5f1e12ae7fe762ad2a55ee
+DIST vivaldi-snapshot_3.5.2130.3-1_armhf.deb 68150440 BLAKE2B 1fed1ebf32bb1a7a81760239d2a1fef3bf439b48c5c84c82029dc0486363d5234b10e17bc7d1a11a209f734638bb9549460e2bcf428c4bbc66d56ac1b2cc769a SHA512 4cc4373b33681542b1f780be8fff0dc05ad1d1422e9d710cf83cfb71cbb304ee01e9b9054cae6297d9e3fc3a883d54d23d14c308e2da89f57060889ab9217df7
+DIST vivaldi-snapshot_3.5.2130.3-1_i386.deb 73624036 BLAKE2B 9f706c1e6d398445b7325c1bd34d0fd870cd03b915f24c41c469889001eb63c1d58d7115779e9d09af0a3816939756c252872d5d93db05fcbf56001eb37f4730 SHA512 be803724cbd77f8fceea87e57a267000638ebf80b7344f80bd8aebaf5ab76ddffc4beb514e366aa440cb30d2b4d0a3288848d9acaecfaab1eb7258ce94e63527
+DIST vivaldi-snapshot_3.5.2131.8-1_amd64.deb 76855420 BLAKE2B d59f6acefcfaf130beea1a1d08af2f68f2ce24ddfa8a15f63c577b141c992e3b77a6be01716db8774a90fc752ed53d244f0029e8bc2aa0e397a352a5424bbffa SHA512 b19f466d713d99ec78cf4295a31325b5d0c87b80dc95ff9fd3faa22a4c0c90b1e6feb35a1489cf56a22227b010a64267d6f51e452f41ea55d672cd097b0762f3
+DIST vivaldi-snapshot_3.5.2131.8-1_arm64.deb 69080380 BLAKE2B 2ba552ddb7e517ce6ae4dfb2a206549a0aa344d6b5a11dccb7738788a12e3640e58c4614a29e081d8afeb854bafdb3d26632e9a68e6ed5151eaa15c3d0940185 SHA512 ed9aac855a9cdee0b2cdd5c4f53b9fdf2ce059d71d927caba358e1f4aa143a7656daf6a2e372e1d6f40bfa20c826afa7b37b6611ef2caab04a76597d0f97ada0
+DIST vivaldi-snapshot_3.5.2131.8-1_armhf.deb 68159604 BLAKE2B ad8a85872d0abb106856f5f41014b358ba6c65fb0e2b9e3bfe7a8d4d0f2b1a3e12573f19c3ff3d7e30208c72803b9cd9bd4c7bdbbd75a264bae1343093bfc9e1 SHA512 72e236246a1969a18e4b9c26a84eeea3e575f63ef0b93ed2a0898c2f04a9f3848f4130de34cfb57f9f1da2236b6b6c7fdfc567fc77d9a0f99516fff7b4d66013
+DIST vivaldi-snapshot_3.5.2131.8-1_i386.deb 73628540 BLAKE2B c9bbdc00353fd02931a7c007070c29406071437b59d56b6adc17855446e2e89dcddfcc534ea6dcb5a8b6c207cbd3d9a660cd484959d4e1f27d7fc94b6048c242 SHA512 06d6259cda2f2011ab22b1caee09c8957089a5bef0816bee124630803c4bc5e3b3314e357412226988a2ed47cca48784c79d5ec5ae6c5e90dccb943e5f4261a2
+EBUILD vivaldi-snapshot-3.5.2130.3.ebuild 3119 BLAKE2B 2280d8cb71ddda8d59bacd6b1302e2096ac7a74b5754f962bd8492ee321b5916ce3ebf999d12f6d0be52620a362bcb40d86d87ea31aea236eb0f8e4a13dd08ed SHA512 2a5c2b58435f1f871c6a7c83a82d642dda5e7b8d96d98f509b6c2b11573829cd58f5ccf64a3fee74c692d11921bed361791b3e6d304502a97c89efafb8bd02dd
+EBUILD vivaldi-snapshot-3.5.2131.8.ebuild 3119 BLAKE2B 2280d8cb71ddda8d59bacd6b1302e2096ac7a74b5754f962bd8492ee321b5916ce3ebf999d12f6d0be52620a362bcb40d86d87ea31aea236eb0f8e4a13dd08ed SHA512 2a5c2b58435f1f871c6a7c83a82d642dda5e7b8d96d98f509b6c2b11573829cd58f5ccf64a3fee74c692d11921bed361791b3e6d304502a97c89efafb8bd02dd
 MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.31.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2130.3.ebuild
index f69da1d681b9..f69da1d681b9 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.31.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2130.3.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.4.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2131.8.ebuild
index f69da1d681b9..f69da1d681b9 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.4.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2131.8.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index d29c26454f1f..3f565b98a3e8 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-3.4.2066.106_p1-amd64.deb 75692172 BLAKE2B 6311f405833e99652d3905c08591535bd09ae2f290bf6cc147011f6e7e6099975c355ef44bd99488950cbd09b85aa2dd17448c1337942c18077fbea57c77984f SHA512 da3db40bda4cb709f24764531fab9c1e13c00fc4eda22a27a3f06320d5b3f85aa6b49aa35df8cd1aa17ca27d2019ac74151d504fe3c23bef50cdcd0771aca613
-DIST vivaldi-3.4.2066.106_p1-arm64.deb 68074616 BLAKE2B 90677ffe9f7b76a45a686dc1953c4eccb956a438c1c5afccf8e7af2fbdf3a22b5446fb4932c309c57ada545af2844f45a4c4fb3ec9c5731c7fe6ca29ba96aa27 SHA512 a8c44bcb0643f5282de37935161dad0e0cd278ead1ea1bcd4ee7a907ab630c41e5d88bb271c4221e3e8ca87fd5de0df9a902121ed7cd7266dc9f6942eb1d4f95
-DIST vivaldi-3.4.2066.106_p1-armhf.deb 67022536 BLAKE2B 5ee874dc41c484aa2130ca20a1a68b48178f7a55db1c56c010b4319448aada2c0c4e0b2d7ab36dd85d37cf4f789e25ec57679a3b6ea87c086e537025ab56199f SHA512 3fc1f20dcf7c0baa2c7a021b5e9d3480f62a04eb65697712df1481f85ef7afdc019a94e2873964ffba870bda525d5b84dbf3201a7e660428576e00c4770c067e
-DIST vivaldi-3.4.2066.106_p1-i386.deb 72096496 BLAKE2B 6728eaefa74d4ee061d75d510817ccd7196455bd1e1f0347c90f7528358c33c7f81bd6e46edaafd94e0da1880e633dcf0aeee795eaeee3b88497a06f3ba9533b SHA512 cac85271513bbcc4af08c5e53c2652b4ac616ce7a11b5896af1c856879cd354298243314fb3ae535d059145cd412f66177b93d9e28f63a741411e04db4030ad7
-DIST vivaldi-3.4.2066.86_p1-amd64.deb 75651984 BLAKE2B 4b5b9caac33f490066ae69453311b6de14d62a49196d7f4ee945e48ca182c242c0de3c0e7ab6fe461073615360e24201972c8a4816f001c9ae75e91d73e4d804 SHA512 98a7100880c9d267ac16a12249452b8fcf66645226b1f9a9da720032e37b8f33ccb1ece77a987472d64a1a54575f9134f67f9468a8e40388f9959b6e7bdf67b4
-DIST vivaldi-3.4.2066.86_p1-arm64.deb 68056016 BLAKE2B 4e811146ba59096b90026b09f982012e4cb3b29c66e9ecca9737a7809b4821c28ab6c65aef4a00c2a06d95b5191c1cbd931fa99aec004d8715712cffaeffbfaf SHA512 889725b266a320397f9b983216eea18863f7047cf70e0f92b39765ab3789b98a3f0206603353f78ec77874eee9d5e019dd453373e211f7f800535b2e0595d518
-DIST vivaldi-3.4.2066.86_p1-armhf.deb 66985864 BLAKE2B b1ff5408d1fe254f169ae2a93e0b41a0a4e590448206e182996e154591964453ab2e508688a3a844812353f4d78c2e9a2b58ef329e4fa4e34b6895c6f8c79b33 SHA512 6a3ccbebc62cb64bf4f4813686b7376d4dd13f0081e849524f8e995282accda6d5fed22b6e562bdf831f23cb6cfb0d6421cb6c7c0dc9ce80ccc32566a4fcbc9b
-DIST vivaldi-3.4.2066.86_p1-i386.deb 72748188 BLAKE2B ac949d03e3e24dfdac9461e212ea48135d6100a1b367c02cf23e0d9b0d2fe6826fb3a3a8207570ba26deac37f916f12a49d87894668a43218a8ce64a6fe1aa04 SHA512 4604fe7797c28e81fd71403fb32214ef48d06e508070da8f613ea16afd3b8074bc65fb81f7dacdbeb71847cb2704aa5ef1eb399199affc047a22582b629d9142
-EBUILD vivaldi-3.4.2066.106_p1.ebuild 2822 BLAKE2B d789dab33c105c76ad04055a8d73a9f4d240dc0188e959963ee985538164fe9ee3904a83e9e558a1c969ef87f620eaf2ac5e5aabb07ea8a6e9aa6dd08da719e4 SHA512 ed638bb8b00e0cee8da2a96bfcebb9fe0f729fb42415155b8df82d05d67e486db577356f310d99c5ee92a37f4a5d3b85e48a08c0c73a26f6914f764519e39357
-EBUILD vivaldi-3.4.2066.86_p1.ebuild 2822 BLAKE2B d789dab33c105c76ad04055a8d73a9f4d240dc0188e959963ee985538164fe9ee3904a83e9e558a1c969ef87f620eaf2ac5e5aabb07ea8a6e9aa6dd08da719e4 SHA512 ed638bb8b00e0cee8da2a96bfcebb9fe0f729fb42415155b8df82d05d67e486db577356f310d99c5ee92a37f4a5d3b85e48a08c0c73a26f6914f764519e39357
-MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
+DIST vivaldi-stable_3.5.2115.73-1_amd64.deb 76802208 BLAKE2B 1421a38a20fc1c25c5e8cebe5eeddf4a991759c325675538c2fc31c2d0001a9846a31a785f8f3f508a6cabc5e52d4365feb2e0a58d60d4cf160b86fc0333eae3 SHA512 f43ac8ebe8c86e244366160bcd5c2c33d22d0cd44602eaa8a4fa512cfc255ee0cfefd6e865eb12ed0f711c182d0f4313836e865cde416890bc694c2835e21bf7
+DIST vivaldi-stable_3.5.2115.73-1_arm64.deb 69054028 BLAKE2B fc17e2d84900d101d5a716fa79990cd6501e741c2e3c80889e3b4b5c057a2ea0dad29b9b22fc71768a14ad75677666ab6755ca3babd29cd9babbf72b15b3830d SHA512 af84e3d1719cfa0f19ccae17af48c375a03e676e68be92a8ab5babb6bec3d36d6cd1ce4b13daeeffd5f0117e2614d4c1da53f5c2690c7f373003cf805b7ca99d
+DIST vivaldi-stable_3.5.2115.73-1_armhf.deb 68138412 BLAKE2B 22c061ac3112d2e8f81b3b9ad0e6fb3d852245f5ba15ca24a6a914d5fe5e8216e973b22e80cb3c94812eb7b02ed7a3b165390bd7651498c9149bfee07994664b SHA512 e1997250bec3f1591000b88a3e08446a8e2d1ffea057cb5faf101e048a1adad1db5d240ee6e12d959ad8d5172de8710ef969c407363b1693b9da83cd39091799
+DIST vivaldi-stable_3.5.2115.73-1_i386.deb 73581952 BLAKE2B 4cc3bc2109056dfcfab741ebee15337fc01213379c258ade99d460ab2e0f588eb54c34ac2596f8f6bc16761e69f43132ca2a8c1e81785f79238668f44be7de22 SHA512 65a25d67ec6decfbfb57fcfaead79600d6eabe3c7278b25c9c5103648e3dfff80d36838f210076bb85cdccf7ca3f4dbc9ef764cb449e76fd8ba54f05f9ed3ed2
+DIST vivaldi-stable_3.5.2115.81-1_amd64.deb 76800924 BLAKE2B f284db01815f2045f338ae05313c3ecc760c358f396d3a5b178f7b78958217929cca5b4565ab5cf886b66674392cd247e1e550b204789b7f82e75a612d0e73c4 SHA512 6586cb7b2aa481c131792e317181f7089bcce6fe2a9682eedd6dbcb957cecf79facd984c5003c23e028a9c8aea5b822f16d8716fe377fc9b9eca03628599f29a
+DIST vivaldi-stable_3.5.2115.81-1_arm64.deb 69060656 BLAKE2B 980c9057d58ffb76f16ff460d507b0d1d4af698b45448be201a6da4b0332f9e10505c0e0cb377670b4f0e2e170467a753f0b694d07277af344908f72182f0f95 SHA512 aa4664f7dc7cb2f2c90a62f555d77ac5232d87205660a626cb6b391735d231e01c76318931607ebb763bb15fe61e6b5b76b9f8136899296db87084ceada38c86
+DIST vivaldi-stable_3.5.2115.81-1_armhf.deb 68138676 BLAKE2B 800424a447f968b73804dfb57505b7ba6f3d422f76e35b1260178fa3b1e8056d6452f9a131f0216d3b6e156e47c84e39bd95a436cccd0c3c44a4600e2378ea9d SHA512 9bdc9a697fe255d5435ea9435c2a5bcd7eabbcc8f013af573fc4b6903f367a14a5cd140ed9141a856bd4c16446fffad1582cf5f3701828a654459a65b1480a0f
+DIST vivaldi-stable_3.5.2115.81-1_i386.deb 73600472 BLAKE2B fad4bbef97173f39446277b1ace8b8bf421cd979f02c490879f7b4b8ba3b82cfb6024c8ebad60aaaf436e755a69151883cbb0108212cce7f0274baa969f3f923 SHA512 8634d8a4ee9f0b240f5c8ab59599918f5e0f830e38f8caa6a24afcdf0e6c3291f447834e6262121ec0e484f098ee17be9fb4ed493b81ecba7e0551ee7a31fa96
+EBUILD vivaldi-3.5.2115.73.ebuild 3117 BLAKE2B fb8f547a924c8c3ce37587307faa723a897c354929193d65bc4efbac2f043b25e82c61ca4e2dfbb65133746c793e87b6781050fbbb887aa2f0b3f5193aa1c193 SHA512 6875e61344d5148d4e65de901512b7a02d03ac9a3aa5513a7c38dbb89efcbe96d7ec81391c0988bf503566e7c7528130204c97915f1321d0c595391139352319
+EBUILD vivaldi-3.5.2115.81.ebuild 3119 BLAKE2B 2280d8cb71ddda8d59bacd6b1302e2096ac7a74b5754f962bd8492ee321b5916ce3ebf999d12f6d0be52620a362bcb40d86d87ea31aea236eb0f8e4a13dd08ed SHA512 2a5c2b58435f1f871c6a7c83a82d642dda5e7b8d96d98f509b6c2b11573829cd58f5ccf64a3fee74c692d11921bed361791b3e6d304502a97c89efafb8bd02dd
+MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index 3b94165dd3d1..91c75704fe9c 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/metadata.xml
@@ -5,4 +5,8 @@
 		<email>chewi@gentoo.org</email>
 		<name>James Le Cuirot</name>
 	</maintainer>
+	<use>
+		<flag name="proprietary-codecs">Use system <pkg>media-video/ffmpeg</pkg> to support patent-encumbered media codecs</flag>
+		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild
deleted file mode 100644
index f807af0fd17c..000000000000
--- a/www-client/vivaldi/vivaldi-3.4.2066.106_p1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd 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 multilib unpacker toolchain-funcs xdg
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_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/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_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/${VIVALDI_BIN} \
-		|| 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
-
-	eapply_user
-}
-
-src_install() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild
deleted file mode 100644
index f807af0fd17c..000000000000
--- a/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd 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 multilib unpacker toolchain-funcs xdg
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_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/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_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/${VIVALDI_BIN} \
-		|| 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
-
-	eapply_user
-}
-
-src_install() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild b/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild
new file mode 100644
index 000000000000..9915e12fccfc
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	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 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+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]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/lib/libffmpeg.so
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+}
diff --git a/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild b/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild
new file mode 100644
index 000000000000..f69da1d681b9
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	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 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+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]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/lib/libffmpeg.so
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /www-client
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)