gentoo auto-resync : 04:06:2024 - 00:07:50

7 files changed, 203 insertions, 7 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 604eb0873c32..1089a4d58914 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 4a8d69a09e26..482487be7031 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,5 +1,6 @@
+AUX dillo-3.1.0-remove-floatref.patch 987 BLAKE2B 916df72ee3d043f909c0593b256b23ea432db262208ad58ee0fa19f426f380925e0352402fbd723fca05fad627b454a394418ea8c1fbbc58e215bbeb79a6dddd SHA512 5369d1bf24a9bf0d2112ae0ea38f3e10c70e35e2e6f3b06649021e89c49e6ef35af173846da2165370963cb78c1b7c5f2899ba7930b7fcf81c2053d84375560f
 DIST dillo-3.1.0-html-tests.tar.xz 46836 BLAKE2B cb5c4ac685bd816cb4adf416d42be1e10de2289ba9180dc2c3181353448ee9a3c043e39e8cede06ba1417f822678bfcea9b1cea73e76768a8934fbd90fa8b00f SHA512 af8625602aae52b209eb3d60fd536c8d5a630b36010fece933e77ab990f48e6d14e4b3bc4fda8df8e5e17e01990bebea3fa343a2e14ae8238b6486d658d6bbd2
 DIST dillo-3.1.0.tar.bz2 994610 BLAKE2B 02e5cd44163e5f066cbccf05a497439db6b7525cf612577908d435414f8a3dbbb4d7ab6a9345709dde5b278373f9d42f5a9f4143a32d5bcc49e2e4a7258a0f6d SHA512 c8a2ea420c2d70a60acc242cf15bd90e65c265db434f9693a1a8e7343cde1eb02c8144293c547582fb0985f306a07f11a7eb8e30c35ec2418131f717b1fda01f
-EBUILD dillo-3.1.0.ebuild 2028 BLAKE2B e54797a572b470cca0704061604925a25c995897a0c103f1193745d6febd333a373b2754661babb52440b027082acdd14cd21b143d18ff441e731b1621bab0e2 SHA512 bd842f7d870d04cbf163e34e428899777fb967826b86e8a5e90cf9adf96842ff513ba0211b8d4b414fa52dafa92b57543b0415af230f733d2620832095945818
+EBUILD dillo-3.1.0.ebuild 2083 BLAKE2B 57ef3f21f6ff778ae7efa66d6135a1ef415a3230bc4069560180b2d857cc83a5b298dfc37fe56fede911b45f1cd33793a147d582166c0cb51404138f69ca2b72 SHA512 5822cf89b312002511c3139784ef1a168f000fb51730a51f45d138cdea5b9a959b0f2dc3157ccecfb1c39d5ff33a592a64d72ef307886a8b6ad5fae530bd1ac9
 EBUILD dillo-9999.ebuild 1630 BLAKE2B f9270808132cfd616f470ce682a81f06a630f010979377b27660468ef80a7974f7b29b3ca39a1ec19d8c3eae94ebeacfc8889df635648ed6487a39c0eaecab50 SHA512 5db00801ae0e61213ef8a5c031187f36a5008e73af5aa8b4c9f692e6a482fa80e11a64d86a5ee0ff18526fd3acd646ac09f4f49f3368ad95c8bfe66fdaba2108
 MISC metadata.xml 645 BLAKE2B 1c0dc7392fa848bf1f229641929105e23f3be0253035c4da8d1b8ac499ed60a90ca7578ffc2a4fdcd8808f25fab8e93678081b621d0cb68f0629e19554958a2d SHA512 10acbeacf15254145d7cc2dbedc75d064f045b0c7d76e5facbf364e15c9e0af1fcf3ab12803323dd827c7540de71770926ddbd123a851da16dad2cd5e1f89248
diff --git a/www-client/dillo/dillo-3.1.0.ebuild b/www-client/dillo/dillo-3.1.0.ebuild
index b0a46b7df935..22187108639d 100644
--- a/www-client/dillo/dillo-3.1.0.ebuild
+++ b/www-client/dillo/dillo-3.1.0.ebuild
@@ -52,6 +52,10 @@ BDEPEND="
 
 DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-floatref.patch
+)
+
 src_prepare() {
 	default
 	if use test; then
diff --git a/www-client/dillo/files/dillo-3.1.0-remove-floatref.patch b/www-client/dillo/files/dillo-3.1.0-remove-floatref.patch
new file mode 100644
index 000000000000..a88e579835de
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.1.0-remove-floatref.patch
@@ -0,0 +1,24 @@
+https://github.com/dillo-browser/dillo/commit/8c4f55260d0715935e2ed59c2a88f0715bb9661d.patch
+From: Rodrigo Arias Mallo <rodarima@gmail.com>
+Date: Sun, 2 Jun 2024 19:58:50 +0200
+Subject: [PATCH] Remove undefined floatRef debug line in RTFL
+
+Fixes: https://bugs.gentoo.org/933361
+--- a/dw/ooffloatsmgr.cc
++++ b/dw/ooffloatsmgr.cc
+@@ -2,6 +2,7 @@
+  * Dillo Widget
+  *
+  * Copyright 2013-2014 Sebastian Geerken <sgeerken@dillo.org>
++ * Copyright 2024 Rodrigo Arias Mallo <rodarima@gmail.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -963,7 +964,6 @@ void OOFFloatsMgr::getSize (Requisition *cbReq, int *oofWidth, int *oofHeight)
+       max (oofHeightLeft, oofHeightRight) + container->boxRestHeight ();
+ 
+    SizeChanged = true;
+-   DBG_OBJ_SET_NUM ("floatRef", floatRef);
+ 
+    DBG_OBJ_MSGF ("resize.oofm", 1,
+                  "=> (l: %d, r: %d => %d) * (l: %d, r: %d => %d)",
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 4e8cef7b8875..73bbc64df08a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -2,6 +2,9 @@ AUX qutebrowser-3.1.0-pyqt670-tests.patch 2871 BLAKE2B 26aca8764e463a0dc6bcde05d
 AUX qutebrowser-3.1.0-qt663-tests.patch 622 BLAKE2B 6829a8c915f21d5cd28a2b867ad64f188837e915d64ddc3446421bc7a3b23657fee1ccd1758d242e9264eda0dc068f8e0473269c1e02c74adced530acf613a6c SHA512 8dc10dbb95e859861c06e57802e52dce634364d80b521aa398597161442388cef3f01b0fbeb96157f8189ce3b669132f4ef3e1dad23cd35c6abd72865e018e40
 DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B d0cca696dd85bb99b8514331a392e1cb54fcbeff32fcf13e058739ef5a20ef1725980fbabef187a226f1cc29be9943784ba1f93275047586827922c3e98d0a64 SHA512 79dff3cf4ff93c75150e5cb9ada835ed5faf0343f03854266c6138fb8e6cceb921c868e1e408432da61b85ebe37e7e1657f634771ff73f1395d1b6e169138d98
 DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B 023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b SHA512 f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7
+DIST qutebrowser-3.2.0.tar.gz 6054386 BLAKE2B 3f0589dbbc2dc34c4138bc7ea33ea090a6aff4abe087e7b80f0294789a252924fb90b2b0229e1513c96e863a612bf26579b6e895bc0b9b553c1b7439361ee589 SHA512 85980ccbb1982ecfb142a4e3fc0a66b8ac88f73c394a6c936b8f1a541ea30a65ee576abd7e202ac50fd943c85457d75b5ccac7d51ea34ff1b0f7eb8a647aa18d
+DIST qutebrowser-3.2.0.tar.gz.asc 659 BLAKE2B 33d88c2d4020535616ee5d8ed8e517aabf24433ab9d712f12aa1f138398a60807a14383d300245ee7873ed027445034ced9c61ce52a54518a2cc240a01f2649f SHA512 895e6d585f4d1d7373544d763663412136ef4b397565ddac24c1bcf16c75e96c8110cc8dea6fa8457799b893a2e3d2fca8979875b8e8423f270a70100d6e57db
 EBUILD qutebrowser-3.1.0-r1.ebuild 7214 BLAKE2B b45fec16f998fe12592868e4dee0a3a276b22f142e41856aa202779b255bd4afb9318d1ee999685ecb5aeb5515841210502bbb977a61e07b323f6443b5d360cb SHA512 cda34aef681d9e4390a6cd2eface82bdc6454d51383357c47083fa5f984999b6d039f4e5140ed1459b4fc9aabc40b6d264f6f16caa9616895fe85e50e1d76243
-EBUILD qutebrowser-9999.ebuild 5519 BLAKE2B 5f8e8c44ac7ea3a6dd6c94f55dd228cba91705e9ad95eb25f28eee9e3eeddacf55b79f9531a836ab21ba0da6273dae549528adb3e7236a9a16f809dfad3ba6e3 SHA512 6f1c073f264c243f43d55ef971e243c9043626ec7c62c5f003d0d8147b7a50c85112cc999ec141bb93662f8ac77ed359546249fc29f575ed3e3c6f22ca2224e7
+EBUILD qutebrowser-3.2.0.ebuild 5317 BLAKE2B 037f5ed31688ba86e34a1330cdaa15abfebc1e3964b5bde0d1dc711f2ebc545cefc297049908a0305c830b221ea46a1ea9c056423c1968d383d79a13cc4869a9 SHA512 f6eda910394fce51425632d0a566ddbbe6dd4c1deb3e6e07b3c46baa74bf72297199420f9e74e56c6784c1ed7276b695bc80f6b3d6155178fd7097fbb244f26c
+EBUILD qutebrowser-9999.ebuild 5317 BLAKE2B 037f5ed31688ba86e34a1330cdaa15abfebc1e3964b5bde0d1dc711f2ebc545cefc297049908a0305c830b221ea46a1ea9c056423c1968d383d79a13cc4869a9 SHA512 f6eda910394fce51425632d0a566ddbbe6dd4c1deb3e6e07b3c46baa74bf72297199420f9e74e56c6784c1ed7276b695bc80f6b3d6155178fd7097fbb244f26c
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.2.0.ebuild b/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
new file mode 100644
index 000000000000..e0f7bb2a94cd
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 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_{10..12} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc )
+	"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf widevine"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+		dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		dev-qt/qtbase:6[icu,sqlite]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+		pdf? ( www-plugins/pdfjs )
+		widevine? ( www-plugins/chrome-binary-plugins )
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/PyQt6[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}]
+		)
+	')
+"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )"
+fi
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use pdf; then
+		# does not hurt to enable by default if it was explicitly requested
+		sed -e '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || 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
+
+	if use test; then
+		# unnecessary here, and would require extra deps
+		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-i pytest.ini || die
+
+		if [[ ${PV} == 9999 ]]; then
+			# likewise, needs vulture
+			rm tests/unit/scripts/test_run_vulture.py || die
+		else
+			# https://github.com/qutebrowser/qutebrowser/issues/7620
+			rm tests/unit/scripts/test_problemmatchers.py || die
+		fi
+	fi
+}
+
+python_test() {
+	local -x PYTEST_QT_API=pyqt6
+
+	local EPYTEST_DESELECT=(
+		# end2end/IPC tests are broken with "Name error" if socket path is over
+		# ~108 characters (>124 in /var/tmp/portage) due to Linux limitations,
+		# skip rather than bother using /tmp+cleanup over ${T} (end2end tests
+		# are important, but the other tests should be enough for downstream)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# python eclasses provide a fake "failing" python2 and trips this test
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
+		# fails in ebuild, seems due to saving fake downloads in the wrong location
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		# may fail if environment is very large (bug #819393)
+		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
+		# fails if chromium version is unrecognized (aka newer qtwebengine)
+		tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version
+	)
+
+	local epytestargs=(
+		# prefer pytest-xvfb over virtx given same upstream and is expected
+		-p xvfb
+		# skip warning tests broken by -Wdefault, and benchmarks
+		-k 'not _bench and not _matches_tree and not _warning'
+		# override eclass' settings, tempdirs are re-used by Qt
+		-o tmp_path_retention_policy=all
+	)
+
+	epytest "${epytestargs[@]}"
+}
+
+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
+
+	if has_version 'dev-qt/qtwebengine:6[bindist]'; then
+		ewarn
+		ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this"
+		ewarn "will prevent playback of proprietary media formats (e.g. h264)."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index c5e8c1d91fae..e0f7bb2a94cd 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -28,9 +28,6 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+adblock pdf widevine"
 
-# TODO: keep an eye on fixes for pdfjs-4.1, may potentially be solved by
-# newer qtwebengine, qutebrowser upstream workarounds, pdfjs changes, or
-# if our pdfjs ebuild ever switch to the legacy sdist
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
@@ -43,7 +40,7 @@ RDEPEND="
 		dev-python/zipp[${PYTHON_USEDEP}]
 		dev-qt/qtbase:6[icu,sqlite]
 		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
-		pdf? ( <www-plugins/pdfjs-4.1 )
+		pdf? ( www-plugins/pdfjs )
 		widevine? ( www-plugins/chrome-binary-plugins )
 	')
 "
@@ -146,7 +143,7 @@ python_test() {
 python_install_all() {
 	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 
-	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+	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}