diff options
Diffstat (limited to 'www-client/qutebrowser')
-rw-r--r-- | www-client/qutebrowser/Manifest | 6 | ||||
-rw-r--r-- | www-client/qutebrowser/qutebrowser-2.5.3.ebuild | 142 | ||||
-rw-r--r-- | www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild | 34 | ||||
-rw-r--r-- | www-client/qutebrowser/qutebrowser-9999.ebuild | 63 |
4 files changed, 199 insertions, 46 deletions
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 90151ab23023..4c4cc17d6304 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,6 +1,8 @@ AUX qutebrowser-2.5.2-dictcli.patch 589 BLAKE2B 1ad904d36935acc28dc9c6f871d0dab260bf8db24e2dec67b60cd09a7234faac719f0836f73e17c6673b99c7253164e18a6ec47827796daf6af5b4babe91e3ac SHA512 00c6907241fc3ccd0266c0433e18580594b0c8a2151f8e393f1d1dc1a04c6c68619a7ca20f1219ec2cca7e302a39ba14542af03faac7b85c68c7fc47a9fc45fe DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc +DIST qutebrowser-2.5.3.tar.gz 6117665 BLAKE2B 3fc1304e4a4343d9a3bdfbf6ac708305a283da2217938dfe2b0f5e049d3a100bc255e0f06807e98c12e095f25dce4d5ed22705a5ae6674cff2f8ffcb0c5afab8 SHA512 a53db1a842b59613115d0823ce9b7d8ea703c6db8882250a587f4c7042a52b7ba93e9f516cfae1804e2f10ad369b0ab8f9d613092a9ca4be86e113c4ed4be7d9 EBUILD qutebrowser-2.5.2-r1.ebuild 4441 BLAKE2B c86a459181c039d78ace97598690d6ea373bc33c6964f187bc98de45a12e807d909e17ecc4506258400f155b230d0f225d6519fe79cc524f74d810a8280e0e96 SHA512 2eec0e64b15604e11f1193fa0af5ce576a1f620db6d916f401fd3257993545c436aa4194ca5184027d84515bf02de29c557ade250e69d13b7c13bef9057a5d4d -EBUILD qutebrowser-3.0.0_pre9999.ebuild 6323 BLAKE2B 6ac49153ddac06b3ac4c7aba5ea9072ddb3fc6e811bbe9d3768530dd218468452e252f7673a81221981daec4fdb30dbf5fde75ae73e8c3791988f46100613507 SHA512 c3f652976c906d8bef52eebee56a4728ee3282ac5a9b99e36025e4ac1d2aa5ba15593f427d796d485a43e6b4708281e08e0d9888fa0659e7de8419be9028651d -EBUILD qutebrowser-9999.ebuild 4558 BLAKE2B 37ddbc18e82e789779feaf37019c2724f24a2a10388c903c035672d2c3e350e695c7b7b6dd58412478de2ba26a3121d74f6aec9462e544c8e18b6445104561f4 SHA512 8fedd7eb240219b96e32f0f2cc5a9f14bf7a167bfe087deef63f87e02b7d937ea28704fb60b391fa7dde7455f327451b5719135c464baa15278eeaccd40585cf +EBUILD qutebrowser-2.5.3.ebuild 4630 BLAKE2B 9c67f8771da3a75d497bbc5a4df689f1b964f46dcb2272e768860e5c2ec87ad53b3ddd9eca41f9e51f6da4fea1141fc928638bf83eba5320c20e194056630c05 SHA512 13d47b1a5340c0017a3f1959195efecd2ad96f17593fc74a1e8b73f296f021b70385a5b5bfe14431cec9b93cf9080874f4dd9dd330fff688e5a053d7714eea94 +EBUILD qutebrowser-3.0.0_pre9999.ebuild 6337 BLAKE2B 0e60e5064c85be840e7d0d64472d5781f9ee378a56ebc80d28bfa86be84bc026e6bf8d3dc354008bc5ab013644e394ee9bc73e8f6f81d40f7a973dac4f339eb5 SHA512 beaee232c67e3549094d4b6ca26225e81871a291fceca45f9518217c8435c971bb29298120982f4890aa4a61e712919da771cd11a4a03e4393ad50c2d47565d9 +EBUILD qutebrowser-9999.ebuild 4630 BLAKE2B 9c67f8771da3a75d497bbc5a4df689f1b964f46dcb2272e768860e5c2ec87ad53b3ddd9eca41f9e51f6da4fea1141fc928638bf83eba5320c20e194056630c05 SHA512 13d47b1a5340c0017a3f1959195efecd2ad96f17593fc74a1e8b73f296f021b70385a5b5bfe14431cec9b93cf9080874f4dd9dd330fff688e5a053d7714eea94 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769 diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild new file mode 100644 index 000000000000..7cb5d6ee3504 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild @@ -0,0 +1,142 @@ +# 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_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-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild index cffa4849cc2e..0de37e2649d8 100644 --- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 multiprocessing xdg +inherit distutils-r1 xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -30,14 +30,16 @@ RDEPEND=" >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/pyyaml-6[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/zipp[${PYTHON_USEDEP}] - adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )') + adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) + ') qt6? ( dev-qt/qtbase:6[icu] $(python_gen_cond_dep ' dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] - dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]') + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets] + ') pdf? ( www-plugins/pdfjs ) ) !qt6? ( @@ -45,7 +47,8 @@ RDEPEND=" dev-qt/qtgui:5[png] $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}]') + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + ') pdf? ( <www-plugins/pdfjs-3 ) ) widevine? ( www-plugins/chrome-binary-plugins )" @@ -60,12 +63,12 @@ BDEPEND=" dev-python/pytest-mock[${PYTHON_USEDEP}] dev-python/pytest-qt[${PYTHON_USEDEP}] dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] dev-python/pytest-xvfb[${PYTHON_USEDEP}] dev-python/tldextract[${PYTHON_USEDEP}] qt6? ( dev-python/PyQt6[testlib] ) !qt6? ( dev-python/PyQt5[testlib] ) - )')" + ) + ')" [[ ${PV} == *9999 ]] && BDEPEND+=" app-text/asciidoc" distutils_enable_tests pytest @@ -78,8 +81,8 @@ src_prepare() { -i ${PN}/config/configdata.yml || die fi - if use widevine; then - # Qt6 knows Gentoo's, but pass for libdir, EPREFIX, and Qt5(bug #888783) + 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 @@ -120,18 +123,17 @@ python_test() { # 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] - # calls eclass' python2 "failure" wrapper - tests/unit/misc/test_checkpyver.py::test_old_python - # qtargs are mangled with USE=widevine - $(usev widevine tests/unit/config/test_qtargs.py) + # tests that don't know about our newer qtwebengine:5 + tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround ) - - # single thread is slow, but do half+1 given spikes ram usage quickly - local jobs=$(($(makeopts_jobs) / 2 + 1)) + # 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 -n ${jobs} -k 'not _bench and not _matches_tree and not _warning' diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 3d0c12b40655..7cb5d6ee3504 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -16,7 +16,7 @@ else KEYWORDS="~amd64 ~arm64 ~x86" fi -DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine" +DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt" HOMEPAGE="https://www.qutebrowser.org/" LICENSE="GPL-3+" @@ -24,23 +24,25 @@ SLOT="0" IUSE="+adblock pdf widevine" RDEPEND=" - dev-qt/qtcore:5[icu] - dev-qt/qtgui:5[png] $(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.0.2[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.0.1[${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/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/pyyaml[${PYTHON_USEDEP}] dev-python/zipp[${PYTHON_USEDEP}] - adblock? ( dev-python/adblock[${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}] @@ -51,8 +53,9 @@ BDEPEND=" dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] dev-python/pytest-xvfb[${PYTHON_USEDEP}] dev-python/tldextract[${PYTHON_USEDEP}] - )')" -[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc" + ) + ')" +[[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc" distutils_enable_tests pytest @@ -60,13 +63,14 @@ src_prepare() { distutils-r1_src_prepare if use pdf; then - sed '/^content.pdfjs:/,+1s/false/true/' \ + sed -e '/^content.pdfjs:/,+1s/false/true/' \ -i ${PN}/config/configdata.yml || die fi - if use widevine; then + 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 "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${widevine}'" \ + sed -e "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${widevine}'" \ -i ${PN}/config/qtargs.py || die fi @@ -75,18 +79,21 @@ src_prepare() { if [[ ${PV} == 9999 ]]; then # call asciidoc(1) rather than the single target python module - sed '/cmdline = /s/= .*/= ["asciidoc"]/' \ + sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \ -i scripts/asciidoc2html.py || die "${EPYTHON}" scripts/asciidoc2html.py || die fi - # these plugins/tests are unnecessary here and have extra dependencies - sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \ - -e '/pytest-instafail/d;s/--instafail//' \ + # 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 - [[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die - [[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || 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() { @@ -94,21 +101,21 @@ 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) + # 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 + # calls eclass' python2 "failure" wrapper 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 + # 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 ) - use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py ) + # 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' |