commit: 2a532e1e3f186c98d72f80ae8a2088ee60db9484 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Dec 2 04:51:35 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Dec 2 05:10:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a532e1e
www-client/qutebrowser: drop 2.3.1-r2 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> www-client/qutebrowser/Manifest | 1 - .../files/qutebrowser-2.3.1-pyyaml60.patch | 19 --- www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 128 --------------------- 3 files changed, 148 deletions(-) diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index f42c7956d26e..95272ae21135 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,2 +1 @@ -DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239 DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B 9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84 SHA512 e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7 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 <[email protected]> -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 bfc54af8e690..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[lua] and net-misc/yt-dlp." - fi -}
