From 85e7fcfe5631986ad1144ea54fc179d8658571d3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Mar 2025 00:31:50 +0000 Subject: gentoo auto-resync : 25:03:2025 - 00:31:49 --- www-client/Manifest.gz | Bin 6214 -> 6211 bytes www-client/qutebrowser/Manifest | 4 +- www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild | 175 +++++++++++++++++++++ www-client/qutebrowser/qutebrowser-3.4.0.ebuild | 175 --------------------- www-client/qutebrowser/qutebrowser-9999.ebuild | 4 +- www-client/tangram/Manifest | 2 +- www-client/tangram/tangram-3.3.ebuild | 2 +- 7 files changed, 182 insertions(+), 180 deletions(-) create mode 100644 www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild delete mode 100644 www-client/qutebrowser/qutebrowser-3.4.0.ebuild (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index 944b7e87de0d..3bcbed1347c8 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 2bd1015111f3..7bfa5f81f1cb 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,5 +1,5 @@ DIST qutebrowser-3.4.0.tar.gz 6065180 BLAKE2B fb4b8c7207b9320ce185465f249cdfa430330935cac40ae02d41e583d7f41da4deb2ac24489cf8c76473468706c8d812eceb7b24c4a430767b758615703b7e57 SHA512 9f056012e53a75c06cf2a6f113dd9ce53d1052250c4fdaa969586b182ec1b36ed077b1a140f10c779e8ae5eb0df69b7d3d466bbf14a21c433a84c9d621f53f96 DIST qutebrowser-3.4.0.tar.gz.asc 659 BLAKE2B 4e9438d9b3b33e2fc61dca1e264cf83b09e77cdb6fcaebe779347097ab4be064f2c1cd18cb59e23e959dc65da94cca578da2adc909c6f0e05b6e6304db25b23b SHA512 6fe8276f2873334dc433c7eeef96c36158a301b53a7bd3f0e670ec539e6c41d47c7c3d4979e590627fb9bf5656ce568bfb1231cab6485e7ca0d761b063b747d7 -EBUILD qutebrowser-3.4.0.ebuild 5728 BLAKE2B ee929342235359c2ada33941e3c065d88be60bdfb3b386ebb51f503bb2768ca0c783e4c170cdf7955de10d11309649666fa3412944dad8f594a832c5c6276149 SHA512 555ae2b9d35c4de3b1968c919c967f4df8c3d8f3b12e25efa1251c18782e88f041feb69c3abf89d215ae45e1fc6221ba0ea9eaeb4ba4340ff3d721aae07e7811 -EBUILD qutebrowser-9999.ebuild 5729 BLAKE2B 398032b0844415b7c239e768635773a99d0f4fc23cb217bb6338d1778e7b9f7a7872fe279d78d97c9647e19eb0523661dc2513ee5d40fd7981b6d0c3a6bd8f38 SHA512 3bcb4a73d3203a3af6ed4d9d93d6e65bd77cb0715cac7f735c422f16ea6ca4ccc7540b9444db32e6a718a220392a3b150254764aa4475181e635412dd7f36f7b +EBUILD qutebrowser-3.4.0-r1.ebuild 5731 BLAKE2B 1a8ad06fa47ce274f4a28280b14661683e0f635807c17154aa7c1880ce7f2c665995df50197fbd48908db10f27542e6070fa244801a216e7ea9b04da85656956 SHA512 eb502a91f6b4d5058869030a38b35a5bc3ea0dbfe6fca088c5eba2aa7fcf04fdb0b37736e9355d2df15e7c64a180ddd003ad9d87ef8e806e8b7c066dd973695e +EBUILD qutebrowser-9999.ebuild 5876 BLAKE2B a68ead3bf98ba3a49ac54a7774f5e3a0da4bcf1853aa67ab1416ccd72762349dd3d15a2dc34bb60f59bc629b3fab23a2451ecf791adb719346df8fcf51cf9972 SHA512 d2b2d27b96e0346f7bfc0e7f6f42afc005fa1749cd0d73a49c36c6a72afd30b37f630a61f4bec869299f8db879d88ec94641bfaa6ebb936ac4cd9da0202f2fee MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d diff --git a/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild b/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild new file mode 100644 index 000000000000..eabfd40f5f79 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2025 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_{10..13} ) +inherit distutils-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" +else + inherit verify-sig + SRC_URI=" + https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc ) + " + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg + KEYWORDS="amd64 ~arm64" +fi + +DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt" +HOMEPAGE="https://qutebrowser.org/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+adblock pdf widevine" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets] + dev-python/pyqt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/zipp[${PYTHON_USEDEP}] + dev-qt/qtbase:6[icu,sqlite] + adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) + pdf? ( =31 is fixed (not looked +# into yet), should normally be pulled by pytest-bdd instead +BDEPEND=" + $(python_gen_cond_dep ' + test? ( + 124 in /var/tmp/portage) due to Linux limitations, + # skip rather than bother using /tmp+cleanup over ${T} (end2end tests + # are important, but the other tests should be enough for downstream) + tests/end2end + tests/unit/misc/test_ipc.py + # python eclasses provide a fake "failing" python2 and trips this test + tests/unit/misc/test_checkpyver.py::test_old_python + # not worth running dbus over + tests/unit/browser/test_notification.py::TestDBus + # fails in ebuild, seems due to saving fake downloads in the wrong location + tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround + # may fail if environment is very large (bug #819393) + tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\] + # may fail if chromium version is unrecognized (aka newer qtwebengine) + tests/unit/utils/test_version.py + # no longer XFAIL due to being fixed in python + tests/unit/utils/test_urlmatch.py::test_invalid_patterns\[host-ipv6-two-closing\] + ) + + local epytestargs=( + # prefer pytest-xvfb over virtx given same upstream and is expected + -p xvfb + # skip warning tests broken by -Wdefault, and benchmarks + -k 'not _bench and not _matches_tree and not _warning' + # override eclass' settings, tempdirs are re-used by Qt + -o tmp_path_retention_policy=all + ) + + epytest "${epytestargs[@]}" +} + +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 + + if has_version 'dev-qt/qtwebengine:6[bindist]'; then + ewarn + ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this" + ewarn "will prevent playback of proprietary media formats (e.g. h264)." + fi +} diff --git a/www-client/qutebrowser/qutebrowser-3.4.0.ebuild b/www-client/qutebrowser/qutebrowser-3.4.0.ebuild deleted file mode 100644 index 81d428f69486..000000000000 --- a/www-client/qutebrowser/qutebrowser-3.4.0.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2025 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_{10..13} ) -inherit distutils-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" -else - inherit verify-sig - SRC_URI=" - https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc ) - " - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg - KEYWORDS="amd64 ~arm64" -fi - -DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt" -HOMEPAGE="https://qutebrowser.org/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="+adblock pdf widevine" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets] - dev-python/pyqt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/jinja2[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/zipp[${PYTHON_USEDEP}] - dev-qt/qtbase:6[icu,sqlite] - adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) - pdf? ( www-plugins/pdfjs ) - widevine? ( www-plugins/chrome-binary-plugins ) - ') -" -# TODO: drop gherkin-official dep entirely when >=31 is fixed (not looked -# into yet), should normally be pulled by pytest-bdd instead -BDEPEND=" - $(python_gen_cond_dep ' - test? ( - 124 in /var/tmp/portage) due to Linux limitations, - # skip rather than bother using /tmp+cleanup over ${T} (end2end tests - # are important, but the other tests should be enough for downstream) - tests/end2end - tests/unit/misc/test_ipc.py - # python eclasses provide a fake "failing" python2 and trips this test - tests/unit/misc/test_checkpyver.py::test_old_python - # not worth running dbus over - tests/unit/browser/test_notification.py::TestDBus - # fails in ebuild, seems due to saving fake downloads in the wrong location - tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround - # may fail if environment is very large (bug #819393) - tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\] - # may fail if chromium version is unrecognized (aka newer qtwebengine) - tests/unit/utils/test_version.py - # no longer XFAIL due to being fixed in python - tests/unit/utils/test_urlmatch.py::test_invalid_patterns\[host-ipv6-two-closing\] - ) - - local epytestargs=( - # prefer pytest-xvfb over virtx given same upstream and is expected - -p xvfb - # skip warning tests broken by -Wdefault, and benchmarks - -k 'not _bench and not _matches_tree and not _warning' - # override eclass' settings, tempdirs are re-used by Qt - -o tmp_path_retention_policy=all - ) - - epytest "${epytestargs[@]}" -} - -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 - - if has_version 'dev-qt/qtwebengine:6[bindist]'; then - ewarn - ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this" - ewarn "will prevent playback of proprietary media formats (e.g. h264)." - fi -} diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 1ce28acc4271..154cb9abbd97 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -28,6 +28,8 @@ LICENSE="GPL-3+" SLOT="0" IUSE="+adblock pdf widevine" +# TODO: check if pdfjs-5 works again with qtwebengine-6.9.x, or try the +# (unpackaged) legacy edition of pdfjs-5 meant for old chromium compat. RDEPEND=" $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets] @@ -40,7 +42,7 @@ RDEPEND=" dev-python/zipp[${PYTHON_USEDEP}] dev-qt/qtbase:6[icu,sqlite] adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) - pdf? ( www-plugins/pdfjs ) + pdf? (