1 |
commit: 000e00ed25578d81ab907a5723d072a12c0e0220 |
2 |
Author: Cédric Krier <cedk <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 25 17:32:24 2020 +0000 |
4 |
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 25 17:34:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000e00ed |
7 |
|
8 |
dev-vcs/mercurial: Version bumps to 5.2.2 |
9 |
|
10 |
Update also 9999 |
11 |
|
12 |
Closes: https://bugs.gentoo.org/701920 |
13 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
14 |
Signed-off-by: Cédric Krier <cedk <AT> gentoo.org> |
15 |
|
16 |
dev-vcs/mercurial/Manifest | 1 + |
17 |
dev-vcs/mercurial/files/zstd.py | 2 + |
18 |
dev-vcs/mercurial/mercurial-5.1.2.ebuild | 5 +- |
19 |
...rcurial-5.1.2.ebuild => mercurial-5.2.2.ebuild} | 76 ++++++++------- |
20 |
dev-vcs/mercurial/mercurial-9999.ebuild | 104 +++++++++++---------- |
21 |
dev-vcs/mercurial/metadata.xml | 16 ++-- |
22 |
6 files changed, 113 insertions(+), 91 deletions(-) |
23 |
|
24 |
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest |
25 |
index 38d572328a6..c4c2fbabd1a 100644 |
26 |
--- a/dev-vcs/mercurial/Manifest |
27 |
+++ b/dev-vcs/mercurial/Manifest |
28 |
@@ -3,3 +3,4 @@ DIST mercurial-4.9.1.tar.gz 7076867 BLAKE2B 8cedc66a8ddffc543a8849bbc98ebfc9ed61 |
29 |
DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5cdc59ab18f1e0d5371e434eb752b68d3d9f6dd34ed9c63df62a646223e86c6c5178775d9b856eed5df65677900 SHA512 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb |
30 |
DIST mercurial-5.0.2.tar.gz 7202797 BLAKE2B 7059efa2cf80c433ec25748c7c49ae0caa688363f5ef2983e0adf39a0a691ea99aaf4a090ebeda11b89e74263c548289cca3f82f40d77efbf925e12231b341cc SHA512 8b328e2e5a2896b690492d75c055bb13cd76df6efb087ef770f60ead86e30f7d952cb3ca82a696c0c5ce7039c319bd0fc9b448a52c079653622760317d5bb315 |
31 |
DIST mercurial-5.1.2.tar.gz 7286238 BLAKE2B 0dcb2556e568e222da628bcfeceba56df8ab04f123f79add1953ce13bbf51e5cb0733fa72d5cff00250aaf0e3bfae5c52cc5cd72c1b6aa1fccb6820fce5a7018 SHA512 a8ce9d9220a5ddf452264801f06e81fe1e699ff700d085e3f82c6877910c6ef0e594203590f198b7b9e31c9a1ed627c8fa2a3a1513d0c5087cf775835a78c408 |
32 |
+DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee |
33 |
|
34 |
diff --git a/dev-vcs/mercurial/files/zstd.py b/dev-vcs/mercurial/files/zstd.py |
35 |
new file mode 100644 |
36 |
index 00000000000..29ae5eacd0c |
37 |
--- /dev/null |
38 |
+++ b/dev-vcs/mercurial/files/zstd.py |
39 |
@@ -0,0 +1,2 @@ |
40 |
+from zstd import * |
41 |
+from zstd import __version__ |
42 |
|
43 |
diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.1.2.ebuild |
44 |
index c3f5137de8f..7ae34dee8a9 100644 |
45 |
--- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild |
46 |
+++ b/dev-vcs/mercurial/mercurial-5.1.2.ebuild |
47 |
@@ -1,4 +1,4 @@ |
48 |
-# Copyright 1999-2019 Gentoo Authors |
49 |
+# Copyright 1999-2020 Gentoo Authors |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
EAPI=7 |
53 |
@@ -151,6 +151,9 @@ pkg_postinst() { |
54 |
elog " dev-vcs/git" |
55 |
elog " dev-vcs/monotone" |
56 |
elog " dev-vcs/subversion" |
57 |
+ |
58 |
+ elog "If you want to use bugzilla extension" |
59 |
+ elog "please install dev-python/mysqlclient" |
60 |
} |
61 |
|
62 |
pkg_postrm() { |
63 |
|
64 |
diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.2.2.ebuild |
65 |
similarity index 72% |
66 |
copy from dev-vcs/mercurial/mercurial-5.1.2.ebuild |
67 |
copy to dev-vcs/mercurial/mercurial-5.2.2.ebuild |
68 |
index c3f5137de8f..339f1ec904c 100644 |
69 |
--- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild |
70 |
+++ b/dev-vcs/mercurial/mercurial-5.2.2.ebuild |
71 |
@@ -1,10 +1,10 @@ |
72 |
-# Copyright 1999-2019 Gentoo Authors |
73 |
+# Copyright 1999-2020 Gentoo Authors |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
|
76 |
EAPI=7 |
77 |
|
78 |
-PYTHON_COMPAT=( python2_7 ) |
79 |
-PYTHON_REQ_USE="threads" |
80 |
+PYTHON_COMPAT=( python2_7 python3_6 ) |
81 |
+PYTHON_REQ_USE="threads(+)" |
82 |
|
83 |
inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic |
84 |
|
85 |
@@ -15,13 +15,23 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" |
86 |
LICENSE="GPL-2+" |
87 |
SLOT="0" |
88 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
89 |
-IUSE="+chg bugzilla emacs gpg test tk" |
90 |
+IUSE="+chg emacs gpg test tk zsh-completion" |
91 |
|
92 |
-RDEPEND="app-misc/ca-certificates |
93 |
+BROKEN_PYTHON=" |
94 |
+ !~dev-python/python-3.5.0 |
95 |
+ !~dev-python/python-3.5.1 |
96 |
+ !~dev-python/python-3.5.2 |
97 |
+ !~dev-python/python-3.6.0 |
98 |
+ !~dev-python/python-3.6.1" |
99 |
+ |
100 |
+BDEPEND="${BROKEN_PYTHON}" |
101 |
+ |
102 |
+RDEPEND="${BROKEN_PYTHON} |
103 |
+ app-misc/ca-certificates |
104 |
dev-python/zstandard[${PYTHON_USEDEP}] |
105 |
- bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
106 |
gpg? ( app-crypt/gnupg ) |
107 |
- tk? ( dev-lang/tk )" |
108 |
+ tk? ( dev-lang/tk ) |
109 |
+ zsh-completion? ( app-shells/zsh )" |
110 |
|
111 |
DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) |
112 |
test? ( app-arch/unzip |
113 |
@@ -32,28 +42,19 @@ SITEFILE="70${PN}-gentoo.el" |
114 |
# Too many tests fail #608720 |
115 |
RESTRICT="test" |
116 |
|
117 |
-PATCHES=( |
118 |
- "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" |
119 |
- "${FILESDIR}/${PN}-4.8.1-unbundle_zstd.patch" |
120 |
-) |
121 |
- |
122 |
python_prepare_all() { |
123 |
# fix up logic that won't work in Gentoo Prefix (also won't outside in |
124 |
# certain cases), bug #362891 |
125 |
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die |
126 |
- |
127 |
- # Don't use bundled zstandard (#666972) |
128 |
- rm -r contrib/python-zstandard || die |
129 |
+ cp "${FILESDIR}/zstd.py" mercurial/ |
130 |
|
131 |
distutils-r1_python_prepare_all |
132 |
} |
133 |
|
134 |
-python_configure_all() { |
135 |
+python_compile() { |
136 |
strip-flags -ftracer -ftree-vectorize |
137 |
- # Note: make it impl-conditional if py3 is supported |
138 |
- append-flags -fno-strict-aliasing |
139 |
- |
140 |
- "${PYTHON}" setup.py build_mo || die |
141 |
+ python_is_python3 || append-flags -fno-strict-aliasing |
142 |
+ distutils-r1_python_compile build_ext --no-zstd |
143 |
} |
144 |
|
145 |
python_compile_all() { |
146 |
@@ -67,20 +68,24 @@ python_compile_all() { |
147 |
fi |
148 |
} |
149 |
|
150 |
+python_install() { |
151 |
+ distutils-r1_python_install build_ext --no-zstd |
152 |
+} |
153 |
+ |
154 |
python_install_all() { |
155 |
distutils-r1_python_install_all |
156 |
|
157 |
newbashcomp contrib/bash_completion hg |
158 |
|
159 |
- insinto /usr/share/zsh/site-functions |
160 |
- newins contrib/zsh_completion _hg |
161 |
- |
162 |
- rm -f doc/*.?.txt |
163 |
- dodoc CONTRIBUTORS |
164 |
- cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die |
165 |
+ if use zsh-completion ; then |
166 |
+ insinto /usr/share/zsh/site-functions |
167 |
+ newins contrib/zsh_completion _hg |
168 |
+ fi |
169 |
|
170 |
dobin hgeditor |
171 |
- dobin contrib/hgk |
172 |
+ if use tk; then |
173 |
+ dobin contrib/hgk |
174 |
+ fi |
175 |
python_foreach_impl python_doscript contrib/hg-ssh |
176 |
|
177 |
if use emacs; then |
178 |
@@ -97,19 +102,16 @@ python_install_all() { |
179 |
fi |
180 |
|
181 |
for f in ${RM_CONTRIB[@]}; do |
182 |
- rm -r contrib/${f} || die |
183 |
+ rm -rf contrib/${f} || die |
184 |
done |
185 |
|
186 |
dodoc -r contrib |
187 |
docompress -x /usr/share/doc/${PF}/contrib |
188 |
doman doc/*.? |
189 |
+ dodoc CONTRIBUTORS hgweb.cgi |
190 |
|
191 |
insinto /etc/mercurial/hgrc.d |
192 |
doins "${FILESDIR}/cacerts.rc" |
193 |
- |
194 |
- # symlink to system zstd |
195 |
- local sitedir=$(python_get_sitedir) |
196 |
- dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so |
197 |
} |
198 |
|
199 |
src_test() { |
200 |
@@ -122,8 +124,16 @@ src_test() { |
201 |
rm -f test-convert-git* # git |
202 |
rm -f test-convert-mtn* # monotone |
203 |
rm -f test-convert-tla* # GNU Arch tla |
204 |
- #rm -f test-doctest* # doctest always fails with python 2.5.x |
205 |
rm -f test-largefiles* # tends to time out |
206 |
+ if [[ ${EUID} -eq 0 ]]; then |
207 |
+ einfo "Removing tests which require user privileges to succeed" |
208 |
+ rm -f test-convert* |
209 |
+ rm -f test-lock-badness* |
210 |
+ rm -f test-permissions* |
211 |
+ rm -f test-pull-permission* |
212 |
+ rm -f test-journal-exists* |
213 |
+ rm -f test-repair-strip* |
214 |
+ fi |
215 |
|
216 |
popd &>/dev/null || die |
217 |
distutils-r1_src_test |
218 |
|
219 |
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild |
220 |
index 4715bed5111..9c47a383e79 100644 |
221 |
--- a/dev-vcs/mercurial/mercurial-9999.ebuild |
222 |
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild |
223 |
@@ -1,32 +1,42 @@ |
224 |
-# Copyright 1999-2019 Gentoo Authors |
225 |
+# Copyright 1999-2020 Gentoo Authors |
226 |
# Distributed under the terms of the GNU General Public License v2 |
227 |
|
228 |
-EAPI=5 |
229 |
+EAPI=7 |
230 |
|
231 |
-PYTHON_COMPAT=( python2_7 ) |
232 |
-PYTHON_REQ_USE="threads" |
233 |
+PYTHON_COMPAT=( python2_7 python3_{6..7} ) |
234 |
+PYTHON_REQ_USE="threads(+)" |
235 |
|
236 |
inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic |
237 |
|
238 |
DESCRIPTION="Scalable distributed SCM" |
239 |
HOMEPAGE="https://www.mercurial-scm.org/" |
240 |
-EHG_REPO_URI="http://selenic.com/repo/hg" |
241 |
-EHG_REVISION="@" |
242 |
+EHG_REPO_URI="https://www.mercurial-scm.org/repo/hg" |
243 |
|
244 |
LICENSE="GPL-2+" |
245 |
SLOT="0" |
246 |
KEYWORDS="" |
247 |
IUSE="+chg bugzilla emacs gpg test tk zsh-completion" |
248 |
|
249 |
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
250 |
+BROKEN_PYTHON=" |
251 |
+ !~dev-python/python-3.5.0 |
252 |
+ !~dev-python/python-3.5.1 |
253 |
+ !~dev-python/python-3.5.2 |
254 |
+ !~dev-python/python-3.6.0 |
255 |
+ !~dev-python/python-3.6.1" |
256 |
+ |
257 |
+BDEPEND="${BROKEN_PYTHON} |
258 |
+ dev-python/docutils[${PYTHON_USEDEP}]" |
259 |
+ |
260 |
+RDEPEND="${BROKEN_PYTHON} |
261 |
+ app-misc/ca-certificates |
262 |
+ dev-python/zstandard[${PYTHON_USEDEP}] |
263 |
gpg? ( app-crypt/gnupg ) |
264 |
tk? ( dev-lang/tk ) |
265 |
- zsh-completion? ( app-shells/zsh ) |
266 |
- app-misc/ca-certificates" |
267 |
+ zsh-completion? ( app-shells/zsh )" |
268 |
+ |
269 |
DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) |
270 |
test? ( app-arch/unzip |
271 |
- dev-python/pygments[${PYTHON_USEDEP}] ) |
272 |
- dev-python/docutils[${PYTHON_USEDEP}]" |
273 |
+ dev-python/pygments[${PYTHON_USEDEP}] )" |
274 |
|
275 |
SITEFILE="70${PN}-gentoo.el" |
276 |
|
277 |
@@ -37,20 +47,20 @@ python_prepare_all() { |
278 |
# fix up logic that won't work in Gentoo Prefix (also won't outside in |
279 |
# certain cases), bug #362891 |
280 |
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die |
281 |
+ sed -i -e '/ hgenv =/a\' -e ' hgenv.pop("PYTHONPATH", None)' setup.py || die |
282 |
+ cp "${FILESDIR}/zstd.py" mercurial/ |
283 |
|
284 |
distutils-r1_python_prepare_all |
285 |
} |
286 |
|
287 |
-python_configure_all() { |
288 |
+python_compile() { |
289 |
strip-flags -ftracer -ftree-vectorize |
290 |
- # Note: make it impl-conditional if py3 is supported |
291 |
- append-flags -fno-strict-aliasing |
292 |
- |
293 |
- "${PYTHON}" setup.py build_mo || die |
294 |
+ python_is_python3 || append-flags -fno-strict-aliasing |
295 |
+ distutils-r1_python_compile build_ext --no-zstd |
296 |
} |
297 |
|
298 |
python_compile_all() { |
299 |
- rm -r contrib/{win32,macosx} || die |
300 |
+ rm -r contrib/win32 || die |
301 |
emake doc |
302 |
if use chg; then |
303 |
emake -C contrib/chg |
304 |
@@ -61,6 +71,10 @@ python_compile_all() { |
305 |
fi |
306 |
} |
307 |
|
308 |
+python_install() { |
309 |
+ distutils-r1_python_install build_ext --no-zstd |
310 |
+} |
311 |
+ |
312 |
python_install_all() { |
313 |
distutils-r1_python_install_all |
314 |
|
315 |
@@ -71,12 +85,10 @@ python_install_all() { |
316 |
newins contrib/zsh_completion _hg |
317 |
fi |
318 |
|
319 |
- rm -f doc/*.?.txt || die |
320 |
- dodoc CONTRIBUTORS doc/*.txt |
321 |
- cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die |
322 |
- |
323 |
dobin hgeditor |
324 |
- dobin contrib/hgk |
325 |
+ if use tk; then |
326 |
+ dobin contrib/hgk |
327 |
+ fi |
328 |
python_foreach_impl python_doscript contrib/hg-ssh |
329 |
|
330 |
if use emacs; then |
331 |
@@ -84,8 +96,7 @@ python_install_all() { |
332 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
333 |
fi |
334 |
|
335 |
- local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 |
336 |
- *.el mercurial.spec) |
337 |
+ local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el ) |
338 |
|
339 |
if use chg; then |
340 |
dobin contrib/chg/chg |
341 |
@@ -94,47 +105,40 @@ python_install_all() { |
342 |
fi |
343 |
|
344 |
for f in ${RM_CONTRIB[@]}; do |
345 |
- rm -rf contrib/$f || die |
346 |
+ rm -rf contrib/${f} || die |
347 |
done |
348 |
|
349 |
dodoc -r contrib |
350 |
docompress -x /usr/share/doc/${PF}/contrib |
351 |
doman doc/*.? |
352 |
- |
353 |
- cat > "${T}/80mercurial" <<-EOF |
354 |
-HG="${EPREFIX}/usr/bin/hg" |
355 |
-EOF |
356 |
- doenvd "${T}/80mercurial" |
357 |
+ dodoc CONTRIBUTORS hgweb.cgi |
358 |
|
359 |
insinto /etc/mercurial/hgrc.d |
360 |
doins "${FILESDIR}/cacerts.rc" |
361 |
} |
362 |
|
363 |
src_test() { |
364 |
- cd tests || die |
365 |
- rm -rf *svn* || die # Subversion tests fail with 1.5 |
366 |
- rm -f test-archive* || die # Fails due to verbose tar output changes |
367 |
- rm -f test-convert-baz* || die # GNU Arch baz |
368 |
- rm -f test-convert-cvs* || die # CVS |
369 |
- rm -f test-convert-darcs* || die # Darcs |
370 |
- rm -f test-convert-git* || die # git |
371 |
- rm -f test-convert-mtn* || die # monotone |
372 |
- rm -f test-convert-tla* || die # GNU Arch tla |
373 |
- rm -f test-doctest* || die # doctest always fails with python 2.5.x |
374 |
- rm -f test-largefiles* || die # tends to time out |
375 |
+ pushd tests &>/dev/null || die |
376 |
+ rm -rf *svn* # Subversion tests fail with 1.5 |
377 |
+ rm -f test-archive* # Fails due to verbose tar output changes |
378 |
+ rm -f test-convert-baz* # GNU Arch baz |
379 |
+ rm -f test-convert-cvs* # CVS |
380 |
+ rm -f test-convert-darcs* # Darcs |
381 |
+ rm -f test-convert-git* # git |
382 |
+ rm -f test-convert-mtn* # monotone |
383 |
+ rm -f test-convert-tla* # GNU Arch tla |
384 |
+ rm -f test-largefiles* # tends to time out |
385 |
if [[ ${EUID} -eq 0 ]]; then |
386 |
einfo "Removing tests which require user privileges to succeed" |
387 |
- rm -f test-command-template* || die # Test is broken when run as root |
388 |
- rm -f test-convert* || die # Test is broken when run as root |
389 |
- rm -f test-lock-badness* || die # Test is broken when run as root |
390 |
- rm -f test-permissions* || die # Test is broken when run as root |
391 |
- rm -f test-pull-permission* || die # Test is broken when run as root |
392 |
- rm -f test-clone-failure* || die |
393 |
- rm -f test-journal-exists* || die |
394 |
- rm -f test-repair-strip* || die |
395 |
+ rm -f test-convert* |
396 |
+ rm -f test-lock-badness* |
397 |
+ rm -f test-permissions* |
398 |
+ rm -f test-pull-permission* |
399 |
+ rm -f test-journal-exists* |
400 |
+ rm -f test-repair-strip* |
401 |
fi |
402 |
|
403 |
- cd .. || die |
404 |
+ popd &>/dev/null || die |
405 |
distutils-r1_src_test |
406 |
} |
407 |
|
408 |
|
409 |
diff --git a/dev-vcs/mercurial/metadata.xml b/dev-vcs/mercurial/metadata.xml |
410 |
index 37d1b32ccb3..691021c6b56 100644 |
411 |
--- a/dev-vcs/mercurial/metadata.xml |
412 |
+++ b/dev-vcs/mercurial/metadata.xml |
413 |
@@ -1,11 +1,13 @@ |
414 |
<?xml version="1.0" encoding="UTF-8"?> |
415 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
416 |
<pkgmetadata> |
417 |
- <!-- maintainer-needed --> |
418 |
- <use> |
419 |
- <flag name="chg">Support Mercurial command server client</flag> |
420 |
- <flag name="bugzilla">Support bugzilla integration.</flag> |
421 |
- <flag name="gpg">Support signing with GnuPG.</flag> |
422 |
- <flag name="tk">Install dev-lang/tk for hgk script.</flag> |
423 |
- </use> |
424 |
+ <maintainer type="person"> |
425 |
+ <email>cedk@g.o</email> |
426 |
+ </maintainer> |
427 |
+ <use> |
428 |
+ <flag name="chg">Support Mercurial command server client</flag> |
429 |
+ <flag name="bugzilla">Support bugzilla integration.</flag> |
430 |
+ <flag name="gpg">Support signing with GnuPG.</flag> |
431 |
+ <flag name="tk">Install dev-lang/tk for hgk script.</flag> |
432 |
+ </use> |
433 |
</pkgmetadata> |