From 95461df035e3867364495f065e5e805bf629b2d7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Oct 2021 00:10:07 +0100 Subject: gentoo resync : 25.10.2021 --- www-client/qutebrowser/Manifest | 7 +- www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild | 83 -------------- www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 4 +- www-client/qutebrowser/qutebrowser-2.4.0.ebuild | 124 +++++++++++++++++++++ www-client/qutebrowser/qutebrowser-9999.ebuild | 6 +- 5 files changed, 135 insertions(+), 89 deletions(-) delete mode 100644 www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild create mode 100644 www-client/qutebrowser/qutebrowser-2.4.0.ebuild (limited to 'www-client/qutebrowser') diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 2899088b35ea..b67b73f27cd4 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,6 +1,7 @@ AUX qutebrowser-2.3.1-pyyaml60.patch 682 BLAKE2B 572d1ffcb23fd1168b8e999300c4f2d7f8c59b1c8e47c3c91bfdbcfc37c1e2c909b608513070f2efde979db7f90e1548dab2f6156cd8f74d8a0c9e1cb32c3a3c SHA512 608103b77779855b636ca0dbc77b726650d6e571d0c44c7ef89d16228e19931ed0b8c6152487e30e59f36996883d7efe0957de5b28c9f8b5d7e4c5bc21ba2031 DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239 -EBUILD qutebrowser-2.3.1-r1.ebuild 2436 BLAKE2B 30a9c3f7f66fa08d9665072ee3e006ef97adc66b365cb7b10a0ccdf3e553e0299ffc42a9ec80bb8ebd21e6c5517dece86aa4e12b702c2313fd3f40d8fa9c2764 SHA512 f23cb74b8036c2f204bd0c8554fa4040bd98271d68c35d04e2143aee4631343f6ae50a8a262f1610095c41f0b63a1b052f18f20308214c8285909fb486cb8ea9 -EBUILD qutebrowser-2.3.1-r2.ebuild 4303 BLAKE2B 3dee4b1317f8159b9bac01403c7cc68bfa68c5555c138801ec3777b7f4fb5974c84907eedda1f887f1a85bb594062ffd816a5c3cd36e789196d0f4769912d8a7 SHA512 7bc6de06328494517e086089a59c389bc9877b795acacc3fb5e15a4d4a67ea7a0a849a54b0539697433f06cfc80f27090f27f8497460f295a17bc4323050651c -EBUILD qutebrowser-9999.ebuild 4274 BLAKE2B c67ca9a10a4ebbb26c1f573870586af1063f1adc4ec36c61965d861848501444004c60e8204aee9e7459183d8cd61c22a6fac7dd4d602a2d220802f9d2fe3265 SHA512 2d582bcd9ef99022acb48e320f2885cad81e9d2cf0e21cdd4d4933ae774325eb55575c0bf287fda24a6c918f1986e13a17f4a96fee38fb4e155fa5eeb1136a57 +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 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild deleted file mode 100644 index fb10ef39b48f..000000000000 --- a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit desktop distutils-r1 optfeature xdg - -DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine" -HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+adblock test" - -BDEPEND="app-text/asciidoc" -RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8) - >=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}] )" - -distutils_enable_tests setup.py - -# Tests depend (misc/requirements/requirements-tests.txt) on plugins -# we don't have packages for. -RESTRICT="test" - -python_compile_all() { - a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page" -} - -python_install_all() { - insinto /usr/share/metainfo - doins misc/org.qutebrowser.qutebrowser.appdata.xml - doman doc/${PN}.1 - domenu misc/org.${PN}.${PN}.desktop - for s in 16 24 32 48 64 128 256 512; do - doicon -s ${s} icons/qutebrowser-${s}x${s}.png - done - doicon -s scalable icons/${PN}.svg - - insinto /usr/share/qutebrowser/userscripts - doins misc/userscripts/README.md - exeinto /usr/share/qutebrowser/userscripts - for f in misc/userscripts/*; do - if [[ ${f} == __pycache__ ]]; then - continue - fi - doexe "${f}" - done - - exeinto /usr/share/qutebrowser/scripts - for f in scripts/*; do - if [[ ${f} == scripts/__init__.py || - ${f} == scripts/__pycache__ || - ${f} == scripts/dev || - ${f} == scripts/testbrowser || - ${f} == scripts/asciidoc2html.py || - ${f} == scripts/setupcommon.py || - ${f} == scripts/link_pyqt.py ]]; then - continue - fi - doexe "${f}" - done - - distutils-r1_python_install_all -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "PDF display support" www-plugins/pdfjs -} diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild index 3a90e9763a2d..0b940abb3a02 100644 --- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild +++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.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" @@ -96,6 +96,8 @@ python_test() { 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 ) diff --git a/www-client/qutebrowser/qutebrowser-2.4.0.ebuild b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild new file mode 100644 index 000000000000..82cb9d908b85 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-2.4.0.ebuild @@ -0,0 +1,124 @@ +# 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.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-6.0[${PYTHON_USEDEP}] + >=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}] ) + ') + 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 + +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-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 22d3277e6864..82cb9d908b85 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -33,10 +33,10 @@ 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-5.4.1[${PYTHON_USEDEP},libyaml(+)] + >=dev-python/pyyaml-6.0[${PYTHON_USEDEP}] >=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}] >=dev-python/zipp-3.6.0[${PYTHON_USEDEP}] - adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) + adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] ) ') widevine? ( www-plugins/chrome-binary-plugins )" BDEPEND=" @@ -92,6 +92,8 @@ python_test() { 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 ) -- cgit v1.2.3