summaryrefslogtreecommitdiff
path: root/www-client/qutebrowser
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/qutebrowser')
-rw-r--r--www-client/qutebrowser/Manifest7
-rw-r--r--www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch19
-rw-r--r--www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild128
-rw-r--r--www-client/qutebrowser/qutebrowser-2.4.0.ebuild6
-rw-r--r--www-client/qutebrowser/qutebrowser-9999.ebuild4
5 files changed, 7 insertions, 157 deletions
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index b67b73f27cd4..d9067b0868d7 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,7 +1,4 @@
-AUX qutebrowser-2.3.1-pyyaml60.patch 682 BLAKE2B 572d1ffcb23fd1168b8e999300c4f2d7f8c59b1c8e47c3c91bfdbcfc37c1e2c909b608513070f2efde979db7f90e1548dab2f6156cd8f74d8a0c9e1cb32c3a3c SHA512 608103b77779855b636ca0dbc77b726650d6e571d0c44c7ef89d16228e19931ed0b8c6152487e30e59f36996883d7efe0957de5b28c9f8b5d7e4c5bc21ba2031
-DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B 9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84 SHA512 e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
-EBUILD qutebrowser-2.3.1-r2.ebuild 4400 BLAKE2B 22b8b11723af9a80a4c74361d083ad4f89b13cc641760fc3add41853af3d4f10d0015e1eac02a039f6f0f61be3beb2c235f72098205bd480960e16e4d0c67e09 SHA512 e67daa83137fdfcf59124077fe56426d5e48243025964a1770d2976a377aef00ff9d5be6736d01af1a9a04965d2527282692c34b22915cfd330bab6f85d9044d
-EBUILD qutebrowser-2.4.0.ebuild 4367 BLAKE2B 18786ec3e9af725a998ef19da97f25c4857f7d44c5e29c7ec2f261a71792f7c56a8abd9e3d97186b4af6a5edd28371001634b3dc2453196dc5017bfb234117db SHA512 2348a26f7cabf13715b6a55068aa6e543290857ae8d1370de6b69ebf3b7e60b67f78ddd9581aecf273b325fab9f24f2f262f0f8e6bfed77f42f9011b7fe614c2
-EBUILD qutebrowser-9999.ebuild 4367 BLAKE2B 18786ec3e9af725a998ef19da97f25c4857f7d44c5e29c7ec2f261a71792f7c56a8abd9e3d97186b4af6a5edd28371001634b3dc2453196dc5017bfb234117db SHA512 2348a26f7cabf13715b6a55068aa6e543290857ae8d1370de6b69ebf3b7e60b67f78ddd9581aecf273b325fab9f24f2f262f0f8e6bfed77f42f9011b7fe614c2
+EBUILD qutebrowser-2.4.0.ebuild 4370 BLAKE2B 9554c0148141525d54f4a2ca3a262f93a53fe6162174903b07f03d29e1e91788eddfe8c638f97c9855a0719291267b4fae9c3531f67873329e83907f8f1f0e68 SHA512 9bd7e90cd9869a3385e47d0b0bc594578300f9bffc7683bba318a07382dacf0103420aee5bcc72d504b3bfa3cb7c16f65ecc43901b4efe5dafaada153071e2d0
+EBUILD qutebrowser-9999.ebuild 4371 BLAKE2B b4176f1da5b6a7f83a58fd8acb46804c46057d87673473b25a55c74c32d61ec132d78bea4ccea9fa365205f2c09c251983dc2e7c6f79440d1071cfcfe24b9d2c SHA512 364b114d8b648f721ad33a34105d0d4d63782d347bfe4aaa5d0af4deb87e5441b05a0d074a94feba44b41194e48e5dae92b67ad0caaf8dd19ed2000f9723544e
MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
deleted file mode 100644
index d585109b9f2c..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/1547a48
-From: Florian Bruhin <me@the-compiler.org>
-Date: Thu, 14 Oct 2021 09:05:07 +0200
-Subject: [PATCH] tests: Adjust for PyYAML 6.0
---- a/tests/unit/utils/test_utils.py
-+++ b/tests/unit/utils/test_utils.py
-@@ -809,8 +809,11 @@ def test_load(self):
- assert utils.yaml_load("[1, 2]") == [1, 2]
-
- def test_load_float_bug(self):
-- with pytest.raises(yaml.YAMLError):
-+ try:
- utils.yaml_load("._")
-+ except yaml.YAMLError:
-+ # Either no exception or YAMLError, not ValueError
-+ pass
-
- def test_load_file(self, tmp_path):
- tmpfile = tmp_path / 'foo.yml'
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
deleted file mode 100644
index 0b940abb3a02..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature 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 widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- $(python_gen_cond_dep '
- >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.1[${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-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- ')
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- app-text/asciidoc
- $(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}]
- )
- ')"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-pyyaml60.patch
-)
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if use widevine; then
- sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
- -i ${PN}/config/qtargs.py || die
- fi
-
- 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 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
- # needs qtwebkit and isn't skipped by default
- tests/unit/config/test_websettings.py::test_config_init
- # 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]
- )
- use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
-
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -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
-
- optfeature "PDF display support" www-plugins/pdfjs
-
- 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 setup to use yt-dlp or youtube-dl."
- fi
-}
diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
index 82cb9d908b85..d18f294eab0a 100644
--- a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
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"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
@@ -33,7 +33,7 @@ RDEPEND="
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-6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
@@ -119,6 +119,6 @@ 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 setup to use yt-dlp or youtube-dl."
+ elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
fi
}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 82cb9d908b85..f3fcf16be9a4 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
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-6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
@@ -119,6 +119,6 @@ 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 setup to use yt-dlp or youtube-dl."
+ elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
fi
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-30 05:20:06 +0000