gentoo resync : 25.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
commit: 95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree: 867dce371a84a696e91be255d89f282975aa0480 /www-client
parent: 46eedbedafdb0040c37884982d4c775ce277fb7b (diff)
38 files changed, 233 insertions, 266 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f3dd6e2b7bde..72db7440a975 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ae9e50ea84d3..23f3a5c900f4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,18 +7,17 @@ AUX chromium-95-harfbuzz-3.patch 1540 BLAKE2B f40fa435623da8bdf1075e27ada445cf1c
 AUX chromium-95-maldoca-zlib.patch 445 BLAKE2B 2793d344ff3083cfadc572bd1ce6932643cf00f11d1cd596f8aaff68363a12a79c4b42a389b1a1843fbe6d760de8960cafc5d3b2f7769f4ea04ff4ef74703839 SHA512 962834cdc6a32be31d61ac526067c7e73fe322c3e3cb72c234735e08d6cd15830ed461493c41febe35d40de60120fa85d2da7b3a62dafbe180b1e213e3d8940c
 AUX chromium-96-EnumTable-crash.patch 2850 BLAKE2B 196f5f739e96cab32d9ac7585ad4a04505f71e2e147b03e5f6e618ceed5cb37591240fdea48e388c0aefc567ecf6b369026a1d9c250112e4c0b2bf7952fcd21d SHA512 c968cc19160a4d91e0000a7ff2efdaaf97a1cd43ec68dbb335493f1bb1ff3798a6b5f33baa836ddc601c7017863655b00cf4d32cd9c9c94dbfcea7187dbec937
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
-AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
-DIST chromium-94.0.4606.81.tar.xz 1039841108 BLAKE2B ff7cead6f4d12e31d48458f5307d2d6055041493f95bee38e1481aa3f16360dbcee6484fc4441dc0bec26313139786c04735cff8f29e410ad23586da10626f8c SHA512 59bde106e41da1daa1e806f790cbeea8623e5b5a191222981981f2722da97a26c7f70cbe3a9108e5d84e411712627657a86b3931ec940121c7e61bdb09b5bee8
 DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
 DIST chromium-95.0.4638.54.tar.xz 1213374932 BLAKE2B 75e1017a50eb0f42c714863969414308df7ee69160271d3bcd5ba7af79c96c5eb53edd9d892f33db6c2455d0b2dfa12dadfa8cb01d4baf1f89d57fde5291783e SHA512 159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9
 DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282
-DIST chromium-96.0.4664.9.tar.xz 1221461124 BLAKE2B 4ab38eb5d3b79f5a59c2f7ca546dcfd375e5dc7580c6de415a097a003d63d6a9d505ed9223d829538ede816ca6ca6a2cbaae9213c99951697ccdb4d880b8d12e SHA512 1dbc23efd8331ac7e31b0a30dff1dda646d81ebd5532a220c7933c6f03362f28406142b92b7ee09f50dbb9bd6c12f5bb4e3a6546dd245b11ecb2f006e40828f1
-EBUILD chromium-94.0.4606.81.ebuild 29924 BLAKE2B 5f09dbd458540310e1a24bd8ba2026f4b4d29a73a5c713062a17f8689dbfd1d126ea1b30bd1b86bc8bef10093a2f564386e91658c57fcc9d1bc26f44392245aa SHA512 b756e99d7522d309c9d4b98fb6fa545b92e49a5161ae6849a5f042577746bced7d0c2b6e5442fda31190ddf8f9b750bfa8ab61799da89ccf5ad1c336fc30175f
-EBUILD chromium-95.0.4638.54.ebuild 30290 BLAKE2B 5254c12e52445676a80fa9ed8712a544a0a8d8fd80f1aab21a4de730605b7ad53e0bfdb7d35709a78844cd1b6fb2239cc03684cf3132b21968805aabecce6d26 SHA512 51cacd5b1eba791d1a6fd9593e5039aa22764e4acfd23dd049b852803e57fe248055df09cdd8109e403f9d01c11c61b2a454eb3864e7b806678c39f17c913f82
-EBUILD chromium-96.0.4664.9.ebuild 30075 BLAKE2B 821daa72d15d4bb04bd89fc04d90f58489181e0069096b202910fc2d7f3b2dd15e146aa9229ec9e662e7652440fd07c52f4ca6f2a21945c6f169e9fe9da3a056 SHA512 e664f0751bd03d37306300c448a497c947ef59a0f97fd16743a57d91d8dc0ddd83e55a548a9cbeeef0af99c64224a8cc5a8528a21f1d99a205c7bab40028dea3
+DIST chromium-96.0.4664.18.tar.xz 1221703620 BLAKE2B b684677298f843733d7aeb28a8c5f4f3c53c16690d578e2fda08f18696e03af485d653e9edca915e5ed9677f46113d2356ae0af3c41405b288608d1e299bf554 SHA512 e115b0727fabac4efca1becdc9ea1c77099a52897f753c57ab37b632e57116574c93f2a4239ee2f0b79d0d4cf674411a898b7c50ab3ecc86fbd6bb24e88312fb
+DIST chromium-97-patchset-1.tar.xz 4508 BLAKE2B a30d60cb4d5f883b3f72e23df1bed8339d144c75de9ab231f5e00ffb80899c87bc6e4a46cf1126c9b163573313ce7342be4dabac1e854bcf24c49f344807feb7 SHA512 651ad56c216b7569df436d13e6f0da13181dc236af8cd4bc177a7d5461eb9ccb0650c122c68231427b6ffd4290d5e7840c5dfa9a1c7ffd8ef7882a3efd053fc4
+DIST chromium-97.0.4676.0.tar.xz 1224908136 BLAKE2B cdb0c94aa364757c0a88fb8c4320164ad96839bef77058d2cc8c10a59882930bd28b20d0bdb324aca785c506e7af24718f62860b714cae5f349d64b9e31234e3 SHA512 1184a56cfcba029f9bd34b5bd422fc01ebbfbc7399223f88d6e9c5f2557e9adfc4332fec26a62e1beb2d7c815163ec9a5f409b0f235e425d93b83677a332c92f
+EBUILD chromium-95.0.4638.54.ebuild 30288 BLAKE2B 3a363aa699af7ec0da446d53a6bd1f7a48dc2156b8559ce763c79829cd745aeb71127a6d98c016dda8f2c951462b6cd5bae77a3b8b80bfc51afb35b09cdf5f79 SHA512 7741abdd5093b28d5c98f3a5cb218b981bf9c1e1121947fe32c3773146436b248f75717baf4ccba958aa354c6439629be9ca093c14e0bd06d224eb2135073093
+EBUILD chromium-96.0.4664.18.ebuild 30075 BLAKE2B 821daa72d15d4bb04bd89fc04d90f58489181e0069096b202910fc2d7f3b2dd15e146aa9229ec9e662e7652440fd07c52f4ca6f2a21945c6f169e9fe9da3a056 SHA512 e664f0751bd03d37306300c448a497c947ef59a0f97fd16743a57d91d8dc0ddd83e55a548a9cbeeef0af99c64224a8cc5a8528a21f1d99a205c7bab40028dea3
+EBUILD chromium-97.0.4676.0.ebuild 30075 BLAKE2B 0ed14e2c53af88b5fa569d48ede0881fe6316cb0de0c56ae690ad9a72be801b3212c010275af9e7d95d28ebbef9b99443428f9ec8fb7c5d26a49c6177a672350 SHA512 baa9cd650e1a5604e5967a9e4088729f16b3fb0acc61ba977cbe6ce364fb9bc28d2dd3b69dbb154c9d2a1f5798b070e0d27a1e4279bf7b0def33da8339eadecf
 MISC metadata.xml 1775 BLAKE2B 2fa038c0f6ebe1d86427cdf0806400dd690e31a9ee2667ea9f4f744478a675b9da89f0f541869bfea4ae5e28af1210d67b2766474d16752322407aad401d2c37 SHA512 0f4430b96a7d4dea4f2f1707cc81b184445c0f9da1d5c35a84c7958a037c13068b1a1073edc4576d7131564fc14c2f3b41a97cb8665f45e5a18eddc428c9ed23
diff --git a/www-client/chromium/chromium-95.0.4638.54.ebuild b/www-client/chromium/chromium-95.0.4638.54.ebuild
index 377ba36b7e97..8d1013b3446b 100644
--- a/www-client/chromium/chromium-95.0.4638.54.ebuild
+++ b/www-client/chromium/chromium-95.0.4638.54.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
diff --git a/www-client/chromium/chromium-96.0.4664.9.ebuild b/www-client/chromium/chromium-96.0.4664.18.ebuild
index 713a8a577ae7..713a8a577ae7 100644
--- a/www-client/chromium/chromium-96.0.4664.9.ebuild
+++ b/www-client/chromium/chromium-96.0.4664.18.ebuild
diff --git a/www-client/chromium/chromium-94.0.4606.81.ebuild b/www-client/chromium/chromium-97.0.4676.0.ebuild
index 0c9e3bc72aed..84b87e1c066a 100644
--- a/www-client/chromium/chromium-94.0.4606.81.ebuild
+++ b/www-client/chromium/chromium-97.0.4676.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 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
@@ -13,14 +13,14 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="1"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
@@ -231,8 +231,8 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
@@ -324,6 +324,7 @@ src_prepare() {
 		third_party/devtools-frontend/src/front_end/third_party/wasmparser
 		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
 		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
 		third_party/dom_distiller_js
 		third_party/eigen3
 		third_party/emoji-segmenter
@@ -378,6 +379,9 @@ src_prepare() {
 		third_party/lss
 		third_party/lzma_sdk
 		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
 		third_party/markupsafe
 		third_party/mesa
 		third_party/metrics_proto
@@ -438,7 +442,6 @@ src_prepare() {
 		third_party/tflite
 		third_party/tflite/src/third_party/eigen3
 		third_party/tflite/src/third_party/fft2d
-		third_party/tflite-support
 		third_party/ruy
 		third_party/six
 		third_party/ukey2
@@ -579,9 +582,7 @@ src_configure() {
 	# 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
@@ -627,7 +628,7 @@ src_configure() {
 	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\""
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
 
 	# TODO: link_pulseaudio=true for GN.
 
@@ -755,6 +756,7 @@ src_configure() {
 	# Enable ozone wayland and/or headless support
 	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
 	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
 	if use wayland || use headless; then
 		if use headless; then
 			myconf_gn+=" ozone_platform=\"headless\""
@@ -766,6 +768,8 @@ src_configure() {
 			myconf_gn+=" use_xkbcommon=true"
 			myconf_gn+=" ozone_platform=\"wayland\""
 		fi
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
 	fi
 
 	# Enable official builds
@@ -848,12 +852,14 @@ src_install() {
 	doexe out/Release/chromedriver
 	doexe out/Release/chrome_crashpad_handler
 
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
 	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"
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
 	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
 	doexe chromium-launcher.sh
 
 	# It is important that we name the target "chromium-browser",
diff --git a/www-client/chromium/files/chromium-launcher-r6.sh b/www-client/chromium/files/chromium-launcher-r6.sh
deleted file mode 100644
index 637cfd612aa5..000000000000
--- a/www-client/chromium/files/chromium-launcher-r6.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# Allow the user to override command-line flags, bug #357629.
-# This is based on Debian's chromium-browser package, and is intended
-# to be consistent with Debian.
-for f in /etc/chromium/*; do
-    [[ -f ${f} ]] && source "${f}"
-done
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default).
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER=$(readlink -f "$0")
-
-PROGDIR=${CHROME_WRAPPER%/*}
-
-case ":$PATH:" in
-  *:$PROGDIR:*)
-    # $PATH already contains $PROGDIR
-    ;;
-  *)
-    # Append $PROGDIR to $PATH
-    export PATH="$PATH:$PROGDIR"
-    ;;
-esac
-
-if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
-	# Running as root with HOME owned by root.
-	# Pass --user-data-dir to work around upstream failsafe.
-	CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
-		${CHROMIUM_FLAGS}"
-fi
-
-# Select session type and platform
-if @@FORCE_OZONE_PLATFORM@@; then
-	CHROMIUM_FLAGS="--enable-features=UseOzonePlatform ${CHROMIUM_FLAGS}"
-elif @@OZONE_AUTO_SESSION@@ && ! ${DISABLE_OZONE_PLATFORM:-false}; then
-	if [[ ${XDG_SESSION_TYPE} == wayland || -n ${WAYLAND_DISPLAY} && ${XDG_SESSION_TYPE} != x11 ]]; then
-		CHROMIUM_FLAGS="--enable-features=UseOzonePlatform ${CHROMIUM_FLAGS}"
-	fi
-fi
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-browser-chromium.desktop"
-
-exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 4c7c3a57d59c..6e4bd3f54879 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -105,8 +105,8 @@ DIST firefox-78.15.0esr-xh.xpi 427847 BLAKE2B aaf667de15953c99c580766047afe082e4
 DIST firefox-78.15.0esr-zh-CN.xpi 564764 BLAKE2B df0b207411e7731c9238dd069fd42e47c7ecd0477089e0673a98fc879e76db566dc6f92c60a515938a831c0e0ef116f4f75f9a0b37350ce2f04be4fd72e53677 SHA512 072aba4d663091121118ecf6978129ad3cad28ae16eea7e1f680831ae0326d8ad5e0f853cac25827719229d7eb51635d1d8ed33e6fec01a48ce05875e15db2f3
 DIST firefox-78.15.0esr-zh-TW.xpi 564733 BLAKE2B dfcc1df31227d62486a8a36428c413523e2b6a81f96fc91481fc35fa65744bdb06f92ec1b259a1b79d1e5b43f1cb16c6fefb0a74fe2d4b33538783755b165453 SHA512 b5b9c3c6a4d717fef8ca250e6ccc636be2de0b22988f3f1da634266622ee0304b59a10a194f424d2b6693ce3262658172fe2a015474de600e1686950f8b90370
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
-DIST firefox-78esr-patches-18.tar.xz 55968 BLAKE2B f32fe8e0086e4bf74fd43127b9fe136a0e0ad6e51cb8a2398f6e8f9fe585de1574c745dd3f50440cf62b626f9fa24d368284c563fb75acbacc5238f9bc8d099f SHA512 99a51a241d91aa00c64550f2a521528f6134c8812e379eaf95cd1287fd51d00346de8d41f2d2f55a83332580531b31c4e814a47d7f69da6e3512613e8e98bb31
-DIST firefox-93-patches-01.tar.xz 21604 BLAKE2B fa9b993f7a5c95fc8a72c81c65c3167e896e4ab6517f5e3c4f543b6fc15714105d8486680557d82482f2ee5a99be23c831564e38ad8fb06f9a1c95d164d1dfb0 SHA512 ef982215b720ae9484229140a2bbfc5d2c606b888203a82113e566409b34451b7edd184e46f3ac500d2f371ecc1ec58f28610395d90f17db30fa58cb638d19fd
+DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a695f52c4712f3b28733648fcd7dac5a599613f4c3d2cfa169266dc62b65619b7f28c0e06d32317adb8ec0056ca79c87e9f6 SHA512 3c81dadc9bf74207c4e361605127ef6141d77700c5c54f1f9cd5ad3be13df9f73c6eec2f51d779558e4bdad1e7395c6aa8943a93415bd1786d461042bc03550a
+DIST firefox-93-patches-02.tar.xz 32064 BLAKE2B a99ebed6fb2e3af8c3d1ef60182e56636f68c596fcddb0450853eaca7b65fa786ce3187dae9d1c5fbce0b9d8de0b2a60d441b38a26d6b1dcad8881c46c11d913 SHA512 7f51f30815dc2386afa1349f512d156d2da3cb2a50cd9c14e763cfdf00535c78bff82f25820977252c3e5c086fe31d59a753dce2d3758ebe4f30dcda7a41056b
 DIST firefox-93.0-ach.xpi 452270 BLAKE2B c7fd81469026d99e21553ec59d0d005e906915483b3765898beba694cf31c02aef3c15789a5c2e2e2d1ee242aef323ca7fa1c142912917ec2ca02a8cb9c604fa SHA512 9a4c7f880801eb1c4391a57107e88e3d43e6ce0a1bd617ba4d11951957e2d62116f102e55bb62db22378460c68d2ecb3a9b9b0285951c46846920ae02360749b
 DIST firefox-93.0-af.xpi 425657 BLAKE2B 8f0f1df2ddc330f386d831696dbbbd15f639b0d95ae4d85b268924116f93f1bce22adc10b6053873f0ed6d69f9067515774b7904f7595c89a25edffde2e25e97 SHA512 f8c122c624c139c0afea5920f063b981665771ae107d32b654206dc0d00a8173230a357ca72649bc636d02825f1af90d291b5e09f9b7044d05b4af1ce39f6e6f
 DIST firefox-93.0-an.xpi 498005 BLAKE2B d0830dfa4f7a0ea4c85a5a3a7a1e90714e2e476024b77d0b8b44ce4ad241f0df1f0090eb4263caca3d05a66c8885c3c75bf167ccb7055716d7efc01ba4554515 SHA512 df7853f86853cc457eb85b8130f7b2ebf7be97ce28f23f963eb9b05b16dae605c5d3f3b925c98a0aa252dcd84e172e42f87256feac042af57294f8cdd3e69383
@@ -205,6 +205,6 @@ DIST firefox-93.0-xh.xpi 426899 BLAKE2B d089a23aa56a881db5a5092bf6da2133c001802c
 DIST firefox-93.0-zh-CN.xpi 567752 BLAKE2B f21d32140357de5cb98da2c75f5d8511c4d98e8405178b7c54553bfeb043aa372c796a79ac6b33704a64427edafa511ce40f69d8b7267d72f4c2037199972f20 SHA512 17c1f6cb48fec384a61ad60b0da4a93648bbd6da9a752be8db1f076dab13efaf5c22fbf539b89b4106427cb310e26aa0f708164f8eb13e045cfeba4e30d048cd
 DIST firefox-93.0-zh-TW.xpi 568218 BLAKE2B 4d842b6492967fa0a4e5cfd2fd46091e5f683df3b0cbc4dd13b4693023e79652a21eda449690acbced52df9e302e50ea32533420929baf76ca70cad416fc1a13 SHA512 11baeb65242512faccb1f4e813b62de681647e246268af1c0763e5a801e8d73dd741eb58b30a0a368f354f4a708dac88f7a1ad32a0497e98b67eb57ab0ef654d
 DIST firefox-93.0.source.tar.xz 382181136 BLAKE2B f4315a81ea5709fbf622ea39a4b259e44e8bafad95468d3f41fa8413dd1d5d92e260f549aacafe8b6af04f0c036fb9d59fe8531f0e2fa8de5dffcc403b33f2e1 SHA512 b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91
-EBUILD firefox-78.15.0.ebuild 34230 BLAKE2B 6109618c8154dd2a2e92655b5d410c48c94a554a191cf3f4a38b8de68670081643addb2be3e3ff51eaf42725a6d28fdfa5fa63b39a27232bf8d65f7ff65163a9 SHA512 2ab103310bf4b729ba53198c7395ba53fe64d7118120b07f0b0ea44e9450eab1944fbfd147f9abcd7d821f6ea1b8a9a13963b43feb5ae8cc503cb6a6803797b9
-EBUILD firefox-93.0.ebuild 33601 BLAKE2B 68df23062f94facddf5b98d3ff397d38ae03af4ea45c6c056d92b04c5bcb038e1f3bf4b67de1eb2cf0f818cf8a2a9852e1f5a491dbf77c179172b308def6ccf8 SHA512 aa271bb31770068a0d5d53346e2cf7f626c4d4d86c60d6e1ac0e31896aa564c45bb15efa04c73bfb252b7aed88554a9cea359c853441b35625b08f23ef7c7c84
+EBUILD firefox-78.15.0.ebuild 34443 BLAKE2B 568b5626c717137be77371545016e0bfbe22e0b362eb3a6d8654f838c323b48e1f62581f7e90d6d40ae2bdbe13826acefd52c7d426587f8fb1f9b7070fb105bf SHA512 9e8cf9e5f4977dfe4cb0dfeb2a82e481b87a7a6bf3b1ef250966a3c07dee6e43dc44fade1b45e46af8e2eadf6758ed2170214529823654ac83030d14de7d63f9
+EBUILD firefox-93.0.ebuild 33813 BLAKE2B ef1d5db89c7e39ff7313f922c5a77007553ee3dccc6f4585e3ac9d23f6ea5be7abec9da0464ff2b45ee9a076e3edbbd59a7c5428a0f9b6968f7eb9da1f4e1f79 SHA512 6d1177807e810d75fee3de1bdf3e6c9dcbfb0a66f5fbef1415644707946e6bba292eecb4201ec9d51f3de74e8fd8b30e129902bf7785ac0f3c567fe5946aca78
 MISC metadata.xml 2151 BLAKE2B 0dd5df0e78dee99abb7d7fc5a384126ac9920f8f39e886932c894328ab4c235aabf0e7fe401c6859973bb8c55f29bb64ec8cc571b58aa427325cd4b98a89fbf4 SHA512 14e367bb16402e3c3efbed5ed6cf2acd776fd725f4f29f5cbf20f4351ddbb59c89103b9d051fb56912bea461f994fe47741afb6da3b072710eaead0004da2c58
diff --git a/www-client/firefox/firefox-78.15.0.ebuild b/www-client/firefox/firefox-78.15.0.ebuild
index 17c94954432f..413da4c11ab6 100644
--- a/www-client/firefox/firefox-78.15.0.ebuild
+++ b/www-client/firefox/firefox-78.15.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-78esr-patches-18.tar.xz"
+FIREFOX_PATCHSET="firefox-78esr-patches-19.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
 
 WANT_AUTOCONF="2.1"
@@ -79,6 +79,14 @@ BDEPEND="${PYTHON_DEPS}
 	>=virtual/rust-1.41.0
 	|| (
 		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:12
 			sys-devel/llvm:12
 			clang? (
@@ -597,6 +605,9 @@ src_configure() {
 	# python/mach/mach/mixin/process.py fails to detect SHELL
 	export SHELL="${EPREFIX}/bin/bash"
 
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
 	# Set MOZCONFIG
 	export MOZCONFIG="${S}/.mozconfig"
 
diff --git a/www-client/firefox/firefox-93.0.ebuild b/www-client/firefox/firefox-93.0.ebuild
index 00f330717b92..0a7fa6f83161 100644
--- a/www-client/firefox/firefox-93.0.ebuild
+++ b/www-client/firefox/firefox-93.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-93-patches-01.tar.xz"
+FIREFOX_PATCHSET="firefox-93-patches-02.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 
 PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -78,6 +78,14 @@ BDEPEND="${PYTHON_DEPS}
 	>=virtual/rust-1.51.0
 	|| (
 		(
+			sys-devel/clang:13
+			sys-devel/llvm:13
+			clang? (
+				=sys-devel/lld-13*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:12
 			sys-devel/llvm:12
 			clang? (
@@ -597,6 +605,9 @@ src_configure() {
 	# python/mach/mach/mixin/process.py fails to detect SHELL
 	export SHELL="${EPREFIX}/bin/bash"
 
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
 	# Set MOZCONFIG
 	export MOZCONFIG="${S}/.mozconfig"
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index ba12656f925d..1ee2d9a32daa 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_95.0.4638.54-1_amd64.deb 89066076 BLAKE2B 6bbf1ccb224184fbc88875cc6c717dc954988915c27a15d5db20eb72f0d89a821ccb5ca07513b41fbfb7d050afe0b3b1b04eb6689c88a5c290f599ead6993010 SHA512 f7fe19544041c6951d3787a515ed3a9dd234868f71d3beb91731c57c2364e0189551efcb724fe46212bfc62c60af420d5b3540e72a094fd79e3106404ab3ebdf
-EBUILD google-chrome-beta-95.0.4638.54.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-beta_96.0.4664.18-1_amd64.deb 89479952 BLAKE2B 73bb9725c0134fb376187f5cff1cad714d8f7ac5e92e12132dd94d3e89ca183a02cc77c99fecea3328ef498f1255721e5103ab8f23c792ea0fa1f18373e08a28 SHA512 1ad8dd87c4caf16553880e2f661ce3a792913597292ad656c0e4eafaa1532b3899f97a724190517bd4aff99353aba008754d6a84bc90402acbfbb27989c32584
+EBUILD google-chrome-beta-96.0.4664.18.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.54.ebuild b/www-client/google-chrome-beta/google-chrome-beta-96.0.4664.18.ebuild
index 56dba81cca90..56dba81cca90 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.54.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-96.0.4664.18.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 2ab2cbd8bd9e..cc4b634857d5 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_96.0.4664.9-1_amd64.deb 89408576 BLAKE2B aa19e91ab098ddc5957244b1a92d420e06deafce7b4fe366fcf55d5919eab39e11d2be8f0403670796bdd96719eabf58e66dc8c0d741e4f88c4385fa410300e8 SHA512 8eb4f4e166d1a5014ad616b2eccde71c240462ab321d2e5cf456b8b789919d6ddbd67eddca8e3b4a748e1198715ce52e8b771176f63b3de3cb798f8d8f08752a
-EBUILD google-chrome-unstable-96.0.4664.9.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-unstable_97.0.4676.0-1_amd64.deb 89168844 BLAKE2B c3ee7a480e6d7ed15c0dc7d006e9d431c90195dc8ea0dc8d21494d26488c203709654b20e8e7c5543df571b30c21df048ae48be3e42957418a338ce62fb6d4e7 SHA512 2ff164f8cd64c346fb6c27da5ab42be47685cca9db47a00baa12943b42650d602f5b2fef3ea3bd40b814a4c97c9c1f316bce9a4d934aa1545a9a299ab1a9ded8
+EBUILD google-chrome-unstable-97.0.4676.0.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4664.9.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-97.0.4676.0.ebuild
index 56dba81cca90..56dba81cca90 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4664.9.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-97.0.4676.0.ebuild
diff --git a/www-client/jd/Manifest b/www-client/jd/Manifest
index f69df5727223..30a83ac732c8 100644
--- a/www-client/jd/Manifest
+++ b/www-client/jd/Manifest
@@ -1,6 +1,4 @@
 AUX jd-gcc-5.patch 531 BLAKE2B cd4ddb54f204eb6c09b77b76013bd91071a13b37bf365d61be7e41239d577453dd6733bf769ac4ceaff4ea7978d800106922b3ef58d46da98eb1bc9e71b31bec SHA512 851c7ff7faa83cf4e443b6ecee31790d97882bdb5ec461fb925c1bc350492d8b2a150a111778798931c8ca7f327890df11d256e0a75062c54839e8bbd285c4c6
-DIST jd-2.8.5-120826.tgz 784657 BLAKE2B 07e3ef150ddbc58cdd5d4e7bddfeb5f4cb5dd9b0c6bfc9fda4309768e34b7f4534549dad919c18ed8c5918d519e672ea4d3728d8bc87280096764d87a74151cb SHA512 0c4aa0845aca71f1172a565d7b9e4a7099fa27c221b452c623b818144b958c8b042e5ab00582eee07bc8d44186a172c9abb750550ae3293851e03382e527e11b
 DIST jd-2.8.9-150226.tgz 770110 BLAKE2B 096469fdc343dab64485897c5a402a48093ab1cc49e30973ab2f969fd60c389b1987c90246cf897125ab0d1787960574b35b811feacbc68e8079a00366c74602 SHA512 39bb4f0242426a5eff40e2a8c4bfc703491d260d4764be3745581b77a39d6db553521f2e09ea36c15d0318847a6fea8f48e079504f1f575fb600cb196c94df70
-EBUILD jd-2.8.5_p120826-r1.ebuild 1220 BLAKE2B 2a8132ceaa0748ec77417bd4c362ddee04b1b4bc4086c86b38552785f6a990081152504664e7f16b2db196f4083e04b05dd98c6ff1e135c97471fbbcbb3f49a7 SHA512 1379861910a22a94bc342d7a94acb7ce1a6c61c520360ed807bdc61041bc6a693ad676b4994b59cb5a49d2c3e55fd2dea01135393a6f4549fad429b04dfe560e
-EBUILD jd-2.8.9_p150226-r1.ebuild 1191 BLAKE2B da8e5934a3deaa113cf506fc0f17a48a56a21d209a0328dc512e899f7faf94149a30857f064f216c507fc7c72f70112271f85edab31b850eb4e7613843fc6d51 SHA512 d2c09e451924e541ee336ffe700ba10f028bdb99e1479caa75dfe9db76169bb1f1a69c60036450b3ba372eca953ae87c06d57179a3d26a339238957be942f005
+EBUILD jd-2.8.9_p150226-r2.ebuild 1215 BLAKE2B e1acd5cceddc80cf9969a22d7087971c07a5618b17403f437c51852164afe8fa107852c61198832c16655be485bfc08877a8126267526df8e95d3cdd24f3b4f2 SHA512 882d6ba610fc80270dc6b43534c3c964e16f5f7e935f64beefa52289632e50c0c2ea66eef6e1be5176a6b014eda714bca11b5c3315eb429b7d29f296112460c8
 MISC metadata.xml 484 BLAKE2B 0fb6efd6446c9e2d8c8bfb3dc468eddb1184417f6d088dc4ae23c3235397d96183cd1374e80a2fbe9492a335a865ec14ab66ea8f04170c119d76721542b62d14 SHA512 d8dfe8a9954599bbce80a3798e340649a49f42a83cd5ddbfbc81bafde99facc92ac9b37ffa21aec6e01229508fa4a8616dab63a5b20756a59c76ddf6a1a1783f
diff --git a/www-client/jd/jd-2.8.5_p120826-r1.ebuild b/www-client/jd/jd-2.8.5_p120826-r1.ebuild
deleted file mode 100644
index 02fdb774cccd..000000000000
--- a/www-client/jd/jd-2.8.5_p120826-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop autotools flag-o-matic
-
-MY_P="${P/_p/-}"
-
-DESCRIPTION="gtk2 based 2ch browser written in C++"
-HOMEPAGE="http://jd4linux.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}4linux/56721/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa gnutls migemo oniguruma"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	dev-libs/glib:2
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-misc/xdg-utils
-	alsa? ( >=media-libs/alsa-lib-1 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl:0= )
-	migemo? ( app-text/cmigemo )
-	oniguruma? ( dev-libs/oniguruma )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with !gnutls openssl) \
-		$(use_with migemo) \
-		$(use_with migemo migemodict "${EREPFIX}"/usr/share/migemo/migemo-dict) \
-		$(use_with oniguruma) \
-		--with-sessionlib=xsmp \
-		--with-xdgopen
-}
-
-src_install() {
-	default
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
diff --git a/www-client/jd/jd-2.8.9_p150226-r1.ebuild b/www-client/jd/jd-2.8.9_p150226-r2.ebuild
index 147ab5936757..45cb4c711bb3 100644
--- a/www-client/jd/jd-2.8.9_p150226-r1.ebuild
+++ b/www-client/jd/jd-2.8.9_p150226-r2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools desktop flag-o-matic
 
 MY_P="${P/_p/-}"
 
 DESCRIPTION="gtk2 based 2ch browser written in C++"
-HOMEPAGE="http://jd4linux.sourceforge.jp/"
+HOMEPAGE="https://jd4linux.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/${PN}4linux/62877/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa gnutls migemo oniguruma"
@@ -19,6 +19,7 @@ IUSE="alsa gnutls migemo oniguruma"
 RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/glib:2
 	sys-libs/zlib
+	virtual/libcrypt:=
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-misc/xdg-utils
@@ -27,8 +28,8 @@ RDEPEND="dev-cpp/gtkmm:2.4
 	!gnutls? ( dev-libs/openssl:0= )
 	migemo? ( app-text/cmigemo )
 	oniguruma? ( dev-libs/oniguruma )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}"/${PN}-gcc-5.patch )
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 7c0ea8cf025d..462d0e39a60f 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -2,6 +2,6 @@ DIST links-2.23.tar.bz2 6521143 BLAKE2B baefdadddc0d44511488ca1a085a45f3235b9c58
 DIST links-2.24.tar.bz2 6470666 BLAKE2B f6ae42f64283e250afc2041efbb1d8680ef860ea83d0592f9f92bb90a2c2a23e470cc6be4a8538bcbed5162bfb42be30336ac48b7d19e1b4b79c64deb9073f55 SHA512 093e24d8504faf95fa9e6ce50b4e6b01284995fa8ee156b5c8b2b52b4ca3bdbcdf95965c8f9c8b72adcfbedf8a5216467c85c122778381c3b148f5696b709fd1
 DIST links-2.25.tar.bz2 6505187 BLAKE2B 3efe9d43b9a8dad498101800ccdefd094a6371a2c74b264aaaaac2abf951db38729abcf00f74a45fdb7f0d24196413996aa02cd9d2ea3ee2cf008faf4062e365 SHA512 b094e3b2096b07da8385d6021e5a5794f5b602c90ec824c48b897e6b69def6d69cb879af3008a4af43effaa7d9359bf09e4feb8ed5371bb7ff22ffcb0794f690
 EBUILD links-2.23.ebuild 3376 BLAKE2B 9aa58d0dbd41479bbf9865d4646a2c8aeb2b13748547cc41655a4a7c34ca1da76f430061c20997d4d7f74855d585cdb72eaba988cba3fc35027e0b58bb4ed656 SHA512 48bb0f21478f61488821e49a7ccd4fd52844808a9c22fb252f5af766490af6f75a95f3ede0caaeafae39d1794e2194075d7992f90a5c4aa7ee5d4eb67be4188a
-EBUILD links-2.24.ebuild 3397 BLAKE2B 56afff4600920104635a4ad6584eb04b6c3f544a2b856fb2db5f14c1c43f37628704423f3d20d2739f6267f643926cba1addbfdc7e46359c27a435108f41f83f SHA512 dafbff9fa822142f740b622c9a759b1a0affb18bc5a58ad0dc8fd574856efc3ae56ad6c2fec24480a35901c964ae9db08982223e472918b65e093eb89def24d4
+EBUILD links-2.24.ebuild 3396 BLAKE2B ff1a0b878fd0409224e7e22a4d1570ba5451cb47dde0083255ca9e44694d5a41d1617a1e90c2620b7bdfdb94f9cbd2d0e36d06cb8188350b1b30f98b42a36e46 SHA512 54573e64fd2ff9200ce650083ca2411b03525e0c7eed84034316cf4b050e536f4d92ef3e0905baeeabfb5b70ba4fc8f21fa6de9a5b5a01a2401a237fdc937227
 EBUILD links-2.25.ebuild 3404 BLAKE2B 50ca2c575d8e94cb526b33134734a6e4ea17ae2bca2a022300e0be6c4fc7fe0c9aff5eaabee770a86bd6eab783124ee90a93ed5346b1ffc01e702289ac10200f SHA512 6863e084013309e586f19e491fea60d4d090f2c833923b9e3fbd0a7d9b2c2e07c59b310d3956696b087270b29be5c10a7a4581f5b875f31461ea8dde9052c822
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.24.ebuild b/www-client/links/links-2.24.ebuild
index 7e6b3e1a2676..2b5f84b54ed6 100644
--- a/www-client/links/links-2.24.ebuild
+++ b/www-client/links/links-2.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 7dd0b2ae9b2d..98a6ee1ffd98 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
 DIST microsoft-edge-beta_95.0.1020.14-1_amd64.deb 115388596 BLAKE2B 15670298240e4f0878e02215afbef683681f93fa113c00bb60a0f907fa699fcd6dca7871c5f7d22df2d09c50692175ec9ad9c89341e98b52e17335f7f16aa8d2 SHA512 f057d1ec8ffaf905ea1171f9256e7a9886ff062d1e6bf9a7ceca1dc4253040c9bb30b36f627fe22a7047a968010c532f806ef61f1c13879f4a62077be3ee74c6
 DIST microsoft-edge-beta_95.0.1020.20-1_amd64.deb 115373860 BLAKE2B 357142de38183a5f79bce81755f3b3ac69e6c8ec16bc03ac592db70c4861e4078aee2011c7048c72094b99079674926294069e9a5343acd7570e3d01b85c0cde SHA512 c2fa6c884932c94b5da69ecad98c6b717d17cab473b83b9554b2dfb956676421ee771dce19127fc00448bda22949f0b1616bd1b1d8f88bf2bff50c4774bd4647
-DIST microsoft-edge-beta_95.0.1020.9-1_amd64.deb 115261788 BLAKE2B afa7ef4d5a40cf12d7f4c16e525cbdc56ac64a0298ecd64ddea8044dddf11b5ae61936e39dc04f2bd09012b04d50fb40fe2f212d714dc35e8ea590524be7078d SHA512 4dcf0963b174b38bdffc80e7aa8dcb02caf909369ba5803d206b9bfd55087f29d75716f669dd14bd9bd4021eb14673631a6e9e9e5b91abbb526f0b30c5c35f5c
+DIST microsoft-edge-beta_95.0.1020.30-1_amd64.deb 115448340 BLAKE2B 01734fb17a065474a0dcd58432062be063dd0aa0f72e4c4ffc50bb6f1262fa0cf55b3cf1b346e8271dc6049fc43233974c4f1691aafff55f629b38d55a0a77ed SHA512 782a857c1e3a5d97b4fbe287c16811a98fbbef37a90c4478e5f6f49286cb5e585b35e7f444cbba9293bf28c504e90a8ebd38282190744bb77e1aa39fb43c036c
 EBUILD microsoft-edge-beta-95.0.1020.14.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 EBUILD microsoft-edge-beta-95.0.1020.20.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
-EBUILD microsoft-edge-beta-95.0.1020.9.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-beta-95.0.1020.30.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.9.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.30.ebuild
index a14f69804a04..a14f69804a04 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.9.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.30.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index e8ad8695db4f..2e7759f1c693 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_96.0.1028.0-1_amd64.deb 115444532 BLAKE2B 13a1d6b04dc410fc54a9381daaeb173a4b4d3e3e923b0a7bd8ae06d240965757e5a3a7bb76fc6c4218ef11cc169bccdebe81ddb4fb840d12524614b307d52107 SHA512 18e3f34515ac5040097616e623386bf574a378d57d96e24e03759193e9fb03ef6fb57560138566834a5c99f494f08b7264836d466ce9d3552f78938791c97b00
 DIST microsoft-edge-dev_96.0.1032.0-1_amd64.deb 116577348 BLAKE2B ab383d482a66078813a7950ac1063903f8aaeb7ecac16eafe4dcec2938a8ace3d9886a81482ca887c36b7281f41962d0d980b6b6e37d9fe6d3634e222ac6d757 SHA512 5b8a4d61ba2dfde8d95a6e6491caaa30640568af19435048b4696d015a24465dc9f80532710784b706d39a96c969ff2939cd352457b73805d000c634856ebfba
 DIST microsoft-edge-dev_96.0.1043.1-1_amd64.deb 117006816 BLAKE2B 34d28cc574c4e5325eb7a43e19d615b4d71174b255969fad9ad4a88cb6969c2a6c37c133b9e143154eadf8e010fa30740ae7a8b90e0b9bb47f5860b41f9876c2 SHA512 2826755c6cd30e5a068f66a4f73b37c0352034ff0a008b3575f84ed75c0e811537f522202e781d2e1ac88f43885a36fb9efac244cee62a36b5fac299306537af
-EBUILD microsoft-edge-dev-96.0.1028.0.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+DIST microsoft-edge-dev_96.0.1047.2-1_amd64.deb 117678124 BLAKE2B b1756d52d745c9cc84ee3fea21fabbfe38cff8b5324bd3be8feebf3078ec2aefbae9094e041ccd47c70778311c37344010bd781ceafdfb25c0c2718c8a3c2ad9 SHA512 0beb1366d2b49c0903cb237ceeb328b625112fc7111019e0e12781577989771aff0d914cd93303c812d05d1907626748bbc3b8250bf2efe8b39f2a47834f7383
 EBUILD microsoft-edge-dev-96.0.1032.0.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 EBUILD microsoft-edge-dev-96.0.1043.1.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-dev-96.0.1047.2.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1028.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1047.2.ebuild
index a14f69804a04..a14f69804a04 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1028.0.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1047.2.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index a41d1b378093..1116c8a1d9e7 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,8 @@
 DIST opera-beta_80.0.4170.11_amd64.deb 80002328 BLAKE2B 735ec69af328e8c79b65a46dca486c34ac290256ecc17283b8bee41bb5acb3d8e32facf73ea57f11d342ce2914b07c863773028cbcdfbee80c1e23c1e8c4bb5a SHA512 dd4729e16aa3078b932ab96b3e568032e68e0e6be2988827f68b0ff59796eb3b931d2629cecb5262dc6287b5ba2259e13e31394c4deecbef52f71fb4fc36ada1
-DIST opera-beta_80.0.4170.7_amd64.deb 80013760 BLAKE2B 8490351b1eaf05dea8d058074ef28dba00927805da669d958351893b28a54f560b21446f840db60553f32d5f2cfa4180374543ea8e1359f66495107270ebc980 SHA512 fdeeb2ea94429bc8aae0cdf5c59993fdc8b024e56e8ec58ed04a9dcebe3d7c1028b7b9fe4f51898354bb797fa9594cfccf64b3dcdd548c78f3567c9d02ebfcc2
 DIST opera-beta_81.0.4196.11_amd64.deb 79198584 BLAKE2B 8776d508c58e85a73ac8925c34a60b3f0c0f72a0de08bec311a946c1a112f7eb22f32351333f5b1eaeffc14f86705f9feebfa2814cad9bd3a74f847224d261dd SHA512 b9f70a2c4ae6789985e25506f344eabf36850c761777b7324deea3f54cc6d10ae198a5dbdeae9513e09352907f07308818337d840abe8219b0667dabc7192ff8
+DIST opera-beta_81.0.4196.14_amd64.deb 79296820 BLAKE2B 5cf8649a3ba84eef8bd76fb8b2cc41d4a66ab1dfb94a1a29a8ee40af3bb0fb891359c544d5d650f84afb7b509b0fa383651c30bdfb085a5c87f678755e4cb473 SHA512 ef087f23ac8e475dce4792100d856b7392b3eb70ddd53e7e88e6ede81003a76cc041c26d3d030d78e4bea1c7bf1e57734c8349a290ddce9357d00eb12b67d132
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
 EBUILD opera-beta-80.0.4170.11.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
-EBUILD opera-beta-80.0.4170.7.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
 EBUILD opera-beta-81.0.4196.11.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
+EBUILD opera-beta-81.0.4196.14.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-beta/opera-beta-80.0.4170.7.ebuild b/www-client/opera-beta/opera-beta-81.0.4196.14.ebuild
index 0ca298be282f..0ca298be282f 100644
--- a/www-client/opera-beta/opera-beta-80.0.4170.7.ebuild
+++ b/www-client/opera-beta/opera-beta-81.0.4196.14.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 7e33d825b8ef..63e22433b214 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,9 @@
-DIST opera-developer_81.0.4175.0_amd64.rpm 77215724 BLAKE2B 6f3b0331923438789c6f8c4b0cbefdfe7bbc4dc219dad040e23049102b8cc3089f2dadde6f63c175fd4f5086ce610d4700608a61bb93efbcf33f4a0067ee3ece SHA512 6af3846beeff70672287ae142b5b85a7d353607c48000ed9b052d9e7b17c9e28f1ba54d6f030addeb8166d40be2a1165fe96e40ef2641f5764adaacb9c9f8db6
 DIST opera-developer_81.0.4189.0_amd64.rpm 76325920 BLAKE2B 4f43c91e6e34065f637f2c93096ee484e4d9e366c15ce720877b82eaa3fe8860ace8d1497f6dbd9783621573d46517cde35b7ee17bee5da3ac70b9a1ced4ad05 SHA512 b23d957f5c314f59205b6d487fb2c2848d18542ed36ffd6bc8a76f148d3d223174b8a080f029caae547901e5b3eb4b4fc39495e2ca40d7eb37d3f3533f7d47cf
 DIST opera-developer_81.0.4196.0_amd64.deb 78838836 BLAKE2B 5e72840660a0c98f5a2e1d095dd0c932c7f549c533391e2ca01fba7089e7dcc51b18caee09307cc5ce2f030320b4ae1f7e859e15075202c3fcdae4f3b3b33b11 SHA512 f9a7502f6221333a782e5c0b1153f163d7b1e7d6d07a4aacf8c977c08a39248ed97b5d6a111c568d79608af2a1eae496204ca5bd93c62af5540576b224971f97
+DIST opera-developer_82.0.4210.0_amd64.deb 79202112 BLAKE2B a6d3c22dc46501eb0a92877cc511e73e0643e65d27dbda792939eabff44e63e375ee042ac56b77c046dd2dc846b8a053883e67b03de396ab3dee18b7db4dea72 SHA512 4487a3a38c1ba0a619c78f451555b7e288c74c37d7875fc84e9bd60342e851787798ce939b14d4b09dc60ad4e5e3e07a83d707d72d07bacba5b4324fa4d1b470
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-EBUILD opera-developer-81.0.4175.0.ebuild 3576 BLAKE2B 3ae5a78cc6785262d0d29e4567c1a4962588e8eec1f6dfb758937e54bbfc62c6d6df90a95942e30411a322fd4840f37b067701df6535082fd3a01f514fbeb914 SHA512 a108e671365d41d6a932b2b326a855e6e7e79bd54a544742dd264dcaf6d22da49c3425b533ecd3c98fc03351aef5427f02dc847abf8621f9ec6c95f7fb505e57
+DIST opera-ffmpeg-codecs-96.0.4655.7.tar.xz 1394152 BLAKE2B a48c1f22b5e92e40d8d5f97f02505021824823796767c1725c821b171b3ff6bf281d0123bf0b7e336f4d81b84bbf9362c6489f30b7de7c2037238c53003d6e00 SHA512 7c6815936e9a027d278a893e90e30f28a3d011ec83723c6500bee7ba0dddc5c96ae3cd75d7e16f7bbd2f9ee635fb64bdba6c2ba1df32761a6215be6eb3d5ec5c
 EBUILD opera-developer-81.0.4189.0.ebuild 3576 BLAKE2B 3ae5a78cc6785262d0d29e4567c1a4962588e8eec1f6dfb758937e54bbfc62c6d6df90a95942e30411a322fd4840f37b067701df6535082fd3a01f514fbeb914 SHA512 a108e671365d41d6a932b2b326a855e6e7e79bd54a544742dd264dcaf6d22da49c3425b533ecd3c98fc03351aef5427f02dc847abf8621f9ec6c95f7fb505e57
 EBUILD opera-developer-81.0.4196.0.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
+EBUILD opera-developer-82.0.4210.0.ebuild 3575 BLAKE2B e5e78bee5a9a036646166d9905d58c21ab4c4c0d5e766311737449a378678bac1a3369d25f7f84a95088285491759784233ce0c5b771589688f7fe234713527b SHA512 96e13cd4ef03c2b3030ebf6ce23c6f8cbf4491e1cc0dce3ea9afc5459c6c01c51a97ebd8e5d8cb4ee9610ce210517ebe94681843c49d4f657da8cf115fb7c44a
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-81.0.4175.0.ebuild b/www-client/opera-developer/opera-developer-82.0.4210.0.ebuild
index b6443ea34186..d23934604a09 100644
--- a/www-client/opera-developer/opera-developer-81.0.4175.0.ebuild
+++ b/www-client/opera-developer/opera-developer-82.0.4210.0.ebuild
@@ -9,7 +9,7 @@ CHROMIUM_LANGS="
 "
 
 # These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=yes}
+: ${OPERA_FORCE_RPM=no}
 
 inherit chromium-2 pax-utils xdg
 
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="94.0.4603.0"
+FFMPEG_VERSION="96.0.4655.7"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index b6ba1795e89e..6913a07aa6e9 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-DIST opera-stable_80.0.4170.40_amd64.deb 79414828 BLAKE2B 151416b279a2f39365a2c40d433227c80590f16061342411b4bfea0ce68167e988466ea75853e5159eafabe781ea0435a0840e993b01899f7962d046bbb90ca5 SHA512 216f57c728fc9cb20992b585cd7ee7b8c88bcb7afb56fcf8349eed28c6dadf39257cd4a60e236365a38f2aa380ca8a36f3a1f6c329c6f56d300adfb5f6df897b
-EBUILD opera-80.0.4170.40.ebuild 3574 BLAKE2B cfb936de9de46171a6393cbd95e83768741689b4238dd4fb512195a58261068236109bd97d68fe8c5d68dcae3db3306f138b8057252f8629b21fffaa58d0ecfd SHA512 b3502e92003ccc76e3c87741a40bae5cfdc4eb1db9e6a1a2c41b09acd3b8d31ca7f4123ed2944db2ee43adad874fca80343e9403bfb3a8a4b8b46e2bdfdb9ec3
+DIST opera-stable_80.0.4170.63_amd64.deb 79435540 BLAKE2B 9ec54d50b6e1ba61b2fba61e495fba6186311551e32ba6c2934f969642c5e17279370d37af980cdf7ce5e28094c71f538b1054d1817ee94cd773e96319793f0d SHA512 224ef39423d5ee373e992e334f5306641450b98f385d50381a8af7f13aa4a16777ae18248a05a073c11dd0636312c579f4ccb429a5efe8eac880d12c97c50660
+EBUILD opera-80.0.4170.63.ebuild 3574 BLAKE2B cfb936de9de46171a6393cbd95e83768741689b4238dd4fb512195a58261068236109bd97d68fe8c5d68dcae3db3306f138b8057252f8629b21fffaa58d0ecfd SHA512 b3502e92003ccc76e3c87741a40bae5cfdc4eb1db9e6a1a2c41b09acd3b8d31ca7f4123ed2944db2ee43adad874fca80343e9403bfb3a8a4b8b46e2bdfdb9ec3
 MISC metadata.xml 590 BLAKE2B ecac1c1d44dff5d3f266f7e0a4135c035c2cd0b08055d30b9103308a53eb046328a9917fccdaff3e9f7ab56e7eec906fe6cfa59efa0f223a237db7ca1a9a2eb9 SHA512 9764641862a12bb0f3c396826265595a900a1801f3fdda45337f4b89088f868a4a036290962d6be64f0509c7c6e69e072de2bfdd490fdb04401c99d64188c7eb
diff --git a/www-client/opera/opera-80.0.4170.40.ebuild b/www-client/opera/opera-80.0.4170.63.ebuild
index df7d5f99d4b7..df7d5f99d4b7 100644
--- a/www-client/opera/opera-80.0.4170.40.ebuild
+++ b/www-client/opera/opera-80.0.4170.63.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 2899088b35ea..b67b73f27cd4 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,7 @@
 AUX qutebrowser-2.3.1-pyyaml60.patch 682 BLAKE2B 572d1ffcb23fd1168b8e999300c4f2d7f8c59b1c8e47c3c91bfdbcfc37c1e2c909b608513070f2efde979db7f90e1548dab2f6156cd8f74d8a0c9e1cb32c3a3c SHA512 608103b77779855b636ca0dbc77b726650d6e571d0c44c7ef89d16228e19931ed0b8c6152487e30e59f36996883d7efe0957de5b28c9f8b5d7e4c5bc21ba2031
 DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
-EBUILD qutebrowser-2.3.1-r1.ebuild 2436 BLAKE2B 30a9c3f7f66fa08d9665072ee3e006ef97adc66b365cb7b10a0ccdf3e553e0299ffc42a9ec80bb8ebd21e6c5517dece86aa4e12b702c2313fd3f40d8fa9c2764 SHA512 f23cb74b8036c2f204bd0c8554fa4040bd98271d68c35d04e2143aee4631343f6ae50a8a262f1610095c41f0b63a1b052f18f20308214c8285909fb486cb8ea9
-EBUILD qutebrowser-2.3.1-r2.ebuild 4303 BLAKE2B 3dee4b1317f8159b9bac01403c7cc68bfa68c5555c138801ec3777b7f4fb5974c84907eedda1f887f1a85bb594062ffd816a5c3cd36e789196d0f4769912d8a7 SHA512 7bc6de06328494517e086089a59c389bc9877b795acacc3fb5e15a4d4a67ea7a0a849a54b0539697433f06cfc80f27090f27f8497460f295a17bc4323050651c
-EBUILD qutebrowser-9999.ebuild 4274 BLAKE2B c67ca9a10a4ebbb26c1f573870586af1063f1adc4ec36c61965d861848501444004c60e8204aee9e7459183d8cd61c22a6fac7dd4d602a2d220802f9d2fe3265 SHA512 2d582bcd9ef99022acb48e320f2885cad81e9d2cf0e21cdd4d4933ae774325eb55575c0bf287fda24a6c918f1986e13a17f4a96fee38fb4e155fa5eeb1136a57
+DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B 9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84 SHA512 e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
+EBUILD qutebrowser-2.3.1-r2.ebuild 4400 BLAKE2B 22b8b11723af9a80a4c74361d083ad4f89b13cc641760fc3add41853af3d4f10d0015e1eac02a039f6f0f61be3beb2c235f72098205bd480960e16e4d0c67e09 SHA512 e67daa83137fdfcf59124077fe56426d5e48243025964a1770d2976a377aef00ff9d5be6736d01af1a9a04965d2527282692c34b22915cfd330bab6f85d9044d
+EBUILD qutebrowser-2.4.0.ebuild 4367 BLAKE2B 18786ec3e9af725a998ef19da97f25c4857f7d44c5e29c7ec2f261a71792f7c56a8abd9e3d97186b4af6a5edd28371001634b3dc2453196dc5017bfb234117db SHA512 2348a26f7cabf13715b6a55068aa6e543290857ae8d1370de6b69ebf3b7e60b67f78ddd9581aecf273b325fab9f24f2f262f0f8e6bfed77f42f9011b7fe614c2
+EBUILD qutebrowser-9999.ebuild 4367 BLAKE2B 18786ec3e9af725a998ef19da97f25c4857f7d44c5e29c7ec2f261a71792f7c56a8abd9e3d97186b4af6a5edd28371001634b3dc2453196dc5017bfb234117db SHA512 2348a26f7cabf13715b6a55068aa6e543290857ae8d1370de6b69ebf3b7e60b67f78ddd9581aecf273b325fab9f24f2f262f0f8e6bfed77f42f9011b7fe614c2
 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
deleted file mode 100644
index fb10ef39b48f..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit desktop distutils-r1 optfeature xdg
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+adblock test"
-
-BDEPEND="app-text/asciidoc"
-RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	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}]
-	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-# Tests depend (misc/requirements/requirements-tests.txt) on plugins
-# we don't have packages for.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	insinto /usr/share/metainfo
-	doins misc/org.qutebrowser.qutebrowser.appdata.xml
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	for s in 16 24 32 48 64 128 256 512; do
-		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
-	done
-	doicon -s scalable icons/${PN}.svg
-
-	insinto /usr/share/qutebrowser/userscripts
-	doins misc/userscripts/README.md
-	exeinto /usr/share/qutebrowser/userscripts
-	for f in misc/userscripts/*; do
-		if [[ ${f} == __pycache__ ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	exeinto /usr/share/qutebrowser/scripts
-	for f in scripts/*; do
-		if [[ ${f} == scripts/__init__.py ||
-		      ${f} == scripts/__pycache__ ||
-		      ${f} == scripts/dev ||
-		      ${f} == scripts/testbrowser ||
-		      ${f} == scripts/asciidoc2html.py ||
-		      ${f} == scripts/setupcommon.py ||
-		      ${f} == scripts/link_pyqt.py ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "PDF display support" www-plugins/pdfjs
-}
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
index 3a90e9763a2d..0b940abb3a02 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
 else
 	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
@@ -96,6 +96,8 @@ python_test() {
 		tests/unit/config/test_websettings.py::test_config_init
 		# may misbehave depending on installed old python versions
 		tests/unit/misc/test_checkpyver.py::test_old_python
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
 	)
 	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
 
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
new file mode 100644
index 000000000000..82cb9d908b85
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+	$(python_gen_cond_dep '
+		>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
+		>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+		adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
+	')
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	app-text/asciidoc
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/cheroot[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+			dev-python/pytest-bdd[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/pytest-qt[${PYTHON_USEDEP}]
+			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+			dev-python/tldextract[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use widevine; then
+		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+	# these plugins/tests are unnecessary here and have extra dependencies
+	sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d;s/--instafail//' \
+		-i pytest.ini || die
+	[[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die
+	[[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# end2end and other IPC tests are broken with "Name error" if
+		# socket path is over 104 characters (=124 in /var/tmp/portage)
+		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# tests that don't know about our newer qtwebengine
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		tests/unit/utils/test_version.py::TestChromiumVersion
+		# needs qtwebkit and isn't skipped by default
+		tests/unit/config/test_websettings.py::test_config_init
+		# may misbehave depending on installed old python versions
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+	)
+	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -k 'not _bench and not _matches_tree and not _warning'
+}
+
+python_install_all() {
+	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "PDF display support" www-plugins/pdfjs
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
+		elog "have additional dependencies not covered by this ebuild, for example"
+		elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or youtube-dl."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 22d3277e6864..82cb9d908b85 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
 		>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
 		>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+		adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
 	')
 	widevine? ( www-plugins/chrome-binary-plugins )"
 BDEPEND="
@@ -92,6 +92,8 @@ python_test() {
 		tests/unit/config/test_websettings.py::test_config_init
 		# may misbehave depending on installed old python versions
 		tests/unit/misc/test_checkpyver.py::test_old_python
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
 	)
 	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index f8efbe103a34..0d89ef9d4e4e 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,5 +1,9 @@
 DIST vivaldi-snapshot_4.3.2439.41-1_amd64.deb 88036868 BLAKE2B f5f89adc1e55ff2982600353f5be130ee6b53a9bdf0a85e0898719b65018ae5b6bad7480b38680b4811d1ffcaa30f8e67bf8e19c189f3e6a952499b8eea5d53d SHA512 d5d6b2b96a9f9bb4b0a2cd5a84e01107e23ab06d0895209deaa0b4794d8cc4864c2f9a8d0702a1c35b8192cb1d15a7c1765177a2cc96c9ff3fe7bfd111274b3b
 DIST vivaldi-snapshot_4.3.2439.41-1_arm64.deb 82795244 BLAKE2B a2c39b06362c1d1f507b3bcc97d99309a25d313853e009192e6f51220f3195ef916758566987a7492354e4bab708983f7d191e56f9bc2e0fc4e4f8472afceba7 SHA512 1543d6a92b4577ef70f4749b7cabb21d90202afed06b1292b0c45a3f985d997ebac00959d9d739ed147f79efb653efc904fc721bd9376acb0e6915906deddbf7
 DIST vivaldi-snapshot_4.3.2439.41-1_armhf.deb 78980916 BLAKE2B 0f389dc4922683f3ed60922701b8904026a32c67ec2abd1320e0f95ea797cb4da04e3b9c38d04ba763cf01fb9b7adf9f6c3ad1010eb5df99492880d14dc8e64c SHA512 355059e74c3475c55397167a3905f142b739bf8c4786605e4a642f639adb575ee9d37b4471a77e383ab6dba8712761b33c4c24bba409a4dac747cf34a1acf65d
+DIST vivaldi-snapshot_4.4.2457.3-1_amd64.deb 88064736 BLAKE2B 053bc4e08ae03bef4e28382fcb78be702f4b35a818376b61b47682cc78e2e15ec4e772bbe24a72f75c59c25888783fe4b8f27d35817110b268dd88486fceef85 SHA512 5ae4a7f89f00c5a564d59b3bbb1c93f6bd7b8b3456322ea94cc2b31523c8ce4a21e0111911a50c9710bc2ec9481e6ea7a0c9cb38c9be93f67f86251080736c39
+DIST vivaldi-snapshot_4.4.2457.3-1_arm64.deb 82871488 BLAKE2B d23b6033d373d09ffb1eaebd1b67b87dbc801e08b4f98f5045d85186d718a29db078135a2b5f4b65aa51c2fbcab17689e88cb9a59892cf3484819ab053d4117f SHA512 d96087b582be5da8c00efa3fb63c6fd5f9c61517993aa4e3dcb9cb32ffa10bad33c07e1f0252f1583459d30901a661c4b7e5f2b0c1a33ce006a81521186f5e6a
+DIST vivaldi-snapshot_4.4.2457.3-1_armhf.deb 79055812 BLAKE2B 1618c60831f825cbf3f7b8b6d3d562ae03c5610ee8c0541cea6c4ec8bf78684ea71576c14ccaadbde87a0965772008b6e6baeb34423aa9d0a261a605ca166764 SHA512 88bf379c1f063e0cf45e7681dc50acfd7108f8abe91b8bf782113fa4375f76e9522def41d523e401d321aca06549f0751478ea6c2288cd95294bdb8ac1cb4bd7
 EBUILD vivaldi-snapshot-4.3.2439.41.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
+EBUILD vivaldi-snapshot-4.4.2457.3.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.39.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2457.3.ebuild
index 9fafe2ed2efc..9fafe2ed2efc 100644
--- a/www-client/vivaldi/vivaldi-4.3.2439.39.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2457.3.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index e02f1d43d0c0..5be9aa6e3e5f 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,17 +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_4.1.2369.21-1_amd64.deb 85176340 BLAKE2B 7017231df566c4ba973a638ded298647c125c3dacf23a538596ce77f82832d9035a9b00a1f9e93c16abb2e93083c7b9831f6bbe957f64c5ef319c08d6bcbfed5 SHA512 a33dfb4152ee2cb36db38111f65d285cc78fad3f2b41f7ecccb8e4e96fd3a3a3dadbb2d2435c7120ec140b10567bac9e1a68393d7912c2f9528f0292c2f6abf4
-DIST vivaldi-stable_4.1.2369.21-1_arm64.deb 80663556 BLAKE2B 65a1dbd52eeca4eabbf5271436b6bf0319448e9ff070770e50f50f6b5eeaa5226339e53864a6bccd6923c3dae93ce1a6a5b4f0672eccc569e87e401cacb6582f SHA512 8a16a403d64c57e0d488a29043ff03070f8608ca663e6003bdd6b1f7e1ad412826002bcf435ff29aaec71eceed16c3782d5cff1e00280f85e31cdbc093a86227
-DIST vivaldi-stable_4.1.2369.21-1_armhf.deb 76573196 BLAKE2B 7103a117cc9b3094a1d76c90f6bd9e84e84b8b0c12e4c4e328c1f54a3dacfc10f4fe6669286a58ebfbdde28cac8f761f9b6e0f2ad8c52a1aef33176243bd701c SHA512 a219f24342e16ef43c681f288a2ac854f6d13272dade191d30272b1159c88d046b4523bcef7175dcbbcdf285064598e11c4f5039091a19ba976bede8f7734b85
-DIST vivaldi-stable_4.3.2439.39-1_amd64.deb 88042364 BLAKE2B 71f471f9642e0a15584a2eaa9ba9300f0b473cf85ad17d3ce9b5c6d9123cf844014885b38cf9b5700eab0aa5a0063bacfeb013b293e02097de68fd7d4fa2d62f SHA512 fc1099b7cb1dac8882db3b093f213c674049fe9781106f2c8d0114020e25b55dc84621933c999a4dc04ff1e4e497927f8b85d4055747df79dd6bc942e05aa3a3
-DIST vivaldi-stable_4.3.2439.39-1_arm64.deb 82781716 BLAKE2B 7896804368d34a81aa936969b1473d32a414c14d344dce4df55f64a36c8cf52464979fb2d9ecb3508db01e24749d44a58f72ad3d7a2d474501394d2f5a5ed675 SHA512 437921cce2fb215728c1dfdd07975dc424208f0c89383a965738a3e2127f1ced9a0258ce2b1ea835bb0cfc71524652e519883e5371f33356cef5640741bd9e7c
-DIST vivaldi-stable_4.3.2439.39-1_armhf.deb 78946108 BLAKE2B 86a2ae7b947d7ebd7beab88e76e20b5d4115531329b1b4072f448cbcfd2f25ea396b88d976c977c1fde40a231d8e450b9c06953ec7412fc0be03212055cb3ea8 SHA512 081bc6a711ab3520008417520e572fc4b885400fd19f32950064382067b6c7b36eaeab918ec5b065f19540df706f03892f83c2b81cc49e66bbad2885e4b33cce
 DIST vivaldi-stable_4.3.2439.44-1_amd64.deb 88033720 BLAKE2B 1d2cea0200b9686254963c40e94fee389f3aa364c53575c60bda2c22252100b13920eef9c6de84cf2ca3d8d7f5514c2ba607cefde9ef73d8e66dec46365ecf4d SHA512 144aa07d85f9960faa36d0b266445ee6af91cf1b20e4bd9e1d1c8cb7143ad07ea11691996c3f4878288767628cbf88cb478d3c39c8933fdd4373d4498b627332
 DIST vivaldi-stable_4.3.2439.44-1_arm64.deb 82806876 BLAKE2B b83aead84525790e3f2f6249b0ebab9b96031598496fd9599be5448b2a4c64814c9b625a34f3d51ec459330998d540aec4b3a7f19713c70b7d10502d33076a9c SHA512 5a88c5b2ccd979d5d5c6e6b9aa8a8e94194ea0a5700bdabfd7ac44a7fb9530a51918340ea95740a07a5b796f08dd25fce48aee52250a10aff03ab984b024c789
 DIST vivaldi-stable_4.3.2439.44-1_armhf.deb 78995280 BLAKE2B e183d188a69a7e4f81234aa297602be6328959aee95ec7749db4222bbb3eb83a0a3153309e858be6e4bd654dfca4af787baa8481fc0be780ba4b0990848560da SHA512 afa0e0db5367ee260163d4ebfa802553710b1236ee3e3051842b0be40197fa4949e137f0fd6cec71bacbd34b18f51c0eac327f3a439f8002608b72e6543687c2
+DIST vivaldi-stable_4.3.2439.56-1_amd64.deb 88024500 BLAKE2B 6425a97df0209038d2511b5c4ace65dc5d27f287d33b87dcf72b54c35d888a7915e03f1ee43c056b8677ed64e1755cd677974e9205eeafc414ee8c6ba472215c SHA512 6966a40bb0ea0ec50540753fb121a8ce295c0782a09ae5adc2db894412c71c7d8b3c9bc3c019f7850ec1495482d2979723dd6e32c9e8e426a2e5a429453a2a88
+DIST vivaldi-stable_4.3.2439.56-1_arm64.deb 82810248 BLAKE2B 011b80e3567d572bb1afe193edc0db1aa9da3f07d920ee0b47c339eb920f7288d07c2e985d5321dd6c8b496964045eabef80a50794658b9ebb8984946e1f9557 SHA512 7cfe9732fd5f0d498b601921349122b801c58140b164ffc8c0e2011ddd15f716ab165c946720e30bae955af455228314734d9f5ed53d12842a9a790b5afe8ce8
+DIST vivaldi-stable_4.3.2439.56-1_armhf.deb 78990996 BLAKE2B 44567bb3c1a75363c3e73c73f1e6455671932db369bca1dda66e9a458b9c836f7c3fa04502000768d6daaf40819e34d219755a489c49362844efe60f28381646 SHA512 71bbdde42e2f7ac826fb2ffa24979b088bded2bd1977a05fa7cab7e152d10c091bb222a6654f53daa524040b884ec43b076abad136b5194019c0904eecf68642
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
-EBUILD vivaldi-4.1.2369.21.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
-EBUILD vivaldi-4.3.2439.39.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
-EBUILD vivaldi-4.3.2439.44.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
+EBUILD vivaldi-4.3.2439.44.ebuild 3600 BLAKE2B 1a0123725248afd642eaa705f01a2f8af5574e71be02f46d42952f4f8a08eda8d460201d40f79dbfb708f7185fbc37eeb3f684e1a6adcd60318572e02ea31499 SHA512 ce4f5f36b03c133c07bf2e7d9858d7a61dab1f63698d8d4a5477ea9237defab3b3aacd409e0e29fb92303906691f1410825f1e5ad95b9bcdfab8cb930238bf5f
+EBUILD vivaldi-4.3.2439.56.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild
index 9fafe2ed2efc..ef7b0078a7c4 100644
--- a/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild
+++ b/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild
@@ -96,7 +96,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/vivaldi-4.1.2369.21.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.56.ebuild
index ba5f6dc05f73..9fafe2ed2efc 100644
--- a/www-client/vivaldi/vivaldi-4.1.2369.21.ebuild
+++ b/www-client/vivaldi/vivaldi-4.3.2439.56.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+CHROMIUM_VERSION="94"
 CHROMIUM_LANGS="
 	af
 	am
@@ -95,7 +96,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 )"
@@ -135,7 +136,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
 	widevine? ( www-plugins/chrome-binary-plugins )
 "
 
@@ -161,7 +162,7 @@ src_prepare() {
 	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
 
 	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
 
 	pushd ${VIVALDI_HOME}/locales > /dev/null || die
 	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
@@ -189,7 +190,7 @@ src_install() {
 	done
 
 	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
 			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
 	fi
author	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
commit	95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree	867dce371a84a696e91be255d89f282975aa0480 /www-client
parent	46eedbedafdb0040c37884982d4c775ce277fb7b (diff)