Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/
Date: Wed, 17 Apr 2019 08:16:37
Message-Id: 1555488737.a3a686e12d8c35676f4dec2250d66bc42ef70796.polynomial-c@gentoo
1 commit: a3a686e12d8c35676f4dec2250d66bc42ef70796
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 17 08:12:17 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 17 08:12:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3a686e1
7
8 dev-vcs/mercurial: Security cleanup
9
10 Bug: https://bugs.gentoo.org/658712
11 Package-Manager: Portage-2.3.63, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 dev-vcs/mercurial/Manifest | 3 -
15 dev-vcs/mercurial/mercurial-4.5.2.ebuild | 137 ----------------------------
16 dev-vcs/mercurial/mercurial-4.7.1.ebuild | 136 ----------------------------
17 dev-vcs/mercurial/mercurial-4.8.2.ebuild | 148 -------------------------------
18 4 files changed, 424 deletions(-)
19
20 diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
21 index 725b1e0694f..b4b0a2adc1a 100644
22 --- a/dev-vcs/mercurial/Manifest
23 +++ b/dev-vcs/mercurial/Manifest
24 @@ -1,5 +1,2 @@
25 -DIST mercurial-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941
26 DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5ca6f9de15326dbee555ca3d14b8a552042c4448aae17b1c015b4f302c3512c204f17a834b758f51fbcc2455ed4e6f SHA512 71afb9ed3f62b1b946563c55851dda1fc8b724afe82a4a253c7f4719ae9e1160d5f9644bed7fd27ee3a21d8e682352364fc9f47bafa552cd4cd7fac7c0d42bdd
27 -DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9ac15aef21284337924d13bd5b4b14684d729149c4b48bf8fde13679cf661d92da968943c3f04ea065729df42318c SHA512 04d3f97dd4a0f36c6f6d639d8eccc7e4f29b2dc211fa69e7fc17dae0eb954f2ddaaf04f70facc6b968a166db7c07ed80792575d7a27e80bc0c1a43fc38b5e536
28 -DIST mercurial-4.8.2.tar.gz 6870985 BLAKE2B 822cbfd09b299870b02b7e181c216557d4dcbb60abcb34a95d22b457f130ff2c84c4f85291b6cd4b0314acd9061ec0d416c96821c2daa8627cd7740965944103 SHA512 1010f20ea5ed081f2d5c58e97696027b2d06dd0471b39e88a1858d5409bcf59f2ccf360925c417495834fccba06e1525ae70894233164d617227814ca2277e20
29 DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5cdc59ab18f1e0d5371e434eb752b68d3d9f6dd34ed9c63df62a646223e86c6c5178775d9b856eed5df65677900 SHA512 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb
30
31 diff --git a/dev-vcs/mercurial/mercurial-4.5.2.ebuild b/dev-vcs/mercurial/mercurial-4.5.2.ebuild
32 deleted file mode 100644
33 index f1ffee5400f..00000000000
34 --- a/dev-vcs/mercurial/mercurial-4.5.2.ebuild
35 +++ /dev/null
36 @@ -1,137 +0,0 @@
37 -# Copyright 1999-2019 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=6
41 -
42 -PYTHON_COMPAT=( python2_7 )
43 -PYTHON_REQ_USE="threads"
44 -
45 -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
46 -
47 -DESCRIPTION="Scalable distributed SCM"
48 -HOMEPAGE="https://www.mercurial-scm.org/"
49 -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
50 -
51 -LICENSE="GPL-2+"
52 -SLOT="0"
53 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
54 -IUSE="bugzilla emacs gpg test tk"
55 -
56 -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
57 - gpg? ( app-crypt/gnupg )
58 - tk? ( dev-lang/tk )
59 - app-misc/ca-certificates"
60 -DEPEND="emacs? ( virtual/emacs )
61 - test? ( app-arch/unzip
62 - dev-python/pygments[${PYTHON_USEDEP}] )"
63 -
64 -SITEFILE="70${PN}-gentoo.el"
65 -
66 -# Too many tests fail #608720
67 -RESTRICT="test"
68 -
69 -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
70 -
71 -python_prepare_all() {
72 - # fix up logic that won't work in Gentoo Prefix (also won't outside in
73 - # certain cases), bug #362891
74 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
75 -
76 - distutils-r1_python_prepare_all
77 -}
78 -
79 -python_configure_all() {
80 - strip-flags -ftracer -ftree-vectorize
81 - # Note: make it impl-conditional if py3 is supported
82 - append-flags -fno-strict-aliasing
83 -
84 - "${PYTHON}" setup.py build_mo || die
85 -}
86 -
87 -python_compile_all() {
88 - rm -r contrib/{win32,macosx} || die
89 - if use emacs; then
90 - cd contrib || die
91 - elisp-compile mercurial.el || die "elisp-compile failed!"
92 - fi
93 -}
94 -
95 -python_install_all() {
96 - distutils-r1_python_install_all
97 -
98 - newbashcomp contrib/bash_completion hg
99 -
100 - insinto /usr/share/zsh/site-functions
101 - newins contrib/zsh_completion _hg
102 -
103 - rm -f doc/*.?.txt
104 - dodoc CONTRIBUTORS
105 - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
106 -
107 - dobin hgeditor
108 - dobin contrib/hgk
109 - python_foreach_impl python_doscript contrib/hg-ssh
110 -
111 - if use emacs; then
112 - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
113 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
114 - fi
115 -
116 - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
117 - *.el mercurial.spec)
118 - for f in ${RM_CONTRIB[@]}; do
119 - rm -r contrib/$f || die
120 - done
121 -
122 - dodoc -r contrib
123 - docompress -x /usr/share/doc/${PF}/contrib
124 - doman doc/*.?
125 -
126 - insinto /etc/mercurial/hgrc.d
127 - doins "${FILESDIR}/cacerts.rc"
128 -}
129 -
130 -src_test() {
131 - pushd tests &>/dev/null || die
132 - rm -rf *svn* # Subversion tests fail with 1.5
133 - rm -f test-archive* # Fails due to verbose tar output changes
134 - rm -f test-convert-baz* # GNU Arch baz
135 - rm -f test-convert-cvs* # CVS
136 - rm -f test-convert-darcs* # Darcs
137 - rm -f test-convert-git* # git
138 - rm -f test-convert-mtn* # monotone
139 - rm -f test-convert-tla* # GNU Arch tla
140 - #rm -f test-doctest* # doctest always fails with python 2.5.x
141 - rm -f test-largefiles* # tends to time out
142 -
143 - popd &>/dev/null || die
144 - distutils-r1_src_test
145 -}
146 -
147 -python_test() {
148 - local TEST_DIR
149 -
150 - rm -rf "${TMPDIR}"/test
151 - distutils_install_for_testing
152 - cd tests || die
153 - "${PYTHON}" run-tests.py --verbose \
154 - --tmpdir="${TMPDIR}"/test \
155 - --with-hg="${TEST_DIR}"/scripts/hg \
156 - || die "Tests fail with ${EPYTHON}"
157 -}
158 -
159 -pkg_postinst() {
160 - use emacs && elisp-site-regen
161 -
162 - elog "If you want to convert repositories from other tools using convert"
163 - elog "extension please install correct tool:"
164 - elog " dev-vcs/cvs"
165 - elog " dev-vcs/darcs"
166 - elog " dev-vcs/git"
167 - elog " dev-vcs/monotone"
168 - elog " dev-vcs/subversion"
169 -}
170 -
171 -pkg_postrm() {
172 - use emacs && elisp-site-regen
173 -}
174
175 diff --git a/dev-vcs/mercurial/mercurial-4.7.1.ebuild b/dev-vcs/mercurial/mercurial-4.7.1.ebuild
176 deleted file mode 100644
177 index 5b60d94346e..00000000000
178 --- a/dev-vcs/mercurial/mercurial-4.7.1.ebuild
179 +++ /dev/null
180 @@ -1,136 +0,0 @@
181 -# Copyright 1999-2019 Gentoo Authors
182 -# Distributed under the terms of the GNU General Public License v2
183 -
184 -EAPI=6
185 -
186 -PYTHON_COMPAT=( python2_7 )
187 -PYTHON_REQ_USE="threads"
188 -
189 -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
190 -
191 -DESCRIPTION="Scalable distributed SCM"
192 -HOMEPAGE="https://www.mercurial-scm.org/"
193 -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
194 -
195 -LICENSE="GPL-2+"
196 -SLOT="0"
197 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
198 -IUSE="bugzilla emacs gpg test tk"
199 -
200 -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
201 - gpg? ( app-crypt/gnupg )
202 - tk? ( dev-lang/tk )
203 - app-misc/ca-certificates"
204 -DEPEND="emacs? ( virtual/emacs )
205 - test? ( app-arch/unzip
206 - dev-python/pygments[${PYTHON_USEDEP}] )"
207 -
208 -SITEFILE="70${PN}-gentoo.el"
209 -
210 -# Too many tests fail #608720
211 -RESTRICT="test"
212 -
213 -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
214 -
215 -python_prepare_all() {
216 - # fix up logic that won't work in Gentoo Prefix (also won't outside in
217 - # certain cases), bug #362891
218 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
219 -
220 - distutils-r1_python_prepare_all
221 -}
222 -
223 -python_configure_all() {
224 - strip-flags -ftracer -ftree-vectorize
225 - # Note: make it impl-conditional if py3 is supported
226 - append-flags -fno-strict-aliasing
227 -
228 - "${PYTHON}" setup.py build_mo || die
229 -}
230 -
231 -python_compile_all() {
232 - rm -r contrib/win32 || die
233 - if use emacs; then
234 - cd contrib || die
235 - elisp-compile mercurial.el || die "elisp-compile failed!"
236 - fi
237 -}
238 -
239 -python_install_all() {
240 - distutils-r1_python_install_all
241 -
242 - newbashcomp contrib/bash_completion hg
243 -
244 - insinto /usr/share/zsh/site-functions
245 - newins contrib/zsh_completion _hg
246 -
247 - rm -f doc/*.?.txt
248 - dodoc CONTRIBUTORS
249 - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
250 -
251 - dobin hgeditor
252 - dobin contrib/hgk
253 - python_foreach_impl python_doscript contrib/hg-ssh
254 -
255 - if use emacs; then
256 - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
257 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
258 - fi
259 -
260 - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix plan9 *.el)
261 - for f in ${RM_CONTRIB[@]}; do
262 - rm -r contrib/$f || die
263 - done
264 -
265 - dodoc -r contrib
266 - docompress -x /usr/share/doc/${PF}/contrib
267 - doman doc/*.?
268 -
269 - insinto /etc/mercurial/hgrc.d
270 - doins "${FILESDIR}/cacerts.rc"
271 -}
272 -
273 -src_test() {
274 - pushd tests &>/dev/null || die
275 - rm -rf *svn* # Subversion tests fail with 1.5
276 - rm -f test-archive* # Fails due to verbose tar output changes
277 - rm -f test-convert-baz* # GNU Arch baz
278 - rm -f test-convert-cvs* # CVS
279 - rm -f test-convert-darcs* # Darcs
280 - rm -f test-convert-git* # git
281 - rm -f test-convert-mtn* # monotone
282 - rm -f test-convert-tla* # GNU Arch tla
283 - #rm -f test-doctest* # doctest always fails with python 2.5.x
284 - rm -f test-largefiles* # tends to time out
285 -
286 - popd &>/dev/null || die
287 - distutils-r1_src_test
288 -}
289 -
290 -python_test() {
291 - local TEST_DIR
292 -
293 - rm -rf "${TMPDIR}"/test
294 - distutils_install_for_testing
295 - cd tests || die
296 - "${PYTHON}" run-tests.py --verbose \
297 - --tmpdir="${TMPDIR}"/test \
298 - --with-hg="${TEST_DIR}"/scripts/hg \
299 - || die "Tests fail with ${EPYTHON}"
300 -}
301 -
302 -pkg_postinst() {
303 - use emacs && elisp-site-regen
304 -
305 - elog "If you want to convert repositories from other tools using convert"
306 - elog "extension please install correct tool:"
307 - elog " dev-vcs/cvs"
308 - elog " dev-vcs/darcs"
309 - elog " dev-vcs/git"
310 - elog " dev-vcs/monotone"
311 - elog " dev-vcs/subversion"
312 -}
313 -
314 -pkg_postrm() {
315 - use emacs && elisp-site-regen
316 -}
317
318 diff --git a/dev-vcs/mercurial/mercurial-4.8.2.ebuild b/dev-vcs/mercurial/mercurial-4.8.2.ebuild
319 deleted file mode 100644
320 index 2808c1a5043..00000000000
321 --- a/dev-vcs/mercurial/mercurial-4.8.2.ebuild
322 +++ /dev/null
323 @@ -1,148 +0,0 @@
324 -# Copyright 1999-2019 Gentoo Authors
325 -# Distributed under the terms of the GNU General Public License v2
326 -
327 -EAPI=7
328 -
329 -PYTHON_COMPAT=( python2_7 )
330 -PYTHON_REQ_USE="threads"
331 -
332 -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
333 -
334 -DESCRIPTION="Scalable distributed SCM"
335 -HOMEPAGE="https://www.mercurial-scm.org/"
336 -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
337 -
338 -LICENSE="GPL-2+"
339 -SLOT="0"
340 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
341 -IUSE="bugzilla emacs gpg test tk"
342 -
343 -RDEPEND="app-misc/ca-certificates
344 - dev-python/zstandard[${PYTHON_USEDEP}]
345 - bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
346 - gpg? ( app-crypt/gnupg )
347 - tk? ( dev-lang/tk )"
348 -
349 -DEPEND="emacs? ( virtual/emacs )
350 - test? ( app-arch/unzip
351 - dev-python/pygments[${PYTHON_USEDEP}] )"
352 -
353 -SITEFILE="70${PN}-gentoo.el"
354 -
355 -# Too many tests fail #608720
356 -RESTRICT="test"
357 -
358 -PATCHES=(
359 - "${FILESDIR}/${PN}-3.0.1-po_fixes.patch"
360 - "${FILESDIR}/${PN}-4.8.1-unbundle_zstd.patch"
361 -)
362 -
363 -python_prepare_all() {
364 - # fix up logic that won't work in Gentoo Prefix (also won't outside in
365 - # certain cases), bug #362891
366 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
367 -
368 - # Don't use bundled zstandard (#666972)
369 - rm -r contrib/python-zstandard || die
370 -
371 - distutils-r1_python_prepare_all
372 -}
373 -
374 -python_configure_all() {
375 - strip-flags -ftracer -ftree-vectorize
376 - # Note: make it impl-conditional if py3 is supported
377 - append-flags -fno-strict-aliasing
378 -
379 - "${PYTHON}" setup.py build_mo || die
380 -}
381 -
382 -python_compile_all() {
383 - rm -r contrib/win32 || die
384 - if use emacs; then
385 - cd contrib || die
386 - elisp-compile mercurial.el || die "elisp-compile failed!"
387 - fi
388 -}
389 -
390 -python_install_all() {
391 - distutils-r1_python_install_all
392 -
393 - newbashcomp contrib/bash_completion hg
394 -
395 - insinto /usr/share/zsh/site-functions
396 - newins contrib/zsh_completion _hg
397 -
398 - rm -f doc/*.?.txt
399 - dodoc CONTRIBUTORS
400 - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
401 -
402 - dobin hgeditor
403 - dobin contrib/hgk
404 - python_foreach_impl python_doscript contrib/hg-ssh
405 -
406 - if use emacs; then
407 - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
408 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
409 - fi
410 -
411 - local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion wix plan9 *.el )
412 - for f in ${RM_CONTRIB[@]}; do
413 - rm -r contrib/${f} || die
414 - done
415 -
416 - dodoc -r contrib
417 - docompress -x /usr/share/doc/${PF}/contrib
418 - doman doc/*.?
419 -
420 - insinto /etc/mercurial/hgrc.d
421 - doins "${FILESDIR}/cacerts.rc"
422 -
423 - # symlink to system zstd
424 - local sitedir=$(python_get_sitedir)
425 - dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so
426 -}
427 -
428 -src_test() {
429 - pushd tests &>/dev/null || die
430 - rm -rf *svn* # Subversion tests fail with 1.5
431 - rm -f test-archive* # Fails due to verbose tar output changes
432 - rm -f test-convert-baz* # GNU Arch baz
433 - rm -f test-convert-cvs* # CVS
434 - rm -f test-convert-darcs* # Darcs
435 - rm -f test-convert-git* # git
436 - rm -f test-convert-mtn* # monotone
437 - rm -f test-convert-tla* # GNU Arch tla
438 - #rm -f test-doctest* # doctest always fails with python 2.5.x
439 - rm -f test-largefiles* # tends to time out
440 -
441 - popd &>/dev/null || die
442 - distutils-r1_src_test
443 -}
444 -
445 -python_test() {
446 - local TEST_DIR
447 -
448 - rm -rf "${TMPDIR}"/test
449 - distutils_install_for_testing
450 - cd tests || die
451 - "${PYTHON}" run-tests.py --verbose \
452 - --tmpdir="${TMPDIR}"/test \
453 - --with-hg="${TEST_DIR}"/scripts/hg \
454 - || die "Tests fail with ${EPYTHON}"
455 -}
456 -
457 -pkg_postinst() {
458 - use emacs && elisp-site-regen
459 -
460 - elog "If you want to convert repositories from other tools using convert"
461 - elog "extension please install correct tool:"
462 - elog " dev-vcs/cvs"
463 - elog " dev-vcs/darcs"
464 - elog " dev-vcs/git"
465 - elog " dev-vcs/monotone"
466 - elog " dev-vcs/subversion"
467 -}
468 -
469 -pkg_postrm() {
470 - use emacs && elisp-site-regen
471 -}