From 3018b5a4bd4777c51e2793818305d7af2409a7fd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 23 Jul 2023 20:53:51 +0100
Subject: gentoo auto-resync : 23:07:2023 - 20:53:51

---
 www-client/Manifest.gz                             | Bin 6037 -> 6040 bytes
 www-client/qutebrowser/Manifest                    |   4 +-
 www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 158 +++++++++++++++++++++
 www-client/qutebrowser/qutebrowser-2.5.4.ebuild    | 157 --------------------
 www-client/qutebrowser/qutebrowser-9999.ebuild     |   3 +-
 5 files changed, 162 insertions(+), 160 deletions(-)
 create mode 100644 www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
 delete mode 100644 www-client/qutebrowser/qutebrowser-2.5.4.ebuild

(limited to 'www-client')

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index dd07f5836fe5..489eebb1573d 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 4ea49be7c985..3062219c3b03 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,4 @@
 DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3 SHA512 1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
-EBUILD qutebrowser-2.5.4.ebuild 5146 BLAKE2B 1afe3f919b68805163651570ef0daeeb6891324d4836afa8ef5313be8d340dcf78f39500917f05b73033867f8f4a1bdfdf46d67fe8c42bb81efbc4545b6963bf SHA512 06f7f867cb92f51b6f0bfc8c6ff76d82a276118b2c66f55938c838af0fbda051ea0edbed8bb78180ed4770c3e36bf681605e501d3ab5cbc211453864d16fd304
-EBUILD qutebrowser-9999.ebuild 6468 BLAKE2B 6a3674ca8ec3101cfc80ac8f92cdbe37fcadee5212735c48fb404352c0a6a4f19310286166bfcb04d27acb7ceb35d8ac2eef942997fd98efc2bdff55d6a180d4 SHA512 c6875c2f337c0d34e56e99009421196da5f0ede48105e99ff335c63cb54182dc706502605da7356cd1b4adbed2ed6bd0e24baea583da1e94d51c8e08268a3136
+EBUILD qutebrowser-2.5.4-r1.ebuild 5170 BLAKE2B 1af9713cdac477076dc5e9f38c48b4c36c0b1e7a4b2f9d862cf1fe4df93323a287e29dbe1bf14cb9d08a6a36faa0fcd18adb400a9588e3d4ea8dd0498f5767b6 SHA512 1d850e6569cc9d6636cf09a82c59885cd7709150f81482a42279bd9e9a04c96fdfa0f7dc8296214bcee285e491b09f7593f2f5c24e8245e4b1e1349e699b8adf
+EBUILD qutebrowser-9999.ebuild 6500 BLAKE2B 6491fe16c4bbdea8b6e1bc82a9602fdfcdbb16acacd02d1b21a42adccaef6137e39f44986124cf28d283023782a481a414739c3cca955b64ee418b0d804cbc43 SHA512 244f5749a8763a88dad983ff615104468bf29459cb49c6febf26bbeb1628b171816ea630dc32a3a7aafee92cf57002130e6b430d11f1034edf7d9b74cc6f8d30
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..cf04e29c3d8d
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
@@ -0,0 +1,158 @@
+# 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]
+	dev-qt/qtsql:5[sqlite]
+	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_preinst() {
+	xdg_pkg_preinst
+
+	has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
+}
+
+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 [[ -v QUTEBROWSER_HAD_QT6 ]]; then
+		ewarn "This is a downgrade from Qt6-based ${PN} to Qt5-based, and this"
+		ewarn "older version of ${PN} will /not/ warn on startup that this is"
+		ewarn "going to destroy some browsing data (e.g. cookies) when older chromium"
+		ewarn "version tries to use the newer ~/.local/share/${PN}/webengine."
+		ewarn
+		ewarn "It is recommended to backup in case or go back to Qt6."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-2.5.4.ebuild b/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
deleted file mode 100644
index 59de8c56dd4a..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.5.4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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_preinst() {
-	xdg_pkg_preinst
-
-	has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
-}
-
-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 [[ -v QUTEBROWSER_HAD_QT6 ]]; then
-		ewarn "This is a downgrade from Qt6-based ${PN} to Qt5-based, and this"
-		ewarn "older version of ${PN} will /not/ warn on startup that this is"
-		ewarn "going to destroy some browsing data (e.g. cookies) when older chromium"
-		ewarn "version tries to use the newer ~/.local/share/${PN}/webengine."
-		ewarn
-		ewarn "It is recommended to backup in case or go back to Qt6."
-	fi
-}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 0e11fd896ab8..56936f3f91bd 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
 	')
 	qt6? (
-		dev-qt/qtbase:6[icu]
+		dev-qt/qtbase:6[icu,sqlite]
 		$(python_gen_cond_dep '
 			dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
 			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
@@ -44,6 +44,7 @@ RDEPEND="
 	!qt6? (
 		dev-qt/qtcore:5[icu]
 		dev-qt/qtgui:5[png]
+		dev-qt/qtsql:5[sqlite]
 		$(python_gen_cond_dep '
 			dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-- 
cgit v1.2.3