gentoo resync : 16.09.2020

54 files changed, 2944 insertions, 1320 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b101202ffda7..32f6537f1cd0 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b82ab307c0e1..c2d7fe44ebb0 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,16 @@
 AUX chromium-84-mediaalloc.patch 1242 BLAKE2B 3545ea4f8d71a062f71c20f4fa3e1460dbd02d3512ce6445ac4f948582a51bdcbd98829eff9b01cb7b920313d1f849534c46a942eed209a56ca373da8e938b6b SHA512 7799be695afe24844aad35ee4ed2aeb338b36a06e29a7f8d8a9c5d2b2769167469b8cdfa3f8814e6976c26a2731fc73741dc1c0b095695e1a21bfd3db166f7b4
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-launcher-r5.sh 1556 BLAKE2B 0671bd8558cd98f3ce0281d35893a99388d45388629b0eaa31e141289ed641bf950fa717c4ead9e87803eebb2055ed97b0f8ad6537062e9d563f54c0a9a008cb SHA512 e5bb9c5fc2daabeef1740a0cb9fea67986a233d51cdcaa0b27ff365b0cf6182d9bf047df664dcccca64c6dc4d59d6246e4312c5e7fa16bb30b085c34934d5689
+AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
-DIST chromium-85.0.4183.83.tar.xz 833156956 BLAKE2B ee5201994daa4c351da89437b6b65bec8c28d35e53c27708444b33dc7297535dd2489ae5014c8d29f62b44e90a968bc9bc4d981532bb764d144dfc090bc1aa31 SHA512 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436
+DIST chromium-85.0.4183.102.tar.xz 833172260 BLAKE2B f10cd8579db8c5d61d818604da0353baf5848b7658ec3942bd67471d29b4b4399d989349b1830009df139db9061452ce66fdedfec09f66074e37594584f546b3 SHA512 acd6f0a7b74018098752b6598e09a2bd6d1c9f1120c39a5c6cd3d924c466be92b854f3c7f91693ba9506e47b173ef12c14427f998362524b2497fbe5587a6b6c
 DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
-DIST chromium-86.0.4240.8.tar.xz 826059060 BLAKE2B c304bb6e197e6b989dc9b5d1be33f8094813bd25b7a8245386bffe0a62463cb0c549e7febb6bb1487e8cd4f5d7707e81fc9b20b16b2cda6760e0e854fa09d749 SHA512 c2baff06004e2e74b92a2320acc0fda93ca296aa06558ffee7a7acbca6b1b80c1db886b7b5c222e414c42bf394c0cb8895dd7ec5646fb5f08f9eeb11c27a09da
+DIST chromium-86.0.4240.30.tar.xz 826279324 BLAKE2B 133a696f326627dc07234ceaba006bce27ea57a0c857727759caab34e32c2dd3b16d1bb4e1a20d575595636b241cf2c0264a921f2aedcdd3ce05abb45b3f0090 SHA512 c45e7c0df5ba5e589b34785e1b2b448cb95cd1352642a97cdbddce47db33024b3411e5b76380f54c64e27bd077a0b645896a641d712b35a60a9ddf85260e0f70
+DIST chromium-87-patchset-2.tar.xz 8244 BLAKE2B 3dde2801598c6e1d4a554f70886a57255e23d8c88ba65d1c9f14672e2b0e5475d1725fbd28cf9b650706eab100a1eda946b740d785aa904d8d42e036ff12b96b SHA512 a85976d7e217c5f387af7ab4be9a60b65d71c2674df3a270e4c41d447bb31bfe2ad9c176bc089ed06b8f67f409203fe0e18b8837ef6402bcdac285954bc5f2eb
+DIST chromium-87.0.4259.3.tar.xz 830367636 BLAKE2B 94a2335e4afbaea06745dddc6277afd43c879fd3c6d1611ad3b6b7213eccd081aa925e281460b463dcf45da720f983ff38e567ab376420116147629c4f253f71 SHA512 a9acd2ad9521b32e5e877d19226ab4ee5c0f0e8e291b7bf28929ff5d2e397dbc74fc0e556c231f2e004efd55df22db39b3944c54a5fb0a77afb8ffd73fdcd6f0
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-EBUILD chromium-85.0.4183.83.ebuild 26594 BLAKE2B d1dc4740251918a897e208c78bfa0df33c47189585ef02a9a85617aed2513813212550069c99f1bff0d968cbce0e6fa8168e694618f8dc396439687886ba3289 SHA512 f28df13d3ece2a3a1eaae36b4eea2de994c1bc1722390ff896ccff2ed290e72b810561b9dab6b74a73d1710c97a0788ff3214f5a56ed8dd1c80af49f6123b71c
-EBUILD chromium-86.0.4240.8.ebuild 27409 BLAKE2B 0f4b596c827206878c040faeddb851de491e6a4d72ae87b2f5394dcfff583d97d334c69e66992ce560a0996b5aede57e613d00233a572d0a7842c77fa9c5aac5 SHA512 194aac1ba8ab6f3840e434a9fdc893495936cc094932d2d6c8dbc2958141433e3cabb4b67561e107c1798c0ab3ffa12abc332883cbe50987434305c51aad477b
-MISC metadata.xml 1687 BLAKE2B 587fdf206e202af8964380ebf5566cb68092956f2ef469f744477c72ad69c62adc656d0656aaadbf913339e24f70c1f654bb1e7218aeaebc7716fa7c4430fe39 SHA512 6271388d4c60b7fef0c727e9c0ecffac691c0ee6ec41fc796e5c686a64d5dce7377e922a769c038cc88f2f72387df061929005782602b9e72b044c22455dc8fd
+EBUILD chromium-85.0.4183.102.ebuild 26679 BLAKE2B 1154809a421f02f704d778efa340a29d8a5748ba784060cd39eaa5687d2bb04f46fee00fbb863e6987f7a6b6427ce2af1d5ac3b8551008bcf3cd64fd37fb058e SHA512 c3e7fbd0a29df9f84ad18b48816dd3228685dc601521e49bdd82762093c578a5b24d1793db3551314ee190736685d038da50be47ce1514e1c0e5a0b21a290316
+EBUILD chromium-86.0.4240.30.ebuild 27932 BLAKE2B c4790f812572d65541458b0c4840b6906ac5e620458771da2a6dd0d391107400d9b408b7a2e34ad50262bf5c65f90ede4dd226ddbb7ab4c00bb095d22f8cefbb SHA512 31530182e51266b233d1ecfb8ef8c4cde35843198a31c40351dffaf467ed64b5eca2441d507e9911a5c83d05eda2b1c88bd48eb61bb2d5828df4a18c169f3037
+EBUILD chromium-87.0.4259.3.ebuild 27611 BLAKE2B f008ee8c04b407b021f17bc4aea7eeab8b403e4c7e534dffc6bf663c901f9de0cf0c7a79b7cf7fc68fca0724a3a279a329319fb2893c52f6b78327802a4bf9ba SHA512 803bfa6ed046579337d26284bb146a951ac2a01439c322f09c38a75891d920f51895b3e6b8d82bb41586764570aad5ad489514695880b59af1dbdfc18f8254fa
+MISC metadata.xml 1712 BLAKE2B 07346b7372c3a52dd3c08b320527793f8fcd8be2308503145d6f7a7068d8113035559c7b2576ec009c9488364ed43837dc73581284e563e47b54a49028c9e22e SHA512 756cd5106e7680e33d1de45b5ad8a8154d9f4f7dedef865aa6e1b218d7b690ca8017a9e00696377a33a45aa03c77ecff91f42c6e0b00cf263396b700e5815c3a
diff --git a/www-client/chromium/chromium-85.0.4183.83.ebuild b/www-client/chromium/chromium-85.0.4183.102.ebuild
index 9979a9b053df..3423601bdd4f 100644
--- a/www-client/chromium/chromium-85.0.4183.83.ebuild
+++ b/www-client/chromium/chromium-85.0.4183.102.ebuild
@@ -21,11 +21,12 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 REQUIRED_USE="
 	component-build? ( !suid )
-	wayland? ( ozone )
+	headless? ( ozone )
+	ozone-wayland? ( ozone )
 "
 
 COMMON_X_DEPEND="
@@ -81,10 +82,11 @@ COMMON_DEPEND="
 	ozone? (
 		!headless? (
 			${COMMON_X_DEPEND}
-			x11-libs/gtk+:3[wayland?,X]
-			wayland? (
+			x11-libs/gtk+:3[X]
+			ozone-wayland? (
 				dev-libs/wayland:=
 				dev-libs/libffi:=
+				x11-libs/gtk+:3[wayland,X]
 				x11-libs/libdrm:=
 				x11-libs/libxkbcommon:=
 			)
@@ -459,7 +461,7 @@ src_prepare() {
 	if use tcmalloc; then
 		keeplibs+=( third_party/tcmalloc )
 	fi
-	if use ozone && use wayland && ! use headless ; then
+	if use ozone && use ozone-wayland && ! use headless ; then
 		keeplibs+=( third_party/wayland )
 	fi
 	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
@@ -703,10 +705,10 @@ src_configure() {
 		myconf_gn+=" ozone_platform_headless=true"
 		if ! use headless; then
 			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+			myconf_gn+=" ozone_platform_wayland=$(usex ozone-wayland true false)"
 			myconf_gn+=" ozone_platform_x11=true"
 			myconf_gn+=" ozone_platform_headless=true"
-			if use wayland; then
+			if use ozone-wayland; then
 				myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
 				myconf_gn+=" ozone_platform=\"wayland\""
 			else
@@ -782,7 +784,7 @@ src_install() {
 	doexe out/Release/chromedriver
 
 	ozone_auto_session () {
-		use ozone && use wayland && ! use headless && echo true || echo false
+		use ozone && use ozone-wayland && ! use headless && echo true || echo false
 	}
 	local sedargs=( -e
 			"s:/usr/lib/:/usr/$(get_libdir)/:g;
diff --git a/www-client/chromium/chromium-86.0.4240.8.ebuild b/www-client/chromium/chromium-86.0.4240.30.ebuild
index 52e0c1376357..fcb525d806f7 100644
--- a/www-client/chromium/chromium-86.0.4240.8.ebuild
+++ b/www-client/chromium/chromium-86.0.4240.30.ebuild
@@ -21,11 +21,12 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 REQUIRED_USE="
 	component-build? ( !suid )
-	wayland? ( ozone )
+	headless? ( ozone )
+	ozone-wayland? ( ozone )
 "
 
 COMMON_X_DEPEND="
@@ -58,7 +59,7 @@ COMMON_DEPEND="
 	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc] )
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? (
 		>=media-video/ffmpeg-4.3:=
@@ -81,11 +82,12 @@ COMMON_DEPEND="
 	ozone? (
 		!headless? (
 			${COMMON_X_DEPEND}
-			x11-libs/gtk+:3[wayland?,X]
-			wayland? (
+			x11-libs/gtk+:3[X]
+			ozone-wayland? (
 				dev-libs/wayland:=
 				dev-libs/libffi:=
 				x11-libs/libdrm:=
+				x11-libs/gtk+:3[wayland,X]
 				x11-libs/libxkbcommon:=
 			)
 		)
@@ -220,6 +222,13 @@ pkg_setup() {
 	pre_build_checks
 
 	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Ozone due to unsupported EGLStreams
+	if use ozone && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work correctly with Ozone. You might be"
+		ewarn "able to work around this problem by using SwiftShader OpenGL implementation."
+		ewarn "Add --use-gl=swiftshader to CHROMIUM_FLAGS in /etc/chromium/default to force SwiftShader."
+	fi
 }
 
 src_prepare() {
@@ -464,7 +473,7 @@ src_prepare() {
 	if use tcmalloc; then
 		keeplibs+=( third_party/tcmalloc )
 	fi
-	if use ozone && use wayland && ! use headless ; then
+	if use ozone && use ozone-wayland && ! use headless ; then
 		keeplibs+=( third_party/wayland )
 	fi
 	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
@@ -708,10 +717,10 @@ src_configure() {
 		myconf_gn+=" ozone_platform_headless=true"
 		if ! use headless; then
 			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+			myconf_gn+=" ozone_platform_wayland=$(usex ozone-wayland true false)"
 			myconf_gn+=" ozone_platform_x11=true"
 			myconf_gn+=" ozone_platform_headless=true"
-			if use wayland; then
+			if use ozone-wayland; then
 				myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
 				myconf_gn+=" ozone_platform=\"wayland\""
 			else
@@ -797,7 +806,7 @@ src_install() {
 	doexe out/Release/chromedriver
 
 	ozone_auto_session () {
-		use ozone && use wayland && ! use headless && echo true || echo false
+		use ozone && use ozone-wayland && ! use headless && echo true || echo false
 	}
 	local sedargs=( -e
 			"s:/usr/lib/:/usr/$(get_libdir)/:g;
diff --git a/www-client/chromium/chromium-87.0.4259.3.ebuild b/www-client/chromium/chromium-87.0.4259.3.ebuild
new file mode 100644
index 000000000000..0351b2831aca
--- /dev/null
+++ b/www-client/chromium/chromium-87.0.4259.3.ebuild
@@ -0,0 +1,878 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+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 +system-libvpx +tcmalloc 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:=
+"
+
+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:=
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc] )
+	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 )
+"
+
+: ${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-67.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
+
+	eapply "${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/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/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/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/libgifcodec
+		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/libwebm
+		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/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-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/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/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 system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+
+		# 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
+	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
+	# 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 use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	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)"
+
+	# 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"
+	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)
+		[[ ${#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
+}
diff --git a/www-client/chromium/files/chromium-launcher-r6.sh b/www-client/chromium/files/chromium-launcher-r6.sh
new file mode 100644
index 000000000000..637cfd612aa5
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r6.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Allow the user to override command-line flags, bug #357629.
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+for f in /etc/chromium/*; do
+    [[ -f ${f} ]] && source "${f}"
+done
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER=$(readlink -f "$0")
+
+PROGDIR=${CHROME_WRAPPER%/*}
+
+case ":$PATH:" in
+  *:$PROGDIR:*)
+    # $PATH already contains $PROGDIR
+    ;;
+  *)
+    # Append $PROGDIR to $PATH
+    export PATH="$PATH:$PROGDIR"
+    ;;
+esac
+
+if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
+	# Running as root with HOME owned by root.
+	# Pass --user-data-dir to work around upstream failsafe.
+	CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
+		${CHROMIUM_FLAGS}"
+fi
+
+# Select session type and platform
+if @@FORCE_OZONE_PLATFORM@@; then
+	CHROMIUM_FLAGS="--enable-features=UseOzonePlatform ${CHROMIUM_FLAGS}"
+elif @@OZONE_AUTO_SESSION@@ && ! ${DISABLE_OZONE_PLATFORM:-false}; then
+	if [[ ${XDG_SESSION_TYPE} == wayland || -n ${WAYLAND_DISPLAY} && ${XDG_SESSION_TYPE} != x11 ]]; then
+		CHROMIUM_FLAGS="--enable-features=UseOzonePlatform ${CHROMIUM_FLAGS}"
+	fi
+fi
+
+# Set the .desktop file name
+export CHROME_DESKTOP="chromium-browser-chromium.desktop"
+
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 5fcb0607cc0b..d4dcbbad0a3c 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -13,13 +13,13 @@
 		<flag name="official">Enable Official build instead of Developer build.</flag>
 		<flag name="ozone">Enable Ozone platform abstraction layer with X11 backend.</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
-		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
+		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
 		<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="system-icu">Use system icu instead of the bundled one</flag>
 		<flag name="system-libvpx">Use system libvpx instead of the bundled one</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
-		<flag name="wayland">Enable Wayland backend for Ozone.</flag>
+		<flag name="ozone-wayland">Enable Wayland backend for Ozone.</flag>
 		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 54c7ad07091b..1da93cb2b67d 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,18 +1,6 @@
-AUX elinks-0.11.2-lua-5.1.patch 538 BLAKE2B 10650f042c2a074fcd6a6c3c0b481b096b4d23d530f5a7c59bbc1687f83dde1286eaa6aebc37d6a1ea2e93d3d15287e916ef6abe2d1681678a4beba87cfd07d3 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef
-AUX elinks-0.12_pre5-compilation-fix.patch 464 BLAKE2B 977e4ce921ab0e8593427d2822d2a209124fc3d2d20e093adc362c6c6b4421f86571625f81690aa7a8383431519264cf195d2cec5efb99f95691518606108204 SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe
-AUX elinks-0.12_pre5-libressl.patch 845 BLAKE2B 62b77fb6280618a6fc473cdd55a9c74fb2995f1b80d13660141c4be765fbe67838e3a067c833a8eb9f61e30858d1e29245acebc42d378f4fac5fafa659b1ac38 SHA512 7cf844e5f62abc20b9fffd29c82a786504db4e645a794b98238ea7157db1fe8bfc3e4c211c674ff182aa5d540350b2c8cae34a61891dc79afa1e2525448b747a
-AUX elinks-0.12_pre5-rand-egd.patch 738 BLAKE2B fb76450867476e21dbad27633d313359dc6d641a4e705d4308faf2d79a9c3fd923b6f9b47701af4d67b7e28b67c0b477d40ead617ff8e3041394b3163315cf5c SHA512 7d23496380658f102d933a1722313d1b0396afb0b349260cb7cf735baec4edd08cb5ad363880d6bb95ef67e46770daa8b4aa57116a53ec36762db05a58ed09ff
-AUX elinks-0.12_pre5-ruby-1.9.patch 7131 BLAKE2B 5b65d975982986e85ae2f9f8a1a6ac96a49bbdbaaba23bc9bfb93c8b9a5ef3bf380a0752dd1c36b76772d7abd8cf0b37de4731ad4bd77d256749030bd22b8b0e SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6
-AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 BLAKE2B 133785ebccfcdcebf8f3ada684786f0b55109e46332115238b12aff92404f587186e7c1a434d004ae43df434f8cfb283c4746d6bf91d1b00556b06ebfd4ceab7 SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34
-AUX elinks-0.13-ruby.patch 6679 BLAKE2B aac1923c2115743fd29d94e67af069857e03896d5e970297ba84c250f3eef54df24324975639de14a732e84897d21637397b85eb4346dc005d99a252943718cf SHA512 df93eb589fb6d30bdc4ffac8c44a5b1f4db7565d7221f9aa1edb07809cb5ada0797f6a2128bb5c0083134fa2b58ef62a157e7aad32751821f87e15f5760e34ac
 AUX elinks-0.13.4-ruby-gcc10.patch 337 BLAKE2B 4b01f5cd0c311dca3dbc939157e9cb14b95da4a90782ce12ee4b524502852dade5a092c621c9bdc02f315721868237192028c85faceb13afb3d8633d6f1ccf29 SHA512 b40a69a53b48b957175dbab49566ecc73f1a9a77e7e4e1b824b4a5afcd08319842d6f530feeb2afa63e4854b7dd2e980933a481165c9d64289acf16d72f1bec9
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
-DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c
-DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f
 DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
-DIST elinks-0.13_pre_pre20180225.tar.gz 3518990 BLAKE2B 89c95b1d6e438975f5711f2e83960c90ced451953f395f3d73eeca40e6187b423b3c7d50b065c11673ee9fe03e8ee99a4c7642ebc01eea888c417645a0e53d7d SHA512 3f817768766e6dd6df042f7512163c5de70766e4d565fc081f4f755f7f7958d5487b9ff2ea29187a5cc813dc0841d75d440087fbdaf99f73d2a269dca70d5725
-EBUILD elinks-0.12_pre6-r4.ebuild 4885 BLAKE2B 9c245241dac08a450ee0c278efadda81f3c9c223b97f5571d01118d3ac51e1434f31a73d6e61121c2802429dc2af5e9052803f5e173a0f703a89b1fa25a8beea SHA512 3bb96ccf1729ccb84ed03c1c6c0fbfdd672506f8fe15e72e06c9fdbc34fa03893827198c88cd80dc5164701ff56b064fe34728457eeee1d1040ba94d413b405c
-EBUILD elinks-0.13.4.ebuild 3842 BLAKE2B d0a5d415b95615e27eae8ecadf0e1b3aab9d951da9b6660bd4b022e00379409c9f9147aaedfe27f7837a3b5639865c378ca89d2be09b8332cc955e6308e4d047 SHA512 2edc9c4755cf13dfb4625451ba2c52a25081f2966128cb363dc36587a344501e701c031cc87e08f0452e75d4bedf3d5e5a0ac332f04af53bd0c6c6a36fabf98d
-EBUILD elinks-0.13_pre_pre20180225.ebuild 4050 BLAKE2B d0f842e3f37062d379145e459ec1bb08c7e424a7a54f18a691666a5dbbdb5f220987ea7c99c50e32492a0867d196c1c6cf05aef7e53de73aead3fd1ea06f3092 SHA512 2af2c070130b58cea5755fffc73c2e0333791614e42cb571bf7a2e6418ed83557a07d4934791d688f8cc8d564ce55a76b010120c773d62624499d0e2a062e2c4
+EBUILD elinks-0.13.4.ebuild 3835 BLAKE2B 14af3ca9461896ad01a658ad29f066eb34186032262d336d900fd76cbbd16e1eafb59bc554138d19457f60663747b4a5829e194bbc24677bac2d6c2524080a17 SHA512 05a268835c1e1179afbcabd331379e2b23e9119d946ed472cf0e588a77548ddea50d254075e57259486c0066344c22ba2a2fb1fc51547cea02a9b5c113a296b9
 EBUILD elinks-9999.ebuild 3673 BLAKE2B 9769340042726a76591dbd245326471518007941d2f83458699da984cdd89788d906c49cc3860dd0c60d3956e7e3bb1f929538c27ba365446600ad9a48e15293 SHA512 7a487cfb5f176b950c80409327fb09dae7dedfb6d2f3bed5c03b7f171184185d739c85eedca0eb1ada90b0658fc1b8c1a42b1209df06211f4fe89175f8d7bbef
-MISC metadata.xml 989 BLAKE2B 4b2f65d67e922e7e9cce74761cebca030866842af469ef4776d7cf2f8e685a52f9cbdfee25fb6a29546543e71127f48f93f78593745f6ab151e49250fe1b0259 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990
+MISC metadata.xml 897 BLAKE2B 1a2d64f8a35ee418538530d129957ec313e8085281f0fa1b8711b3b1b4f378e4b8c18eecb999256b542644cd0b93968f4fc0e8ea48a6daf85afdd073d4c12aec SHA512 74993b896b204fe46cb62c718426bc0421ad49e3591620806f49023ed3c6d24d49b243a2d4cbe18c9aa7ceb5f955caff1480fe8e8e5b1619fd39ca9f21d1a3cb
diff --git a/www-client/elinks/elinks-0.12_pre6-r4.ebuild b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
deleted file mode 100644
index 5d39231f42ad..000000000000
--- a/www-client/elinks/elinks-0.12_pre6-r4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
-RESTRICT="test"
-
-DEPEND="
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gc? ( dev-libs/boehm-gc )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
-	idn? ( net-dns/libidn )
-	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
-	lua? ( >=dev-lang/lua-5:0= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tre? ( dev-libs/tre )
-	X? ( x11-libs/libX11 x11-libs/libXt )
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
-	"${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
-	"${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
-	"${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
-	"${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
-	"${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
-	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
-	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
-	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
-	"${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
-	)
-
-src_prepare() {
-	default
-
-	# fix lib order in configure check
-	# (these seds are necessary so that @preserved-libs copies are not used)
-	sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
-		configure.in || die
-	# Regenerate acinclude.m4 - based on autogen.sh.
-	cat > acinclude.m4 <<- _EOF || die
-		dnl Automatically generated from config/m4/ files.
-		dnl Do not modify!
-	_EOF
-	cat config/m4/*.m4 >> acinclude.m4 || die
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use debug ; then
-		myconf="--enable-debug"
-	else
-		myconf="--enable-fastmem"
-	fi
-
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
-	if use ssl ; then
-		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
-	else
-		myconf="${myconf} --without-openssl --without-gnutls"
-	fi
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/elinks \
-		--enable-leds \
-		--enable-88-colors \
-		--enable-256-colors \
-		--enable-true-color \
-		--enable-html-highlight \
-		$(use_with bzip2 bzlib) \
-		$(use_with gc) \
-		$(use_with gpm) \
-		$(use_with guile) \
-		$(use_with idn) \
-		$(use_with javascript spidermonkey) \
-		$(use_with lua) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with tre) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_enable bittorrent) \
-		$(use_enable finger) \
-		$(use_enable ftp) \
-		$(use_enable gopher) \
-		$(use_enable ipv6) \
-		$(use_enable mouse) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable samba smb) \
-		$(use_enable xml xbel) \
-		${myconf}
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/elinks-0.13.4.ebuild b/www-client/elinks/elinks-0.13.4.ebuild
index aa8b251b8b4f..9e8e327da172 100644
--- a/www-client/elinks/elinks-0.13.4.ebuild
+++ b/www-client/elinks/elinks-0.13.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/felinks-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
 	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 
diff --git a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
deleted file mode 100644
index cb8f0fdd3d86..000000000000
--- a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools python-any-r1
-
-EGIT_COMMIT="0dd3aaabe61fbc5ed0d9a74915678d11d00c2a1c"
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${EGIT_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
-	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
-	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
-	lua? ( >=dev-lang/lua-5:0= )
-	perl? ( dev-lang/perl:= )
-	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-	samba? ( net-fs/samba )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tre? ( dev-libs/tre )
-	X? ( x11-libs/libX11 x11-libs/libXt )
-	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
-	"${FILESDIR}"/${PN}-0.13-ruby.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-Werror//' configure* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}"/etc/elinks
-		--enable-leds
-		--enable-88-colors
-		--enable-256-colors
-		--enable-true-color
-		--enable-html-highlight
-		$(use_with gpm)
-		$(use_with brotli)
-		$(use_with bzip2 bzlib)
-		$(use_with guile)
-		$(use_with idn)
-		$(use_with javascript spidermonkey)
-		$(use_with lua)
-		$(use_with perl)
-		$(use_with ruby)
-		$(use_with tre)
-		$(use_with X x)
-		$(use_with zlib)
-		$(use_enable bittorrent)
-		$(use_enable finger)
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable ipv6)
-		$(use_enable mouse)
-		$(use_enable nls)
-		$(use_enable nntp)
-		$(use_enable samba smb)
-		$(use_enable xml xbel)
-	)
-
-	if use debug ; then
-		myconf+=( --enable-debug )
-	else
-		myconf+=( --enable-fastmem )
-	fi
-
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
-	if use ssl ; then
-		myconf+=( --with-openssl="${EPREFIX}"/usr )
-	else
-		myconf+=( --without-openssl --without-gnutls )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	insinto /etc/elinks
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-	docinto contrib/guile ; dodoc contrib/guile/*.scm
-
-	# elinks uses an internal copy of gettext which ships files that may
-	# collide with the system's gettext (https://bugs.gentoo.org/635090)
-	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
-}
-
-pkg_postinst() {
-	elog "You may want to convert your html.cfg and links.cfg of"
-	elog "Links or older ELinks versions to the new ELinks elinks.conf"
-	elog "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
-	elog
-	elog "Please have a look at /etc/elinks/keybind-full.sample and"
-	elog "/etc/elinks/keybind.conf.sample for some bindings examples."
-	elog
-	elog "You will have to set your TERM variable to 'xterm-256color'"
-	elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
deleted file mode 100644
index 20db8a484598..000000000000
--- a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c
---- elinks-0.11.2/src/scripting/lua/core.c	2006-11-19 14:46:37.000000000 +0100
-+++ elinks-0.11.2-lua/src/scripting/lua/core.c	2007-03-10 15:34:47.000000000 +0100
-@@ -646,11 +646,7 @@ init_lua(struct module *module)
- {
- 	L = lua_open();
- 
--	luaopen_base(L);
--	luaopen_table(L);
--	luaopen_io(L);
--	luaopen_string(L);
--	luaopen_math(L);
-+	luaL_openlibs(L);
- 
- 	lua_register(L, LUA_ALERT, l_alert);
- 	lua_register(L, "current_url", l_current_url);
diff --git a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
deleted file mode 100644
index dee09a67eb45..000000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp elinks-0.12pre5-orig//src/intl/charsets.c elinks-0.12pre5/src/intl/charsets.c
---- elinks-0.12pre5-orig//src/intl/charsets.c	2010-04-04 12:19:02.000000000 +0200
-+++ elinks-0.12pre5/src/intl/charsets.c	2010-04-04 12:19:20.000000000 +0200
-@@ -821,7 +821,7 @@ free_utf_table(void)
- 
- 	/* Cast away const.  */
- 	for (i = 128; i < 256; i++)
--		mem_free((unsigned char *) utf_table[i].u.str);
-+		mem_free(utf_table[i].u.str);
- }
- 
- static struct conv_table *
diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
deleted file mode 100644
index d41ab689e9f1..000000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Adapted from upstream
-commit 54ebe365b752f8969a67279d0d29552ab638e025
-Author: Witold Filipczyk <witekfl@poczta.onet.pl>
-Date:   Mon Mar 6 17:39:36 2017 +0100
-
-    Compilation fix for OpenSSL-1.1
-
---- a/src/network/ssl/socket.c
-+++ b/src/network/ssl/socket.c
-@@ -67,7 +67,9 @@
- ssl_set_no_tls(struct socket *socket)
- {
- #ifdef CONFIG_OPENSSL
--	((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
-+#ifdef SSL_OP_NO_TLSv1
-+	SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
-+#endif
- #elif defined(CONFIG_GNUTLS)
- 	{
- 		/* GnuTLS does not support SSLv2 because it is "insecure".
-@@ -145,7 +147,7 @@
- 		}
- 
- 		if (client_cert) {
--			SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
-+			SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
- 
- 			SSL_CTX_use_certificate_chain_file(ctx, client_cert);
- 			SSL_CTX_use_PrivateKey_file(ctx, client_cert,
diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
deleted file mode 100644
index 6c5679a95bbd..000000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/network/ssl/ssl.c
-+++ b/src/network/ssl/ssl.c
-@@ -84,11 +84,16 @@ init_openssl(struct module *module)
- 	 * cannot initialize the PRNG and so every attempt to use SSL fails.
- 	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
- 	 * application coders to seed the RNG. -- William Yodlowsky */
--	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
-+	RAND_file_name(f_randfile, sizeof(f_randfile));
-+#ifdef HAVE_RAND_EGD
-+	if (RAND_egd(f_randfile) < 0) {
- 		/* Not an EGD, so read and write to it */
-+#endif
- 		if (RAND_load_file(f_randfile, -1))
- 			RAND_write_file(f_randfile);
-+#ifdef HAVE_RAND_EGD
- 	}
-+#endif
- 
- 	SSLeay_add_ssl_algorithms();
- 	context = SSL_CTX_new(SSLv23_client_method());
diff --git a/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch b/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch
deleted file mode 100644
index 1e07bcde190a..000000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -urp a/config/m4/ruby.m4 b/config/m4/ruby.m4
---- a/config/m4/ruby.m4	2009-07-07 13:23:17.000000000 +0100
-+++ b/config/m4/ruby.m4	2012-09-10 18:23:09.000000000 +0100
-@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
- 	if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
- 
- 		AC_MSG_CHECKING(Ruby version)
--		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
-+		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
- 			ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
- 			AC_MSG_RESULT($ruby_version)
- 
- 			AC_MSG_CHECKING(for Ruby header files)
--			rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-+			rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
- 
- 			if test "X$rubyhdrdir" != "X"; then
- 				AC_MSG_RESULT($rubyhdrdir)
- 				RUBY_CFLAGS="-I$rubyhdrdir"
--				rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
-+				rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
-+				if test -d "$rubyhdrdir/$rubyarch"; then
-+					RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
-+				fi
-+				rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'`
- 
- 				if test "X$rubylibs" != "X"; then
- 					RUBY_LIBS="$rubylibs"
- 				fi
- 
--				librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
-+				librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
- 
- 				if test -f "$rubyhdrdir/$librubyarg"; then
- 					librubyarg="$rubyhdrdir/$librubyarg"
- 
- 				else
--					rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
-+					rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
- 					if test -f "$rubylibdir/$librubyarg"; then
- 						librubyarg="$rubylibdir/$librubyarg"
- 					elif test "$librubyarg" = "libruby.a"; then
- 						dnl required on Mac OS 10.3 where libruby.a doesn't exist
- 						librubyarg="-lruby"
- 					else
--						librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
-+						librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
- 					fi
- 				fi
- 
-@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
- 					RUBY_LIBS="$librubyarg $RUBY_LIBS"
- 				fi
- 
--				rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
-+				rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'`
- 				if test "X$rubyldflags" != "X"; then
- 					LDFLAGS="$rubyldflags $LDFLAGS"
- 				fi
-@@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
- 			AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
- 		fi
- 	fi
-+	if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
-+		AC_MSG_CHECKING([for rb_errinfo])
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no")
-+		AC_MSG_RESULT($have_rb_errinfo)
-+		if test "$have_rb_errinfo" = "yes"; then
-+			AC_DEFINE([HAVE_RB_ERRINFO], [1],
-+				[Define to 1 if you have the `rb_errinfo' function.])
-+		fi
-+	fi
- fi
- 
- EL_RESTORE_FLAGS
-diff -urp a/src/scripting/ruby/core.c b/src/scripting/ruby/core.c
---- a/src/scripting/ruby/core.c	2009-07-07 13:23:17.000000000 +0100
-+++ b/src/scripting/ruby/core.c	2012-09-10 18:27:05.000000000 +0100
-@@ -76,10 +76,10 @@ erb_report_error(struct session *ses, in
- 		break;
- 	case TAG_RAISE:
- 	case TAG_FATAL:
--		eclass = CLASS_OF(ruby_errinfo);
--		einfo = rb_obj_as_string(ruby_errinfo);
-+		eclass = CLASS_OF(RB_ERRINFO);
-+		einfo = rb_obj_as_string(RB_ERRINFO);
- 
--		if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
-+		if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
- 			msg = "unhandled exception";
- 
- 		} else {
-@@ -88,7 +88,7 @@ erb_report_error(struct session *ses, in
- 
- 			epath = rb_class_path(eclass);
- 			snprintf(buff, MAX_STR_LEN, "%s: %s",
--				RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
-+				RSTRING_PTR(epath), RSTRING_PTR(einfo));
- 
- 			p = strchr(buff, '\n');
- 			if (p) *p = '\0';
-@@ -115,7 +115,7 @@ erb_module_message(VALUE self, VALUE str
- 	unsigned char *message, *line_end;
- 
- 	str = rb_obj_as_string(str);
--	message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);
-+	message = memacpy(RSTRING_PTR(str), RSTRING_LEN(str));
- 	if (!message) return Qnil;
- 
- 	line_end = strchr(message, '\n');
-@@ -162,8 +162,8 @@ erb_stdout_p(int argc, VALUE *argv, VALU
- 		 * the inspect() method, which adds quotes to the strings, so
- 		 * gently ignore them. */
- 
--		ptr = RSTRING(substr)->ptr;
--		len = RSTRING(substr)->len;
-+		ptr = RSTRING_PTR(substr);
-+		len = RSTRING_LEN(substr);
- 
- 		if (*ptr == '"')
- 			ptr++, len--;
-diff -urp a/src/scripting/ruby/core.h b/src/scripting/ruby/core.h
---- a/src/scripting/ruby/core.h	2009-07-07 13:23:17.000000000 +0100
-+++ b/src/scripting/ruby/core.h	2012-09-10 18:26:25.000000000 +0100
-@@ -7,6 +7,20 @@ struct session;
- 
- #include <ruby.h>	/* for VALUE */
- 
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(string) (RSTRING(string)->len)
-+#endif
-+
-+#ifndef RSTRING_PTR
-+#define RSTRING_PTR(string) (RSTRING(string)->ptr)
-+#endif
-+
-+#ifdef HAVE_RB_ERRINFO
-+#define RB_ERRINFO (rb_errinfo())
-+#else
-+#define RB_ERRINFO (ruby_errinfo)
-+#endif
-+
- VALUE erb_module;
- 
- void alert_ruby_error(struct session *ses, unsigned char *msg);
-diff -urp a/src/scripting/ruby/hooks.c b/src/scripting/ruby/hooks.c
---- a/src/scripting/ruby/hooks.c	2009-07-07 13:23:17.000000000 +0100
-+++ b/src/scripting/ruby/hooks.c	2012-09-10 17:53:48.000000000 +0100
-@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *d
- 	{
- 		unsigned char *new_url;
- 
--		new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+		new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- 		if (new_url) {
- 			mem_free_set(url, new_url);
- 		}
-@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void
- 	{
- 		unsigned char *new_url;
- 
--		new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+		new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- 		if (new_url) {
- 			mem_free_set(url, new_url);
- 		}
-@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap,
- 	switch (rb_type(result)) {
- 	case T_STRING:
- 	{
--		int len = RSTRING(result)->len;
-+		int len = RSTRING_LEN(result);
- 
--		add_fragment(cached, 0, RSTRING(result)->ptr, len);
-+		add_fragment(cached, 0, RSTRING_PTR(result), len);
- 		normalize_cache_entry(cached, len);
- 
- 		break;
-@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void *
- 	{
- 		unsigned char *proxy;
- 
--		proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+		proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- 		if (proxy) {
- 			mem_free_set(new_proxy_url, proxy);
- 		}
diff --git a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
deleted file mode 100644
index ee2e5e8d633f..000000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- a/src/scripting/smjs/action_object.c	2012-06-28 11:46:58.000000000 -0400
-+++ b/src/scripting/smjs/action_object.c	2012-06-28 11:52:42.000000000 -0400
-@@ -50,7 +50,7 @@
- 	assert(smjs_ctx);
- 	if_assert_failed return JS_FALSE;
- 
--	value = JS_FALSE;
-+	value = JSVAL_FALSE;
- 
- 	if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) {
- 		JS_SET_RVAL(ctx, rval, value);
-@@ -76,7 +76,7 @@
- 
- 	do_action(hop->ses, hop->action_id, 1);
- 
--	value = JS_TRUE;
-+	value = JSVAL_TRUE;
- 	JS_SET_RVAL(ctx, rval, value);
- 
- 	return JS_TRUE;
---- a/src/scripting/smjs/bookmarks.c	2012-06-28 11:57:40.000000000 -0400
-+++ b/src/scripting/smjs/bookmarks.c	2012-06-28 12:08:20.000000000 -0400
-@@ -250,11 +250,20 @@
- 
- /* @bookmark_folder_class.getProperty */
- static JSBool
-+#if JS_VERSION >= 185
-+bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
-+#else
- bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
-+#endif
- {
- 	struct bookmark *bookmark;
- 	struct bookmark *folder;
- 	unsigned char *title = NULL;
-+#if JS_VERSION >= 185
-+	jsval id;
-+	if (!JS_IdToValue(ctx,iid,&id))
-+		return JS_FALSE;
-+#endif
- 
- 	/* This can be called if @obj if not itself an instance of the
- 	 * appropriate class but has one in its prototype chain.  Fail
---- a/src/scripting/smjs/elinks_object.c	2012-06-28 12:11:15.000000000 -0400
-+++ b/src/scripting/smjs/elinks_object.c	2012-06-28 12:14:50.000000000 -0400
-@@ -185,7 +185,7 @@
- 	                               method, rval))
- 		return JS_FALSE;
- 
--	if (JSVAL_VOID == *rval)
-+	if (JSVAL_IS_VOID(*rval))
- 		return JS_FALSE;
- 
- 	return JS_CallFunctionValue(smjs_ctx, smjs_elinks_object,
---- a/src/scripting/smjs/globhist.c	2012-06-28 12:20:25.000000000 -0400
-+++ b/src/scripting/smjs/globhist.c	2012-06-28 12:20:15.000000000 -0400
-@@ -201,11 +201,20 @@
- 
- /* @smjs_globhist_class.getProperty */
- static JSBool
--smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
-+#if JS_VERSION >= 185
-+smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
-+#else
-+smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
-+#endif
- {
- 	JSObject *jsobj;
- 	unsigned char *uri_string;
- 	struct global_history_item *history_item;
-+#if JS_VERSION >= 185
-+	jsval id;
-+	if (!JS_IdToValue(ctx,iid,&id))
-+		return JS_FALSE;
-+#endif
- 
- 	uri_string = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
- 	if (!uri_string) goto ret_null;
---- a/src/scripting/smjs/keybinding.c	2012-06-28 12:21:39.000000000 -0400
-+++ b/src/scripting/smjs/keybinding.c.new	2012-06-28 12:48:00.000000000 -0400
-@@ -17,11 +17,20 @@
- 
- /* @keymap_class.getProperty */
- static JSBool
--keymap_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
-+#if JS_VERSION >= 185
-+keymap_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
-+#else
-+keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
-+#endif
- {
- 	unsigned char *action_str;
- 	const unsigned char *keystroke_str;
- 	int *data;
-+#if JS_VERSION >= 185
-+	jsval id;
-+	if (!JS_IdToValue(ctx,iid,&id))
-+		return JS_FALSE;
-+#endif
- 
- 	/* This can be called if @obj if not itself an instance of the
- 	 * appropriate class but has one in its prototype chain.  Fail
-@@ -70,11 +79,20 @@
- 
- /* @keymap_class.setProperty */
- static JSBool
--keymap_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
-+#if JS_VERSION >= 185
-+keymap_set_property(JSContext *ctx, JSObject *obj, jsid iid, JSBool strict, jsval *vp)
-+#else
-+keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, JSBool strict, jsval *vp)
-+#endif
- {
- 	int *data;
- 	unsigned char *keymap_str;
- 	const unsigned char *keystroke_str;
-+#if JS_VERSION >= 185
-+	jsval id;
-+	if (!JS_IdToValue(ctx,iid,&id))
-+		return JS_FALSE;
-+#endif
- 
- 	/* This can be called if @obj if not itself an instance of the
- 	 * appropriate class but has one in its prototype chain.  Fail
diff --git a/www-client/elinks/files/elinks-0.13-ruby.patch b/www-client/elinks/files/elinks-0.13-ruby.patch
deleted file mode 100644
index a716439b5124..000000000000
--- a/www-client/elinks/files/elinks-0.13-ruby.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- a/config/m4/ruby.m4
-+++ b/config/m4/ruby.m4
-@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
- 	if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
- 
- 		AC_MSG_CHECKING(Ruby version)
--		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
-+		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
- 			ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
- 			AC_MSG_RESULT($ruby_version)
- 
- 			AC_MSG_CHECKING(for Ruby header files)
--			rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-+			rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
- 
- 			if test "X$rubyhdrdir" != "X"; then
- 				AC_MSG_RESULT($rubyhdrdir)
- 				RUBY_CFLAGS="-I$rubyhdrdir"
--				rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
-+				rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
-+				if test -d "$rubyhdrdir/$rubyarch"; then
-+					RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
-+				fi
-+				rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'`
- 
- 				if test "X$rubylibs" != "X"; then
- 					RUBY_LIBS="$rubylibs"
- 				fi
- 
--				librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
-+				librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
- 
- 				if test -f "$rubyhdrdir/$librubyarg"; then
- 					librubyarg="$rubyhdrdir/$librubyarg"
- 
- 				else
--					rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
-+					rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
- 					if test -f "$rubylibdir/$librubyarg"; then
- 						librubyarg="$rubylibdir/$librubyarg"
- 					elif test "$librubyarg" = "libruby.a"; then
- 						dnl required on Mac OS 10.3 where libruby.a doesn't exist
- 						librubyarg="-lruby"
- 					else
--						librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
-+						librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
- 					fi
- 				fi
- 
-@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
- 					RUBY_LIBS="$librubyarg $RUBY_LIBS"
- 				fi
- 
--				rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
-+				rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'`
- 				if test "X$rubyldflags" != "X"; then
- 					LDFLAGS="$rubyldflags $LDFLAGS"
- 				fi
-@@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
- 			AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
- 		fi
- 	fi
-+	if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
-+		AC_MSG_CHECKING([for rb_errinfo])
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no")
-+		AC_MSG_RESULT($have_rb_errinfo)
-+		if test "$have_rb_errinfo" = "yes"; then
-+			AC_DEFINE([HAVE_RB_ERRINFO], [1],
-+				[Define to 1 if you have the `rb_errinfo' function.])
-+		fi
-+	fi
- fi
- 
- EL_RESTORE_FLAGS
---- a/src/scripting/ruby/core.c
-+++ b/src/scripting/ruby/core.c
-@@ -76,10 +76,10 @@ erb_report_error(struct session *ses, int error)
- 		break;
- 	case TAG_RAISE:
- 	case TAG_FATAL:
--		eclass = CLASS_OF(ruby_errinfo);
--		einfo = rb_obj_as_string(ruby_errinfo);
-+		eclass = CLASS_OF(RB_ERRINFO);
-+		einfo = rb_obj_as_string(RB_ERRINFO);
- 
--		if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
-+		if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
- 			msg = "unhandled exception";
- 
- 		} else {
-@@ -88,7 +88,7 @@ erb_report_error(struct session *ses, int error)
- 
- 			epath = rb_class_path(eclass);
- 			snprintf(buff, MAX_STR_LEN, "%s: %s",
--				RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
-+				RSTRING_PTR(epath), RSTRING_PTR(einfo));
- 
- 			p = strchr((const char *)buff, '\n');
- 			if (p) *p = '\0';
-@@ -116,7 +116,7 @@ erb_module_message(VALUE self, VALUE str)
- 	struct terminal *term;
- 
- 	str = rb_obj_as_string(str);
--	message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);
-+	message = memacpy(RSTRING_PTR(str), RSTRING_PTR(str));
- 	if (!message) return Qnil;
- 
- 	line_end = strchr((const char *)message, '\n');
-@@ -165,8 +165,8 @@ erb_stdout_p(int argc, VALUE *argv, VALUE self)
- 		 * the inspect() method, which adds quotes to the strings, so
- 		 * gently ignore them. */
- 
--		ptr = RSTRING(substr)->ptr;
--		len = RSTRING(substr)->len;
-+		ptr = RSTRING_PTR(substr);
-+		len = RSTRING_LEN(substr);
- 
- 		if (*ptr == '"')
- 			ptr++, len--;
---- a/src/scripting/ruby/core.h
-+++ b/src/scripting/ruby/core.h
-@@ -7,6 +7,20 @@ struct session;
- 
- #include <ruby.h>	/* for VALUE */
- 
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(string) (RSTRING(string)->len)
-+#endif
-+
-+#ifndef RSTRING_PTR
-+#define RSTRING_PTR(string) (RSTRING(string)->ptr)
-+#endif
-+
-+#ifdef HAVE_RB_ERRINFO
-+#define RB_ERRINFO (rb_errinfo())
-+#else
-+#define RB_ERRINFO (ruby_errinfo)
-+#endif
-+
- VALUE erb_module;
- 
- void alert_ruby_error(struct session *ses, unsigned char *msg);
---- a/src/scripting/ruby/hooks.c
-+++ b/src/scripting/ruby/hooks.c
-@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *data)
- 	{
- 		unsigned char *new_url;
- 
--		new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+		new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- 		if (new_url) {
- 			mem_free_set(url, new_url);
- 		}
-@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void *data)
- 	{
- 		unsigned char *new_url;
- 
--		new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+		new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- 		if (new_url) {
- 			mem_free_set(url, new_url);
- 		}
-@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap, void *data)
- 	switch (rb_type(result)) {
- 	case T_STRING:
- 	{
--		int len = RSTRING(result)->len;
-+		int len = RSTRING_LEN(result);
- 
--		add_fragment(cached, 0, RSTRING(result)->ptr, len);
-+		add_fragment(cached, 0, RSTRING_PTR(result), len);
- 		normalize_cache_entry(cached, len);
- 
- 		break;
-@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void *data)
- 	{
- 		unsigned char *proxy;
- 
--		proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+		proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- 		if (proxy) {
- 			mem_free_set(new_proxy_url, proxy);
- 		}
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 8dfd5728bec7..f3fc1b6822c0 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -13,7 +13,6 @@
 		<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
 		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="finger">Enable support for the finger protocol</flag>
-		<flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name="gopher">Enable support for the gopher protocol</flag>
 		<flag name="mouse">Make elinks to grab all mouse events</flag>
 		<flag name="tre">Enable support for regex searches via <pkg>dev-libs/tre</pkg></flag>
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 500fb493ad57..4d46414a6701 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -168,6 +168,7 @@ DIST firefox-80.0-nn-NO.xpi 562633 BLAKE2B b529c4764a15a88915ec7c30711467c0741b8
 DIST firefox-80.0-oc.xpi 584396 BLAKE2B b279c3302fa988a8816100c575d650140b2c43a71a295a520b132bcb37df47d8cb456da2aea103bb6dcde7f310c456b357282820eb637da9f059b1082ca1f6fa SHA512 e1c7674269b1939530304dfcf707f06ecef95c31050276b713fefd554c15f2d266a8866605edd732a0cdba6477bc38dbd5109ef4e8c43aa116541ae5c685afc2
 DIST firefox-80.0-pa-IN.xpi 613993 BLAKE2B 0f543b581c0d9928b2119c4e091968542865830cbb6258999a29018cb7e4d025b8fd6bcf8c21bf6e7b760a37fed07f0bea088debdf157026188dffc02d65366b SHA512 e80d10daf882dcbe01add70105081be50feb26178ee2ab6cf576afb4c2e4fa9f9868b694016ec006e7f6134e1f6ef40d8f9875661a479f57498d3bb451f0378c
 DIST firefox-80.0-patches-02.tar.xz 26280 BLAKE2B 11445bae206ed9e8cbadb7f9c2a2ca143c50d4924e663e3b83533f5b6b2aab4e1c760c9c21e1c7ed7d324443ce5df50d1f6b1284184ddaaacbe6c040c5835dee SHA512 51ea389c14757636eea87d9cdb64015072b85ca79e86c68a299568b2a02a8225116c40f0b6306bb15cb73ea9ba18e1767d5e0c21e0aa6dd202cf6ae3d74c304a
+DIST firefox-80.0-patches-03.tar.xz 26756 BLAKE2B c15615123acc531b99cfdfb3211e22f268afa416b0bd0da7a0e6a1411245d46175051cbb548d37503903f136a013b308e6c839424060124900f2c5e39d641c90 SHA512 1db6abf91dc1a51892c74452ad703193aba6dfbbce05b631dd030af6d0952f91578658fd865557d78bff157464bd64a71d16c23562720803da567cc24f9285fc
 DIST firefox-80.0-pl.xpi 588790 BLAKE2B 690ea2bce21714412ebc64fe353354efccd96041721ff4d6d73282900bd69c349a264c61923d3026ff5c39412e04a1be59a864a2b2607c6602b94dc255516824 SHA512 5f4b739b379fdb019fab043277f32b798cc317caae96b11f76228d5c2045907ad44f0b40649b42d66b5b2b1970fb6201fc47393eb4e2bbd86422d1ad4335b62c
 DIST firefox-80.0-pt-BR.xpi 569559 BLAKE2B d3964f5460e4eb24797fda4bfa4c101103634056fc5df39ea362114f27407a0f5fa1d4a4724391c8b6b8249ce2a0619c2a3fe914c111450c0b5f3860ad291afe SHA512 821aaed6238d01a583bd71dff1d014ff3fa8b2caa5c4478b12e54b011dce561b0ca88239774c8e59479b4488993c4dd2877e68c7e658b310fc490c826cf48d35
 DIST firefox-80.0-pt-PT.xpi 579329 BLAKE2B 774aab81cb5e10c053c1b383bd10941c62352af26098c742c323eeceab3a509bd8d6ae582545cc7dfd7fe5dbc9804227ba338fd004eaa0681a17be7f050ecdbe SHA512 639bf10dab4fe118ccc58c2d42b0ea4bd78be3edb9d77ce142c7a3a4a84e8ad55dd50ca56db7a7a94570186fdd2ded88bd99d727dd8d9dabfc30259f006643a0
@@ -286,6 +287,7 @@ DIST firefox-80.0.1-zh-TW.xpi 611178 BLAKE2B e84b0defc7990b6c775a9ee9a5ba7dd54a6
 DIST firefox-80.0.1.source.tar.xz 334690792 BLAKE2B 47c8cdb2c8c0088b5dc8abbdfba8be685dfdd4d079b155aebb1431a5f8b448b94d90e188d08426053be961f228d3b4e7852626f502397099e99e4a897e7dadfa SHA512 97a54e5f0ff0e34d0994b9ea67250fda1e9a51acb1129a5f6ce632ca5d15132ae4e5eb18c1a9a609a14f5012daf87c6e1a5049e096dd1c32cac9e2c981381d10
 DIST firefox-80.0.source.tar.xz 335316448 BLAKE2B 3099426b27cd3c89b63be7d796c8c5a87d0ee9bd8252e5bde23ed3a61f71d611e7427ffee506224e81a88ef109eefe944f2cf3367bd636a6ed46b7351d0a4b1b SHA512 6cfba55615d032e77f973ffdb1d4bb27c3c00d1ef642521284afa3e01a1bd29c6db963181e9ebefb0a44e49b96c3f93e57ce49541eae7e5a54d3360ffa81c1f3
 EBUILD firefox-68.12.0.ebuild 28973 BLAKE2B d19e41a8a047426a34573a019744c517716cd30a06a992284d2be2f76433cbdb6e75e1c2a9caa8518efb003c143b6e6afeb22d9089808483285560a074de1e64 SHA512 8a9791f34f548f5d628c00810046a365bf4f8d86a86a9aa2df6fde37d5d7ccf7116a43c80d04478dca23cec8a496cc5059eb36801ad23ed7984234d4eb9f1f6e
+EBUILD firefox-80.0.1-r1.ebuild 28853 BLAKE2B 63718fa37a658403ac2d7cd25b523ebf3a33d2652761a1beeca02f0a733889d450fcee4aa4455577fd9fe60e04e019dd5ec9c50b6078c1c95d33f7fd81d5b493 SHA512 42326b2e83383aa49dd9d79c1438060a56985adaef65ea2f02a8a14918ca769b3637ea0ad1e4b772baebb6e40fc8397ee177f9d071ebc2af8a8ebe27a616d23d
 EBUILD firefox-80.0.1.ebuild 28853 BLAKE2B 5b48db6f1c2434ce1dd57dc57b79ed18266b74478dcef62fc34ab062ec5e264c07b0fe196549f743691e1a4c05186322f52627331e76ecd232320429a65904a5 SHA512 c8323a71a8cd774f8831c04e65dc648ba15fb90e9cfef69e71a2c05cb90a4b9391d3fdf066003e096084efa9ec84eeb640fb0c47a2dfcbb85741e07cb56d936a
 EBUILD firefox-80.0.ebuild 28767 BLAKE2B 185a08ee124387571bd8e87533c3f8d8c01dea1e569a8758eb04abb09142443b4d0eb081353135ae57f2d34a6046bece68a0c4f854fed64b3411b6241a7fb2c5 SHA512 40bc2692649ed7b5b3ea6df9bc3bc92921b6f71631c3ecce373a95b46784a6f4b0f2e3bb0fb0e61405fb75575e930f6d97208db5ba478430967a6c9861bf7a76
 MISC metadata.xml 2559 BLAKE2B d1b21789a936805597548ce0636dfac52084ab4df2086dc5823fb00a3bb4cef802c2c3810690a29263b58b0d10179cf24ec9f149e18161301ea1f8e253c72253 SHA512 cadffe14e56530ae0e1f107e254b95e5dfb2f5d06cf676f65c34703e1e7700843553a51e3ecd1bf93bcfcd3b62b4960db53929361d52758b59bf1ec393a18167
diff --git a/www-client/firefox/firefox-80.0.1-r1.ebuild b/www-client/firefox/firefox-80.0.1-r1.ebuild
new file mode 100644
index 000000000000..1c590e9cadcd
--- /dev/null
+++ b/www-client/firefox/firefox-80.0.1-r1.ebuild
@@ -0,0 +1,933 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb
+el en 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 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 tr uk ur uz vi xh
+zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-80.0-patches-03"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=10
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 multiprocessing virtualx
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon
+	+openh264 pgo pulseaudio screencast +screenshot selinux +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp test wayland wifi"
+
+REQUIRED_USE="pgo? ( lto )
+	screencast? ( wayland )"
+
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.55
+	>=dev-libs/nspr-4.26
+	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}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.19.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	virtual/pkgconfig
+	>=virtual/rust-1.43.0
+	|| (
+		(
+			sys-devel/clang:10
+			!clang? ( sys-devel/llvm:10 )
+			clang? (
+				=sys-devel/lld-10*
+				sys-devel/llvm:10[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			!clang? ( sys-devel/llvm:9 )
+			clang? (
+				=sys-devel/lld-9*
+				sys-devel/llvm:9[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+	)
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+pkg_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 || use test ; then
+			CHECKREQS_DISK_BUILD="11G"
+		else
+			CHECKREQS_DISK_BUILD="5G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug || use test ; then
+			CHECKREQS_DISK_BUILD="11G"
+		else
+			CHECKREQS_DISK_BUILD="5G"
+		fi
+
+		check-reqs_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 \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE \
+			XAUTHORITY
+
+		addpredict /proc/self/oom_score_adj
+
+		llvm_pkg_setup
+	fi
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+}
+
+src_unpack() {
+	default
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	use pgo && rm "${WORKDIR}"/firefox/0032-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+	eapply "${WORKDIR}/firefox"
+
+	# 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"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+
+	# Clear checksums that present a problem
+	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json || die
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# libclang.so is not properly detected work around issue
+	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,now"
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	mozconfig_annotate '' --with-toolchain-prefix="${CHOST}-"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable screencast pipewire
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# 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_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-3 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot ; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| die
+		done
+	fi
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist ; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes} ; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+
+	local display_protocols="auto X11" 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='firefox-wayland --name firefox-wayland'
+				newbin "${FILESDIR}"/firefox-wayland.sh firefox-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='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox'
+				;;
+		esac
+
+		newmenu "${FILESDIR}/icon/${PN}-r2.desktop" "${desktop_filename}"
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${ED%/}/usr/share/applications/${desktop_filename}" || die
+	done
+
+	rm "${ED%/}"/usr/bin/firefox || die
+	newbin "${FILESDIR}"/firefox.sh firefox
+
+	local wrapper
+	for wrapper in \
+		"${ED%/}"/usr/bin/firefox \
+		"${ED%/}"/usr/bin/firefox-x11 \
+		"${ED%/}"/usr/bin/firefox-wayland \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX%/}/usr:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" || die
+	done
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.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_desktop_database_update
+	xdg_icon_cache_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
+		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
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 12cf0f420e94..025b7852b722 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_85.0.4183.83-1_amd64.deb 70238712 BLAKE2B 919213a02924b3720fafb566de62d5397d54495071c8e97c426642e54c43208538fe19c0df96bd0d721bc5e8870ccebf551dcffed61394876414e94f32b6c4bd SHA512 0bf9ecc8e8ce15420a41e64aa6510e9051f5ff7c46f9bc8588dcb296111ff61331e8d416915ca72438dc33f6912c2d6db2e64c6656a432cfb16f5295e42cc0b3
-EBUILD google-chrome-beta-85.0.4183.83.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-beta_86.0.4240.30-1_amd64.deb 71183372 BLAKE2B 595fc849b4fce9d243ef0d6a0ac4c3f7c3e9ec2e5f7e84c8688aba83e2978e5f283dbcf08c00b37fd5c2a87b69eaad7a87c5720c99fbe675a717fe06a018227c SHA512 90965ec3319eca1964cd2b1078ab6adccfdd5f205709f9c90e0c781165e302d14d693495d4b68c711393b1e3699462713442255e66310938f482ac484a4e050f
+EBUILD google-chrome-beta-86.0.4240.30.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-85.0.4183.83.ebuild b/www-client/google-chrome-beta/google-chrome-beta-86.0.4240.30.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-85.0.4183.83.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-86.0.4240.30.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 2b0d8fb5d727..437df72cfaeb 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_86.0.4240.8-1_amd64.deb 71085400 BLAKE2B 78bf5028987777a2fb4456c01a8109aa76e863197435a8db18baecac122eba41e89e9ddd825a06a26f3f4962ae855f857dc200cd5204e5c531edb58ef7268199 SHA512 43bea9be1e0b53c10ee13afab010fba80364e211dc5c42885fc9d23f603f9038863f0fe26bf46b77d7b818b030138e68acc03a1884bb6172378da9df51a78aca
-EBUILD google-chrome-unstable-86.0.4240.8.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-unstable_87.0.4259.3-1_amd64.deb 71514460 BLAKE2B 6c0e02ec196b3d8e4295b06b2525594937fae342b86a2bc17fe455f66a5ad34b2380f25c9f63b149894e84536fa79bfaeb6c092d45e13a69676a385f0ad476c2 SHA512 852437f7fd9a963b8c45d904d9ffd6b95bc5525359693495a89d6d38a22d32c481ed996e90788aa5bcf2bd66ccde8e689aa2e1379ec3f9d8be1e3c467255a6d6
+EBUILD google-chrome-unstable-87.0.4259.3.ebuild 3064 BLAKE2B e4252260812199c8484605a62ed9176c6e95c34e04ac20286265ad5de90a9d9918466b21466d2cecf2539b480f740eb9a03744f66798507f7d04130b3b551a78 SHA512 6e709849f6fefb71bb4e1f292ca6a7b663ad65eb04a9783a1be75e353828cfab788400f4ebf27fc7a3e168b900cd97d67b889f2e335063e8373179a1b16b814e
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-85.0.4183.83.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-87.0.4259.3.ebuild
index b5a38b97587d..30f7b9c29e98 100644
--- a/www-client/google-chrome/google-chrome-85.0.4183.83.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-87.0.4259.3.ebuild
@@ -32,6 +32,7 @@ RESTRICT="bindist mirror strip"
 DEPEND=""
 RDEPEND="
 	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
 	app-arch/bzip2
 	app-misc/ca-certificates
 	dev-libs/atk
@@ -39,15 +40,18 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	>=dev-libs/nss-3.26
+	dev-libs/wayland
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/mesa[gbm]
 	net-print/cups
 	sys-apps/dbus
 	sys-libs/libcap
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
 	>=x11-libs/libX11-1.5.0
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -60,6 +64,7 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/libxcb
+	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-misc/xdg-utils
 	selinux? ( sec-policy/selinux-chromium )
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 042bbea3dd20..e902ecae0b62 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_85.0.4183.83-1_amd64.deb 70228112 BLAKE2B 877582ff8586be93abc47db6ccb6b15f16dd4ca21d85826b2e97d31eeab3ac1d6cdde73791683e999f965a00324505b84cee8f5cfc7a2b62ad502a6c1c1e5b05 SHA512 e789ff39595daacc47ce5402ce1f0452d99e82350c5d24e071d85d17ceb7956183d717c7d99879eb5517b03049f9afb1407189373793805d8fae2be6961cff92
-EBUILD google-chrome-85.0.4183.83.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-stable_85.0.4183.102-1_amd64.deb 70242092 BLAKE2B e78a0c36fdaede944be9d761f906addeb71f69ff85b9bd68e10a573026209d5536eecb39ce2a44091590b24aacbbcebe818a12b6942d69419ddaa654aa7631cd SHA512 99398fed5c0e117614dc507b317a774460a3c35084d7fa4c1409a2e978110d9196eaf661ea8fc9b473d0e08a9693998873bb4d0d8d5932bf0c4102fa68b9c5cb
+EBUILD google-chrome-85.0.4183.102.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-86.0.4240.8.ebuild b/www-client/google-chrome/google-chrome-85.0.4183.102.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-86.0.4240.8.ebuild
+++ b/www-client/google-chrome/google-chrome-85.0.4183.102.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 49f89b4a5fc5..b83eddea1316 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,9 @@
+DIST opera-beta_71.0.3770.126_amd64.deb 68278732 BLAKE2B edb569db1a790964f36fa0cc8620fb966d60459a6ec75b53a7a8b9130eefa8798d29d4dc44fea8fe9385e54fd5b86513be4de3967b5c795f8063d672fa63b581 SHA512 0a2d3fe294c7a4611ddcd86dd31c33707974cf2760c378af6afa2f85a5c9c4d84ba95b11a11f22aae022ecba0cb971039df3696c6891c217911f2a93164d020b
 DIST opera-beta_71.0.3770.50_amd64.deb 68263536 BLAKE2B 0a48ff6994e6e7343c0e7fa67db6ab149e521390d598d1c1b464ed8d16e12e1c368920929c93ee53128d871a95021ab4f51441723e3be7fafef4ab20d0258f6d SHA512 68b3d636bc70cd41b97d7b57297f553886a06c1f48b950f81f5c672f6c29290a141784a44c599bd7d564845ae838dffa402a096a87c509f4b6d31a8bf499ac2d
 DIST opera-beta_71.0.3770.81_amd64.deb 68283640 BLAKE2B 8578dd008e3be1450cf6dae231e0ff50138a453da550102b7fa0009665787de1fe37daa559cc66372a94b115a44107be7a4596e84e8268ddc28075e7676b745a SHA512 7ae8326e030530ca13d5234de52ca66770286b9b27793ea66f16b45ac10a80e3744b96a59752bf15a35dba3e4153af5201469167399f7e7943146d013fee4fb0
+DIST opera-beta_71.0.3770.97_amd64.deb 68269300 BLAKE2B d5a52db87f78fdb13fbefdb59083548b396baf765083419009a654908401d2345efad804485872edc25f5df16993c402b19e1d837716305be71e07669108eb7d SHA512 4b66e0b3ec6859cfc5d54bddf938c6f2b61697831abf077efe1573834e923d03d52b3bbcc1d8eab8df5f91f1615a63ae81006b3d93641fede5322297c2813942
+EBUILD opera-beta-71.0.3770.126.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 EBUILD opera-beta-71.0.3770.50.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 EBUILD opera-beta-71.0.3770.81.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
+EBUILD opera-beta-71.0.3770.97.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild b/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild
new file mode 100644
index 000000000000..99905f624666
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-beta/opera-beta-71.0.3770.97.ebuild b/www-client/opera-beta/opera-beta-71.0.3770.97.ebuild
new file mode 100644
index 000000000000..99905f624666
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-71.0.3770.97.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index acad37241fe6..9112095b6e60 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,8 +2,10 @@ DIST opera-developer_72.0.3779.0_amd64.deb 68386104 BLAKE2B 090ed3e767b9793245a1
 DIST opera-developer_72.0.3784.0_amd64.deb 69828944 BLAKE2B 5af2375494103280fe3759f9f301e4a4a68c4a81998ebec39bfefc075e7ed205bf0efbaf8b8c33c1fbd3d21f7394215c738b7a8f2c0f8d0b8da9de2809dba2e7 SHA512 07d8bdb915355952f6fc827d7aea8871b70ac45e4cbdd2c3c5801056a9243b3b649aa101dd8c92b2fa8593c2c70585596844540f57964cd9a7ebe96d1a52f92b
 DIST opera-developer_72.0.3791.0_amd64.deb 71139492 BLAKE2B 02849f680c0532aee25ebcfff9c337574266a3cb6ed7d1906e30a7782694f4d7d33dd278ccd59dca5e62b703a35ee1ab76df41a050005e4db431fb12aaf3b360 SHA512 38dfcd7e02bb9a4ec181e6e1c3168f301bf57a52dd2d5010664ecfc81d39414cdee7a53910214f6632dd5a2d041210db0a12149993b2b1c3493748520ce4f653
 DIST opera-developer_72.0.3798.0_amd64.deb 71257520 BLAKE2B 44609fa5e405f69cbbe887ff493cfa062d73a65d9aeda287246add6d35d6a7b0c8b67002b5032ecc06ef50c24904ddab6f7a23755b2ae6ddc99ebfd92178b009 SHA512 5c8a58bdc9ad990df5cfeb964aafc3a99ca25d237a54a31c45b79c8705afe905acea0c648df0accf158815ac9ed5455512b95a0d1a1ae56cc8e45cffb2aaa5b0
+DIST opera-developer_72.0.3807.0_amd64.deb 71855636 BLAKE2B 2645932c9e88c5af26916edc69836282ef4e2eb41fbb9c5e3317fbdfe221f2740d25e85d13b662f1813ab8ca990c86f968b52ed03f7ed555f4b731dcf31c0639 SHA512 cd51efd12395a6a824988c62faf86c4a606ee48b417dc90781dd9df1696046166e1f3fb8abefd5f1bd9eeccd37b79a07fc4d74eb1aba68172088f8492f4b48b0
 EBUILD opera-developer-72.0.3779.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 EBUILD opera-developer-72.0.3784.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 EBUILD opera-developer-72.0.3791.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 EBUILD opera-developer-72.0.3798.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
+EBUILD opera-developer-72.0.3807.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-72.0.3807.0.ebuild b/www-client/opera-developer/opera-developer-72.0.3807.0.ebuild
new file mode 100644
index 000000000000..837674712eae
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-72.0.3807.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 7e4e2f804aff..9285ee138ec6 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,5 @@
-DIST opera-stable_70.0.3728.144_amd64.deb 67316628 BLAKE2B 9dc48927b026a9c488526b9853fb161366fec9b5867e1a423a01f1e1d84d596191d4649044ce7d271ddaa2f86c2da62a0e9e39bed3fdecae5dd15518ca0776a5 SHA512 0c2175cec658e4ccf5a6199143f2cd66a0317ba6ece18403a9310cabefca17e4d83948ea56f96fb3a547db2ed6b208aea13be204816fcf31c2325d3b0e997489
-EBUILD opera-70.0.3728.144.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
+DIST opera-stable_70.0.3728.154_amd64.deb 67310968 BLAKE2B e43b41be25dfda3079d2c57c1a9b9df54ff5d27c689fe42efc507a7f979d0ff2a828032bd3d149ab72856d07547f19a1fc625565dee11835734a4061403c7272 SHA512 d708e96be745693de15a23b03716ba77430cc1feeaf56f85ba35dc9b537261a92bc1749d363ed0fba6600810a12e6d470f208c472fee116f6a3f0e100b3ad957
+DIST opera-stable_70.0.3728.178_amd64.deb 67334984 BLAKE2B 5cc3bfdaa19f948eec19ca69af6023526d126e31d8d5c5869f2c86fa63d834c72ca82e6982c57984af531450ed1fc243c7dbae0b2f36d752210aa195570dc660 SHA512 22fbde279f97b7c619621713f980385951abf682f4d38aa63905b5a1f5127a58f3955b4f2d9076c2d82f3dadb2103027fb3f226469226e4b0ad7b438a3bb8169
+EBUILD opera-70.0.3728.154.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
+EBUILD opera-70.0.3728.178.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-70.0.3728.144.ebuild b/www-client/opera/opera-70.0.3728.154.ebuild
index fb69b98489da..fb69b98489da 100644
--- a/www-client/opera/opera-70.0.3728.144.ebuild
+++ b/www-client/opera/opera-70.0.3728.154.ebuild
diff --git a/www-client/opera/opera-70.0.3728.178.ebuild b/www-client/opera/opera-70.0.3728.178.ebuild
new file mode 100644
index 000000000000..58c0be89c0ab
--- /dev/null
+++ b/www-client/opera/opera-70.0.3728.178.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}"/localization > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index 588cab89e2df..e96ba52fb1fa 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,4 +1,4 @@
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
-EBUILD pybugz-0.13.ebuild 1064 BLAKE2B b02940c078430ba474cc420ef39e33444c2e5f6b51d2c1fadd660a8d8484b7480810ba8e78d30c8144fe515d82ff560f10f308cea236477c48d2684005b5dea8 SHA512 ef5651f0c8d0cd5f323946ec5560cce914f91adbee9b4caee05201026ec7c77c1f71e89e49250d588b60a469d2d7a7957dd44da63cd17e3904d711ffc44f2332
-EBUILD pybugz-9999.ebuild 1065 BLAKE2B 187e58fe3e96768dc6ce6f1a978d91646420221eec5f076c72788f4a3edb90f5ee529f40d54ff94f058776bf79d2de82e7e4d1f2d8cee20f0d9b814d11a768dd SHA512 e84ea021328c08ee5bcf607942f4589fc17bfcef89608107120278ca0dc427281b17c335aabf571e6d4aa21160b6c18534ae344739e428b129dfa8903bf87e93
+EBUILD pybugz-0.13.ebuild 1063 BLAKE2B 3ae7492fd6a7c17b9e5e87b9ed9e52d6cf80a9ad163ee2be0ef36d7f6477849462e3c57998a7f94e20ac466e38224a94bb9ece21cbfdaf4038624cf9fc326a21 SHA512 998a399fdeba85fa4d280e3be79a271f129317c23f612dbb51bfaad7bb4b78b676035c817d1452da7f3f29f20d63557e3c5f298e8d471a5fb9674dee273035bd
+EBUILD pybugz-9999.ebuild 1066 BLAKE2B 55aee6baef77e5644dc79ede87334657494346cfc1b2956d9da1052b2542587cc2a39d008744c5edd9c59feb45d26eedd9e7f3705b9c8d35d2be4e2e33738f61 SHA512 644aef71df1eb3ce91c9c984fa4a9dfe3a355d93fb9c8f78c6a414de256f89abf81866febc1516a4ff187bdecb19962c99920d3acccc88ccae939cb990153739
 MISC metadata.xml 307 BLAKE2B 35d9a21eb8997a7ebed4e14a088ac85802c9828d3d968adc0b41b1c7f5a54d863747cd32a96624785e16caecb6ca0a5b645aec61459c19ce746bedd67000a3a6 SHA512 ae4880029f219b2a1db5b8975ae0b442eb23d9059bdf5798f79d2f23a7d43bdd5efd7e8c626cb3dc642936f7ae84bbdf66d9509cd96e5c986bba136c77668b75
diff --git a/www-client/pybugz/pybugz-0.13.ebuild b/www-client/pybugz/pybugz-0.13.ebuild
index 65bab6744677..226dd0826b8f 100644
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ b/www-client/pybugz/pybugz-0.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 771fc0b4610b..2f1f75bd296c 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index e345070280ca..1096918b58f9 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,8 @@
 DIST qutebrowser-1.12.0.tar.gz 3979851 BLAKE2B 1a55c8b10aea5b618c0aa730828a123b127f1185d4e3f57b48f5c741c1bd5600e92b5e1bd48a1d3df94449eec650bb6f0d8b84a0c1f6f5ece045a6a0bce5583f SHA512 a8d979310f7c00a64b8cf976529def09b9a42542c80dd7055e2a38a174d9ef51834de6e816739911454a73ad9cc79a7d3e1fcda7d76bade463bc253aeb9ef608
 DIST qutebrowser-1.13.0.tar.gz 4015550 BLAKE2B cc2f2779ca994da48e85156d5bba0a70f6f5380bc6c362e05944a2454e22ee99acf15875def448675ea86af8a919290dfaca5abf97ee5603e6c2b0d2ed41fabb SHA512 ee598db9416e4efcf5d8bc6aaa3d373637ed67f181e67e56c04fd7f2c12ebaf185f67a9463fff195d74ff7a239ce0a88c24bf35d3ad627116e2fa5ebed973d3d
 DIST qutebrowser-1.13.1.tar.gz 4027485 BLAKE2B cb19fa2baa447776e0d03128446619eeacd1049b30fcca26008e0cccb10594d1d32037643b3834297adef637328444aad33d84383bdc49307528321cfa2b846d SHA512 a3eb3845a896a88f755e4e7d336d86a8740be66ae94a8e19fb4739148ce1e66aa9fddec04df9308a51c8ef922fa28e3683bb911dd3ba7c91816c26ea92665cfd
-EBUILD qutebrowser-1.12.0.ebuild 2198 BLAKE2B 8e24b987ad9f82d76b7c28e31249e2b816394a86d65ecb9cc7559f9ac1322054a1625576dd8d47fe036e68516ee145176d402a5e22d8512d3d5172aa8d748028 SHA512 6b9f463433cd6641a5810c3c1db85aa2c9e72077594c3445336ceaeeea25d09e00adfb83fa6fdfbf1aa9e0e92f7b7405fb73bce6215e55ed246bddaa3da75441
-EBUILD qutebrowser-1.13.0.ebuild 2198 BLAKE2B 8e24b987ad9f82d76b7c28e31249e2b816394a86d65ecb9cc7559f9ac1322054a1625576dd8d47fe036e68516ee145176d402a5e22d8512d3d5172aa8d748028 SHA512 6b9f463433cd6641a5810c3c1db85aa2c9e72077594c3445336ceaeeea25d09e00adfb83fa6fdfbf1aa9e0e92f7b7405fb73bce6215e55ed246bddaa3da75441
-EBUILD qutebrowser-1.13.1.ebuild 2136 BLAKE2B a4e27f3eafa1ab6eccf5bdf1fba23492f0b798c0647a2632c1168c7dba67d0a5dda8c4480369961089be42c1ebdff5c8bded0ac539b8a631c6acdceb4229420b SHA512 28bd8d2f8864a8fafd75b6474a04db1c4ff43d9755d55e7d011e2ef475d004f1f2ecbc6e7271a737100ada2937141409152ed49896f07a983db88f34bede7108
-EBUILD qutebrowser-9999.ebuild 2240 BLAKE2B 3761b84021b1c97d3c83402a8086ec66e0762c5d216f968360f816ba2ff8542fb36494514c865ad7db9394ccf225e1463580d8f77b9cc3ba4ec19fb838130cf1 SHA512 090530ca4c7e0d0239a06525e31b622867e504be5f60eb3d4211b0b8970c718ed9354dd8019d346dfcfa8681274cdc49a20fc325e83e88498d491e500e172410
+EBUILD qutebrowser-1.12.0.ebuild 2202 BLAKE2B b968f9fd07f5f6e7f045d64cb6c58eb803fe9fe86271bc2715c369fd31cd9b7fc150f60eed8384ec87bdb4fd2f1ef95607ece20bf881bdd6f87a9dacb8822642 SHA512 99d3bd12b01890cd3786384afeb0c994b600ed4414556d72d2344243f61ea26b276bccd32e13e86627c10bf6cb28b702b331ba3e8523e2972a4e8deec30c9b58
+EBUILD qutebrowser-1.13.0.ebuild 2202 BLAKE2B b968f9fd07f5f6e7f045d64cb6c58eb803fe9fe86271bc2715c369fd31cd9b7fc150f60eed8384ec87bdb4fd2f1ef95607ece20bf881bdd6f87a9dacb8822642 SHA512 99d3bd12b01890cd3786384afeb0c994b600ed4414556d72d2344243f61ea26b276bccd32e13e86627c10bf6cb28b702b331ba3e8523e2972a4e8deec30c9b58
+EBUILD qutebrowser-1.13.1.ebuild 2140 BLAKE2B 518be42090995d3cd5a53f264fd1353b0785db1bdda30d14329ce2a8a30e53036625f3052b7d1d85314c3702cae750f00dcafb7a856cf64ad02da8dc8cf8a8d5 SHA512 5b4c289f695bdd1e00b5fb40deb1a9cc4df2e346c44609b6c35824f3a9b77d756382f9ac59eb67698533a1493341816ab7d0357efaf0ccf101a5499a3997fcc0
+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.12.0.ebuild b/www-client/qutebrowser/qutebrowser-1.12.0.ebuild
index aa75aa620455..173787fedaed 100644
--- a/www-client/qutebrowser/qutebrowser-1.12.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.12.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit desktop distutils-r1 eutils xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
 
 DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
diff --git a/www-client/qutebrowser/qutebrowser-1.13.0.ebuild b/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
index aa75aa620455..173787fedaed 100644
--- a/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit desktop distutils-r1 eutils xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
 
 DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
diff --git a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild b/www-client/qutebrowser/qutebrowser-1.13.1.ebuild
index fae5ee4b212d..6034e2d0d813 100644
--- a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.13.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit desktop distutils-r1 eutils xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
 
 DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index cbd3094d32d7..da981f610aa3 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit desktop distutils-r1 eutils xdg-utils
+inherit desktop distutils-r1 optfeature xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index a8efec088053..02646dae0416 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -7,6 +7,10 @@ DIST seamonkey-2.53.2.source.tar.xz 291744036 BLAKE2B 23908f875a70fba1a8034a447e
 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2
 DIST seamonkey-2.53.3.source-l10n.tar.xz 12086368 BLAKE2B 29901a62bdd65b4e49419ae65687fcff35de87d3b1d80df5d6914f9276b00b323e07fd521b2636320c5a8da0b3d42eea623df45de6c2beed8ac68d5baf8ed7a4 SHA512 4431d716cb4fc2a57dbc44aeefe52c3e0f7dad989b2c057692702eed764f1021a2c81ff86279231cad533810abc2917fab9c637e039d843a4502f73bb6f57830
 DIST seamonkey-2.53.3.source.tar.xz 294208732 BLAKE2B 459c31859e7a91eaddf6dfd6f3e84f57ef3b686dd2868413fbda5e05c7a84d49ffad631531840dd25236075be2ab8bd84e1bdbe836b7667e036ca9bbdb62a5f6 SHA512 f9465fdf3925d517d8b5dd9d4dd5162b50f39e5a35f61383f4dec89784b5fc4273724195ae98abe30bfb6458ab615f6ac9dcd3a233e7add211fbfdaad0ff5328
+DIST seamonkey-2.53.4_beta1-patches-01.tar.xz 39676 BLAKE2B de7742e6c286ca21403d003e22e3eba56e4d59c3f628c9768b47bac148abefbabfcd0510c89cc319c29e0775e316922c680d3de3dbfc542cae4f1f4942773124 SHA512 e97d6de074041f17cfe935995ce7116dee4249dc736315c82ed3878a92189d09542f141f65499ecdfd8621638d130b6d5786ab6033f3f794a805e136acefec3d
+DIST seamonkey-2.53.4_beta1.source-l10n.tar.xz 12109440 BLAKE2B 310c9f59df17608480d8827a07ebcfaf8a2226fafeb99dfc56cb32f18e63a6ce719419a172e442d9eb5678ea18ed6f83daa701e2ca27107dbb8d7910b2bda83f SHA512 1f27d24e315f0496a1faf00ba50fe9e2ba211dff5c03c8a2b66732893ab42c537a127e4a25a272992b43d47637bb4cf83bdf69b43ce1818107ade83547813ab8
+DIST seamonkey-2.53.4_beta1.source.tar.xz 294677260 BLAKE2B 510924c5b3b6e9acaad6feb3f4b0312122eed312f1e64ccc1df51efff730be1bf94f2123a0d4cdfd58ebe6c22ab7633f8d26cb87fdd1dfaa6fb7065aec389e81 SHA512 e8df89bd3332749c5325454352091a2e78828dbbdaf4d6948710009e6372087638f3b4c892d7b7869416804bf5e039aa54d182deab84ac7395bf7cf78c63f306
 EBUILD seamonkey-2.53.2.ebuild 16112 BLAKE2B 64747f0c98ef23afcea4325c81126b661c68cfd96a24625650cb0367b363fadcdbd44d47aeeddbde5068bfb65357d60ad360131f242b869c9e153bab2c2b4105 SHA512 8b48733f06bc03d2f3ee53ce6720cd369c272532346170af11c972830fd6dc51f18090964c308c942d4ce3f65e24bb0deb959b4a83430bf2ba1a6b5db73c84f0
 EBUILD seamonkey-2.53.3.ebuild 16421 BLAKE2B fa516b2c6e6e34572197957454a157d1a390693b2e9ed8ca2663ee631c0352bb06272516a945c95bf766c3f22197224a3e433d0d96bdb236e689a19429006cd4 SHA512 4feb9eac17035364393d45631179c81a79007b96380e07e2318eac68132d4d788c0b880f7e066cf7f712327035a7b51e97e23020b3e13ceaa7f158f826dace5d
+EBUILD seamonkey-2.53.4_beta1.ebuild 16304 BLAKE2B d52630ca5df17d6ce19cb4ae5b159e8ef525ae77b1192e45134deb0659460ceae773662155a190036482e96c69ce062a744f1ddfe8fabc645599c7743f1bbe67 SHA512 bd59a1b2ccc236dd5bf3ec0233a46a758abe7aae6d3126a0d6f279139e494c0053d6649909906fca74dc3534b3ce5f3bcc7eef3fe03517335bb69d150e6ba8bb
 MISC metadata.xml 1762 BLAKE2B dde9738ba4c4b065806ce8d7eafe14a3def18c30cc32f78967ef015441a7c594e3776a202e289b6879aedc02314d8e000d5e35800e490ddb8446ae29b4d6be68 SHA512 9caf3a4ea297a544452a64bf73659d6ac005d400047d260cfa521bba157e63fc5cd9b74b6786a2553e0ff2b67e59a9a8598486be2815703ed7197601b9d470e2
diff --git a/www-client/seamonkey/seamonkey-2.53.4_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.4_beta1.ebuild
new file mode 100644
index 000000000000..ef146756d3d7
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.4_beta1.ebuild
@@ -0,0 +1,529 @@
+# 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"
+
+	# 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/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index ecf8f5c5db48..07aaab083d22 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,26 +1,16 @@
-DIST vivaldi-snapshot-3.3.2001.3_p1-amd64.deb 71962452 BLAKE2B 74d636f5d5549d971b4d2dec3472710f79b827e42e64211a62acf0873260fca6e1ce7e1bc14efb2a3d618573fd8598b141da8d7ca658468620a9bb8860d1555d SHA512 b0a6f2c03fd1bf53295cb8cabe48791a966279a9d30032c3b04f8949d29a91272b546dd40a754fb6364c8d87fda974fd663686bdfc02fcaacd8717773c6e42d9
-DIST vivaldi-snapshot-3.3.2001.3_p1-arm64.deb 64231616 BLAKE2B 39fb5fd842b8e5c0ea73f469cadc6131aca650075947e2b42022a88cf097486fbb15c39795a46e41ce0b5194c1db896ac24cecd4a391bd3a0f65fb1a86ebcabf SHA512 3c11134ff1ca9f9c1f934f10de592ad17835c48a77af30d70c24d59b53cd062c81efb7fd18cfc9b1ff7e067d6a1792909383e6f5d1f24be21a4abed74df6b2c2
-DIST vivaldi-snapshot-3.3.2001.3_p1-armhf.deb 63742308 BLAKE2B 8d152dd3c179055a01ae5d918913957371a6d08d8ab250d22768ebc6627873c74655a4fab0165517df3e452b7b02d1e6e44385817e57473644886e1a445b0660 SHA512 a7dab4002bc4f46dde263e08339a06ba516a45f36eb32722c8f77964496d123f6a72a5aedf9fb4aa6b08d01f7002bfd44f519df33e730012660f11148d8feb68
-DIST vivaldi-snapshot-3.3.2001.3_p1-i386.deb 70252588 BLAKE2B 10a29b4160b6be5021aa3dc8b3a36d765430a16fcf1f6fa689649099babe63bb73bdc22bb47b31e9e924b1041d338b432be54abab473f95a62cc4a2d0b3ed1cd SHA512 e414efd78ca4028c21d1d6c230b6433ffd0ec8501c6e422fdd7ed3a9dbcc1fbc4e28921fa77d10612eaaf92a18de8043dc25e0cb5dcac387782bc3e3b928ad95
-DIST vivaldi-snapshot-3.3.2009.3_p1-amd64.deb 72494348 BLAKE2B 932b4f910bab16c643c7b90d0f52515c11ce67598c9bc4475a67efd2c44520716689ecbc5b51c34e598115e50721913ffe9b8927acb5e53db3bbfa67989700f1 SHA512 61ea657e1ac38c3a2baa3fb8bf71734d46558a49881941367a2867a69600ecc960eea6cedec5b4c5935ad1d577eb36e828a72d9303ad122630f1307b19bd766a
-DIST vivaldi-snapshot-3.3.2009.3_p1-arm64.deb 64823756 BLAKE2B b526092c420f0c1f619889249cac6bef60e0800e66bd90732ec7761244a6b998438ba0d45cc39240c132df9e163cf5a54290d264bbff67355f16ff152a514eaa SHA512 f30eb8f920e33c613bfcb5059df5ac9e99964c211a6455328c4000e8e589042019635a8932e7cc3c6190a1dffef905243dc75aae102e83ec9f5c4489712e5ca9
-DIST vivaldi-snapshot-3.3.2009.3_p1-armhf.deb 64277012 BLAKE2B 44233db3675fde9ae2e6d4b5917cbe8eb6d2f06775e87503583cd536a6d02eeae0b8a584d33594189e27bcd9f60803d8268dd01ff0674afb75d307a1e4e8ff87 SHA512 f53a4f0750ae382c45f5eb972b125c2d5071400ce6bc64156e450a9b125d2580c8c9c059cf43bb3106ef44bdac2e4bed986bf1b3874d969880c02341377b25a4
-DIST vivaldi-snapshot-3.3.2009.3_p1-i386.deb 70782452 BLAKE2B 066131cc9bf487a97b168c919a8ba824bb15ce791cfb0f8c0a084f10e5bf4abfd7639e1b37c715c5505c8cd48705d81d601f41b69446746da76b7532263060f7 SHA512 0128bfbe99450220ab0fd53c46bee8f77f085d43fb17ed6e0ef7310b53346f3cea2ad1ec0da431c8a48d299c8fabca11ee3ad17f9bf86e1fe6ee1349f6e29951
-DIST vivaldi-snapshot-3.3.2020.3_p1-amd64.deb 72493644 BLAKE2B a2373803271f7b081254be1deb4e1d7fab884501fce54b8c41383d95aea7508725fdd12cf081ca1051e5dc17149afaf75a86d3693c75339e20e36f4bed0cda3b SHA512 c3bcac4f4bf98cbb041362082dd239b390459165ab3b565994bcd2d8a162feed26212cd5cfbc7d2d702837de872ef59bd7e903d81fba833e5784b716473e8a13
-DIST vivaldi-snapshot-3.3.2020.3_p1-arm64.deb 65239632 BLAKE2B 71b54b22ef38fc649b892fc112c51419368720709cf7b2c0f80a328b513bea3875633e80a8998be8d4cbe5ba03b26a0d9a65007d3c0e8b757f86c080332f0bc6 SHA512 fdc8e2203888e37fcc9bfe3f0a81080290c4b689cff8c8a269d1633cb1720b852e95bd7b171c05a3e9fca37668a9b6df5707dee53e04c3703aeaa1f56c080520
-DIST vivaldi-snapshot-3.3.2020.3_p1-armhf.deb 64269308 BLAKE2B f01d93649d0b24338e993d0617da694316d46b8d0989aeaadc2fc33a57813cc3aacbb6ec50d772b4bb63c20e161103c7295b06cf34ef6dbf8e7ccad3c6b1e7ce SHA512 4bc8e0004ff1b78c1fb669e4b4c4a409f810a9f33e2ae788522be126fb4d6572141267041d5166a6f807db9da6e722b6fa2745fbcdd80f53612c6f016fc4c6e3
-DIST vivaldi-snapshot-3.3.2020.3_p1-i386.deb 70775604 BLAKE2B d039e8131440ab96e39c16168f52b542196b405cdc8a387c553ab129d073fde18e1926c77ea7ece9a7782eade12562b8509105d8a5a2712ef2e3da9934be646b SHA512 ce3e78a7a6955e15dcd1cad63235584242259f75c35b58d85c9f85e4f2c3b540fda7a201b646c09576c814045a507cf6544dd36cfe62f57e3068efbe1379e30b
-DIST vivaldi-snapshot-3.3.2022.23_p1-amd64.deb 72521052 BLAKE2B bbb28a2906c6f3e656d732ef9e8c39782e4c8627c0d58dbbb66abbc17f6d4fd2b112e74c8bb6573307cbfbeba47d125593aad68265ce125e9625c14b0550b6a6 SHA512 cbf6fc904514b99313f6571e7cde38a0b1db36365cef6152019a016837dbcee25bf538556374caa0acd84803b7ff4b649808dfdcab57a4e750db431a7eaa6f1b
-DIST vivaldi-snapshot-3.3.2022.23_p1-arm64.deb 64722492 BLAKE2B 52a89bd8a5fcf7a1025b17a5598b078775dacc6fe0e472ecfa747086209c54e832ef14f9e952586cbe130d70e99d6ffd3539de9e789faf87fd09822f19e08ff9 SHA512 15cf70055447c1f909f69c7a9280de2522482b8e325832a52084c4bd2ca4e812cfacf4a3ebe053929a4eaa618f3ebace5d40c1cab47b5f45dddeb79257311137
-DIST vivaldi-snapshot-3.3.2022.23_p1-armhf.deb 64293056 BLAKE2B d9e205dae88ac56afe1188e47d23a68a2f73d09fe2d74b5ac6a5511fd6f5b35ac1d9ec03630f35c09af5e091d1ae2c5681ca35eadedc23e85517e9b6ffa059eb SHA512 16abb7c51fc05aa642b3f1413f629fca0ec6fef26f9c4c3576887f10f32471b2af443c195b0ea1b1814e6be7da8d47ba5a63d526bb80ad703b207f230b474eb3
-DIST vivaldi-snapshot-3.3.2022.23_p1-i386.deb 70805224 BLAKE2B f67b900376250bde133709cd63777e2abfd0188c792dbd3ec10bdc1d35d7ad9533ee5f4f56d55d94295e226e9e6bcd2c64e47ab04893e401a5e417873596512c SHA512 08cdfd67a5c7daffb464bab5862b299fa0be92317efa5a1d3ce91b10ff22ea4d9b3b1d49bbe9128a0570252dcfd2e1877ece882fc761b584e2675c0a1d6a4108
-DIST vivaldi-snapshot-3.3.2022.6_p1-amd64.deb 72527684 BLAKE2B fc36dc548eacb677a27242a9fd2bd8607d51f790c4c2e2aa595684e502dfcaf87ff221c6c5b7ba47e2840bc2a60c8c4867f9b63ac7c026df23322df28c16c46e SHA512 455467311947cf22ef4fdfc442cbe91c0aa9efcae0e9475a86dd73ef876aa2c32ee930ac3ee91f3cc7a345ccf1eb2c55d5ed62b748b2c3ae03a0be5f36dfec01
-DIST vivaldi-snapshot-3.3.2022.6_p1-arm64.deb 65255944 BLAKE2B 977bee23830b33debe065268097c03c62a3297eec5ff952da02c927660c228bfd3c70c564f7a6b9caad30c3a4edeb41d622ea2eff35a82dd65c1e09bb684bf7e SHA512 fa325c88b2216a317d7c33a7bac15c68e92e51de0c68c5b9c0dc5c8d07767b77a18670dad068e044cb5042fbdae5d91b240382c7c1d1dcd7122a3442f0b6056b
-DIST vivaldi-snapshot-3.3.2022.6_p1-armhf.deb 64288748 BLAKE2B 16f1f900342b44b9fdaf872d370ab856257102af622764cf8a019beedf17d505260909d16b905cdbc85f19ecb12265d0c473da0fd5a44e986f47cba4513bf5d4 SHA512 5d791f853835fb8e9e5648056b638f732dea892e9f272835da19fd5624d9bb03952eac1a915851c82c9756144c6243ddab1db299faf171a0880a154480d40d53
-DIST vivaldi-snapshot-3.3.2022.6_p1-i386.deb 70119636 BLAKE2B 826496d581e5a3c5759941358b3f4f6554ef3466335c280d71b6cc28d0f127fee217146f53d12f5b1277a06a05d351bb01c31a922fb92e1d074cdd66ca3baa47 SHA512 60bb7499f746529dbb21a41ee667fc549c296734318aa65ab72a831d366d7b75f2cb9cd81918b25f8624e7dbaeb498713a1654a3aa6df8a09b031e293fe1b74e
-EBUILD vivaldi-snapshot-3.3.2001.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
-EBUILD vivaldi-snapshot-3.3.2009.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
-EBUILD vivaldi-snapshot-3.3.2020.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
-EBUILD vivaldi-snapshot-3.3.2022.23_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
-EBUILD vivaldi-snapshot-3.3.2022.6_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+DIST vivaldi-snapshot-3.4.2035.3_p1-amd64.deb 72616764 BLAKE2B 70efb42f082eb3bea0e90e3fbe8c6d75a910a5f29d367f37450b1ac079ef7b7fc49177aedcbdf7406e532204027dd27d6bdf7405186d5d39c711a8d6b916fcbf SHA512 c6d70a0c5fce6334dbb3aefb5f66b5cdf9fb3bbe940488fc01bfa8f939a16c7b37951a86016363e52989e55b2bbe37f30491d3cd339672314055ffaebe3d0d90
+DIST vivaldi-snapshot-3.4.2035.3_p1-arm64.deb 65360100 BLAKE2B c777f9b68c4fc602f0e7785ec28ef2534390da55cd93d31356cba4d60130eaf471d40ded33526cbe66b48c0757b001fafdd0d7f23839d19e1e73d6bb9238c0f4 SHA512 9ddace0c66ead92d5cdd66f18e491a08b1d215d7d43b4aba09e84bfba2066ddd4d7ec5c6d447ac05106a81404643415ef2ebf4a52757bc0ed24d53401ef9458d
+DIST vivaldi-snapshot-3.4.2035.3_p1-armhf.deb 64379992 BLAKE2B 625fb859b6edb15412fb9a6a012f12eb7b36a547de3651021215d9e21c59419f391b7f377c329bc09360d03c37fa164073fc24ba190f4da644e727e26a14cd59 SHA512 c6278ef40e2b93b63b9627385d24606901a6134ee197ebc270d63fe5db625db36efde9ab76c30389d953076b07137cbf2e3664e7389e4db6ab6b100783f976df
+DIST vivaldi-snapshot-3.4.2035.3_p1-i386.deb 70889216 BLAKE2B 8212681518cc6f5a4b6860380a7c9129f0345b775a45d0ab08ecf12aedafb57c622a483da5583f848d35da36bfb7bae4e3ed0ae6a7cd53abe50a7e0229903622 SHA512 8ad9dbf0d56b49fd2600793f1a8aa0454b911dc3f9933f640e4233798acc33b0503b2df85f6c9df6dff9cfcd6cca7445c5f37133a1fc83868a65fab96c81ee86
+DIST vivaldi-snapshot-3.4.2036.3_p1-amd64.deb 72609260 BLAKE2B af147ed659125f6269a8950d280eb43e73d2cc48a47efc5b4e5d82b6ae9b348f798aa16694bf065bd61a5f377343f1e8cf6cf86ee7f91ea4242d3fc4bea07c74 SHA512 b4e5a5e5faee24ae85594a6609e4988bf7474766f56715523a358aea10b35ae434d5560e769a0e6b6b230611ae562748f5de30c5b2c9d82e4fd13ec1dbe6442d
+DIST vivaldi-snapshot-3.4.2036.3_p1-arm64.deb 65358424 BLAKE2B f49de7021b12486ecb1c632f41248a8bbc47e0988a23eed78050977681a018c56618ebe3fa79a4b5a5cfa8a2cbacf53a85524cb2069512d1fa07ca16686fef19 SHA512 1e6bb15e8ed66aba15d900172014d315d1a1a3b020e0d3cdef9cc55fbc8918799e3928dc2d9b95585b39ed5e62db5f75e1e9fbfbcd8ef1f9ce99548f8abf894d
+DIST vivaldi-snapshot-3.4.2036.3_p1-armhf.deb 64386640 BLAKE2B d2981641ea25f510e2dafdb94fd222056d6e8c0682b02da2bd934b3d82b0c1cdf844154a92f9588cad42b43c7aa3e9539ee1f883cd19794d061e4c32df0df17f SHA512 8f4b1fc93969033195e9254c6af215933ec97b81afb8946c21989eedccf9fd21f6d45082824739a238dc18758945ad60b7618fa5b74eac56a2c48dd10b460bf5
+DIST vivaldi-snapshot-3.4.2036.3_p1-i386.deb 70905896 BLAKE2B 68ea6bbe636a013aa2755d1093de429af888977c6ece103f8a278c9588c83cdf6eaae6ce929f1b7f21ece4acbc23a3a796a3ad37c8906be3b0dafb659cb3e735 SHA512 f95f3316a56186a9bce5f5fd5a6169070763942e76ca3d00af6167e95bbf4adedf06128be3e4814eb5780da2716b428b4be44add0f38611824236e6014656c7e
+DIST vivaldi-snapshot-3.4.2038.4_p1-amd64.deb 75820936 BLAKE2B 60a31d0e1a4b5a84744c15218e1d1d00613ba0b564f138e43d6576a49d815b710fbb836949d4649589f5fda5c4c5c356166428b18c6848e6b68ca30ecb44ff22 SHA512 8da93b1b73e560add618b883e5914bab9293a8bcd4e7e8564fa2f54393797cfb742648a7b45fce3aa1acd5d0a1ebdc31a513b18a6c5429fd4034deca0cb63101
+DIST vivaldi-snapshot-3.4.2038.4_p1-arm64.deb 69128664 BLAKE2B 9ad581e07dc5edb467bbd518fa28edab3c481613fc2204f2c419f6bcc43b28109f6c2311e8556c980209a030fc8c24d5d5a5f4cdf2b769b009802ce1b4f89dae SHA512 2821c4617f6aa4eb0e48ec4fe1e0772dcbbea1368484e9bfc1e83fc1d9070ee48cb63dd2b606b65d366384393ccae5f691e0a0be8b5aca0aa11a3f931ec919e5
+DIST vivaldi-snapshot-3.4.2038.4_p1-armhf.deb 68167016 BLAKE2B 90cd1e2f3fce532336c14347a5f7dca318a970c07d0c199270e21835208bf58c793dea5a1fa50d158e3b59212fdff65fedef8a8910b42500c74126ee40ead3e2 SHA512 3576175e00311a6a07994910fcff0f177ec3f675be0d24ad6164310bbf37e064a9c513c37a004141714c5bc194951f4d2524d4a291d587df6780a3860f233e4e
+DIST vivaldi-snapshot-3.4.2038.4_p1-i386.deb 73993612 BLAKE2B b624959013d81360e056de4cf596bca5efe5557f67587d13c1c48bf1ebf522a6be13fde2ef24cdb788d67688db2ed942d2dd4d5f24318fc9c459aee70a5d4d6d SHA512 a88b75a5dbf340c4fc951f75fefcbed5dc49bfb0b4480d8ccdf97415dc4c2c487bef3824f2d578dde57a983b49376e189d6863c9700dc0bd7683a0a0915e8558
+EBUILD vivaldi-snapshot-3.4.2035.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.4.2036.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.4.2038.4_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2022.23_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2022.23_p1.ebuild
deleted file mode 100644
index db3613b057e7..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2022.23_p1.ebuild
+++ /dev/null
@@ -1,116 +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-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		|| 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}/vivaldi-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2022.6_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2022.6_p1.ebuild
deleted file mode 100644
index db3613b057e7..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2022.6_p1.ebuild
+++ /dev/null
@@ -1,116 +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-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		|| 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}/vivaldi-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2001.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2035.3_p1.ebuild
index db3613b057e7..db3613b057e7 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2001.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2035.3_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2009.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2036.3_p1.ebuild
index db3613b057e7..db3613b057e7 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2009.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2036.3_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2020.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2038.4_p1.ebuild
index db3613b057e7..db3613b057e7 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.3.2020.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2038.4_p1.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index d7c8c317d254..9f90219fe326 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-3.2.1967.47_p1-amd64.deb 71853076 BLAKE2B ed79da0a11cb676496b3c9ce03bc61ec0fc2ad2aeda75704caf6520dd372a038332413f4191751fa8b35c64f3ba7a82cf407f77b4f656c5f6a3a569e0664214b SHA512 99532d00da0d1831c64362dbb7828c8d064c4548b650305ed142627aab241b8c3cc1629640b1ae6c6ae20c4b24d0b4d82dadf15ef0f739a2ce1b7e031a20b227
-DIST vivaldi-3.2.1967.47_p1-arm64.deb 64630720 BLAKE2B 777ef7ac03176f5786cdcbd77223f5ff6243aad6e3fe34dbf6dbe4e9c886fab6b9f3a88fea06bb9c6f61dae5ad172fc9c02f4d3c049be7aff204c3e0ce3a4d87 SHA512 4ef35dcf6acef23b39bf7746c020515d8adf43290057e6bb8a25ed7af8034e95b3e2afebf0cd056de0e21c3ec5dc4249c0055812756785cb4982877a4cc14e2c
-DIST vivaldi-3.2.1967.47_p1-armhf.deb 63645748 BLAKE2B b7acb3c7672306ad8defc903b5c73dfe20e8de42489c3638d62999d249c25ee4749937b3cff55cab3d91d12365261673046f644f0f124fa6adf660ed24a58f16 SHA512 63db5f2786fcabc37f5ee23ab5ee2c5b79d945bd93b394dfd8ad5005211bc5eca8708bdedb987097f94a8615e8197e7ca978a80bc5205c8d1c0ce3517f11763e
-DIST vivaldi-3.2.1967.47_p1-i386.deb 70102476 BLAKE2B 399da7d7d080ff52ee40f2f119f9864ab34141405a83c4d6924cbf23143a2e428d6b7d9e8ffbe5addaf18a1b97077bf116f7446fa0ee7609747ae4b33efd2947 SHA512 bdb5ef6ee869ba25f7e9fcecbc03b490833dc547fe8c854ab4709debf8e298353fd93761f3da0a920f3819b765ae55f7c477745e117653f532de247bae7089cd
-DIST vivaldi-3.3.2022.26_p1-amd64.deb 72512136 BLAKE2B 387a811b51e37eb64c20ce2ad32091304e31bcad9011ceeb9b41db88996b8e5e9775ecfa01c23aaccef9516fe6fd19e7f9699218e6bc4476c0e44838cebd3bf3 SHA512 efee6c37028a6b15328de7176c9a76f9347b9729f4c448bea0f8a846d0867b516ff1f6ff129004fd2c2e073d7b9567721debef952fe6290c8b0f68e04cd2e8a9
-DIST vivaldi-3.3.2022.26_p1-arm64.deb 65262128 BLAKE2B 3bb054b3b6f0d1277ada57fe8276fc0c52f6fe714ff6980fab0f627d444ece747d49241793af29738bf9faf6f867f3d14e23db177aa88ccca24e8e2df425f77f SHA512 bf2b04ad731e3b123542aaf474d6a894dab6ee12100244714a7458c4704045f9c6b3ce60893414866633eb840fcc53b448f7fa30b325ad87d1f86b23fe2afc74
-DIST vivaldi-3.3.2022.26_p1-armhf.deb 64322356 BLAKE2B ea6ab8146852a1625516bc165cf11abe907d626ead0641f6c5c8645b68a4dff171e4d8bc3611f6391b0d33009a7ebcffee9f7d67a7863fe0b9745427cff883be SHA512 5f8dd987599be53ad103da28a3e22b4a8eb783900ebbc59726abe4f731bfa3b29fa95a24c4cbba8b7b71157e31ec8ac4c1109cfbc12f9b8c47e36547823b5cd4
-DIST vivaldi-3.3.2022.26_p1-i386.deb 70804172 BLAKE2B 73529fd2766c5d7db569f231e51b2a6cbddb4927e8f66a6b7d6e7814b32ac5ea1fdfb71da783712906fbd5210fa973afad3b08d5ad4eb7e22c001ac502b10da9 SHA512 26be9ba625ae03331ad42f4bf0219c9b05b8788ed5b107f1a571396ec21f5d14ab407219012fa5558827d967f7c66f7c3e49cfa3bcacd2140a8cc91c5d0e9b10
-EBUILD vivaldi-3.2.1967.47_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
-EBUILD vivaldi-3.3.2022.26_p1.ebuild 2972 BLAKE2B eaf158cdcb97fba387d5f83bb7835872c696a4e3c816b561dd2134975b66f860f570388dac32df1d188c1ee318c54359dd236f608c12a02f46733a32aa6c63ff SHA512 6c27dcf77ec35f6ad8acc530a81f70f46bfec2f1cf82ed1e5d6ed4e7bfaedd406adb0e22dccc88ff151f0f760391b373841e3463b2de7058cbbaed41b14b5bb0
+DIST vivaldi-3.3.2022.45_p1-amd64.deb 72555276 BLAKE2B b9fd559504d995745eefe253d65897eea4391e67b5c7a403eea2b4d85a623c731b0e688efab3d1ef3ea047495165cd34ca18cb86c43793abde7fcb581505621a SHA512 79a88d76dce231852ff57f2e23045a5350f31818896ab6a626c56561f5b54f82fccbe7d3c0b12d161814c623f7d4520fad4babf557bec0213b50de1107058984
+DIST vivaldi-3.3.2022.45_p1-arm64.deb 65292620 BLAKE2B 1d0bdccc8dd1c9dd7b6dba31e0774e436ad7eb61dca9e5ad42b540dc3cd72a11acacea146f680e7cea131c5a617228f071c7e541de735894c5c16a53d217348c SHA512 18665cb1cad131eca05cb7d4a506cffd6867c13787942da7dd4ec210cd125337255e7a18c6b166292f704e7b978009eda8bd4377c06e33efde6339826c56e8e1
+DIST vivaldi-3.3.2022.45_p1-armhf.deb 64314512 BLAKE2B 7301433d3a2d40580ceaf7628b2dd86d9f70941c5b2b8df5fd9b86ffe80e21dc5a984c2712c594bc130a621c5def64c43e4b24734e06163b9714211eb89d4e13 SHA512 64f71bf4939677a168e7b956bdc1ef2eed6560a13b075f9a419c8c8c3e1390b36cf045708bc217f375f9e6f953b019e169a77d9c21edf0288e089d953571e306
+DIST vivaldi-3.3.2022.45_p1-i386.deb 70818576 BLAKE2B 065455c7dacb310eef187ce0147f1d608aa98ec2f85178c7c4927b323d49207affea4d9858e029f38de228ed12c2d68ac6fae55ffed03aba52ee932ba9d58970 SHA512 5bfb1978529e961945667baaf3617912d0dfa0d456412e0845d8e1ef584a3ba4b8766d41f9e08ee47146318df79af077abf2a833ba1df2818d7c57d57f2dae7b
+EBUILD vivaldi-3.3.2022.45_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-3.3.2022.26_p1.ebuild b/www-client/vivaldi/vivaldi-3.3.2022.26_p1.ebuild
deleted file mode 100644
index a156328cef54..000000000000
--- a/www-client/vivaldi/vivaldi-3.3.2022.26_p1.ebuild
+++ /dev/null
@@ -1,125 +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-utils
-
-#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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi/vivaldi-3.2.1967.47_p1.ebuild b/www-client/vivaldi/vivaldi-3.3.2022.45_p1.ebuild
index f28a5ac334d7..f28a5ac334d7 100644
--- a/www-client/vivaldi/vivaldi-3.2.1967.47_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.3.2022.45_p1.ebuild