1 |
commit: c74ded47caf44e1655e62f23dcc223a5b7541496 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 16 22:19:46 2023 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 18 23:22:12 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74ded47 |
7 |
|
8 |
www-client/qutebrowser: drop 2.5.2-r1 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
www-client/qutebrowser/Manifest | 1 - |
13 |
.../files/qutebrowser-2.5.2-dictcli.patch | 17 --- |
14 |
www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild | 133 --------------------- |
15 |
3 files changed, 151 deletions(-) |
16 |
|
17 |
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest |
18 |
index ec0594f9451b..7644b9878438 100644 |
19 |
--- a/www-client/qutebrowser/Manifest |
20 |
+++ b/www-client/qutebrowser/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc |
23 |
DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3 SHA512 1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e |
24 |
|
25 |
diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch |
26 |
deleted file mode 100644 |
27 |
index cd179a5d0236..000000000000 |
28 |
--- a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch |
29 |
+++ /dev/null |
30 |
@@ -1,17 +0,0 @@ |
31 |
-https://github.com/qutebrowser/qutebrowser/commit/f277876ce0817f7d05ca94b05beb644482027f85 |
32 |
-From: Florian Bruhin <me@××××××××××××.org> |
33 |
-Date: Sat, 19 Nov 2022 16:00:15 +0100 |
34 |
-Subject: [PATCH] dictcli: Switch from master to main |
35 |
- |
36 |
-Fixes #7481 |
37 |
---- a/scripts/dictcli.py |
38 |
-+++ b/scripts/dictcli.py |
39 |
-@@ -40,7 +40,7 @@ |
40 |
- from qutebrowser.utils import standarddir |
41 |
- |
42 |
- |
43 |
--API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/' |
44 |
-+API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/main/' |
45 |
- |
46 |
- |
47 |
- class InvalidLanguageError(Exception): |
48 |
|
49 |
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild |
50 |
deleted file mode 100644 |
51 |
index 1e0b94274b51..000000000000 |
52 |
--- a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild |
53 |
+++ /dev/null |
54 |
@@ -1,133 +0,0 @@ |
55 |
-# Copyright 1999-2023 Gentoo Authors |
56 |
-# Distributed under the terms of the GNU General Public License v2 |
57 |
- |
58 |
-EAPI=8 |
59 |
- |
60 |
-DISTUTILS_SINGLE_IMPL=1 |
61 |
-DISTUTILS_USE_PEP517=setuptools |
62 |
-PYTHON_COMPAT=( python3_{9..11} ) |
63 |
-inherit distutils-r1 xdg |
64 |
- |
65 |
-if [[ ${PV} == 9999 ]]; then |
66 |
- inherit git-r3 |
67 |
- EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" |
68 |
-else |
69 |
- SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz" |
70 |
- KEYWORDS="amd64 ~arm64 ~x86" |
71 |
-fi |
72 |
- |
73 |
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine" |
74 |
-HOMEPAGE="https://www.qutebrowser.org/" |
75 |
- |
76 |
-LICENSE="GPL-3+" |
77 |
-SLOT="0" |
78 |
-IUSE="+adblock pdf widevine" |
79 |
- |
80 |
-RDEPEND=" |
81 |
- dev-qt/qtcore:5[icu] |
82 |
- dev-qt/qtgui:5[png] |
83 |
- $(python_gen_cond_dep ' |
84 |
- dev-python/colorama[${PYTHON_USEDEP}] |
85 |
- >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}] |
86 |
- >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] |
87 |
- dev-python/pygments[${PYTHON_USEDEP}] |
88 |
- dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] |
89 |
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
90 |
- dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)] |
91 |
- dev-python/zipp[${PYTHON_USEDEP}] |
92 |
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )') |
93 |
- pdf? ( <www-plugins/pdfjs-3 ) |
94 |
- widevine? ( www-plugins/chrome-binary-plugins )" |
95 |
-BDEPEND=" |
96 |
- $(python_gen_cond_dep ' |
97 |
- test? ( |
98 |
- dev-python/beautifulsoup4[${PYTHON_USEDEP}] |
99 |
- dev-python/cheroot[${PYTHON_USEDEP}] |
100 |
- dev-python/flask[${PYTHON_USEDEP}] |
101 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
102 |
- dev-python/pytest-bdd[${PYTHON_USEDEP}] |
103 |
- dev-python/pytest-mock[${PYTHON_USEDEP}] |
104 |
- dev-python/pytest-qt[${PYTHON_USEDEP}] |
105 |
- dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] |
106 |
- dev-python/pytest-xvfb[${PYTHON_USEDEP}] |
107 |
- dev-python/tldextract[${PYTHON_USEDEP}] |
108 |
- )')" |
109 |
-[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc" |
110 |
- |
111 |
-distutils_enable_tests pytest |
112 |
- |
113 |
-PATCHES=( |
114 |
- "${FILESDIR}"/${P}-dictcli.patch |
115 |
-) |
116 |
- |
117 |
-src_prepare() { |
118 |
- distutils-r1_src_prepare |
119 |
- |
120 |
- if use pdf; then |
121 |
- sed '/^content.pdfjs:/,+1s/false/true/' \ |
122 |
- -i ${PN}/config/configdata.yml || die |
123 |
- fi |
124 |
- |
125 |
- if use widevine; then |
126 |
- local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so |
127 |
- sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${widevine}'" \ |
128 |
- -i ${PN}/config/qtargs.py || die |
129 |
- fi |
130 |
- |
131 |
- # let eclass handle python |
132 |
- sed -i '/setup.py/d' misc/Makefile || die |
133 |
- |
134 |
- [[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die |
135 |
- |
136 |
- # these plugins/tests are unnecessary here and have extra dependencies |
137 |
- sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \ |
138 |
- -e '/pytest-instafail/d;s/--instafail//' \ |
139 |
- -i pytest.ini || die |
140 |
- [[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die |
141 |
- [[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die |
142 |
-} |
143 |
- |
144 |
-python_test() { |
145 |
- local -x PYTEST_QT_API=pyqt5 |
146 |
- |
147 |
- local EPYTEST_DESELECT=( |
148 |
- # end2end and other IPC tests are broken with "Name error" if |
149 |
- # socket path is over 104 characters (=124 in /var/tmp/portage) |
150 |
- # https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX) |
151 |
- tests/end2end |
152 |
- tests/unit/misc/test_ipc.py |
153 |
- # tests that don't know about our newer qtwebengine |
154 |
- tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround |
155 |
- tests/unit/utils/test_version.py::TestChromiumVersion |
156 |
- # may misbehave depending on installed old python versions |
157 |
- tests/unit/misc/test_checkpyver.py::test_old_python |
158 |
- # bug 819393 |
159 |
- tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner] |
160 |
- # not worth running dbus over |
161 |
- tests/unit/browser/test_notification.py::TestDBus |
162 |
- ) |
163 |
- use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py ) |
164 |
- |
165 |
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault |
166 |
- epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning' |
167 |
-} |
168 |
- |
169 |
-python_install_all() { |
170 |
- emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install |
171 |
- |
172 |
- rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die |
173 |
- fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md} |
174 |
- python_fix_shebang "${ED}"/usr/share/${PN} |
175 |
- |
176 |
- einstalldocs |
177 |
-} |
178 |
- |
179 |
-pkg_postinst() { |
180 |
- xdg_pkg_postinst |
181 |
- |
182 |
- if [[ ! ${REPLACING_VERSIONS} ]]; then |
183 |
- elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts" |
184 |
- elog "have additional dependencies not covered by this ebuild, for example" |
185 |
- elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp." |
186 |
- fi |
187 |
-} |