From be83e841a72f70653bdfa19224a96c50ee72aab8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 11 Dec 2022 21:23:38 +0000
Subject: gentoo auto-resync : 11:12:2022 - 21:23:38

---
 www-client/qutebrowser/Manifest                    |   3 +-
 .../files/qutebrowser-2.5.2-dictcli.patch          |  17 +++
 www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild | 134 +++++++++++++++++++++
 www-client/qutebrowser/qutebrowser-2.5.2.ebuild    | 130 --------------------
 4 files changed, 153 insertions(+), 131 deletions(-)
 create mode 100644 www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
 create mode 100644 www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
 delete mode 100644 www-client/qutebrowser/qutebrowser-2.5.2.ebuild

(limited to 'www-client/qutebrowser')

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index a5fe94b96855..45ba58131970 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,6 @@
+AUX qutebrowser-2.5.2-dictcli.patch 589 BLAKE2B 1ad904d36935acc28dc9c6f871d0dab260bf8db24e2dec67b60cd09a7234faac719f0836f73e17c6673b99c7253164e18a6ec47827796daf6af5b4babe91e3ac SHA512 00c6907241fc3ccd0266c0433e18580594b0c8a2151f8e393f1d1dc1a04c6c68619a7ca20f1219ec2cca7e302a39ba14542af03faac7b85c68c7fc47a9fc45fe
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
-EBUILD qutebrowser-2.5.2.ebuild 4473 BLAKE2B 7a4cbac998feb87739829bff747dea40a3eb1e77a932b8805ab6b3c5352055304df8fce8d56d4303d295e95db75264803137b214a1592801f9a6661b48954729 SHA512 d2ec602142662483895adf2d0852b0d804c50652af3a3a5ca8f350261685a827a5b85dc1541b26dc85f960bf00bd04cdd217b3c91c58893e2393a40454f162f0
+EBUILD qutebrowser-2.5.2-r1.ebuild 4520 BLAKE2B c88b11c45c62c5caa8ef1a59135514c9424accf72d6e5144e915a825503d398aeabe0ccff29f6193adfb4af8370177d7abd847c4a5f153efa93c754a53505b90 SHA512 8b66ede7ac45b0327ad2776d5e7045cf8a0596e7094c98ec44080de09f33215701d0e28007947a000671b7783267e7c1cc53edcc5ae806c7222ba7e07018b56e
 EBUILD qutebrowser-3.0.0_pre9999.ebuild 6192 BLAKE2B ed41317cd7bf1d417078b947e27db97433474933970c75da8b5e5a7e3c2da028ac506dcd6c13898f20d213035a887dfbf730dc6b701f525a8ac65658794cc926 SHA512 f71e025301089f579ca54dc34996282fef7b6ec5c1736cae8ef8830bbfff4cb23205ac68f5e3bae65bb04810b649e516e5bfd12afc9188cd1c2aca24ec541d97
 EBUILD qutebrowser-9999.ebuild 4474 BLAKE2B 58bd61b320fff4dfe9c2fb99d64a5c6585120490269c43b8041c393a7ed003b16795884b00d2e6f24aef385813e35e7f2e28f19931ec2accf9fe4877641baf4a SHA512 a3796d16fca4dc236305b7878277f77b86bc023fea507ce9fff7e1c43eab1904cc3fa0725c91cd86a4c5f8ec2900f75cb18ca18ad197e180dc7c48986f801deb
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
new file mode 100644
index 000000000000..cd179a5d0236
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
@@ -0,0 +1,17 @@
+https://github.com/qutebrowser/qutebrowser/commit/f277876ce0817f7d05ca94b05beb644482027f85
+From: Florian Bruhin <me@the-compiler.org>
+Date: Sat, 19 Nov 2022 16:00:15 +0100
+Subject: [PATCH] dictcli: Switch from master to main
+
+Fixes #7481
+--- a/scripts/dictcli.py
++++ b/scripts/dictcli.py
+@@ -40,7 +40,7 @@
+ from qutebrowser.utils import standarddir
+ 
+ 
+-API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/'
++API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/main/'
+ 
+ 
+ class InvalidLanguageError(Exception):
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..459d498416d1
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 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_{8..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 PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf widevine"
+
+RDEPEND="
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
+	$(python_gen_cond_dep '
+		dev-python/colorama[${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[${PYTHON_USEDEP},libyaml(+)]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+	pdf? ( <www-plugins/pdfjs-3 )
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	$(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}]
+		)')"
+[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dictcli.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use pdf; then
+		sed '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || die
+	fi
+
+	if use widevine; then
+		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}'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	# let eclass handle python
+	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 -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
+		# 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
+		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
+	)
+	use widevine && 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-2.5.2.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
deleted file mode 100644
index d3151e4cf8de..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 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_{8..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 PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf widevine"
-
-RDEPEND="
-	dev-qt/qtcore:5[icu]
-	dev-qt/qtgui:5[png]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
-	$(python_gen_cond_dep '
-		dev-python/colorama[${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[${PYTHON_USEDEP},libyaml(+)]
-		dev-python/zipp[${PYTHON_USEDEP}]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
-	pdf? ( <www-plugins/pdfjs-3 )
-	widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
-	$(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}]
-		)')"
-[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if use pdf; then
-		sed '/^content.pdfjs:/,+1s/false/true/' \
-			-i ${PN}/config/configdata.yml || die
-	fi
-
-	if use widevine; then
-		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}'" \
-			-i ${PN}/config/qtargs.py || die
-	fi
-
-	# let eclass handle python
-	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 -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
-		# 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
-		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
-	)
-	use widevine && 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
-}
-- 
cgit v1.2.3