gentoo resync : 20.06.2021

19 files changed, 980 insertions, 37 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2fb67a6c5330..ccbd90cd9c24 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8a0bd7c196a9..7d40894d76f2 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,13 +11,15 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-91-patchset-6.tar.xz 4280 BLAKE2B 18887953453133589cfc5df58d24725047235fac3652cc7af7bd117fbc94aa9a2e1b1dd3147f772f84d8fa3e7b5b77159abc1e408d7b24b065bb1f12cebbfb2f SHA512 49b4aaedfbb1fa5629dbb453bb74f5735c05b14407ea3d2bb1eaee9686e03661a3c471357d085ab839dff16df92d71dae3a6f17486c017a79a836c1d8780a250
 DIST chromium-91-ppc64le-6.tar.xz 28968 BLAKE2B 5153be672aec91899d9eabe3ddf4c3d0b4b2d307e396afa2a83bf3102bc540fa62d69df365057128227428bd3abfc8cab9203fae41e5150191025d8ecea935ab SHA512 78071d204bf04a13a132a63a3d268a0d6d05a895c1ee55a41176fb5cca975c502e69a83ca0388ecea92c041f24235c452abdfbf0ee557e93db6685589fb9428b
 DIST chromium-91.0.4472.106.tar.xz 950214296 BLAKE2B 1c68c3d6ccb593b4516482ba8f18f3bf769fe90ca423692f8e8d9fabd36fa8cda7a66f870fc30478ea4e1f9bd147bb6cadb77df4d9e0ef846c30e653b15dcc98 SHA512 142507bbf5fcc47d7eeb5f890ed70eae403271a7f537903545ad09ac26501aae914f327c3287d5588ed4ab601012584f6204cca6896ed2705326b090df2fe00c
+DIST chromium-91.0.4472.114.tar.xz 950268264 BLAKE2B e811ec3550434a5f5dcff3f5a0c07d2a951b0479ae8ef7de0dc82c60d63bb19a04ed065b2f8f12b0ba4786244fd0fdba9a38e1f0ae076a9be2fc50bc293453b5 SHA512 7a04d966e8c8b75b5fe063730cbc4734cc9a5a38a50a573193243301930719cef26e2b741f2f893350bb717261302e5d00b0b3264a3fdb8f80a5460223eac5de
 DIST chromium-92-patchset-6.tar.xz 3764 BLAKE2B a7149940b1371e4bd295e6038b87cc13f4edf8d8ed286d9d8d0e63144c2546de39564fc203a4b2e185267e46398efd0414c1f695ee31c78d33a6cd8d7b434016 SHA512 2f104901271d42762ea27f7c8a017307bde7348ec6b84d0c85875a07bf3783ba43bdb886fb3c6376753b6a14102b495a28bdc7adc611992440d2c1345aea035b
-DIST chromium-92.0.4515.51.tar.xz 957598564 BLAKE2B 5b911148153cae7058522d155b671c96f94a42621b9e0c371a82acb953de5bfa0baa1c6fe410a8e23d1ff77756437c39bab809cee1f95634ab1abb87ff5456b7 SHA512 63bb8012b7f0cec81bdb13e0acf1ef43e996cb3c66f2374933741c21fd906a6e0ce88e16b4772d4f14cb197c3e35f99235b56021780e405d245b5721096ae732
+DIST chromium-92.0.4515.59.tar.xz 957613080 BLAKE2B b6d4009e9c0cb90d3c16bac95d383a243c0e0660a521110bb188c1091aa97d84de85f5766e2a1ed908f78637ea786778030a0ae430ddfa8a4505feb5e9385fd4 SHA512 d7dbc569751cb4b3b3fd97429cfda5577d8468ba201914775b27562911010719c84ea2380b11f07c7b5965cd8444676200ae190f06a19e35586a0980d085968b
 DIST chromium-93-patchset-3.tar.xz 4848 BLAKE2B eb46541d283f8c17967ad45ac36838f9f46f20883eb13260c5804aaf805736283a7890e5f76ab7c1dccfd218bbf55cfbb04378c116c4e390a575c91511308aa7 SHA512 be61f3c907899121e08394647c276f638201e6c1a2d682fac0e559117866e3c1c40fd6283159725504d699b6ad6ef773e980e0e98487aafb80f1c458a3b55959
 DIST chromium-93.0.4542.2.tar.xz 988397092 BLAKE2B 9491aff480ca5200b0ebfa0ddb2082cffe7f86475241d99c320a4c415e36df81696d14323219e8d2a62ae0cc18bdbc03a8f5dff57b95acf25316b842b9c1c648 SHA512 28e00b6e343e74a6abb0d9c60017e37c6ec5e577ac292232cf7d6f13176edc1663f2c4fd5a18a5436b76055d9ac7ec2b4c477dbe59a9a963bd62d447aaf8c56c
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-91.0.4472.106.ebuild 30004 BLAKE2B fabf65aec811906477c4b76c05dee55ae9c20a7573ebacf4cefa3b4a0ab89b690a1c1c5dcc009e5bb416b75c3fa509fbb76306ff23d6702a8981b7b5bd3cecdb SHA512 43b03f73cde551bc677c392e5134d2bb89629f5a3690e67b75d9f3a1c6c7b8e646794d8eb17d72468d8c80d1e6cd6c8f8513fc2678d4672c97d4b918490569f9
-EBUILD chromium-92.0.4515.51.ebuild 30440 BLAKE2B 9459b20d5cff5ff1082e92bdd225cc37c3d0e9ddeb35888a97a970c0fd99a97a37b17dcb68f5e230753e472be16ef0036fa95894fd2ad4986152be9f5b251e8d SHA512 28b1454ef0cfc325b39dc45ec2f776ff98ccc7d21abfc05f52f92f1dc3209e1ef647a8c422a224c784c0ae54ef9b3757f55297344eb4c0739529372f31b238a4
+EBUILD chromium-91.0.4472.114.ebuild 30005 BLAKE2B 3cde9119ff1363ec3c0378e7675ad21e3d4fb890756c8835226d0589dd3884c3489316990d55b18ace072eb34f0f10e374a4af1ae47616a9eb9670f07451b096 SHA512 4ed2d4d72d550641ddb469973f0444e11a151bad003f6e08f1c52b81582871157da6a2f0caf805dd0956fc81ad4dc60510bfc781fcc8682f23080ebe0e2805a7
+EBUILD chromium-92.0.4515.59.ebuild 30444 BLAKE2B bc0ab51c428747f0c2b020b52a91f67eaf39bd102ea6cc9754937f2e925d644cf6eaae49ba8782c523f05b80f3e69ef3950f9b467ec4a27fea0668110afcd7b6 SHA512 4590741bc98efb9d734876a01947683e2ee982029f1119ce6774095fcb168d818807727e0916feb2fda3bdbac750b8d3743dd38c8450b13b9eecc3182e37be74
 EBUILD chromium-93.0.4542.2.ebuild 30083 BLAKE2B 3b74444429aa48953176cb12753e533baf7c0257373e7c4f1463da3527dec61ca08b1e0e60804dc43f1167cee262db5be9e1e27c652fb1f127927d30e32b59a3 SHA512 95d9d50f1534afdb11bc397eb1207ff8783f27016b00803681c13605a9e06b551ccfe682e71d3e43437d4aa2b6891c4f385788cd4b8cc33a4904717c0811ab72
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-91.0.4472.114.ebuild b/www-client/chromium/chromium-91.0.4472.114.ebuild
new file mode 100644
index 000000000000..986d0856563e
--- /dev/null
+++ b/www-client/chromium/chromium-91.0.4472.114.ebuild
@@ -0,0 +1,944 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="6"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+PPC64LE_PATCHSET="6"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-$(ver_cut 1)-ppc64le-${PPC64LE_PATCHSET}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+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:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+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-69.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
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="8G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-91-ThemeService-crash.patch"
+		"${FILESDIR}/chromium-91-system-icu.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	# seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, bug #769989
+	if has_version -d ">=sys-libs/glibc-2.33"; then
+		ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp sandbox might"
+		ewarn "still not work correctly. In case of issues, try to disable seccomp"
+		ewarn "sandbox by adding --disable-seccomp-filter-sandbox to CHROMIUM_FLAGS"
+		ewarn "in /etc/chromium/default."
+		PATCHES+=(
+			"${FILESDIR}/chromium-glibc-2.33.patch"
+		)
+	fi
+
+	use ppc64 && eapply -p0 "${WORKDIR}/${PN}"-ppc64le
+
+	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
+
+	# bundled highway library does not support arm64 with GCC
+	if use arm64; then
+		rm -r third_party/highway/src || die
+		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
+	fi
+
+	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/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		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/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/tint
+		third_party/ruy
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/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 wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+}
+
+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)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# 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"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=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)
+
+	# highway/libjxl relies on this with arm64
+	if use arm64 && tc-is-gcc; then
+		append-cxxflags -flax-vector-conversions
+	fi
+
+	# highway/libjxl fail on ppc64 without extra patches, disable for now.
+	use ppc64 && myconf_gn+=" enable_jxl_decoder=false"
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	# don't inherit PYTHONPATH from environment, bug #789021
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/chromium-92.0.4515.51.ebuild b/www-client/chromium/chromium-92.0.4515.59.ebuild
index 338eee1281c8..4d57fb73b33d 100644
--- a/www-client/chromium/chromium-92.0.4515.51.ebuild
+++ b/www-client/chromium/chromium-92.0.4515.59.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 4ca5ba9d3c28..79bbc5ba5fbc 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_91.0.4472.106-1_amd64.deb 83550348 BLAKE2B a4b7a60b8b1b43d93c7de8439e4fcc2ac007cd57d40525aae18cc59c2d6402dd6cacaec8a9dd5b9d20ebf808dc2b90f364b0cb9baff4ee26bb35e9cb26151fdf SHA512 dd6e897cfee09d71afe18369c37527cdd0c1dfe545fa5cc86476411537b02083aa18cee9d29de8e2543211463511f9ace28dbd9f90f0c4ccf385e6dbc2e69149
-EBUILD google-chrome-91.0.4472.106.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
+DIST google-chrome-stable_91.0.4472.114-1_amd64.deb 83565736 BLAKE2B c7e98f10708ba839c6d2e4ced39ac4a2258d2ade9f958f22d97fdd479951d87b8ea60863bc2d7fb8520225b76668f8720a3ee1ada496cd666c31c218b9b54653 SHA512 48ff385ab69630b2e734c1c502bc31048bf05958308fb5d478a40f37fe161889b3e0903e5f9b59cf3bfc93b10f6b5a640a6540bb6c247558529253ff864805a7
+EBUILD google-chrome-91.0.4472.114.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-91.0.4472.106.ebuild b/www-client/google-chrome/google-chrome-91.0.4472.114.ebuild
index 5378595af7f2..5378595af7f2 100644
--- a/www-client/google-chrome/google-chrome-91.0.4472.106.ebuild
+++ b/www-client/google-chrome/google-chrome-91.0.4472.114.ebuild
diff --git a/www-client/netrik/Manifest b/www-client/netrik/Manifest
index 5a325b4e3bfd..7920b5fc4b97 100644
--- a/www-client/netrik/Manifest
+++ b/www-client/netrik/Manifest
@@ -1,5 +1,5 @@
 AUX netrik-1.16.1-configure.patch 1598 BLAKE2B ab512408ebc804feecb523cb8a17a6af4ed6b7f151de2612ecad46fe105556e2ab1afa8e9fbf2f86e5cf28832fdac2e52a9a4d5db4912ee88ef73bc1731de795 SHA512 fd03a8b9d627e79d5eb962228fe78f31281a67fbd2f68b7a839c5ee36f73af5a9cb7636ef8fda7ccd51406415408cbef393d556373b7118b5083d21b75f90cf8
 AUX netrik-1.16.1-ncurses-tinfo.patch 261 BLAKE2B f5ca6b454ed26d16e88de7fa08f0c74e7165071377217e093b57c646ce02dcc7f4c5f059e23374cf16516947a252897cd8132efc993c73b000ed8a4cc065e492 SHA512 82b10cccff84b83613f312f9d644a5de3b10f68fd27295cada67a53d4d081f6469f79276c0c601c75937be95d38a9161416c0ecf334ef4b4a590c765130c1509
 DIST netrik-1.16.1.tar.gz 476669 BLAKE2B dc0b9f0ccaaa81def843b8df3b9b70db9c48667e306e992d7e3161800666b92714f5137d38f56719a652022160a5fda835eb31dad71a93a66331bf35e83ea6d7 SHA512 73e754f8ce34226446b47c9438fb45dcc094c19ca8a2933a6cc68ed32e9cf40c9ace3189c8e63bd4537d286b608c515efd8433f795d4238ad30bd6612dd850e7
-EBUILD netrik-1.16.1-r1.ebuild 870 BLAKE2B b6eb8e524e85ef4e7a7aee8e7d8d89288181eee5ae9259fdb05f19d095f3d4804eaf4374a0cb3cf1609e69b1d123455856d158a488f998b713cee572ee77d8f7 SHA512 04a856feb6b6d4943ac85cb8e5d0178a487c65145be269cafb47763c4338c70d4dc95125aaf99c362a0707c729f939745ea9b450b25b2665b88a6b4327b23366
+EBUILD netrik-1.16.1-r2.ebuild 874 BLAKE2B 7a08535702b1390cacb302a9f5b4ba090b26ee98ef19d427dc537fa551b8cfe484f20bedd40202d87d044c8185fbb91f2f0e95e31cd0f5de2184af8702baf3f7 SHA512 c6cd710fec5ad2b8089dd4507e14d2996e4dfb4f4c63b480c1c8460fcc617614f8eb39cda99dc1253b72cbf50568041852c8fbc73b59db18aa7f2e33b8b6be3b
 MISC metadata.xml 303 BLAKE2B fc4bfef2b83e524928195e57df9d65cc43ed9361cef2444558d8ed22cdc9a78661cf5b106c098368f5b6fb2c5b09ac3c56447823f0c45d5114f7a629b3ddbb17 SHA512 dd51a4b51ad9fa0bfac8f2486d96a5a40790c8c50e0e28e54edce8e2aee67a72121ed93d9ec3d628d18b91da473bdde672121e5cb2fcc7350f05c5b2968d8f24
diff --git a/www-client/netrik/netrik-1.16.1-r1.ebuild b/www-client/netrik/netrik-1.16.1-r2.ebuild
index 039318f9d3e6..fd4d5b1a9866 100644
--- a/www-client/netrik/netrik-1.16.1-r1.ebuild
+++ b/www-client/netrik/netrik-1.16.1-r2.ebuild
@@ -13,8 +13,8 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
 
-RDEPEND=">=sys-libs/ncurses-5.1[unicode]
-	sys-libs/readline"
+RDEPEND=">=sys-libs/ncurses-5.1:=[unicode]
+	sys-libs/readline:="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 55231d97ccf8..6042376711d0 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,8 @@
-DIST opera-beta_77.0.4054.14_amd64.deb 74436584 BLAKE2B 07f73149b2b073ac7fa4b77b074ab0c67e6f1a6c7dae5cc2428f17042acef6616da61b988c11ca5ba71cbee245163cdac752c365c4e8fafd11da5f91439d5f71 SHA512 1fa86b20d0d573edb4e1ab167710599d5ccecae4897fefac365a5d76f41b9260eedfdbfe2394d48afba5fce1aaab9701aa33438f5d21ce95db5116900c55db01
 DIST opera-beta_77.0.4054.19_amd64.deb 74518136 BLAKE2B a4ebfff4eda040eaec1c885825d4e1ca12113daeb2a911ec8c761b0f21d4488a2e3a92617dbbe560952810bd16e427a69e0fe0e07e37e76eaf32541d31f4b7ef SHA512 a4d0541064e845d54e31c89d1bae54ff1ea6460104829c3052a61376718c0472e5318ae25e7f6341e27b15639bd25abef221c53e720f026192ff56798e4f26b2
 DIST opera-beta_77.0.4054.38_amd64.deb 74524540 BLAKE2B a62a16d139561fa29d56cece83768815e220e1da8e72b25e09d540c7180f53b4c5d7aed14fe947864b69622816476a89f717689e7fd45f046c4691929996b27f SHA512 110ddc0c6bb6d9cee9f56f363669bc847ea90c2c86257a6e146dc87fa04f8e89ee4316de83d4243699b31724a5214fef4715f11c5c56cba11534ad829533512e
+DIST opera-beta_77.0.4054.91_amd64.deb 80822784 BLAKE2B 4d13e5e6f978f7cc3094c45e097485c64b7137ce6bc8a58c7a41092ef40dd85c86547750b2aa8e9b90b896bb5c1a2d87f852ce3a7e54e2c6711d82f62adb6b63 SHA512 66ac1dafbc4c0ee45b5b1e07efc940e5b8865cab5f5842f386c06de0692ef4bb186c4d306e066d19d54a70b2fffe071f106b2a753a7cc0f28d46f311d01e4f3b
 DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
-EBUILD opera-beta-77.0.4054.14.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
 EBUILD opera-beta-77.0.4054.19.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
 EBUILD opera-beta-77.0.4054.38.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
+EBUILD opera-beta-77.0.4054.91.ebuild 3019 BLAKE2B 028bfe55f3a470c69a3d7f72deb2ff08ae436e5750d49f62c2a458069048b219f2553a530011ffcf6f22eda588ddc4a618dee35a66007d7d25d023ef375d2722 SHA512 583ec7f58eb5b1475e2e1382c92f118f3ca398210b63ff36c710a4913defbddd9281f21bc6b6e9d3fed12b1651c799b25518e8d5cb154b071ee03ac7925d1fa1
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-beta/opera-beta-77.0.4054.14.ebuild b/www-client/opera-beta/opera-beta-77.0.4054.91.ebuild
index ac62c3431ac4..ac62c3431ac4 100644
--- a/www-client/opera-beta/opera-beta-77.0.4054.14.ebuild
+++ b/www-client/opera-beta/opera-beta-77.0.4054.91.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index eeafec1f87b5..49d6a4788a04 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
-DIST opera-stable_77.0.4054.80_amd64.deb 74296172 BLAKE2B 3dedf4e557d1005c8d681ed76c93cfb02b513ad838aab5abc4cdb4db801e8fb5c3825304e24a552626c06f7156b036826f4d44234944f00ac376da3b4f384aa2 SHA512 3e86793bbc4e7f1ddc63ef27f83c75d705099cdb21f0fd36a0cd12798c61046ba27210033421796d76eef8010cbf265a543902cb7abb6390131e4398ff0bdb4e
-EBUILD opera-77.0.4054.80.ebuild 3018 BLAKE2B 99a2f074dc96f78bdee3dff67f7a90e0e810daa941f61f7453649e860de3c56a4cfe3d9deb85773cfd4f9ae954d6f33f9237c73656c677961f27c3752f7cf6ea SHA512 65d5d7c2cd5b2b3bc842dcdb2f971ac73ae155cc46e2de995846846d12f9beb3e907f66e6392cf03e5030574043d15eca94d3b8e85b182626da4398208966015
+DIST opera-stable_77.0.4054.90_amd64.deb 74362012 BLAKE2B 27ccbbebdc16fea2cd8fff3af1b0df891815264bdbc0ff08bb3bd057356573ed130f4a745debac6ccea0e68f7e7898483c074ae1238a7f7cbbfd3b6bfcd574c9 SHA512 175a7a532ad41b9da5384831453738f242f3f7e340e001b834e132fe1a77329df6cc0c4c1ee210409bc71887c27c9c10a6df549aa3ed617938a083a1342e389e
+EBUILD opera-77.0.4054.90.ebuild 3018 BLAKE2B 99a2f074dc96f78bdee3dff67f7a90e0e810daa941f61f7453649e860de3c56a4cfe3d9deb85773cfd4f9ae954d6f33f9237c73656c677961f27c3752f7cf6ea SHA512 65d5d7c2cd5b2b3bc842dcdb2f971ac73ae155cc46e2de995846846d12f9beb3e907f66e6392cf03e5030574043d15eca94d3b8e85b182626da4398208966015
 MISC metadata.xml 589 BLAKE2B 6264d0b26100282d9399d5922ef7a49b99add9ebad066559201db4fddf7e33598eb5f8c1f8b4bf569ff9e636154be2d377df1326b653633a5bd7764302cf1a29 SHA512 2c3a8e587d5548372f0d27246aa439b532f9b61387a35dbf9752060ad9f013f7996c7524217e426498f3eb4b983a4fd674116f124a4b680ca78b328c02647f45
diff --git a/www-client/opera/opera-77.0.4054.80.ebuild b/www-client/opera/opera-77.0.4054.90.ebuild
index 644b37a1b9d8..644b37a1b9d8 100644
--- a/www-client/opera/opera-77.0.4054.80.ebuild
+++ b/www-client/opera/opera-77.0.4054.90.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index ae0dabfc89c9..a5a504318201 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,8 @@
 DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B 941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d SHA512 85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
-DIST qutebrowser-2.2.1.tar.gz 6299507 BLAKE2B a92ce4c79c35932c6cb8b7a8b9ecaefe61aedbfc1a4e77e41a70a4111859ab5d1f1fdd57b4e9a5097aaa13dc86cb0dcf939ec97ac9d2bb15131bcd1a50c2c540 SHA512 397d6e8ababf2c20112a2b7bcbfb30abb441a528ac023214326a61e1f906749ee47dcbd36bea4c2c4a1e31176fd52f0f63d86a1f7a2d8c8f40bc698e8db891cf
 DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4 SHA512 ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
+DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B 7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c SHA512 608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
 EBUILD qutebrowser-2.1.1.ebuild 2791 BLAKE2B 90a2a6018c6cd28e57dcd0b5fe650b49f370f7384bfb6b69a49cd92c61db14fb2fedcc59fdd7a8ff6a7d0599c37049e6e6fb1676f5dd899b50de1753c51244cf SHA512 7c28e82135f002a852f8960078531d8eecf4bbe02ec504e2a70d6fdc26f492436b76d59756a3061ce5c292e9a625f2be1b6974ee3ef7b7f824d0705f33f52f43
-EBUILD qutebrowser-2.2.1.ebuild 2879 BLAKE2B 37e7737aded4f27ec3964e9ccdf7d3bd037a4352c53b68b1fbe7e6744c0296f00c56f4f0b6513967d90f4b18a4a433966c4879582b74bd869a17ccec3e82b304 SHA512 38f1269b86a9bf2ca9f27f0be6e164c4952fda9117a716110bb0b1703d502fad8eb658427bef7104033f82444fe601c6f3ea0473001d4ff0d5e655d71252ca25
 EBUILD qutebrowser-2.2.2.ebuild 2879 BLAKE2B 37e7737aded4f27ec3964e9ccdf7d3bd037a4352c53b68b1fbe7e6744c0296f00c56f4f0b6513967d90f4b18a4a433966c4879582b74bd869a17ccec3e82b304 SHA512 38f1269b86a9bf2ca9f27f0be6e164c4952fda9117a716110bb0b1703d502fad8eb658427bef7104033f82444fe601c6f3ea0473001d4ff0d5e655d71252ca25
+EBUILD qutebrowser-2.2.3.ebuild 2874 BLAKE2B 87494c17d62f92873e8cf4c9807a6da4b35058cd4a824f21ad90ff41dac062b18e7360aec1a65cf47c8dae4ded7d5b02741745d5deb03ae35eaccc9128cfbdcc SHA512 d49e166f95df0fad010fafe3b4fcb710b9ee2ca1409f98e2ea012704c0c89a7841e87b7cbdd8cefc1a62d30014b096568413f41bd55054d42b9dd3a64f86fa9b
 EBUILD qutebrowser-9999.ebuild 3071 BLAKE2B 32ba24464d629b3c41b44fe154e6ba2329e58839e499afe0cb5266e0cb9369ba189587e993b4dec3597af7d64d95daffe5e0837a0d3d479ab3563cea087700d5 SHA512 5a655d6d23a18f5bc9c101861d426195513984e3a454c4031963d8dc1d59f0cd5139f7b4459a515a22b31ddd774a3a51be0a65481d8f6fe78602ed94469ec46e
 MISC metadata.xml 742 BLAKE2B 3410b02e22887bb80f47c72888bbbe12505686aef9a83e7fa8c66fa01dcd16f0b60511c9cb9953aa087c89e62eac5845ea7db155014b978fed66c35ecefe8780 SHA512 22873bfafc2654f695eb90182c922ebd9465b3f7b3bbfca4199ef6684b65c3a28a8164a2045c823017cd6beab1ed65d00fc56904f6686bc98acca6145e80abe0
diff --git a/www-client/qutebrowser/qutebrowser-2.2.1.ebuild b/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
index be33807c24d0..ab48622e1e25 100644
--- a/www-client/qutebrowser/qutebrowser-2.2.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.2.3.ebuild
@@ -16,10 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="scripts test"
 
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
+BDEPEND="app-text/asciidoc"
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
@@ -28,8 +26,7 @@ RDEPEND="
 	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
+	dev-python/zipp[${PYTHON_USEDEP}]"
 
 distutils_enable_tests setup.py
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index d0f07272cb03..62aec42660c0 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,13 +2,13 @@ DIST vivaldi-snapshot_3.9.2289.3-1_amd64.deb 83539836 BLAKE2B d8a9dcc850dbd4d15f
 DIST vivaldi-snapshot_3.9.2289.3-1_arm64.deb 79023788 BLAKE2B 163adf52c555f47ea1ac6b9f6e6ef457cf901a4be0b04590da482b22c330381437de9c23016759d5eb6d8da82061b451067840ffe097de3e273b569067d5d939 SHA512 5c8596448bdffd22bf6837b0fa966b049af8efa22a4da009f953e17743bd9497dc825589ea92bb672ebe1ce8a0003ace6f9a91f3d5e2c8d9092f9049d59ccc80
 DIST vivaldi-snapshot_3.9.2289.3-1_armhf.deb 75093252 BLAKE2B 0deaff270b851a9febdbae29102d5e5e0e221ddee7e285db1fe13fbb3ba8b44d82cab61220a66d12ab31fb36300236b107848c401e2e1203bfd5330be254ac78 SHA512 1fc4a6f6b5abca3e45b7208c8416029c40641c5213fc472bf54ef6ea5284c7bfccfe1cdf66c623c88b7fe200fe8d7356c99a9baacd85944b0818006d9d54fe02
 DIST vivaldi-snapshot_3.9.2289.3-1_i386.deb 82584664 BLAKE2B f5447df81bf87b128cf9e65443913f61b29417e2ade09407c4131a0211006b7779816d28ae777aaf8792bd3745e9669dbce03bdda83616e5a669333f9e520a06 SHA512 dedfa2249ebeae7a5f55a26235f25a351988e9ae9d6d6a383d4e5c2a0680eafeb3e30603e6476b0d814a9f5b1958b7e0894a4b60b47e5bb72d2af2e577ae35aa
-DIST vivaldi-snapshot_4.0.2312.13-1_amd64.deb 84211088 BLAKE2B 61165d76cb8892ad269598f2f34252792fc9241811dc9452b7a65466f9e5fad457eeeca2d0d5cf489399dba66898e90fdab83a33f6d1dba25e22017d31034649 SHA512 86c0e08ec392a236b476c712a4f0fba17bd80e271a4c9819cabc6aa8d1d77dd4cb889143abffd9a337f19daaa6074f00d4a4595d5f3be126219c4c1e51065317
-DIST vivaldi-snapshot_4.0.2312.13-1_arm64.deb 79638308 BLAKE2B 41722e6c3065b610e6d59d8dd83d3c7e920b2d37f195e0f6583f57c5c5d9f501d41be6a7fd8f5433585676842efb9041d6de170a40ba627e77612ce723c1b926 SHA512 0e605ea62e64064563b287be08366254b1fa1578d5cb44a4578bbd17ed1b876a6d648c36fe584c7ea799aa7a5163be7f1413ffe32a454682d092bce9ce2065c1
-DIST vivaldi-snapshot_4.0.2312.13-1_armhf.deb 75769556 BLAKE2B 7fbcc2f0fc309218c3b46ed905fb3704fa7c52f762a974e225ccb0b9a4692e74a1cbc56c6d192ccced312936e0f615e521841d3572c9626d17449ed696effee1 SHA512 0eec9ba838af6f64e6f768fc6fa148ae0fbbfd5af171968e72d24528458dd271d2f305ce3f1c3caf855ffc95458debcc498834ef43219a040c48d70c229153b9
 DIST vivaldi-snapshot_4.0.2312.17-1_amd64.deb 84262456 BLAKE2B 0159b85977673c4b75519bb41afe63f1abb31012a5775177b96cfef795da5e21bf2bc476b74b95b124101fe0b899696b973a2c954f8ecc8cbba96128df4e45cf SHA512 871acf44e878c97558b668ff87184fcab0712d575a7a87073f844d92d94282bbbc9e88fcb90b02c0e64c9aa4399be4e9f8f1fbf8ffbb5b2ea19202297c811274
 DIST vivaldi-snapshot_4.0.2312.17-1_arm64.deb 79692328 BLAKE2B 959a28e2164a662ff6ef979b1358ddb4b2727434ccf1edf3a71dcc4a86c13420f35430cf64805b75e1bc6b1a842d951827dabb1869633d445a81c4511e2052c0 SHA512 7176aaa731137f8580121bb9e64c11e046cef88dc6629c9f915bfb21d3f2271ecb76dbbd48c5f52dd38dccd3d647c78664aec96ff8fb190bae13f2c6f8cfbe62
 DIST vivaldi-snapshot_4.0.2312.17-1_armhf.deb 75808604 BLAKE2B 022be117fd874b9bce06f531d5d992dc9ebc9727a7cfb94f403723021eed4fc043b04d0b9ad0381fc9bce15f6470f9ff2b1019c71d8054451d540216e81e5535 SHA512 3f2deda734a225e78af911603a5c2d892bd7c322b0d1c3c6c1af61a8debb22a85f595f42decedddc331ef0282b9a46c2408763c523362805ca0a3c9e73900f2c
+DIST vivaldi-snapshot_4.1.2328.3-1_amd64.deb 83660280 BLAKE2B 69ac05f694329ddaa0b850bbbc1a970aa3e0583a5859af5b7726ea59e941fea955d32663ed644c8196b4baf0e67eeb6026e69911ae5e19b513992971573a145e SHA512 689c85aa147afb8dcbc6d145817a50fa0500ba19ea205246da2f627c8bdf86874a71a38ff3ef1513998f9347e426004b2d81bc959bb86469bad11e783ab791a2
+DIST vivaldi-snapshot_4.1.2328.3-1_arm64.deb 79732764 BLAKE2B 577141274ba36b0698edf8db9eac093a4cf3d01d32bfef8f19d6a0a42e7e3d67f456e3e2c26a0450b274b4e5ec557ed7d466ab7c9d0eac4993d07f74b4331661 SHA512 288fbcc3cf2d33aeaa33aecec47c4cb8ee1a288a65643e6c5ed44d9597d7dcf75246d2aa69b1e1351f2812016a69f0184747de859ed7404a0f4629552632ed87
+DIST vivaldi-snapshot_4.1.2328.3-1_armhf.deb 75852072 BLAKE2B ab160ad2a8cac43edb128687cedf1c131df4ae6ed1cc9073a073bd7afdce54702b8b5e64e9d3ac4111286b2c0bcb73252af2da4a9204951004bd18742897c6d9 SHA512 946ba9f5b9ed799633abc23989e8659e1f64cfed70a189080487583ca09b1a23990acd2a280d4f9107a1fe705d37a5364020955b2dd3714e8050f8dd2f48ec08
 EBUILD vivaldi-snapshot-3.9.2289.3.ebuild 3342 BLAKE2B 6cedcc20db6fef8468a74fa7b0102b7e0de08029e179dfac685f636184a7250f7494d2a5b52ea2e3ecb9f73321e9cb8f57e2aa8ff0a7c86901c7ca1f6639f301 SHA512 8a2ead0fe7aa024f0565e6ed4effba0dc47d51da8c79fea96f7ada0deb504115140b3ef4e97d8a97e65fdea479b27019ee34ac11f31c87e5233067ec6af0db0d
-EBUILD vivaldi-snapshot-4.0.2312.13.ebuild 3299 BLAKE2B 193954a5de47e83ec163773a2e32418e851aba1a53a85602d0b74809ec5d180412f7e9a5b8ab12ab18bcef56121ceb3c3ade8eb4fc5c0a2fd954f805c024024d SHA512 17a62c808e17ce142559cf9e99abed4d373b2d42e2b9a53bc9be51ce15f810e34a1a7c61f79ae4013cbd80c0f1d3773dcb64f15a338a184f7a63330a6a44bb98
 EBUILD vivaldi-snapshot-4.0.2312.17.ebuild 3299 BLAKE2B 193954a5de47e83ec163773a2e32418e851aba1a53a85602d0b74809ec5d180412f7e9a5b8ab12ab18bcef56121ceb3c3ade8eb4fc5c0a2fd954f805c024024d SHA512 17a62c808e17ce142559cf9e99abed4d373b2d42e2b9a53bc9be51ce15f810e34a1a7c61f79ae4013cbd80c0f1d3773dcb64f15a338a184f7a63330a6a44bb98
+EBUILD vivaldi-snapshot-4.1.2328.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-3.8.2259.42.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2328.3.ebuild
index ba5f6dc05f73..c2409d01a97f 100644
--- a/www-client/vivaldi/vivaldi-3.8.2259.42.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2328.3.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index e376c88ce42f..85e496d15226 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,13 +2,13 @@ DIST vivaldi-stable_3.7.2218.58-1_amd64.deb 78992560 BLAKE2B da8f3eacd8d0c826006
 DIST vivaldi-stable_3.7.2218.58-1_arm64.deb 71046428 BLAKE2B 8f0dd3e845f2e4587d238c8f48447e514ac7605acab8d67f30c30ce2df04fae600382218087aea68f75621887f5a71506389c81f9b31614e20d3d7611d7bfe0e SHA512 2126c24ae8a7e4370f4ced2b37580871394de1f38a02b88d24c974ee23c13a4264ca8c11e0c5b7ad542812531898d9ee425657d9c7eeba4e08c718c07c7337bd
 DIST vivaldi-stable_3.7.2218.58-1_armhf.deb 69900368 BLAKE2B a85b97405c80dd10907d9b0b9846b8c2b1101346cdce4b19ddeb1192de64c49056e086903829b30b9e6bb4928c3de500138cda460596dff7c2505fae0661d6ca SHA512 2d37b2080dbacbd6986e9d346be4e0aefd48a25f039668e2c1e697a025c294e4f945fdd3d86ae34688335e0d2b496355461756ae650e0b0fd212fbd983494ae0
 DIST vivaldi-stable_3.7.2218.58-1_i386.deb 76040556 BLAKE2B 4710993024a401a8b9e25dd5cae55d5e5077423a7f7bba7af55150675d7848427f6bdca1fa8666f338b7609cbb11254c75df901e3c33fc6b75c5824c17808b71 SHA512 d5a8658d80aa8a4b5ec38491f3a4f6fb16c5a0de7934d4f7f518efaee36afc1d9585695c121f5cd65d961ae134c7cae0cd6bf0b07858ef2f906d715ca424ead4
-DIST vivaldi-stable_3.8.2259.42-1_amd64.deb 82450108 BLAKE2B c5de31fc2b87b8dbe52ac196b32fdff5403cc0c4f82b907cebea93ba5afe4e355efd9c1b10ddf806db44648616957dbdcfe4f2ff54f30c20ccb2f1b75e33332f SHA512 2f0b3056937ccf5ef7b418c43de4fbbf913c492c09dc8b8e9382359f63aad848f04171895a212691d6ce06b886d8f622a023b305cf075e4890310dd3fe976774
-DIST vivaldi-stable_3.8.2259.42-1_arm64.deb 74055056 BLAKE2B 40a26f034f238284e98432e89eb5bcc828d8321ea14c17e0a2257248df830f8852a9f29b017ba68a6336177dd0eb12bda39942f1c8d52660382f147a0211d33d SHA512 3c3736edcd38c42dd6c1cfda19ace0d6c1595f4899dfb48b43106880688d69f8c8a535c8362b1ad71052d3038f44eb025641abacb9226748b5a56a3dbe233719
-DIST vivaldi-stable_3.8.2259.42-1_armhf.deb 72659844 BLAKE2B faf0d951fa249ab17c98269ea754300ae91880139aa0fb6a8fdfb5c241e7b70a3bf6ae726a2fc9dc36927fda8e9ff7dbc10300dfd1b282624c261b615f05ea28 SHA512 90551f20dd9af42ccc5453ba037bcd17350747ef83bdfa55b0e73fc749831f7dbbe1d9c2f6ba4f80aaea118c37124341fe49a5274b7ed905a2e5c0ff2c776973
 DIST vivaldi-stable_4.0.2312.27-1_amd64.deb 84282184 BLAKE2B f3d4a75ce7cfac096e2e6fa5b76afd1ada7d35299aa128b7977affa85a1690b402efae586c465ebf5ff00f253643620538ca27b8532e6af42da7bc4eb20b0757 SHA512 24d338396c834d28ba5fa9d6a0b39a4c6d7b149abc5f5774760c3327c147718dfb72ee4709a2ea9b5516f8db20b9610ddbbbd6528fd7fd5b7f047017bd174495
 DIST vivaldi-stable_4.0.2312.27-1_arm64.deb 79750920 BLAKE2B 02c80f783548639f9514f8c0b3c2979b3e1752d6d4ff5363b148173ba4023ca83acf5492307b3ea55cea8dddf0f8a241ceb51f1474aa083824007edc6853439c SHA512 2bd374762ad03db2bab670bf58bc43d71d0148ada25a763a5fe5966b7f7eab0ed30c8a2b6798f12a5d84cff45963d046cab892631988263ff5f645b18a48d21f
 DIST vivaldi-stable_4.0.2312.27-1_armhf.deb 75851284 BLAKE2B 7d77d47ea4b25df635f85f7a0407ad106e605f5bfbc02605d80deccb0af3cb65f68ebd499e85be85bc4835ab788665b4a5791a6a4e457359b079d9a3706015e1 SHA512 50aec87f3ea4813859464006a5266c599bdda92a53dd870084efd7209f07cca313602d3770ae8a64af9296ce0e8feb06f809c838f1bc835da8c158fc29bdaabb
+DIST vivaldi-stable_4.0.2312.33-1_amd64.deb 84295960 BLAKE2B 5624a91b3e957056eebac9c3d2e11b8b15a351d67d4cb6d42256ba04ddb37c876838cc492986703206ca57d079f0d06f146e941ea29565fb11f62b11ff451e46 SHA512 5d237d4bc6652091cdbfc2595c9f33de11c16be5c2d8b0c498d4e1d43c03501bb49b865422f78519a1762ddd18f7c566fce7fafc8fd4126b0baee23a158fc687
+DIST vivaldi-stable_4.0.2312.33-1_arm64.deb 79737104 BLAKE2B 8161941f9ab7dd427f9b117f51d60b84b16c6114ae6fadcf016d4dd87f0002a5f33eafb613e5c31cf97fdbdc00b5665a8f8226fd6232a4396fce5fd53ff58a3d SHA512 fa3d6cb5eb9cf3227c55e0dcdb0c3d5c493069a3abdd00f29f8668ce794e521e86a52c40e299e43c642f54423fbfc07b83d0e0a0713a771312a9d5f6c67d1f65
+DIST vivaldi-stable_4.0.2312.33-1_armhf.deb 75854768 BLAKE2B 63a3420e89d75ca1491eae66c4a7927e64d631fa45b3b5016f161c7730d75886872c54e0d9c6bbdaaed1a3ac0d1632b32ee62785f3f45da1d20ce6740bf096f3 SHA512 921ba73aa67413bbac2ac6cbffbf337fb35319ffc2b0bf6bcc77c1830d06260d354326a8bbc454b6127065149d633895a19c3b97e4e67cc1e0c4cb8a1e07e952
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
-EBUILD vivaldi-3.8.2259.42.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
-EBUILD vivaldi-4.0.2312.27.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-4.0.2312.27.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
+EBUILD vivaldi-4.0.2312.33.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.27.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.27.ebuild
index c2409d01a97f..ba5f6dc05f73 100644
--- a/www-client/vivaldi/vivaldi-4.0.2312.27.ebuild
+++ b/www-client/vivaldi/vivaldi-4.0.2312.27.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.13.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.33.ebuild
index 922779ca6f6f..c2409d01a97f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.13.ebuild
+++ b/www-client/vivaldi/vivaldi-4.0.2312.33.ebuild
@@ -95,16 +95,16 @@ else
 	DEB_REV=1
 fi
 
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="proprietary-codecs widevine"
 RESTRICT="bindist mirror"