1 |
commit: 0d8a9c4090058823695e2f8b5fd79e5bfb38a3ec |
2 |
Author: Cédric Krier <cedk <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 17 20:46:43 2021 +0000 |
4 |
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 17 20:47:27 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8a9c40 |
7 |
|
8 |
dev-vcs/mercurial: update live build with test enabled |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
11 |
Signed-off-by: Cédric Krier <cedk <AT> gentoo.org> |
12 |
|
13 |
dev-vcs/mercurial/mercurial-9999.ebuild | 36 +++++++++++++++------------------ |
14 |
1 file changed, 16 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild |
17 |
index 516f17871e1..1fa18749e4a 100644 |
18 |
--- a/dev-vcs/mercurial/mercurial-9999.ebuild |
19 |
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild |
20 |
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)" |
21 |
DISTUTILS_USE_SETUPTOOLS=no |
22 |
CARGO_OPTIONAL=1 |
23 |
|
24 |
-inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic |
25 |
+inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic multiprocessing |
26 |
|
27 |
DESCRIPTION="Scalable distributed SCM" |
28 |
HOMEPAGE="https://www.mercurial-scm.org/" |
29 |
@@ -25,18 +25,18 @@ BDEPEND=" |
30 |
|
31 |
RDEPEND=" |
32 |
app-misc/ca-certificates |
33 |
- dev-python/zstandard[${PYTHON_USEDEP}] |
34 |
gpg? ( app-crypt/gnupg ) |
35 |
- tk? ( dev-lang/tk ) |
36 |
-" |
37 |
+ tk? ( dev-lang/tk )" |
38 |
+ |
39 |
DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) |
40 |
- test? ( app-arch/unzip |
41 |
- dev-python/pygments[${PYTHON_USEDEP}] )" |
42 |
+ test? ( |
43 |
+ app-arch/unzip |
44 |
+ dev-python/pygments[${PYTHON_USEDEP}] |
45 |
+ )" |
46 |
|
47 |
SITEFILE="70${PN}-gentoo.el" |
48 |
|
49 |
-# Too many tests fail #608720 |
50 |
-RESTRICT="test" |
51 |
+RESTRICT="!test? ( test )" |
52 |
|
53 |
src_unpack() { |
54 |
mercurial_src_unpack |
55 |
@@ -50,11 +50,7 @@ python_prepare_all() { |
56 |
# fix up logic that won't work in Gentoo Prefix (also won't outside in |
57 |
# certain cases), bug #362891 |
58 |
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die |
59 |
- sed -i -e '/ hgenv =/a\' -e ' hgenv.pop("PYTHONPATH", None)' setup.py || die |
60 |
- # Use absolute import for zstd |
61 |
- sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \ |
62 |
- mercurial/utils/compression.py \ |
63 |
- mercurial/wireprotoframing.py || die |
64 |
+ sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die |
65 |
|
66 |
distutils-r1_python_prepare_all |
67 |
} |
68 |
@@ -62,7 +58,7 @@ python_prepare_all() { |
69 |
src_compile() { |
70 |
if use rust; then |
71 |
pushd rust/hg-cpython || die |
72 |
- cargo_src_compile |
73 |
+ cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs) |
74 |
popd |
75 |
fi |
76 |
distutils-r1_src_compile |
77 |
@@ -74,7 +70,7 @@ python_compile() { |
78 |
if use rust; then |
79 |
local -x HGWITHRUSTEXT="cpython" |
80 |
fi |
81 |
- distutils-r1_python_compile build_ext --no-zstd |
82 |
+ distutils-r1_python_compile build_ext |
83 |
} |
84 |
|
85 |
python_compile_all() { |
86 |
@@ -97,7 +93,7 @@ python_install() { |
87 |
if use rust; then |
88 |
local -x HGWITHRUSTEXT="cpython" |
89 |
fi |
90 |
- distutils-r1_python_install build_ext --no-zstd |
91 |
+ distutils-r1_python_install build_ext |
92 |
} |
93 |
|
94 |
python_install_all() { |
95 |
@@ -151,6 +147,7 @@ src_test() { |
96 |
rm -f test-convert-mtn* # monotone |
97 |
rm -f test-convert-tla* # GNU Arch tla |
98 |
rm -f test-largefiles* # tends to time out |
99 |
+ rm -f test-https* # requires to support tls1.0 |
100 |
if [[ ${EUID} -eq 0 ]]; then |
101 |
einfo "Removing tests which require user privileges to succeed" |
102 |
rm -f test-convert* |
103 |
@@ -168,12 +165,11 @@ src_test() { |
104 |
python_test() { |
105 |
local TEST_DIR |
106 |
|
107 |
- rm -rf "${TMPDIR}"/test |
108 |
distutils_install_for_testing |
109 |
cd tests || die |
110 |
- "${PYTHON}" run-tests.py --verbose \ |
111 |
- --tmpdir="${TMPDIR}"/test \ |
112 |
- --with-hg="${TEST_DIR}"/scripts/hg \ |
113 |
+ "${PYTHON}" run-tests.py \ |
114 |
+ --jobs $(makeopts_jobs) \ |
115 |
+ --timeout 0 \ |
116 |
|| die "Tests fail with ${EPYTHON}" |
117 |
} |