gentoo resync : 29.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
commit: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree: 83fc5facb6b12be510a37bc3d241cc63e965b13a /www-client
parent: feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
42 files changed, 446 insertions, 1956 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 90bc61ae4d1d..a1315325c646 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ea1e57849e58..f83e2bc9e90b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,13 +20,13 @@ AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c2
 AUX chromium-compiler-r12.patch 5680 BLAKE2B e45848b2fff230c87d2f31cd5f6e9aa85bd4fe3f354323728292b145cd1ad9c914c8511f22aa43067f00d1ed4a10b05d4a2f5886c5b26a127c0f3f6ceddf9596 SHA512 7cde27589a708ccea35f2a9b8ebf9280822b8c505dad62cb8ecf1f360670eca4d953b4f2113695eef9f227ab1f368c57fffad489b4eecdeac668f4adf641a8b6
 AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
+AUX chromium-launcher-r4.sh 1608 BLAKE2B 92bb6db1e052a072fe601a1f16d38ab20025d331b135ad29add5fb30a0eb4ab37601ae00b5f07a570ef53eca74a4893cc7a3d579f8ff502a5f40564974a7eeaf SHA512 14008bc9fd1fea333c12d8e13d86b82a261c789ba9a4d98094f724d820263c31a32dd76609386873dc771fd5f87a4e08cd99eb8381dde89c0ff86b606c0d8d83
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-83.0.4103.106.tar.xz 802630620 BLAKE2B b145fd04347ef252778c99931d2e6aebc4cb9c3b4340db13ede074ac0631fef3c530b6b8c348ad33576a1da828817a590339206cf941729ee01444350bec1683 SHA512 37d0298ec6794f753bc280352c9ea45d57dd5050240d468fd2a7465b2021ebb598cdc6c4538050dd1d626bcd4a146af87fb837619e08766d38d21821605bd3a8
-DIST chromium-84-patchset-1.tar.xz 17652 BLAKE2B 17008a5d7b81fd9dd3934f815922a10c4b33bd4b3a13b350011d60627133f2179c2e70a6e74ef11ddf9b68b83b988fad3df15e9307f871006ccb7aca52c819da SHA512 2a45183c60794256b150bf67aa8395bab113e77b338775f737ebd8a822fd17be776b786ad12ffa759774a8876e0976a1c285ef90257e9532cfd9952baba7096d
-DIST chromium-84.0.4147.45.tar.xz 845103524 BLAKE2B 8b1e1c052b2ff3968fc4f13215551b9bd53b2fe89f15512d064267e82e71909f267d4f91665b456ad84ec537601e4fbc097eebc45b461f967aa8fe997da2716c SHA512 d43ef067ed855813d3f003cc8f7302d433c924a58ea79bdafa3ec1fe35b4f71a24c4493389563bbc88744ee8fce9b1664c62548e975e0e5a97c823f90aacfe30
+DIST chromium-83.0.4103.116.tar.xz 802626772 BLAKE2B 6890d8f4a4a9b12ab56a63e037129f6b77f03f95a841494505fdbbe212b0dd756e5558bddd7ee186669929c6069568c76b70b179fe4a58ccad465f2d4677d6e5 SHA512 dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
+DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664
+DIST chromium-84.0.4147.68.tar.xz 845188784 BLAKE2B a0185a5aacc1297f6240e2d887e980c69ba1219267714fb82c87e2ec31e4a3bee24ea9c059fc4f56dcc5c3e576d0baf5b59ec3576fc266daac583cf2b2917b56 SHA512 c5304dfa76ec9bf1d7e96116b6560b77d636eaa226acf7be46798f4b161c6aba90c54bec797dfbf1e48ece46d4e52e44737ed68457f9b10bbc11658a9020bffd
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
-EBUILD chromium-83.0.4103.106.ebuild 25699 BLAKE2B 5baae430d54d36f24d2628eff1b79dd0f6b048775ffd2cfeb8db7744af15549ab37621cd54731c48ecc472ab8992eed0bdf32bc07a40adb0c8524e0c5f03b06e SHA512 ff69aea06f90ee39b3612ac2592c2c1d6a1650b639923b60aa7c7162a07f2fa50d68ffdbc43ccf83e109c81d84dbe31103bf7cf221bd2fa168a6c2371690fd59
-EBUILD chromium-84.0.4147.45-r1.ebuild 25561 BLAKE2B 5d52ec638ce4d4c07f4eb475a35a9b6a720321c34815a4c8e58a41f3aeac0f9cdf7caf8e89736e779f1bc5ec8c507a83784969b87155fac9b387083b028df1c0 SHA512 38a7fba0b4017d924dcd69ae329f65b5d167475479a7ba19514ba1833874328b660cbc5dcdd1709cc92692591c13f84e6278b9d807cc3d6094d286d21e5e1a97
-EBUILD chromium-84.0.4147.45.ebuild 25373 BLAKE2B 317630fff497b42d9064e8159121960f58845992858d639b9afd124e827d0f722516f3939d594536a75ef6e851eec78a095b849a1143e34a285d3ac34979e873 SHA512 fe5b3bae665f6af43011f2fedf6d725d35bd2f5ea84e3a3085b3beb22258b4590d9c27415e8945f173a581651a8232a547db162b98723bc194a1f532a1450b25
-MISC metadata.xml 1351 BLAKE2B fb5be12f788385e19aa41ab929c0c0f2744a61cc83b19ed973174cee564043a871f68fadb721ee91d688020aa1daba5fb2bca4535c53630bd88cc0ede527ef53 SHA512 ae812473401017ce399461a829e7182e6e28c56b01c1da926883bd3edf751fa804dc88f429c77a3f533647b2115c960a7bba21572735dcf3d039a6d87fabf51d
+EBUILD chromium-83.0.4103.116.ebuild 25728 BLAKE2B e01916870f7d8d96cd4c3428df2e792f73fcc9440c8924c305ab69f8fd5afa55744e599770104e2837bb1d9367e48dfc281df3a4ac4a660cb73b98b56a0715e4 SHA512 d7b82773af9896b0c1eb718af61765aaf314e5ec9e2ff180f171ec5e9987133034b458b8e8ec5158ed5c4fa1b80665082d4f0245c289bf36738bf7a0c3375beb
+EBUILD chromium-84.0.4147.68.ebuild 26746 BLAKE2B ec9b839ff84ca30a00b6b681a01961bf166fafb06724dae6b389012d26ad00aba1771f965e6256e9a902ecdcc595f3836f524d938e4ef84422c4333cba0cd2ff SHA512 7a2cf68c15284915b88b1b1e9ae6ce05889c3d6f89bda85f8333e119718f7c878fe2d75601919a93afa7e4ddca011effd3c7a61933d3d0a677371864dc0ea551
+MISC metadata.xml 1605 BLAKE2B d582e6df6dd04e61fd59e5886e45730c03f1124b1da141063565efda9a455a0c9b4acd83e579a6b6639e4b6be506bc853bad3c6a24dd06b6f67ae9cd9deed4df SHA512 a1d57bc2236f10d9af56cc9ca30ff9447ea9dfa091c96149dd5dd796e5d9a15116a87f20ecda1da345ede991023377d8e95156feaa0ed6557e5bff9db23bfc01
diff --git a/www-client/chromium/chromium-83.0.4103.106.ebuild b/www-client/chromium/chromium-83.0.4103.116.ebuild
index 2a4c9b76532c..db11978df3cb 100644
--- a/www-client/chromium/chromium-83.0.4103.106.ebuild
+++ b/www-client/chromium/chromium-83.0.4103.116.ebuild
@@ -42,7 +42,8 @@ COMMON_DEPEND="
 	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
+		>=media-video/ffmpeg-4:0
+		<media-video/ffmpeg-4.3:0=
 		|| (
 			media-video/ffmpeg[-samba]
 			>=net-fs/samba-4.5.10-r1[-debug(-)]
diff --git a/www-client/chromium/chromium-84.0.4147.45.ebuild b/www-client/chromium/chromium-84.0.4147.45.ebuild
deleted file mode 100644
index d50cafdca25e..000000000000
--- a/www-client/chromium/chromium-84.0.4147.45.ebuild
+++ /dev/null
@@ -1,804 +0,0 @@
-# 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/"
-XCB_PROTO_VERSION="1.14"
-PATCHSET="1"
-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://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos 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 )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	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:=
-	media-libs/mesa:=[gbm]
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			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/gtk+:3[X]
-	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/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# 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.1726
-	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
-	closure-compile? ( virtual/jre )
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-9"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-9"
-	DEPEND+=" >=sys-libs/libcxx-9"
-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
-}
-
-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/cacheinvalidation
-		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/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/fabricjs
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		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/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		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/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/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-7.0
-		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/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/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 [[ ${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
-	# 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+=" closure_compile=$(usex closure-compile 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)
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Use bundled xcb-proto, bug #727000
-	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
-
-	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
-	# Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${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" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.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
-	doins out/Release/*.so
-
-	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/chromium-84.0.4147.45-r1.ebuild b/www-client/chromium/chromium-84.0.4147.68.ebuild
index 966c8a05a06d..6f26ac56db27 100644
--- a/www-client/chromium/chromium-84.0.4147.45-r1.ebuild
+++ b/www-client/chromium/chromium-84.0.4147.68.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
 XCB_PROTO_VERSION="1.14"
-PATCHSET="1"
+PATCHSET="3"
 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
@@ -23,15 +23,31 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts headless kerberos ozone 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 )"
+REQUIRED_USE="
+	component-build? ( !suid )
+	wayland? ( ozone )
+"
+
+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/libxcb:=
+"
 
 COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
 	app-arch/bzip2:=
 	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
 	dev-libs/expat:=
 	dev-libs/glib:2
 	>=dev-libs/libxml2-2.9.4-r3:=[icu]
@@ -43,7 +59,6 @@ COMMON_DEPEND="
 	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
-	media-libs/mesa:=[gbm]
 	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? (
@@ -59,23 +74,31 @@ COMMON_DEPEND="
 	virtual/udev
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	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/libXScrnSaver:=
-	x11-libs/libXtst:=
 	x11-libs/pango:=
 	media-libs/flac:=
 	>=media-libs/libwebp-0.4.0:=
 	sys-libs/zlib:=[minizip]
 	kerberos? ( virtual/krb5 )
+	ozone? (
+		!headless? (
+			${COMMON_X_DEPEND}
+			x11-libs/gtk+:3[wayland?,X]
+			wayland? (
+				dev-libs/wayland:=
+				dev-libs/libffi:=
+				x11-libs/libdrm:=
+				x11-libs/libxkbcommon:=
+			)
+		)
+	)
+	!ozone? (
+		>=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]
+		x11-libs/libXScrnSaver:=
+		${COMMON_X_DEPEND}
+	)
 "
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND="${COMMON_DEPEND}
@@ -160,6 +183,10 @@ them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
 in /etc/chromium/default.
 "
 
+PATCHES=(
+	"${FILESDIR}/chromium-84-mediaalloc.patch"
+)
+
 pre_build_checks() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		local -x CPP="$(tc-getCXX) -E"
@@ -206,7 +233,6 @@ src_prepare() {
 	python_setup
 
 	eapply "${WORKDIR}/patches"
-	eapply "${FILESDIR}"/chromium-84-mediaalloc.patch
 
 	default
 
@@ -434,6 +460,9 @@ src_prepare() {
 	if use tcmalloc; then
 		keeplibs+=( third_party/tcmalloc )
 	fi
+	if use ozone && use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
 	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
 		keeplibs+=( third_party/libxml )
 		keeplibs+=( third_party/libxslt )
@@ -658,9 +687,6 @@ src_configure() {
 	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
 	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
 
-	# Silence lots of GCC warnings upstream doesn't seem to care about
-	append-cxxflags -Wno-invalid-offsetof -Wno-attributes -Wno-pragmas
-
 	# Explicitly disable ICU data file support for system-icu builds.
 	if use system-icu; then
 		myconf_gn+=" icu_use_data_file=false"
@@ -669,6 +695,26 @@ src_configure() {
 	# Use bundled xcb-proto, bug #727000
 	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
 
+	# Enable ozone support
+	if use ozone; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		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_x11=true"
+			myconf_gn+=" ozone_platform_headless=true"
+			if use wayland; then
+				myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
+				myconf_gn+=" ozone_platform=\"wayland\""
+			else
+				myconf_gn+=" ozone_platform=\"x11\""
+			fi
+		else
+			myconf_gn+=" ozone_platform=\"headless\""
+		fi
+	fi
+
 	einfo "Configuring Chromium..."
 	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
 	echo "$@"
@@ -734,8 +780,14 @@ src_install() {
 
 	doexe out/Release/chromedriver
 
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	ozone_auto_session () {
+		use ozone && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r4.sh" > chromium-launcher.sh || die
 	doexe chromium-launcher.sh
 
 	# It is important that we name the target "chromium-browser",
@@ -757,7 +809,11 @@ src_install() {
 	insinto "${CHROMIUM_HOME}"
 	doins out/Release/*.bin
 	doins out/Release/*.pak
-	doins out/Release/*.so
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so)
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
 
 	if ! use system-icu; then
 		doins out/Release/icudtl.dat
diff --git a/www-client/chromium/files/chromium-launcher-r4.sh b/www-client/chromium/files/chromium-launcher-r4.sh
new file mode 100644
index 000000000000..cb1e9f548b35
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r4.sh
@@ -0,0 +1,52 @@
+#!/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
+if @@OZONE_AUTO_SESSION@@; then
+    if [[ -z ${XDG_SESSION_TYPE+x} ]]; then
+        if [[ -z ${WAYLAND_DISPLAY+x} ]]; then
+            CHROMIUM_FLAGS="--ozone-platform=x11 ${CHROMIUM_FLAGS}"
+        else
+            CHROMIUM_FLAGS="--ozone-platform=wayland ${CHROMIUM_FLAGS}"
+        fi
+    else
+        CHROMIUM_FLAGS="--ozone-platform=${XDG_SESSION_TYPE} ${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 c54bc9ef3515..4be3cc808730 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -8,7 +8,9 @@
 	<use>
 		<flag name="closure-compile">Enable closure type-checking for Chrome's web technology-based UI. Requires Java.</flag>
 		<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
+		<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
 		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</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="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag>
@@ -16,6 +18,7 @@
 		<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="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 8767ac132c6c..8c0a98cab2d7 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,11 +1,9 @@
-AUX elinks-0.10.4.conf-syscharset.diff 2584 BLAKE2B a56369026802030871418033898896a1d4c940f74d73c90bb0a39dfe183f250437d4c3fe696696a83f63b51d0e1ce825754949b0e3b0588daf49997c419326fc SHA512 bed691b24adf7aa408af01e3a0a905946f9fe95cc5ded7e1448d9159ef7777bc2df1c3ef37c5498fc0f64bc59df80493fc42076bafa708c80ef5cba78e8bca9c
 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.12pre5-spidermonkey-callback.patch 513 BLAKE2B 493b1fa0b6d86a7c9ec26935a44e8e268065c47dc27a37ec4d6d6c7da8d65720d489bbf1070b92215656c9715ac09cb21691259715d8be53c7a3acd631e759b1 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43
 AUX elinks-0.13-ruby.patch 6679 BLAKE2B aac1923c2115743fd29d94e67af069857e03896d5e970297ba84c250f3eef54df24324975639de14a732e84897d21637397b85eb4346dc005d99a252943718cf SHA512 df93eb589fb6d30bdc4ffac8c44a5b1f4db7565d7221f9aa1edb07809cb5ada0797f6a2128bb5c0083134fa2b58ef62a157e7aad32751821f87e15f5760e34ac
 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
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
deleted file mode 100644
index 83accf4c2d95..000000000000
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
-+++ b/elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
-@@ -12,8 +12,6 @@
-   # obsolete config.saving_style. You shouldn't touch it.
-   set config.saving_style_w = 1
- 
--    ## terminal.linux.charset <codepage>
--    set terminal.linux.charset = "us-ascii"
-     ## terminal.linux.transparency [0|1]
-     set terminal.linux.transparency = 1
-     ## terminal.linux.colors [0|1]
-@@ -29,8 +27,6 @@
-     ## terminal.linux.type <num>
-     set terminal.linux.type = 2
- 
--    ## terminal.vt100.charset <codepage>
--    set terminal.vt100.charset = "us-ascii"
-     ## terminal.vt100.transparency [0|1]
-     set terminal.vt100.transparency = 1
-     ## terminal.vt100.colors [0|1]
-@@ -46,8 +42,6 @@
-     ## terminal.vt100.type <num>
-     set terminal.vt100.type = 1
- 
--    ## terminal.vt110.charset <codepage>
--    set terminal.vt110.charset = "us-ascii"
-     ## terminal.vt110.transparency [0|1]
-     set terminal.vt110.transparency = 1
-     ## terminal.vt110.colors [0|1]
-@@ -63,8 +57,6 @@
-     ## terminal.vt110.type <num>
-     set terminal.vt110.type = 1
- 
--    ## terminal.xterm.charset <codepage>
--    set terminal.xterm.charset = "us-ascii"
-     ## terminal.xterm.transparency [0|1]
-     set terminal.xterm.transparency = 1
-     ## terminal.xterm.colors [0|1]
-@@ -80,8 +72,6 @@
-     ## terminal.xterm.type <num>
-     set terminal.xterm.type = 1
- 
--    ## terminal.xterm-color.charset <codepage>
--    set terminal.xterm-color.charset = "us-ascii"
-     ## terminal.xterm-color.transparency [0|1]
-     set terminal.xterm-color.transparency = 1
-     ## terminal.xterm-color.colors [0|1]
-@@ -96,8 +86,7 @@
-     set terminal.xterm-color.m11_hack = 0
-     ## terminal.xterm-color.type <num>
-     set terminal.xterm-color.type = 1
--    ## terminal.screen.charset <codepage>
--    set terminal.screen.charset = "us-ascii"
-+
-     ## terminal.screen.transparency [0|1]
-     set terminal.screen.transparency = 1
-     ## terminal.screen.colors [0|1]
-@@ -270,10 +259,6 @@
- 
- 
- 
--    ## document.codepage.assume <codepage>
--    # Default document codepage.
--    set document.codepage.assume = "ISO-8859-1"
--
-     ## document.codepage.force_assumed [0|1]
-     # Ignore charset info sent by server.
-     set document.codepage.force_assumed = 0
-@@ -343,10 +328,6 @@
- 
- 
- 
--    ## document.dump.codepage <codepage>
--    # Codepage used in dump output.
--    set document.dump.codepage = "us-ascii"
--
-     ## document.dump.width <num>
-     # Width of screen in characters when dumping a HTML document.
-     set document.dump.width = 80
diff --git a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
deleted file mode 100644
index b48ddaeecc47..000000000000
--- a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c elinks-0.12pre5/src/ecmascript/spidermonkey.c
---- elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c	2011-06-12 01:03:02.427000686 +0200
-+++ elinks-0.12pre5/src/ecmascript/spidermonkey.c	2011-06-12 01:03:31.368000736 +0200
-@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp
-                 JSContext *ctx)
- {
- 	interpreter->exec_start = time(NULL);
--	JS_SetBranchCallback(ctx, safeguard);
-+	JS_SetOperationCallback(ctx, safeguard);
- }
- 
- 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 0a33310ff617..8a9f16bd6ad4 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_84.0.4147.45-1_amd64.deb 69645272 BLAKE2B 72e59a5962920ae0fe59de84ac8654ed0bd7b1ee99ccb6428dfe67fe1a015fcfbc4d92b8de7dae54ccecb51c44f23da5aedd5758c1a3a2540234e49b02f0b4a9 SHA512 843c96581ed93e5308f8b436eaf7a5270cf186ccbcd82f6dbd12cff071e402a3515bd310620027075d39b62131314039d3defa70550d0ed7ff8f02c1dd53eefe
-EBUILD google-chrome-beta-84.0.4147.45.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-beta_84.0.4147.68-1_amd64.deb 69666824 BLAKE2B 2e0c5e3bff9b8634a1960d3ed1c1cbe7e6b95dbab7fa51bbe4180f99e9c0a9dd9add35551d3711db0d9a444217aadd3ed74d68e33ae10751ba620912c4dfc58d SHA512 e1aa88090a5a92b78169ed4f67d4c6a21f6b714c4daf36bfe53695f73042f4a1790ab9272780d8a4776fda3cd0bd4a43788853cc20e7eaabd4d5ca9528edc716
+EBUILD google-chrome-beta-84.0.4147.68.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-84.0.4147.45.ebuild b/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.45.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f49d6406635a..e2a896799006 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_85.0.4168.2-1_amd64.deb 69788596 BLAKE2B 5ab77816fff94fdad8b585a7f0d566a7733d19e572fa4fdc0d3b1f457b703e20743979db8ec7a5223ed0dda34c9b11bd1eb100ced86e2377cb2a5cac991f600f SHA512 30c02dca77ed5de229ead4f0db4a9d6b1c154f2a45968958e3e5df048af74c9e35ab745eb8d2f1bbc4e62c3237041eba016cbb13a2be7cf8445f421faadf899f
-EBUILD google-chrome-unstable-85.0.4168.2.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-unstable_85.0.4181.8-1_amd64.deb 69878204 BLAKE2B b18cdbca45fb830c7bf34b0c47f308d19f440000639b41a342712a0f5df71cf3e13d903414e59b2a6265512370d541195560c0129c4da32c05927ddf86f7085a SHA512 a2e751e3d296e520c44e687138786881db61c98f5c881a0f04a4c1e2f7b576644bcdccc369b23e070a5afdb2bb330b11c9329850224aed696f01aafcec280afd
+EBUILD google-chrome-unstable-85.0.4181.8.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-85.0.4168.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4168.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a14eb7e53871..4cc1a503c9ce 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_83.0.4103.106-1_amd64.deb 68641320 BLAKE2B 90a7183c0d5dccf3b8b293dcac01a615923f08e963b63708fffd6b19570c03e9eee6ec30707164313093a68413e671a09fed338c72341144195bd3545d9acc1e SHA512 2fc1cfbe52e79b88ab900aca87a6bc57edb0dcb9e26a37101e881300a62028c316731465235407a1aa20a459109af40e7f6349c1bc486161f1da06a83a4eb2c5
-EBUILD google-chrome-83.0.4103.106.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-stable_83.0.4103.116-1_amd64.deb 68648484 BLAKE2B e783a1788ec091c0f785acae36cd759f9c5d016830e33a93218e42fcbb752602eba8dd28e687187d6ab71235ad77f09249999fa02b1494e523e4df955cfaab52 SHA512 2ec0279fbdff50b19e82f508590faa9ec9401b55254ce37f3d41302bcd8fecd454c7e24e95ce0e1ef0322b9f6f91d9463334dfbcb0399fa87ca5b8163c42de9f
+EBUILD google-chrome-83.0.4103.116.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-83.0.4103.106.ebuild b/www-client/google-chrome/google-chrome-83.0.4103.116.ebuild
index b5a38b97587d..b5a38b97587d 100644
--- a/www-client/google-chrome/google-chrome-83.0.4103.106.ebuild
+++ b/www-client/google-chrome/google-chrome-83.0.4103.116.ebuild
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 16a7c0b9ad76..cc0266a6578c 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,9 +1,6 @@
-AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
-AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
-AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+AUX netsurf-3.10-disable-failing-tests.patch 1196 BLAKE2B 055f4663bfed7ebe291e922ad52b20acb3b014e0be36e2e562410ce8e1188fcaa0edce1dd39ec9b834139e4250c30a08039a896a47dfc90c23e9f2e4a1675869 SHA512 dc10108ee223287978305942e1254efacf7ac78201355df0de5c19ebb0782077cdaf655e8eba590c5187df38d1f67e861f77b13d507faea481bf8f1992fe0e1d
+AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
-DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
-DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
-EBUILD netsurf-3.8-r2.ebuild 3901 BLAKE2B 05e18fe99ada4d93333c4cc00c7083850423d41e6326b9b40b475b68fa9ad21b65b8fcaa6bba3b9e56bee6ccb6712362f8cfdbfe934b3043ff348145bdf77237 SHA512 38647c20bc9a6dc97ec3168f6b52280fec876bf3eef3ba29c7294f918be05467c628c7288c90ecf4c69c5dfadb7b53b3977ace67f22ccc8321c5c6645ee83707
-EBUILD netsurf-3.9.ebuild 3906 BLAKE2B 47797b8f43c566cd2c758a69dbdeae37133ad1e3bf3a648e1397e528affc7b3f7769a0673a5760890105b35abbd2715972e4af8aaa2f9634e1ea34b2f5b92361 SHA512 9e55f7d46404a942db368c3a644edf318215c00125c2a08b59449c87dd7a141777c2077f378fd6cfb747e40af8c4024a0d59a1fa193b795ba1f6a8f643ef75e9
-MISC metadata.xml 1556 BLAKE2B 4ce7e6462525c4091f3a6e6226afaa29748d11728e4e4574147f317cb3b0ec650b247023e7b1c74e29f28e60fba3116084730e831daa6ad11e01267ccac896f4 SHA512 b529c7584bed60fa7b9d84f629314a1d902cdfbfe381e5a5975c77218aa7cbb58c4c4e66de96cb2029192c25956b05e6d47ee6baf394a192154806f46979febf
+DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
+EBUILD netsurf-3.10.ebuild 3899 BLAKE2B a3e64bbaa69941d911c6e6bdf0f6dcb2165777ea407c78ad3e01aa891abe5ee5c48b67589f0990340e08ff017bd2a764c05e785ece928fa76212734be32e3822 SHA512 dd0cfac0bf5f30e800b2bde2523f83e42317ed946d80527b10da89d9a94ffca14c30723a959c3884988c595d12e427ddf7e2a7e19f706bdd52697e7e5aba1f25
+MISC metadata.xml 1564 BLAKE2B 613fed039b6dac6329dacce954d28087855dfb2db7445496e9394882c0d9bf59c9db936bb47188a582eaf7987961acb5d4045baf1917fd1a46b72dad1c24ed7e SHA512 634e81db8221b34e71fab51ff66efd15d95307a88dc08812837b290301a8b8e1644dab4972f9e1941434b04f0c5877343033099d624fa68bd449796f0866ab48
diff --git a/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
new file mode 100644
index 000000000000..6ffcec002e0b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
@@ -0,0 +1,42 @@
+From 4c3d6b10802b6747ba36b6e7c988f6b584352358 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:42:34 -0400
+Subject: [PATCH 1/1] test: disable failing tests.
+
+Just cut them right out of the Makefile if they ain't gonna work.
+
+Bug: https://bugs.gentoo.org/687378
+Upstream-bug: https://bugs.netsurf-browser.org/mantis/view.php?id=2779
+---
+ test/Makefile | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 82ffee6..952d238 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -5,8 +5,6 @@ TESTS := \
+ 	nsurl \
+ 	urldbtest \
+ 	nsoption \
+-	bloom \
+-	hashtable \
+ 	hashmap \
+ 	urlescape \
+ 	utils \
+@@ -47,12 +45,6 @@ messages_SRCS := utils/messages.c utils/hashtable.c test/log.c test/messages.c
+ # nsoption test sources
+ nsoption_SRCS := utils/nsoption.c test/log.c test/nsoption.c
+ 
+-# Bloom filter test sources
+-bloom_SRCS := utils/bloom.c test/bloom.c
+-
+-# hash table test sources
+-hashtable_SRCS := utils/hashtable.c test/log.c test/hashtable.c
+-
+ # hashmap test sources
+ hashmap_SRCS := $(NSURL_SOURCES) utils/hashmap.c utils/corestrings.c test/log.c test/hashmap.c
+ hashmap_LD := -lmalloc_fig
+-- 
+2.26.2
+
diff --git a/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
new file mode 100644
index 000000000000..3a6ccc2466f4
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
@@ -0,0 +1,34 @@
+From d585a1573819306bb3660db3f13a85b2fd254c63 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:23:10 -0400
+Subject: [PATCH 1/1] utils/idna.c: adjust utf8proc.h header location.
+
+There are two upstreams for libutf8proc, and they each put utf8proc.h
+in a different location -- ostensibly as a performance art piece
+intended to remind the programmer that we as human beings are all
+slowly dying, and that our limited time here on earth should not be
+wasted. This commit switches the header location from the netsurf-
+upstream one that used to work, to the julia-upstream location that
+works now (that the Gentoo package follows the julia upstream).
+
+Bug: https://bugs.gentoo.org/721318
+---
+ utils/idna.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/idna.c b/utils/idna.c
+index 628ef1f..f6e498a 100644
+--- a/utils/idna.c
++++ b/utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
+ 
+ #ifdef WITH_UTF8PROC
+ 
+-#include <libutf8proc/utf8proc.h>
++#include <utf8proc.h>
+ 
+ int32_t idna_contexto[] = {
+ 	/* CONTEXTO codepoints which have a rule defined */
+-- 
+2.26.2
+
diff --git a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
deleted file mode 100644
index 06754464cb6c..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/content/handlers/image/image.c
-+++ netsurf-3.6/content/handlers/image/image.c
-@@ -27,14 +27,28 @@
- #include "netsurf/content.h"
- #include "desktop/gui_internal.h"
- 
-+#ifdef WITH_BMP
- #include "image/bmp.h"
-+#endif
-+#ifdef WITH_GIF
- #include "image/gif.h"
-+#endif
- #include "image/ico.h"
-+#ifdef WITH_JPEG
- #include "image/jpeg.h"
-+#endif
-+#ifdef WITH_NSSPRITE
- #include "image/nssprite.h"
-+#endif
-+#ifdef WITH_PNG
- #include "image/png.h"
-+#endif
-+#ifdef WITH_RSVG
- #include "image/rsvg.h"
-+#endif
-+#ifdef WITH_NS_SVG
- #include "image/svg.h"
-+#endif
- #include "image/image.h"
- 
- /**
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
deleted file mode 100644
index c52422dcb92b..000000000000
--- a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile.defaults b/Makefile.defaults
-index 51090109e..f1ec46f73 100644
---- a/Makefile.defaults
-+++ b/Makefile.defaults
-@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
- # But recover after sanitizer failure
- NETSURF_RECOVER_SANITIZERS := YES
- 
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
--# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
--CXXFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
- 
-diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
-index bdedd903b..35179138a 100644
---- a/frontends/framebuffer/Makefile
-+++ b/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
- 
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- 	  -D_BSD_SOURCE \
- 	  -D_DEFAULT_SOURCE \
- 	  -D_XOPEN_SOURCE=600 \
-diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
-index cc712e992..f132c97d6 100644
---- a/frontends/framebuffer/Makefile.defaults
-+++ b/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
- 
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
-diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
-index ec60ce70c..04af6df8f 100644
---- a/frontends/gtk/Makefile
-+++ b/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
-diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
-index a98043eb9..bb5371230 100644
---- a/frontends/gtk/Makefile.defaults
-+++ b/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
-diff --git a/test/Makefile b/test/Makefile
-index 4f9dd22c9..8bec9b88a 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
-   COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
- 
--BASE_TESTCFLAGS := -std=c99 -g \
-+BASE_TESTCFLAGS := -std=c99 \
- 	$(COMMON_WARNFLAGS) \
- 	-D_DEFAULT_SOURCE \
- 	-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
deleted file mode 100644
index e9c2420a33fd..000000000000
--- a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/desktop/font_haru.c b/desktop/font_haru.c
-index 4ee9824f0..3304ba82a 100644
---- a/desktop/font_haru.c
-+++ b/desktop/font_haru.c
-@@ -37,7 +37,7 @@
- #include <hpdf.h>
- 
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
- 
-diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
-index 889190089..9e6265cfb 100644
---- a/desktop/save_pdf.c
-+++ b/desktop/save_pdf.c
-@@ -60,6 +60,8 @@
- #include "utils/useragent.h"
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "netsurf/bitmap.h"
- 
- #include "netsurf/plotters.h"
-@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
- 
- 		switch(content_get_type(content)){
- 		/*Handle "embeddable" types of images*/
--		case CONTENT_JPEG:
-- 			image = HPDF_LoadJpegImageFromMem(pdf_doc,
-- 					(const HPDF_BYTE *) source_data,
-- 					source_size);
-- 			break;
- 
- 		/*Disabled until HARU PNG support will be more stable.
- 
-@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
- 
- 
- #ifndef PDF_DEBUG
--	if (option_enable_PDF_compression)
-+	if (nsoption_bool(enable_PDF_compression))
- 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
- #endif
- 	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -780,7 +777,7 @@ void pdf_end(void)
- 	assert(settings->output != NULL);
- 
- 	/*Encryption on*/
--	if (option_enable_PDF_password)
-+	if (nsoption_bool(enable_PDF_password))
- 		guit->misc->pdf_password(&owner_pass, &user_pass,
- 				(void *)settings->output);
- 	else
-@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
- {
- 	nserror res = NSERROR_OK;
- 
--	if (option_enable_PDF_password && owner_pass != NULL ) {
-+	if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
- 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
- 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
- 		free(owner_pass);
-diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
-index 8c46fd884..748518fdc 100644
---- a/frontends/gtk/scaffolding.c
-+++ b/frontends/gtk/scaffolding.c
-@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
- 
- 	free(url_name);
- 
--	strncpy(dirname, option_downloads_directory, PATH_MAX);
-+	strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
- 	strncat(dirname, "/", PATH_MAX - strlen(dirname));
- 	dirname[PATH_MAX - 1] = '\0';
- 
- 	/* this way the scale used by PDF functions is synchronised with that
- 	 * used by the all-purpose print interface
- 	 */
--	haru_nsfont_set_scale((float)option_export_scale / 100);
-+	haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
- 
- 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
- 		GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index c0afc0380304..4abc84a70da8 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,36 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>philipp.ammann@posteo.de</email>
-		<name>Philipp Ammann</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
-	</upstream>
-	<use>
-		<flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
-		<flag name="duktape">Use duktape.org javascript engine</flag>
-		<flag name="gtk">Build GTK3 GUI</flag>
-		<flag name="gtk2">Build GTK2 GUI</flag>
-		<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
-		<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
-		<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
-		<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
-	</use>
-	<longdescription lang="en">
-		NetSurf is a free, open source web browser. It is written in C, has 
-		its own layout and rendering engine entirely written from scratch. It 
-		is small and capable of handling many of the web standards in use 
-		today.
+  <maintainer type="person">
+    <email>philipp.ammann@posteo.de</email>
+    <name>Philipp Ammann</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <changelog>
+      https://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt
+    </changelog>
+  </upstream>
+  <use>
+    <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
+    <flag name="duktape">Use duktape.org javascript engine</flag>
+    <flag name="gtk">Build GTK3 GUI</flag>
+    <flag name="gtk2">Build GTK2 GUI</flag>
+    <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
+    <flag name="rosprite">
+      RISC OS Sprite bitmap image support (media-libs/librosprite)
+    </flag>
+    <flag name="svgtiny">
+      SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
+    </flag>
+  </use>
+  <longdescription lang="en">
+    NetSurf is a free, open source web browser. It is written in C,
+    has its own layout and rendering engine entirely written from
+    scratch. It is small and capable of handling many of the web
+    standards in use today.
 
-		Whether you want to check your webmail, read the news or post to 
-		discussion forums, NetSurf is your lightweight gateway to the world 
-		wide web. Actively developed, NetSurf is continually evolving and 
-		improving.
-	</longdescription>
+    Whether you want to check your webmail, read the news or post to
+    discussion forums, NetSurf is your lightweight gateway to the
+    world wide web. Actively developed, NetSurf is continually
+    evolving and improving.
+  </longdescription>
 </pkgmetadata>
diff --git a/www-client/netsurf/netsurf-3.9.ebuild b/www-client/netsurf/netsurf-3.10.ebuild
index 89bfe438c733..206f8f8d2f65 100644
--- a/www-client/netsurf/netsurf-3.9.ebuild
+++ b/www-client/netsurf/netsurf-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,9 +11,9 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
-	pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
+KEYWORDS="~amd64"
+IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
+	+png +psl rosprite +svg +svgtiny +webp"
 
 REQUIRED_USE="|| ( fbcon gtk gtk2 )
 	duktape? ( javascript )"
@@ -36,11 +36,13 @@ RDEPEND="
 		x11-libs/gtk+:3 )
 	gtk2? ( dev-libs/glib:2
 		x11-libs/gtk+:2 )
-	javascript? ( >=dev-libs/nsgenbind-0.7
-		!duktape? ( dev-lang/spidermonkey:0= ) )
+	javascript? (
+		>=dev-libs/nsgenbind-0.7
+		duktape? ( dev-lang/duktape )
+		!duktape? ( dev-lang/spidermonkey:0= )
+	)
 	jpeg? ( >=virtual/jpeg-0-r2:0 )
 	mng? ( >=media-libs/libmng-1.0.10-r2 )
-	pdf-writer? ( media-libs/libharu )
 	png? ( >=media-libs/libpng-1.2.51:0 )
 	psl? ( media-libs/libnspsl )
 	rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
@@ -53,11 +55,10 @@ BDEPEND="
 	dev-perl/HTML-Parser
 	>=dev-util/netsurf-buildsystem-1.7-r1"
 
-RESTRICT="test"
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.9-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+	"${FILESDIR}/${PN}-3.9-conditionally-include-image-headers.patch"
+	"${FILESDIR}/${PN}-3.10-julia-libutf8proc-header-location.patch"
+	"${FILESDIR}/${PN}-3.10-disable-failing-tests.patch"
 )
 
 DOCS=( README docs/using-framebuffer.md
@@ -84,13 +85,12 @@ _emake() {
 		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
 		NETSURF_USE_JS=NO
 		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
-		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
 		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
 		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
 		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
 		PKG_CONFIG=$(tc-getPKG_CONFIG)
 		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
-		NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
+		NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
 		NETSURF_USE_VIDEO=NO
 	)
 	emake "${netsurf_makeconf[@]}" $@
@@ -98,7 +98,7 @@ _emake() {
 
 src_compile() {
 	use fbcon && _emake TARGET=framebuffer
-	use gtk2 && _emake TARGET=gtk
+	use gtk2 && _emake TARGET=gtk2
 	use gtk && _emake TARGET=gtk3
 }
 
@@ -111,19 +111,19 @@ src_install() {
 		-i "${WORKDIR}"/*/utils/git-testament.pl || die
 
 	if use fbcon ; then
-		_emake TARGET=framebuffer DESTDIR="${ED}" install
+		_emake TARGET=framebuffer DESTDIR="${D}" install
 		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
 	fi
 	if use gtk2 ; then
-		_emake TARGET=gtk DESTDIR="${ED}" install
-		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+		_emake TARGET=gtk2 DESTDIR="${D}" install
+		elog "netsurf gtk2 version has been installed as netsurf-gtk2"
+		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk2 NetSurf-gtk2 netsurf "Network;WebBrowser"
 	fi
 	if use gtk ; then
-		_emake TARGET=gtk3 DESTDIR="${ED}" install
+		_emake TARGET=gtk3 DESTDIR="${D}" install
 		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+		make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
 	fi
 
 	insinto /usr/share/pixmaps
diff --git a/www-client/netsurf/netsurf-3.8-r2.ebuild b/www-client/netsurf/netsurf-3.8-r2.ebuild
deleted file mode 100644
index e9cd87acae48..000000000000
--- a/www-client/netsurf/netsurf-3.8-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs desktop
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
-	pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
-	duktape? ( javascript )"
-
-RDEPEND="
-	>=dev-libs/libcss-0.8
-	>=net-libs/libdom-0.3
-	>=net-libs/libhubbub-0.3
-	>=dev-libs/libnsutils-0.0.5
-	>=dev-libs/libutf8proc-2.2
-	dev-libs/libxml2:2
-	net-misc/curl
-	bmp? ( >=media-libs/libnsbmp-0.1 )
-	fbcon? ( >=dev-libs/libnsfb-0.2
-		truetype? ( media-fonts/dejavu
-			>=media-libs/freetype-2.5.0.1 )
-	)
-	gif? ( >=media-libs/libnsgif-0.1 )
-	gtk? ( dev-libs/glib:2
-		x11-libs/gtk+:3 )
-	gtk2? ( dev-libs/glib:2
-		x11-libs/gtk+:2 )
-	javascript? ( >=dev-libs/nsgenbind-0.6
-		!duktape? ( dev-lang/spidermonkey:0= ) )
-	jpeg? ( >=virtual/jpeg-0-r2:0 )
-	mng? ( >=media-libs/libmng-1.0.10-r2 )
-	pdf-writer? ( media-libs/libharu )
-	png? ( >=media-libs/libpng-1.2.51:0 )
-	psl? ( media-libs/libnspsl )
-	rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
-	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
-		!svgtiny? ( gnome-base/librsvg:2 ) )
-	webp? ( >=media-libs/libwebp-0.3.0 )"
-DEPEND="${RDEPEND}
-	dev-libs/check
-	dev-perl/HTML-Parser
-	>=dev-util/netsurf-buildsystem-1.7-r1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8-CFLAGS.patch
-	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${PN}-3.8-pdf-writer.patch
-)
-
-DOCS=( README docs/using-framebuffer.md
-	docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
-	default
-	rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	local netsurf_makeconf=(
-		"${NETSURF_MAKECONF[@]}"
-		COMPONENT_TYPE=binary
-		NETSURF_USE_BMP=$(usex bmp YES NO)
-		NETSURF_USE_GIF=$(usex gif YES NO)
-		NETSURF_USE_JPEG=$(usex jpeg YES NO)
-		NETSURF_USE_PNG=$(usex png YES NO)
-		NETSURF_USE_NSPSL=$(usex psl YES NO)
-		NETSURF_USE_MNG=$(usex mng YES NO)
-		NETSURF_USE_WEBP=$(usex webp YES NO)
-		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
-		NETSURF_USE_JS=NO
-		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
-		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
-		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
-		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
-		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
-		PKG_CONFIG=$(tc-getPKG_CONFIG)
-		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
-		NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
-		NETSURF_USE_VIDEO=NO
-	)
-	emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
-	use fbcon && _emake TARGET=framebuffer
-	use gtk2 && _emake TARGET=gtk
-	use gtk && _emake TARGET=gtk3
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	sed -e '1iexit;' \
-		-i "${WORKDIR}"/*/utils/git-testament.pl || die
-
-	if use fbcon ; then
-		_emake TARGET=framebuffer DESTDIR="${ED}" install
-		elog "framebuffer binary has been installed as netsurf-fb"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-	fi
-	if use gtk2 ; then
-		_emake TARGET=gtk DESTDIR="${ED}" install
-		elog "netsurf gtk2 version has been installed as netsurf-gtk"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
-	fi
-	if use gtk ; then
-		_emake TARGET=gtk3 DESTDIR="${ED}" install
-		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
-		make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins frontends/gtk/res/netsurf.xpm
-}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index ac39269b243d..45dc74b37352 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,3 @@
-DIST opera-beta_69.0.3686.12_amd64.deb 66516048 BLAKE2B 3d8644a3c61d36c575fc3dad6bd920e8bee78ee4895374391dedee6455530b3f415dfc69b027611158fbde3c84dd7d2c1d14755df9d869b8786bb0950f0cb5f5 SHA512 d1ce815e9ba92a8795dd372d123c759734feca210fb311147aff1e33cdbc406b5df75827d50c57d0d7d29ff3bd45e2c4f86001345c8feb391145100b35ece553
-DIST opera-beta_69.0.3686.21_amd64.deb 66550336 BLAKE2B 0ee1ecbafade7a9c835dd0770e0ce838ecfa8861ac2a454a82e8a3538b50c843b7058b60a79f9ab416bc51bddb52e0b88330c3da615898fc422019e26ee7822b SHA512 f9c01baff92e71f34264fa00d2ec195a07a257230eb19d599d2c02badb14f472b46d327601789059311ca832aff106d8785a9121bd726d2434aa00a4c16c3c06
 DIST opera-beta_69.0.3686.30_amd64.deb 66554112 BLAKE2B a755afb1b5b381106c9a05a4b157581d23355d04d29177519663d6860d8add4ab2e58756c5826780c0dbe15f7dd158cf6c2f0f60a3543743c5ac73f371c07cfa SHA512 7d1268ad77ffc5df93deefa97f1e7af1b21961db7d3399288e0bd32e2bb2cc70cfd0803b5a02eb1837302d6686d59961fb398a00faecd50275f81cc03c784ca8
-DIST opera-beta_69.0.3686.7_amd64.deb 66514300 BLAKE2B 2f590713571a42a6b87d1c39ecc257b0dd19455e6a08f62887310031147ff05cbe9ca1b3aef1eb68373fa58453c6cc9d72754d746a94d5d10904ca274cc6f4ef SHA512 daec2ea81ae1790a1a0550a41b84bce6b036836ded4dae18a218104fbdf069fa5574797b7e7e21278d56de49686c6f6d7a155b53fe5489309ae0d6b61d8021cf
-EBUILD opera-beta-69.0.3686.12.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-69.0.3686.21.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 EBUILD opera-beta-69.0.3686.30.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-69.0.3686.7.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	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-69.0.3686.7.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	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 fe1bd104c496..e2787ad0086c 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,11 +1,5 @@
-DIST opera-developer_70.0.3693.0_amd64.deb 66336804 BLAKE2B 57c3d32bf6a21b87f85512b9bb295e9c8bc8b89d4812f27d118774810c59b8c6634ae98f9d6d93e7890809f55c330d01afe43ee849802bab51129bd42d244294 SHA512 8ed29d90a7fd6b3ed7be23035cdbcb1d43243c884e86416d5f4f1777c626cb9482772cb10a1045bbf31b8467f63df90da2096870eb9fc49956da8ac9d35174fa
-DIST opera-developer_70.0.3701.0_amd64.deb 66415456 BLAKE2B 6b9402b9cb6a33ea1da728547903c1788b1bb861c80d7c382cf299d0b091dce67a2db6026fa1b227d713c090b77f61f468e80ebca644c824c92c166c746bdb40 SHA512 1e4485f040b645789a9e4f81e9615a55f3a184e0e3675d563f4bf52471794d6c3f6e0298fbfafdccb925be142cd99796cfbda4843fe23a79cf83630add8ab46a
-DIST opera-developer_70.0.3707.0_amd64.deb 66703228 BLAKE2B 9d6f2588fbdf8803907b4e7cd235cf05fd46f9ca99e791300efa8533b6fc294f444f8dff9f2499f9ee45022729adbb398cf1bed7fdb55e048eeb24a522e8a4ed SHA512 3a6252a36b0599c7339320a975a22a9ed2a7083dcfda3694aa2f8f8f69cd66a39ff1d5108743d2a492426f8988425b38703b7e06e4506009f5d679da86a94d3e
-DIST opera-developer_70.0.3714.0_amd64.deb 67228556 BLAKE2B a2f7cf7bcacb706e5ea8eadd3fa47ca42c440307c54a937cba02b0c42193676a6dbbb28534dd2f1f860d6e9d35cc23f65500f4d5f2711074d37016ab1c92bcd3 SHA512 73447463572a72abee219d49711fc797570ffa9b933ad7b77b83c76af964f934f7a5f8850efab029284eca3e664878b98ed691e456cc81147040bb2d632be317
 DIST opera-developer_70.0.3721.0_amd64.deb 67339908 BLAKE2B 8165e55bb82c9a89581a52d9d887d931d29b0de5763c0320f1bebd930ecfec3057f97796ebf40bfa90897b8d3653989a2dbb8b2c1e88c3f930ab40be61a32f60 SHA512 bf35b6f7e94cf64312592df1764fe85b73a3f84712dcb73a48bd976c1d3a03d9578305170bec7480427e9c9e9db8a84c27f5a20aef98d1a4391fd1295f8881b9
-EBUILD opera-developer-70.0.3693.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-70.0.3701.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-70.0.3707.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-70.0.3714.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
+DIST opera-developer_70.0.3728.0_amd64.deb 67337716 BLAKE2B 408d699664de431777d38873e60fefa298b2e3dce1c1bc51fae5230cd172150753fd260459f3649c5563d34aa5c79ad7f79ba8e3607dc6f533d3e1471c7c7a8f SHA512 b055a320b92888295094d83f609ed6afd256c007fac108d979bf4f54569bebf6c39a7926f0ba44456590b77bf93452356638fc61d8323c0bab42aac7c7d5b2b6
 EBUILD opera-developer-70.0.3721.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
+EBUILD opera-developer-70.0.3728.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	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-developer/opera-developer-70.0.3707.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	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-developer/opera-developer-70.0.3714.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	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-developer/opera-developer-70.0.3693.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3728.0.ebuild
index 837674712eae..837674712eae 100644
--- a/www-client/opera-developer/opera-developer-70.0.3693.0.ebuild
+++ b/www-client/opera-developer/opera-developer-70.0.3728.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 3d8270320deb..5761e1ce0f1d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,5 +1,7 @@
 DIST opera-stable_68.0.3618.165_amd64.deb 67448160 BLAKE2B 8f0c70011898ccbbbf9badbf8ba2c792d6f6150af073e033bb2131e21cf3237d85d9c7ca7ebee0adaae7a587957be8d9cfc82cacfe9cc188e42c75574f2199c4 SHA512 7d62438f42df88593be51b60625045ef1b398ade01ee33cdefa780d96505e2b469609b684741f3f0884dce7068faeb38fb6887cb89a580e113bea528734620dc
 DIST opera-stable_68.0.3618.173_amd64.deb 67459012 BLAKE2B fcb37a6491f0174710a8bd22351ec01431b292039d2671cc91243cee406d0171d05ff1e9296746bc484507163c7d167deeb2852783a62464421b2c9714668924 SHA512 149f666465b13f3fd776c4889339e19face710101b134d69b8ab30c370f155692d0ee85593127dc3e72236b7956fc5dce4971afa1a65d9c9e8f5e5c73931906f
+DIST opera-stable_69.0.3686.36_amd64.deb 66189672 BLAKE2B d92b9aaeabcbe52b2d3f2adde7764d3a94dea78c003a5fe6748afbc2f9692ad8138b99637761f99379cb14f955df4012471f4457b1876028639bc314b4142ef0 SHA512 3a1aa77bccef2dcb21d6a81ddb4af534edb27f1a0002e523de1d44db810634b3b26cd8f3d9eb538ec81566c57afb5c9dd83d837c8c2da8801360c8ebfa1f015d
 EBUILD opera-68.0.3618.165.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
 EBUILD opera-68.0.3618.173.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
+EBUILD opera-69.0.3686.36.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild b/www-client/opera/opera-69.0.3686.36.ebuild
index 99905f624666..58c0be89c0ab 100644
--- a/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild
+++ b/www-client/opera/opera-69.0.3686.36.ebuild
@@ -3,9 +3,10 @@
 
 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
+	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
 
@@ -19,13 +20,11 @@ SRC_URI_BASE="
 	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"
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-SRC_URI+=")"
 KEYWORDS="~amd64"
 
 RDEPEND="
@@ -33,7 +32,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
@@ -61,10 +59,6 @@ RDEPEND="
 QA_PREBUILT="*"
 S=${WORKDIR}
 
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
 src_unpack() {
 	unpack_deb ${A}
 }
@@ -72,22 +66,22 @@ src_unpack() {
 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
 			;;
-		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
+	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
 
@@ -97,9 +91,10 @@ src_prepare() {
 }
 
 src_install() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
 	mv * "${D}" || die
 	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
 }
 
 pkg_postrm() {
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 5c9b5396c962..c5456ad40bb4 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -6,6 +6,16 @@ DIST vivaldi-snapshot-3.2.1952.3_p1-amd64.deb 71810008 BLAKE2B d050d8c1ef8aa6281
 DIST vivaldi-snapshot-3.2.1952.3_p1-arm64.deb 64091432 BLAKE2B 4825e2833b5a15ac1ff47e7b085fd24a5c7474f5af88db2a5a0327048fea39a63580e06279fa6c7426fce4c4a07a8bbb9cb152b65a2102d584b9c48be4e0521d SHA512 53f469d043bff2aca62bc97fc3272a786d15a5ac3c110ff4eec3fbb4e4d09dfb51755729d8793024e04cb03c0d61579e6e6974a1d42d3471272969049bf04243
 DIST vivaldi-snapshot-3.2.1952.3_p1-armhf.deb 63607868 BLAKE2B c0e8ca2afbd0967a6549f03b83fe3cbeda6f010385b15fde526685015a309aab818fd5318254900dc5d1a1390eea7abc4bef4c7a4489d77ef21f44fbdf7c8212 SHA512 f359b64968aaf1d8e6e4f3b1d44648c0de168504d59b70c622388a89355e2856ed516700daad986e65027717e354a20bd1b10ff065aab7a152e80f0336c6f9a9
 DIST vivaldi-snapshot-3.2.1952.3_p1-i386.deb 70126608 BLAKE2B 4eaa68846f1ec9f753c5e15b556106708b3236d10a87fab5e30372f8a47e75ef66709b436580ad83a61308271462e62df693a8fdcb074a116c86c1164da9054d SHA512 d859418867dd3f105269bc19e0592b46ec7d3a58249d91bd0ab9f2101c995f6e34b85b44cc7a74cfedff5902afb84f6b931ffa15b31c168e38846b015d66377b
+DIST vivaldi-snapshot-3.2.1957.9_p1-amd64.deb 71810384 BLAKE2B 30218a9333752d2fb15168aad039a4a4a2d584c5eb1836e1782a4527c17d2ec18fb31c2973e4ceba44819ba6e35aaf0ade349b74d1ce57c4886c72a88b1d08db SHA512 29e2972efd591539f89ed9f01ff2d292ad7a90a955c885e579c904692bc8db2f4606fad2ff0b257ca77a5f1ddb6f338049bd9eb14b6b25621dae3b60fb7786e1
+DIST vivaldi-snapshot-3.2.1957.9_p1-arm64.deb 63549412 BLAKE2B d08dca3583263f5f9ed3b1e809e404fb7a666da0871c5eb0d44efd72c2661ecd9bf33c033fc3c71c489267b7e33381a239937db87071cb3468c91221e94a1132 SHA512 350fbf9b736507cfbf97e6bf9598e6636124e6b9d561b39287c15eea437075fc17519922f33846d0d2bfe4a46aa4155be11d9a13581e59a62c9c4e22e0602d6b
+DIST vivaldi-snapshot-3.2.1957.9_p1-armhf.deb 63607628 BLAKE2B e9b6ccb128f3826d1dca0c218f7a7eecf1b154b3c0fb9e84cc241e3837950d94a92a46c8a341a6337fc1b0395bf96dc328931385bd38b27c78336c93ea879936 SHA512 a5f6e8c7417ff0496eab6bb7ba45c90815065f7491745496e8a49a762f72533c40d274314dfb0765cfccc07b9ba1d0b78ce265686d81d0b1ec155f01a700e950
+DIST vivaldi-snapshot-3.2.1957.9_p1-i386.deb 70135524 BLAKE2B 7af5206e09c2dd21dfccde2c29148f66cc9e485dbf8bc77fcf10216c731043bc2d1770a45b17778677624f0b963b566d0bd076b27daf61d98344ef19d72483e2 SHA512 04fc506f5c870378b5ceae858f8b89699ee312b8207e63c347b9c1f28173d407186947e92694b1dbcd1e8413f7ca6c0736e0794086c6e42880874aa2f4cb7308
+DIST vivaldi-snapshot-3.2.1959.3_p1-amd64.deb 71834236 BLAKE2B 9529e943544c52b37e54ad79e3bc5183390926d4cd3089d3a3a38b7f8546180a7314dc8b8baa96ff488e294f67793f8edfeb2c9e9838b6f8fe2e9aebc5eeaa99 SHA512 189b53f6406dfd194dcbf23fa26e1e4b82b500a770803d6190006cbf4b8f2dd4894f02ca288496ba978b5e6bdb6284bc589c82605379d1388334bbd0c13837b2
+DIST vivaldi-snapshot-3.2.1959.3_p1-arm64.deb 64105704 BLAKE2B e4079252ba4ee183457efed529dcfdaf4ea71f443dd32ccda82103f1944799a770a986b3ed64fb3a29514a93a05aa770acbceb933acdc1e5c0d5ada5375a5fd3 SHA512 03a9f6cd2fe2ee23f87e66de9dfed39b38bd008d93e9962ed4f0a14ec5843bac54bcd074fd7b2c6164c7e025ef29f6a8400388133274ff84689bd73f407a0ab5
+DIST vivaldi-snapshot-3.2.1959.3_p1-armhf.deb 63622548 BLAKE2B 2f4301ea84654c07fe6f37d4b004332ae5976da293dd042e01c1209e5c81ed229e1968cfcab71101b3feb341e2e011c7d1d780559b1c7e5411f3d7ae95df2d67 SHA512 a3be2cb7121df3c11b263f18333fd1a140a80c845c4cac6bfefc2005c7bfe18a02d9a54da3390554ffe94ba32d376406adad8aa7412d7015532f2fffd6ae5411
+DIST vivaldi-snapshot-3.2.1959.3_p1-i386.deb 70144276 BLAKE2B e00c1f233340c33254147465d37edb75933bec9f48e14c0bcbb5d33c7eed3d83688fe7e1b2a6a1f80fd11adb8bbad5ceac266b51cf2dee059c25616b082498f2 SHA512 95038df8fb53a4539038c475a22784025298f8291cdf25a3056f34421a68b4cb045f66f27339f6c313a49a05981eb85914bab8199d6bf61442baf677b0713f48
 EBUILD vivaldi-snapshot-3.2.1950.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 EBUILD vivaldi-snapshot-3.2.1952.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.2.1957.9_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.2.1959.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
index a156328cef54..db3613b057e7 100644
--- a/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
@@ -10,14 +10,10 @@ CHROMIUM_LANGS="
 "
 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}"
+VIVALDI_HOME="opt/${PN}"
 DESCRIPTION="A browser for our friends"
 HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+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 )
@@ -69,22 +65,17 @@ src_unpack() {
 }
 
 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
+	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/${VIVALDI_PN} usr/share/doc/${PF} || 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/${VIVALDI_BIN} \
+		etc/cron.daily/${PN} \
 		|| die
 	rmdir \
 		etc/cron.daily/ \
@@ -111,7 +102,7 @@ src_install() {
 	mv * "${D}" || die
 	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
 
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
 }
 
 pkg_postrm() {
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1959.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1959.3_p1.ebuild
new file mode 100644
index 000000000000..db3613b057e7
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1959.3_p1.ebuild
@@ -0,0 +1,116 @@
+# 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/Manifest b/www-client/vivaldi/Manifest
index 17f7871c554c..5e0bcc7f95d7 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,6 @@
-DIST vivaldi-3.1.1929.34_p1-amd64.deb 70991636 BLAKE2B 5452174dc7b63762a67840008be49db909614c9ce5ef23fa2d8b2f262b8a19d645113a021d5f8cd011ef7b681c057ab119e9dfb51071cb1b06224c16183f59ac SHA512 ea4ef7de3a1cc35b6e64aaa4fd8fbd1b069fa1962357118d380ca4be2fb7f83258b7fdc62f09512f778c97fb5fb05bf0204a9988579d8b075e5a378e7cc0d140
-DIST vivaldi-3.1.1929.34_p1-arm64.deb 63497152 BLAKE2B 6c075a3c6d12e784834d26b385a9e80760b8350caf7466a5982d2435308ff82433d1824e714720a9015b13f6767bb4a0952d4e1705bad6905b30313e898ca0c0 SHA512 7b8d3c5f373d05e70fbfe29750f6a7c684450beead9ef54b33758f8847f4bb3f736f323becdbf90fc24917caefb9087f6ece1b1ef7c013fc0480f1224eb05269
-DIST vivaldi-3.1.1929.34_p1-armhf.deb 62920496 BLAKE2B 45cdb93d10338054b55385c27ff0547e8047ac9d24fbd4dddd72e94f7d8ffc23a111e8fd632f87d13acc79a7c6598d3683735b067c7fcc8cbf6ef32beca296a3 SHA512 4c218e95b13886c96b6489095f406ee18f51fe45b4e092c8fcf15737707fcabbccfbbb1fb59c724eecd93e1e20e98be9dbed3761db44f5afd641b3d8babc37e9
-DIST vivaldi-3.1.1929.34_p1-i386.deb 69389876 BLAKE2B 1b378650a72c8c6bfc088ec22d5d654fae0251a7415932e16bd29e588680132e8d75dc34fe98a5edf45339f4ae7465e6196185d8314b0e8df9303c15652ab2b8 SHA512 12e1cd1539ba13cdebc49ce962c8e4dacf9695dbfb9791191771b3f98e1518b3750ab0164df2405b3601611a0986b70cdaea8b0aaa09b4b7545bcfbdd5fde8a1
-DIST vivaldi-3.1.1929.40_p1-amd64.deb 71036780 BLAKE2B b1f7f921bfa0983ac3f5d841ed005d6f0897a7cc2aa273816648964724111d0d646b3137644246e2efe5f0cf9068799c98ef2474a9702f9b8651b2d4e2ac7274 SHA512 3a2193f21f97df386943e4fd0b249c2fa53495261aef45081c4d837ade21c85ae4e4131d8fac2b09eadc4747f3fcafaf72924c03ecc848896c054c8c7235758e
-DIST vivaldi-3.1.1929.40_p1-arm64.deb 63485296 BLAKE2B cf9f6ea2c7a0094d5bc0d5bbfc0ab79f963cc225ae86215997c67990eaf7435262711f75a4ad2d1ed4fc90638f29699ce0d6aa08a77cfbb7f6266288ff871792 SHA512 6ea9a33279dbd1349ff1e4681f872d954d8c9e3a5b0e98121e9bde0bd5c2ed6fabbfcc1e8cf77fa090264f2b5033fc5adedf8c01c4bf32756de008b12a288f1d
-DIST vivaldi-3.1.1929.40_p1-armhf.deb 62935604 BLAKE2B 094181c43b86f35f1e897b2a4da10b2f294a87a1a73dffde54344b8ec0645b88a2272d6990ac14f8a3f36a0e6c375823f735ce8de5b01fb9f7de9dfaba5517af SHA512 be5f04d3ff3028b282a4e3c2c91dd7d41ac4f81fe3fc9601dc1528864de94828697f214f1e83781715699ecb992e28f92e2483218874a50d09980edcd7b73bfb
-DIST vivaldi-3.1.1929.40_p1-i386.deb 68708216 BLAKE2B 0bcdd6796a2a6be4490501583bb91c164d76fa1105091a8ca1db0575b49d2d9a946849896a4f5f8a567dd047b7b635dcb38f4bb417cae811ad0d6457954163ca SHA512 c190a64fcf17b24aac81ab4470540a9cad15da4af9eb16d33828e73ed4c5dfce46de26fb72bf1f13d52bc5437a298d859bba4d4cdc4c5d9e5cc2fb3d90ce37ff
-EBUILD vivaldi-3.1.1929.34_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
-EBUILD vivaldi-3.1.1929.40_p1.ebuild 2972 BLAKE2B eaf158cdcb97fba387d5f83bb7835872c696a4e3c816b561dd2134975b66f860f570388dac32df1d188c1ee318c54359dd236f608c12a02f46733a32aa6c63ff SHA512 6c27dcf77ec35f6ad8acc530a81f70f46bfec2f1cf82ed1e5d6ed4e7bfaedd406adb0e22dccc88ff151f0f760391b373841e3463b2de7058cbbaed41b14b5bb0
+DIST vivaldi-3.1.1929.45_p1-amd64.deb 71017500 BLAKE2B 8bb5ef135a2194e968c0d86a89aff026a606bf3520846f42169267a639b608322d2b3e0c3053bca0280316e7b03b477e579ba84b923e42c5b4f5ba3895217c41 SHA512 add7f3987758e2edeb9b49c342cc075fcf6444dcd27320b5db15abff1b68b60b619460d19165fb08705c7f19d69df8a200346d44360af326da0f17bd7ee0a020
+DIST vivaldi-3.1.1929.45_p1-arm64.deb 63499340 BLAKE2B 1e33c0b380ee48cb0562ca7867e05979d1bda9dcc3db64c2cdacbd6b8b9e6955e26c5b40e94ad6a9e00a6553fcf74919a4cb95d361677c313209d5ed0dbed543 SHA512 c4ef4f360604cf79aef85016d94fab3c49dd1f8bb7ac20ee6b9c79c8545d4b771918aeb51adeed1f94b4b66a6323d84ea6901c613825a70029dc2f0f501d544e
+DIST vivaldi-3.1.1929.45_p1-armhf.deb 62950080 BLAKE2B e4ffd51f6858a70fdad7669be95ffeca8dc4e9313cb824d8274af9b33a72c21b465a2926f2946f465021de3ce4aa25259cefb45f16314e7dd3c843d9f6c3b5c4 SHA512 7c077f4c3a66921461ee28dbdec80412474b5a0799f6b3bc400a0522a06840f4328c9658e7ab01dd4d29e7a7c8ff1bda0c543447ed56c8b0109be7848295f005
+DIST vivaldi-3.1.1929.45_p1-i386.deb 69392664 BLAKE2B acc2f38031cc7179341bf082814c8505f39d35e9769960197a4f30fe0c29477b63ce59245c105ffa04717849218f103924585987f95bec9b8bd39ae6eab817fb SHA512 fcd73da5809e199337ef12aa02fb0a139e184f189b835304617bfd6be77ae5cde4b28ddf3232b3351f5f28a5da93d2d694c4d2cab22371c8f7be9e724f54db80
+EBUILD vivaldi-3.1.1929.45_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild b/www-client/vivaldi/vivaldi-3.1.1929.45_p1.ebuild
index f28a5ac334d7..f28a5ac334d7 100644
--- a/www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.1.1929.45_p1.ebuild
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 442ba93bcf70..893527216ed2 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -11,5 +11,5 @@ AUX w3mmee-w3mman.patch 631 BLAKE2B b155487da7120b5e106c7b747a7cfc0d3157bdd651da
 DIST w3mmee-p24-22.tar.gz 690094 BLAKE2B 9b779122a10f606fab8cfe9e3ffde7473f60ee65591de3a1eca241e563ced7c70260670da7c56c9eaf39010180733933eba039d743e723b0cc8c230ef8a31d81 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761
 DIST w3mmee-p24-23.tar.gz 697342 BLAKE2B cdfd5752a29ee486ccb4cb174ac68aa2b93c818a088e28a8938ef308030b4baac69645e5adcf86361297f79b2473de483917f523bdd0cda0f6d0d93cc0755534 SHA512 fa74b9124e0790461ea7936411f89265c8a367326bf1bba7a5ea5f4abf748197e0926847f9860ec8d35e97f0e53bcdc69821fdd9d741fc8b18b5e11211aa3271
 EBUILD w3mmee-0.3.2_p24-r10.ebuild 3831 BLAKE2B 7fc6f1094f012938a8d69f95bedcb03636247fca6b22526dc530e272b21e6845c75e3f4eed9e72ff6353d8a982bc70d5ab41daeb70b9e128a9e59a86a0f4b884 SHA512 7a622fa47ccab3f458424da26374ec12493494b12ed61e2e9fde3f128e97e693f3b5a2446b15fdae9f7f7ff62a6e3e15b6ae71744ecc619a5f416c68123c01b5
-EBUILD w3mmee-0.3.2_p24-r12.ebuild 3688 BLAKE2B 9817a47b88082f520a84fa757e9e7babc03af0959d6b269a541ffc88f795d0125a567c76e4113afcdacba5ded0771529b5bed58b5567e714f967100cd9331a9f SHA512 b38cded71655fa5e556d4e600c8d6abc13265a9cfd5991e2313c95a8b57a5f1771e3cf8a740a61c41d7e67089d777aa8da1505f067ba8c82732b237f53f25cf2
+EBUILD w3mmee-0.3.2_p24-r12.ebuild 3685 BLAKE2B d9111a284ae3efd5775c647f2b5b63f18fa74316a061ebdb0b0b7124873b2dde627dadcde6b3b5bfeb5ffc06f1ebd9598fa4e8cc236487558ce6059bf5040575 SHA512 d0bbdc2f3af03d676f39a558ce554ef28eac010acb9e656168449c446698733cd0f6c7b2b13c11a1c782da78ca33dff41921452ec6082e0ed202604c62820477
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
index 96d017eb15bc..fd3d08fbe5a4 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="w3m"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gpm libressl nls ssl"
 
 DEPEND=">=dev-libs/boehm-gc-7.2
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
commit	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree	83fc5facb6b12be510a37bc3d241cc63e965b13a /www-client
parent	feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)