| 1 |
commit: 732752644bee2ef95565cd0533c89ee1da2fa947 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 17:13:41 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 18:10:05 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73275264 |
| 7 |
|
| 8 |
www-client/qutebrowser: tidy live ebuild and use pep517 |
| 9 |
|
| 10 |
QtWebKit test was fixed to properly ignore that we don't have it, |
| 11 |
albeit may still be present in a potential 2.4.1 release on a |
| 12 |
separate branch. |
| 13 |
|
| 14 |
Remove typing-extensions, was only needed for <python-3.8. |
| 15 |
|
| 16 |
Also move asciidoc dep to live-only (it is getting tempting to just |
| 17 |
maintain live and releases separately given the increasing amount |
| 18 |
of PV == 9999 blocks, which may get worse given considering adding |
| 19 |
verify-sig support too). |
| 20 |
|
| 21 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 22 |
|
| 23 |
www-client/qutebrowser/qutebrowser-9999.ebuild | 26 ++++++++++++-------------- |
| 24 |
1 file changed, 12 insertions(+), 14 deletions(-) |
| 25 |
|
| 26 |
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild |
| 27 |
index f3fcf16be9a4..6e52913c8194 100644 |
| 28 |
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild |
| 29 |
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild |
| 30 |
@@ -1,9 +1,10 @@ |
| 31 |
-# Copyright 1999-2021 Gentoo Authors |
| 32 |
+# Copyright 1999-2022 Gentoo Authors |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
EAPI=8 |
| 36 |
|
| 37 |
DISTUTILS_SINGLE_IMPL=1 |
| 38 |
+DISTUTILS_USE_PEP517=setuptools |
| 39 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 40 |
inherit distutils-r1 optfeature xdg |
| 41 |
|
| 42 |
@@ -27,20 +28,17 @@ RDEPEND=" |
| 43 |
dev-qt/qtgui:5[png] |
| 44 |
$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8) |
| 45 |
$(python_gen_cond_dep ' |
| 46 |
- >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}] |
| 47 |
+ dev-python/colorama[${PYTHON_USEDEP}] |
| 48 |
>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}] |
| 49 |
>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] |
| 50 |
dev-python/pygments[${PYTHON_USEDEP}] |
| 51 |
dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] |
| 52 |
dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
| 53 |
- >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)] |
| 54 |
- >=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}] |
| 55 |
- >=dev-python/zipp-3.6.0[${PYTHON_USEDEP}] |
| 56 |
- adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] ) |
| 57 |
- ') |
| 58 |
+ dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)] |
| 59 |
+ dev-python/zipp[${PYTHON_USEDEP}] |
| 60 |
+ adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )') |
| 61 |
widevine? ( www-plugins/chrome-binary-plugins )" |
| 62 |
BDEPEND=" |
| 63 |
- app-text/asciidoc |
| 64 |
$(python_gen_cond_dep ' |
| 65 |
test? ( |
| 66 |
dev-python/beautifulsoup4[${PYTHON_USEDEP}] |
| 67 |
@@ -53,8 +51,8 @@ BDEPEND=" |
| 68 |
dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] |
| 69 |
dev-python/pytest-xvfb[${PYTHON_USEDEP}] |
| 70 |
dev-python/tldextract[${PYTHON_USEDEP}] |
| 71 |
- ) |
| 72 |
- ')" |
| 73 |
+ )')" |
| 74 |
+[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc" |
| 75 |
|
| 76 |
distutils_enable_tests pytest |
| 77 |
|
| 78 |
@@ -62,10 +60,12 @@ python_prepare_all() { |
| 79 |
distutils-r1_python_prepare_all |
| 80 |
|
| 81 |
if use widevine; then |
| 82 |
- sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \ |
| 83 |
+ local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so |
| 84 |
+ sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${widevine}'" \ |
| 85 |
-i ${PN}/config/qtargs.py || die |
| 86 |
fi |
| 87 |
|
| 88 |
+ # let eclass handle python |
| 89 |
sed -i '/setup.py/d' misc/Makefile || die |
| 90 |
|
| 91 |
[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die |
| 92 |
@@ -88,8 +88,6 @@ python_test() { |
| 93 |
# tests that don't know about our newer qtwebengine |
| 94 |
tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround |
| 95 |
tests/unit/utils/test_version.py::TestChromiumVersion |
| 96 |
- # needs qtwebkit and isn't skipped by default |
| 97 |
- tests/unit/config/test_websettings.py::test_config_init |
| 98 |
# may misbehave depending on installed old python versions |
| 99 |
tests/unit/misc/test_checkpyver.py::test_old_python |
| 100 |
# bug 819393 |
| 101 |
@@ -102,7 +100,7 @@ python_test() { |
| 102 |
} |
| 103 |
|
| 104 |
python_install_all() { |
| 105 |
- emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
| 106 |
+ emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install |
| 107 |
|
| 108 |
rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die |
| 109 |
fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md} |
Archives