gentoo auto-resync : 04:09:2024 - 12:28:34

4 files changed, 4 insertions, 174 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index c203aa0d321d..13fb16255c78 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,5 @@
-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
 DIST qutebrowser-3.2.1.tar.gz 6054942 BLAKE2B 7ddae7333b3ae906adc7811e0e383bb384c2105c59db935b96d165653f9570a249f3fedf9ad98f33d1ae7bd19f8637a3e1ed885f88aa724f4ceb61da4b8046a9 SHA512 753f053a157271806e273b667b656d64277d10d012d6940c5e023125e1f8fab151a32cf4defafe167141fe31461e6bf178d01b2d842f7252fd7405729a0edc68
 DIST qutebrowser-3.2.1.tar.gz.asc 659 BLAKE2B d37b81d4dd6b662522c48e4704f2e09d24e4cf87f6ec92389ff841bc80a362a51cac4c7ee1a41d83b4994b2060ea64a57af4220293e93033840838c650a17310 SHA512 9fb75c016ea200735d749f9bfe9c0e85df68a9cc616bd1331e977fe13226baf020a3b09ed37b696511e6668e2e221f15d0cf3731e7070f32fd9da29e8ebef59d
-EBUILD qutebrowser-3.2.0.ebuild 5385 BLAKE2B ce42d2a26a510abbb0e553bb60a383bbb9b95bfb88d11c13bcba3e64c97459a1cb210129bb46203cd1efa1e7745ae69ebe4f1e6f696ebbe9017cd4a77c0a4549 SHA512 7bd1f598dc1796dc3bb51837653e08087a7dfe8caec27df5780bf1c17171f7d323b827c7ec1c0d1d14cd30929a33bb7734e757edb6b1da7d6cd987aa19d125f5
-EBUILD qutebrowser-3.2.1.ebuild 5385 BLAKE2B ce42d2a26a510abbb0e553bb60a383bbb9b95bfb88d11c13bcba3e64c97459a1cb210129bb46203cd1efa1e7745ae69ebe4f1e6f696ebbe9017cd4a77c0a4549 SHA512 7bd1f598dc1796dc3bb51837653e08087a7dfe8caec27df5780bf1c17171f7d323b827c7ec1c0d1d14cd30929a33bb7734e757edb6b1da7d6cd987aa19d125f5
-EBUILD qutebrowser-9999.ebuild 5386 BLAKE2B 7e0a23f5a5fd92d6d23d443eb995f26b7ad1d4ddc70b24ad2c1f377806b0eb2dc6f1cfef6d0f690166ad3cf8fcc7e7bde3cc96b0b906308d6d05625af96f8185 SHA512 76bc31fabd7634d575b5259cba6a3381719b5c71f47a8a4805bc00e0a70f0a80538f786d9922dd9c11ab388df59e4522634ee22e75dea7059830fb1d4ab3d45e
+EBUILD qutebrowser-3.2.1.ebuild 5450 BLAKE2B 1aa282856a520e0a1c3caf198d359147588be891e600282b6c5c8d389cc4017dbca77e1a86abc590d9039e17d5790c39d811fe6fbdd4e33f3b932fd24a2ef52c SHA512 ece5cef7d3a9a2251a47944f979e0ef5451a6be7f5973930a96ee62b83e395eae813bd0ff35f293a8793564ca7cdef8bc1eff36e7ab3573587538bd7c97ac476
+EBUILD qutebrowser-9999.ebuild 5451 BLAKE2B c8b8cecd601a3985592a56cc513c9e3dcc54807cf29810986551f2815292acbaf8daeb2e8905ab56af6dc5ba31f33e49fe24201629b79f255c7ca57cbf03b794 SHA512 9f1eae6e62b1e5ca197a120863ae0725000a3e9e33fdace87fdf553b558be78113dd9f446bde86e07886704ab95bf5ef3458f1fdff89733e6f3c48df8a7c23b1
 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/qutebrowser-3.2.0.ebuild b/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
deleted file mode 100644
index b58568e40ad0..000000000000
--- a/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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
-		# skip unnecessary (for us) pytest plugins, and ignore Qt's
-		# warnings that tend to newly appear with new versions
-		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
-			-e '/pytest-instafail/d' -e 's/--instafail//' \
-			-e '/qt_log_level_fail/s/WARNING/CRITICAL/' \
-			-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\]
-		# may fail if chromium version is unrecognized (aka newer qtwebengine)
-		tests/unit/utils/test_version.py
-	)
-
-	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-3.2.1.ebuild b/www-client/qutebrowser/qutebrowser-3.2.1.ebuild
index b58568e40ad0..f889d8fed698 100644
--- a/www-client/qutebrowser/qutebrowser-3.2.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.2.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
+# py3.13: https://github.com/qutebrowser/qutebrowser/issues/8205
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 xdg
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 5525cd7811df..8d8a36382b17 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
+# py3.13: https://github.com/qutebrowser/qutebrowser/issues/8205
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 xdg