gentoo auto-resync : 18:02:2023 - 02:09:39

9 files changed, 423 insertions, 50 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index bff93d008e06..3977dcdf83f5 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 90151ab23023..4c4cc17d6304 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,8 @@
 AUX qutebrowser-2.5.2-dictcli.patch 589 BLAKE2B 1ad904d36935acc28dc9c6f871d0dab260bf8db24e2dec67b60cd09a7234faac719f0836f73e17c6673b99c7253164e18a6ec47827796daf6af5b4babe91e3ac SHA512 00c6907241fc3ccd0266c0433e18580594b0c8a2151f8e393f1d1dc1a04c6c68619a7ca20f1219ec2cca7e302a39ba14542af03faac7b85c68c7fc47a9fc45fe
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
+DIST qutebrowser-2.5.3.tar.gz 6117665 BLAKE2B 3fc1304e4a4343d9a3bdfbf6ac708305a283da2217938dfe2b0f5e049d3a100bc255e0f06807e98c12e095f25dce4d5ed22705a5ae6674cff2f8ffcb0c5afab8 SHA512 a53db1a842b59613115d0823ce9b7d8ea703c6db8882250a587f4c7042a52b7ba93e9f516cfae1804e2f10ad369b0ab8f9d613092a9ca4be86e113c4ed4be7d9
 EBUILD qutebrowser-2.5.2-r1.ebuild 4441 BLAKE2B c86a459181c039d78ace97598690d6ea373bc33c6964f187bc98de45a12e807d909e17ecc4506258400f155b230d0f225d6519fe79cc524f74d810a8280e0e96 SHA512 2eec0e64b15604e11f1193fa0af5ce576a1f620db6d916f401fd3257993545c436aa4194ca5184027d84515bf02de29c557ade250e69d13b7c13bef9057a5d4d
-EBUILD qutebrowser-3.0.0_pre9999.ebuild 6323 BLAKE2B 6ac49153ddac06b3ac4c7aba5ea9072ddb3fc6e811bbe9d3768530dd218468452e252f7673a81221981daec4fdb30dbf5fde75ae73e8c3791988f46100613507 SHA512 c3f652976c906d8bef52eebee56a4728ee3282ac5a9b99e36025e4ac1d2aa5ba15593f427d796d485a43e6b4708281e08e0d9888fa0659e7de8419be9028651d
-EBUILD qutebrowser-9999.ebuild 4558 BLAKE2B 37ddbc18e82e789779feaf37019c2724f24a2a10388c903c035672d2c3e350e695c7b7b6dd58412478de2ba26a3121d74f6aec9462e544c8e18b6445104561f4 SHA512 8fedd7eb240219b96e32f0f2cc5a9f14bf7a167bfe087deef63f87e02b7d937ea28704fb60b391fa7dde7455f327451b5719135c464baa15278eeaccd40585cf
+EBUILD qutebrowser-2.5.3.ebuild 4630 BLAKE2B 9c67f8771da3a75d497bbc5a4df689f1b964f46dcb2272e768860e5c2ec87ad53b3ddd9eca41f9e51f6da4fea1141fc928638bf83eba5320c20e194056630c05 SHA512 13d47b1a5340c0017a3f1959195efecd2ad96f17593fc74a1e8b73f296f021b70385a5b5bfe14431cec9b93cf9080874f4dd9dd330fff688e5a053d7714eea94
+EBUILD qutebrowser-3.0.0_pre9999.ebuild 6337 BLAKE2B 0e60e5064c85be840e7d0d64472d5781f9ee378a56ebc80d28bfa86be84bc026e6bf8d3dc354008bc5ab013644e394ee9bc73e8f6f81d40f7a973dac4f339eb5 SHA512 beaee232c67e3549094d4b6ca26225e81871a291fceca45f9518217c8435c971bb29298120982f4890aa4a61e712919da771cd11a4a03e4393ad50c2d47565d9
+EBUILD qutebrowser-9999.ebuild 4630 BLAKE2B 9c67f8771da3a75d497bbc5a4df689f1b964f46dcb2272e768860e5c2ec87ad53b3ddd9eca41f9e51f6da4fea1141fc928638bf83eba5320c20e194056630c05 SHA512 13d47b1a5340c0017a3f1959195efecd2ad96f17593fc74a1e8b73f296f021b70385a5b5bfe14431cec9b93cf9080874f4dd9dd330fff688e5a053d7714eea94
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
new file mode 100644
index 000000000000..7cb5d6ee3504
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 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 Python and Qt"
+HOMEPAGE="https://www.qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf widevine"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+	')
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
+	pdf? ( <www-plugins/pdfjs-3 )
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/PyQt5[testlib]
+			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}]
+		)
+	')"
+[[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use pdf; then
+		sed -e '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || die
+	fi
+
+	if use widevine && use prefix; then
+		# hack: QtWebEngine knows Gentoo's widevine, but not with ${EPREFIX}
+		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+		sed -e "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	# let eclass handle python
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	if [[ ${PV} == 9999 ]]; then
+		# call asciidoc(1) rather than the single target python module
+		sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
+			-i scripts/asciidoc2html.py || die
+
+		"${EPYTHON}" scripts/asciidoc2html.py || die
+	fi
+
+	# disable unnecessary tests/plugins that need extras
+	sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d' -e 's/--instafail//' \
+		-i pytest.ini || die
+	if [[ ${PV} == 9999 ]]; then
+		rm tests/unit/scripts/test_run_vulture.py || die
+	else
+		rm tests/unit/scripts/test_problemmatchers.py || die
+	fi
+}
+
+python_test() {
+	local -x PYTEST_QT_API=pyqt5
+
+	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
+		# calls eclass' python2 "failure" wrapper
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+		# tests that don't know about our newer qtwebengine:5
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+	)
+	# qtargs are mangled with widevine+prefix
+	use widevine && use prefix && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -p xvfb -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
+
+	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[lua] and net-misc/yt-dlp."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index cffa4849cc2e..0de37e2649d8 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 multiprocessing xdg
+inherit distutils-r1 xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -30,14 +30,16 @@ RDEPEND="
 		>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
 		>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-6[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/zipp[${PYTHON_USEDEP}]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+	')
 	qt6? (
 		dev-qt/qtbase:6[icu]
 		$(python_gen_cond_dep '
 			dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]')
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+		')
 		pdf? ( www-plugins/pdfjs )
 	)
 	!qt6? (
@@ -45,7 +47,8 @@ RDEPEND="
 		dev-qt/qtgui:5[png]
 		$(python_gen_cond_dep '
 			dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]')
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		')
 		pdf? ( <www-plugins/pdfjs-3 )
 	)
 	widevine? ( www-plugins/chrome-binary-plugins )"
@@ -60,12 +63,12 @@ BDEPEND="
 			dev-python/pytest-mock[${PYTHON_USEDEP}]
 			dev-python/pytest-qt[${PYTHON_USEDEP}]
 			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
 			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 			dev-python/tldextract[${PYTHON_USEDEP}]
 			qt6? ( dev-python/PyQt6[testlib] )
 			!qt6? ( dev-python/PyQt5[testlib] )
-		)')"
+		)
+	')"
 [[ ${PV} == *9999 ]] && BDEPEND+=" app-text/asciidoc"
 
 distutils_enable_tests pytest
@@ -78,8 +81,8 @@ src_prepare() {
 			-i ${PN}/config/configdata.yml || die
 	fi
 
-	if use widevine; then
-		# Qt6 knows Gentoo's, but pass for libdir, EPREFIX, and Qt5(bug #888783)
+	if use widevine && use prefix; then
+		# hack: QtWebEngine knows Gentoo's widevine, but not with ${EPREFIX}
 		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
 		sed -e "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
 			-i ${PN}/config/qtargs.py || die
@@ -120,18 +123,17 @@ python_test() {
 		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
 		tests/end2end
 		tests/unit/misc/test_ipc.py
+		# calls eclass' python2 "failure" wrapper
+		tests/unit/misc/test_checkpyver.py::test_old_python
 		# not worth running dbus over
 		tests/unit/browser/test_notification.py::TestDBus
 		# bug 819393
 		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
-		# calls eclass' python2 "failure" wrapper
-		tests/unit/misc/test_checkpyver.py::test_old_python
-		# qtargs are mangled with USE=widevine
-		$(usev widevine tests/unit/config/test_qtargs.py)
+		# tests that don't know about our newer qtwebengine:5
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
 	)
-
-	# single thread is slow, but do half+1 given spikes ram usage quickly
-	local jobs=$(($(makeopts_jobs) / 2 + 1))
+	# qtargs are mangled with widevine+prefix
+	use widevine && use prefix && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
 
 	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
 	epytest -p xvfb -n ${jobs} -k 'not _bench and not _matches_tree and not _warning'
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 3d0c12b40655..7cb5d6ee3504 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
 HOMEPAGE="https://www.qutebrowser.org/"
 
 LICENSE="GPL-3+"
@@ -24,23 +24,25 @@ SLOT="0"
 IUSE="+adblock pdf widevine"
 
 RDEPEND="
-	dev-qt/qtcore:5[icu]
-	dev-qt/qtgui:5[png]
 	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-		>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-2.1.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[${PYTHON_USEDEP},libyaml(+)]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/zipp[${PYTHON_USEDEP}]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+	')
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
 	pdf? ( <www-plugins/pdfjs-3 )
 	widevine? ( www-plugins/chrome-binary-plugins )"
 BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
+			dev-python/PyQt5[testlib]
 			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 			dev-python/cheroot[${PYTHON_USEDEP}]
 			dev-python/flask[${PYTHON_USEDEP}]
@@ -51,8 +53,9 @@ BDEPEND="
 			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 			dev-python/tldextract[${PYTHON_USEDEP}]
-		)')"
-[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc"
+		)
+	')"
+[[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc"
 
 distutils_enable_tests pytest
 
@@ -60,13 +63,14 @@ src_prepare() {
 	distutils-r1_src_prepare
 
 	if use pdf; then
-		sed '/^content.pdfjs:/,+1s/false/true/' \
+		sed -e '/^content.pdfjs:/,+1s/false/true/' \
 			-i ${PN}/config/configdata.yml || die
 	fi
 
-	if use widevine; then
+	if use widevine && use prefix; then
+		# hack: QtWebEngine knows Gentoo's widevine, but not with ${EPREFIX}
 		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
-		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
+		sed -e "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
 			-i ${PN}/config/qtargs.py || die
 	fi
 
@@ -75,18 +79,21 @@ src_prepare() {
 
 	if [[ ${PV} == 9999 ]]; then
 		# call asciidoc(1) rather than the single target python module
-		sed '/cmdline = /s/= .*/= ["asciidoc"]/' \
+		sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
 			-i scripts/asciidoc2html.py || die
 
 		"${EPYTHON}" scripts/asciidoc2html.py || die
 	fi
 
-	# these plugins/tests are unnecessary here and have extra dependencies
-	sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
-		-e '/pytest-instafail/d;s/--instafail//' \
+	# disable unnecessary tests/plugins that need extras
+	sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d' -e '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
+	if [[ ${PV} == 9999 ]]; then
+		rm tests/unit/scripts/test_run_vulture.py || die
+	else
+		rm tests/unit/scripts/test_problemmatchers.py || die
+	fi
 }
 
 python_test() {
@@ -94,21 +101,21 @@ 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)
+		# 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
-		# may misbehave depending on installed old python versions
+		# calls eclass' python2 "failure" wrapper
 		tests/unit/misc/test_checkpyver.py::test_old_python
-		# bug 819393
-		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
 		# not worth running dbus over
 		tests/unit/browser/test_notification.py::TestDBus
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+		# tests that don't know about our newer qtwebengine:5
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
 	)
-	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+	# qtargs are mangled with widevine+prefix
+	use widevine && use prefix && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
 
 	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
 	epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 192cff5f8a40..16d32b788c56 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_5.7.2921.33-1_amd64.deb 101546700 BLAKE2B f61bdb8753f540293702521ce4c97b3e83b844bff5481f54fc1a79a1919a341c449374f59121b901224beedd853bd9cbc9d87934f8b6820c67f815d3d60642ec SHA512 0b58725982668fa0b1be6fc4cc4e57f19733b361708f99d852c501b67accecee71fa79274e5ffc13d58b6de30f0172685d45cf522c5782433c8dd9230bca950a
-DIST vivaldi-snapshot_5.7.2921.33-1_arm64.deb 91100108 BLAKE2B ad546e91cf8e56a17bd0fb74b9088ed6a9171d774eabc712a5d00082ae06bd8b5034227c9b461cd030ff5044ad9c890ae74cdfb66fe790a517357bc9d4444fd3 SHA512 03572f39b4f1abaafa185f4cf8fa0c4811005315e4e023e2582243cad69c7d74e3711262166bd9543049027b1537a276b06742846d91eda7df8d45f11dfb3ddd
-DIST vivaldi-snapshot_5.7.2921.33-1_armhf.deb 90791320 BLAKE2B b24511e0b3f66e19f19797e73781739ead2d760f27b35e24e66e513b5eb82535dca43b00656dffd9a451d56cd69d44b0ae9ca1ac9e943051ef9d0309ddec1bdf SHA512 230c568b6292bb880001e0e3d1a1058270cffcacaa403467ac8afaf57fb4ee495203e2b5dc132d738ccff6e9d75b37c0b2b4e6bb74d70c249013f251e9eeef4f
 DIST vivaldi-snapshot_5.7.2921.41-1_amd64.deb 101576476 BLAKE2B 958e924f7882226d8a00f8e6a8a72b6b4eadf961841eed7548a7682638a538fdb259faea3bb5f3b2511a2fa2bad9eb77cc602b2a0a4b2c8f52f599a91f1b1f74 SHA512 a93638e9e41e27ad8fff9b396bd880d603598de52e4d8342e67dfa3bd6a67207b3220d0c5ed43785e3facbcc4f2870bbf4f4aab58535a3c0e394eb4747d9d3a2
 DIST vivaldi-snapshot_5.7.2921.41-1_arm64.deb 91105188 BLAKE2B 514f785e9e9b6d2f47c5424f7b43105e9adb77b4c793190cd3323927f896e7e09f7b9b49a9af9ab711a81b147613490433c772910db1d27f82a927728c5c9567 SHA512 0bd54f1c5fd6baeae551e3f24b9a4ed9522bc5342e2342ffe708becce406f3229c88e59a82e6a1026ac53375578093d3e0f4510cffa75267f875d575c6b046e9
 DIST vivaldi-snapshot_5.7.2921.41-1_armhf.deb 90776464 BLAKE2B e5675c7b4d51ad95f246f66e34f3b44b5de2e8463c9d388b5b459b3bcfb3bfff196b81688cb69e70839950b99948b366559756ac787a889e5862a5906c446a68 SHA512 69a5f1f23f400da823166f1e9bb1235b6445c704cb8e42fdb7a50d00abca48599d032b4fdcdad2fe10795741b8b769fe2e9503d237119dfbd87c1a96051b3ef0
-EBUILD vivaldi-snapshot-5.7.2921.33.ebuild 3826 BLAKE2B 4aa5296c9d134bc28547c312872349a647db81dc6ff54fbc0311c537285cb318670fb59f4a4c75623cf612978077b0219aaa4706e11509d4188b69d4f702c635 SHA512 8aa5f674c1c6ee3a87bf3d6e1232d635fb3d740b56a9872cdea22fd2f0841d761d82d1ebc04c7e325b560b99bb3ab05bf6eb2b5599c72289ea2976af725e0921
+DIST vivaldi-snapshot_5.8.2936.3-1_amd64.deb 101610392 BLAKE2B c15dd96f5042e2526af582a403a6cd0d2044bc98de189bff9dd68174eb59c15fe7a35956421207fe39e372337fb0706940c40b9ae1ab44574a7e01920e84b16c SHA512 5a6ce42a40a474b459edca64589433caeac4ef36bd13b7d95d3433de4fd8cd55e1c923d4913f5904d40f055d043ed2f9296eef6a4ec116936b9d2f13c951df20
+DIST vivaldi-snapshot_5.8.2936.3-1_arm64.deb 91123504 BLAKE2B 1867304c33cf1617dd906c45d13df3c2e72f0b1d26e4af1e5e81574409f2033b16644e13d58dc58b1bde009fa5e12f95a028dc8a1c03a61aa560d214430c754c SHA512 2d320899b42bda7ba75a030f13200392c974bf87b4212305cbc91933185960a0c51658e80381756e84f92ed68e04988bf873b243bf5f5582089bb053768fd954
+DIST vivaldi-snapshot_5.8.2936.3-1_armhf.deb 90795304 BLAKE2B 77db349d26f05c1834349202db5c26e0a69a1f91203913700838a947fa52ffd99f0e1cf33c67edd19fe78db1114826296767e062805582f693f7f6c9208b66dc SHA512 e7b12bdcb7b3185641cdc6a40c8df497e10082b28d45048f45b3f271b778384f024a8b114ddc71f38b7c5163f08880ae438f17aef01c13bcefbb377289225dd8
 EBUILD vivaldi-snapshot-5.7.2921.41.ebuild 3826 BLAKE2B 4aa5296c9d134bc28547c312872349a647db81dc6ff54fbc0311c537285cb318670fb59f4a4c75623cf612978077b0219aaa4706e11509d4188b69d4f702c635 SHA512 8aa5f674c1c6ee3a87bf3d6e1232d635fb3d740b56a9872cdea22fd2f0841d761d82d1ebc04c7e325b560b99bb3ab05bf6eb2b5599c72289ea2976af725e0921
+EBUILD vivaldi-snapshot-5.8.2936.3.ebuild 3826 BLAKE2B 4aa5296c9d134bc28547c312872349a647db81dc6ff54fbc0311c537285cb318670fb59f4a4c75623cf612978077b0219aaa4706e11509d4188b69d4f702c635 SHA512 8aa5f674c1c6ee3a87bf3d6e1232d635fb3d740b56a9872cdea22fd2f0841d761d82d1ebc04c7e325b560b99bb3ab05bf6eb2b5599c72289ea2976af725e0921
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.7.2921.33.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.8.2936.3.ebuild
index 9c296c0f9dbd..9c296c0f9dbd 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.7.2921.33.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.8.2936.3.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 35797f1603e1..853ba46bff0f 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,5 +1,9 @@
 DIST vivaldi-stable_5.6.2867.62-1_amd64.deb 101307028 BLAKE2B a1ffc864c3af6ddd0ea75d8dc9b05ec6992a6e42ddefb3b33d38a88acdc172dcc94eb2b2c21e444cf61dbe4afb12c3b2d9d8b650c806c1e021878196a95c8304 SHA512 21ee85f953a5ee3549eaa3ffc953df056799118239ef4e5c66977ebd7cc933bf40e22356313b8a1a2042f9b8d2b6c17f10bc4e0be34d92d16b1f957c50bc6dd2
 DIST vivaldi-stable_5.6.2867.62-1_arm64.deb 90983876 BLAKE2B bcfa8915e9950ec917c43e9c24cfaea98b4633f10e2b99947f8571925505fe54769a99bf43edd4bfeef5839b105701ee5b4abeb45ceb3d8b302f4573b283734c SHA512 7aa69c536aaaeab1e0030f390a8c2cf02d122f8086509cd496da8906f9e9681fd964a57cdbb3821c36ff5f8d6f71adf4b12115b8a140b49e9d760b04068db504
 DIST vivaldi-stable_5.6.2867.62-1_armhf.deb 91079228 BLAKE2B 9c9f5f49bc46ff251a5fd276449f4513bb3371fa14a6007a14da9df4018c6fe55ba8f9113e5e9e263db4502488bea1eabf5d88a03e8afd6e30a4f0d4bcf666f2 SHA512 8cdfdc8e3de4c8b7c265ac6d6ba8e624e7d5dd7c888b232552d405b271098b940866a8cd195c99cd745cb19489eb3bb6966eea81206a405c43db98b3ac478994
+DIST vivaldi-stable_5.7.2921.53-1_amd64.deb 101595952 BLAKE2B 66e47e1fc5e0c702b8475043ce4a926a25a2e75fe63c2b8fd39f4538c6656d33c26b934a27db9895f95cb2c14d796f3ad6b0c83e49c212a15d1ad82deb918c6e SHA512 cd3b2ae462be4e90f70b4f42d2b60a1843e5b53a77b0c94bee225bfffa64d19fa751dcfb27ee3b807967f113cadac9af527a2835946155e5f55fae213519c658
+DIST vivaldi-stable_5.7.2921.53-1_arm64.deb 91093460 BLAKE2B d880d8ee4dfd7e6d4545a8775519f50c78ee0d1c99267d2e04be86dfe569175b67bd6189d8be9baafd00703a0e7a0843d456cbc6c121a6f56e235eec4b6133ee SHA512 7b78cd1210494e6afe53304cc76c5db4e45d8b23b0a2ec40aaac42e288795b9fc5f55f9a165fbb56743560b51a996115f174814cac9e5270b7b2fe790cc9a539
+DIST vivaldi-stable_5.7.2921.53-1_armhf.deb 90776036 BLAKE2B 104c557aa7cc41cce1c7ed5dfa1f0f1db0bd6a2e49fbe4e8248fa3a5ddc552fced37b1aec167d4fa229aa66a42e01597c2ab169787d35577053ee6759246dbfe SHA512 048fba21a8d31ce33de4cb75f0e54053f89476a3eeaf1380be600baba656e8917574ec62fb5ff3e20cb0fe860fb961a029b57c72e82ee6fca42a7d9bdf250e74
 EBUILD vivaldi-5.6.2867.62-r1.ebuild 3825 BLAKE2B d5d7133ebbadcffdc581b6266e06dfc2984b77488a6408821f3b11891dafe7dfc51fe26f828b1db6529390374964360d6664a52aef77c1211f7c580d8bb9b29a SHA512 47ca442cad70af36b7d8b4f7bd687bbb17db44b5fb7d2afa9acb202d54a665fe35b748ac6ade531b8d53760f14865c4bf5808568be50016c49bdfa4003729f5e
+EBUILD vivaldi-5.7.2921.53.ebuild 3826 BLAKE2B 4aa5296c9d134bc28547c312872349a647db81dc6ff54fbc0311c537285cb318670fb59f4a4c75623cf612978077b0219aaa4706e11509d4188b69d4f702c635 SHA512 8aa5f674c1c6ee3a87bf3d6e1232d635fb3d740b56a9872cdea22fd2f0841d761d82d1ebc04c7e325b560b99bb3ab05bf6eb2b5599c72289ea2976af725e0921
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-5.7.2921.53.ebuild b/www-client/vivaldi/vivaldi-5.7.2921.53.ebuild
new file mode 100644
index 000000000000..9c296c0f9dbd
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-5.7.2921.53.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="106"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+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 )"
+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"
+IUSE="gtk proprietary-codecs qt5 widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -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.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	if ! use qt5; then
+		rm ${VIVALDI_HOME}/libqt5_shim.so || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}