[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
commit: 94280e8cb588f3b855879561a870ec602f194276
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Jun 29 17:25:56 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Mon Jul 3 17:50:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94280e8c
dev-vcs/mercurial: Drop trivial Emacs site-init file
Signed-off-by: Ulrich Müller gentoo.org>
dev-vcs/mercurial/files/70mercurial-gentoo.el | 3 ---
dev-vcs/mercurial/mercurial-6.2.3.ebuild | 2 +-
dev-vcs/mercurial/mercurial-6.3.2.ebuild | 2 +-
dev-vcs/mercurial/mercurial-6.4.4.ebuild | 2 +-
dev-vcs/mercurial/mercurial-.ebuild | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dev-vcs/mercurial/files/70mercurial-gentoo.el
b/dev-vcs/mercurial/files/70mercurial-gentoo.el
deleted file mode 100644
index 5779a612f204..
--- a/dev-vcs/mercurial/files/70mercurial-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; mercurial site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
\ No newline at end of file
diff --git a/dev-vcs/mercurial/mercurial-6.2.3.ebuild
b/dev-vcs/mercurial/mercurial-6.2.3.ebuild
index 3b23fa049db4..0b93688248f7 100644
--- a/dev-vcs/mercurial/mercurial-6.2.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.2.3.ebuild
@@ -246,7 +246,7 @@ python_install_all() {
if use emacs; then
elisp-install ${PN} contrib/mercurial.el* || die "elisp-install
failed!"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ elisp-make-site-file "${SITEFILE}"
fi
local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el
)
diff --git a/dev-vcs/mercurial/mercurial-6.3.2.ebuild
b/dev-vcs/mercurial/mercurial-6.3.2.ebuild
index 4e3511fc87fc..8bdf4536c637 100644
--- a/dev-vcs/mercurial/mercurial-6.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.3.2.ebuild
@@ -252,7 +252,7 @@ python_install_all() {
if use emacs; then
elisp-install ${PN} contrib/mercurial.el* || die "elisp-install
failed!"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ elisp-make-site-file "${SITEFILE}"
fi
local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el
)
diff --git a/dev-vcs/mercurial/mercurial-6.4.4.ebuild
b/dev-vcs/mercurial/mercurial-6.4.4.ebuild
index 74741a745c30..e24cf5d8b71c 100644
--- a/dev-vcs/mercurial/mercurial-6.4.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.4.4.ebuild
@@ -265,7 +265,7 @@ python_install_all() {
if use emacs; then
elisp-install ${PN} contrib/mercurial.el* || die "elisp-install
failed!"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ elisp-make-site-file "${SITEFILE}"
fi
local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el
)
diff --git a/dev-vcs/mercurial/mercurial-.ebuild
b/dev-vcs/mercurial/mercurial-.ebuild
index 13d27e773bce..2fb319d58180 100644
--- a/dev-vcs/mercurial/mercurial-.ebuild
+++ b/dev-vcs/mercurial/mercurial-.ebuild
@@ -112,7 +112,7 @@ python_install_all() {
if use emacs; then
elisp-install ${PN} contrib/mercurial.el* || die "elisp-install
failed!"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ elisp-make-site-file "${SITEFILE}"
fi
local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el
)
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
commit: 344daed170af3fae72cc031684585281efca896a Author: Cédric Krier gentoo org> AuthorDate: Sat Jan 28 20:03:34 2023 + Commit: Cédric Krier gentoo org> CommitDate: Sat Jan 28 20:04:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344daed1 dev-vcs/mercurial: add 6.3.2 Signed-off-by: Cédric Krier gentoo.org> dev-vcs/mercurial/Manifest | 3 + .../mercurial-6.3.2-setup-rust-makedirs.patch | 30 ++ dev-vcs/mercurial/mercurial-6.3.2.ebuild | 333 + 3 files changed, 366 insertions(+) diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 968fab6f456f..ea3c3899ee07 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -92,6 +92,7 @@ DIST mercurial-5.8.tar.gz 7985326 BLAKE2B 3b64343b692c389368b9c61baf367fe739bb79 DIST mercurial-6.0.2.tar.gz 8089180 BLAKE2B 3141e20e844c451717c93c347bc30843d11b3f66fbea3808199ea3a18a992be0fdb8f8dabe0010e1f038cf797b6148b224e7d7cfb067c184bcfd4ca2060d9980 SHA512 1591618840a3e4b862f0eb9e560d511b59eb34815de2e6e6cc1179d32f88a1e9a6f14abf3e02d76e17dbab1ffe384e52d97721e39da252ac5ba98a2233853c9a DIST mercurial-6.1.4.tar.gz 8070694 BLAKE2B e37fa67c22a153c3a939d5c20b7b601ef520378a1999ddb49b00937807edbc2ed67bb7819aadf4c9aebef0a812d8be2a99e4f96058a09ca3844a2f969e1d5420 SHA512 b43221c078efd4978fd47414d9442f423a97660e1f4c10d704a8d3403051778d2a25a0b4be6315d0a2126d01c14910ccbe9a5be6242b561a2bea0c522f54b731 DIST mercurial-6.2.3.tar.gz 8058864 BLAKE2B 72d710985298f17b2940b0a5cda896e8cadb881db0c9293c2c32ff3c2100dc2291fa314157b433eb05a5a25a442c0e0ae021a5abf7c477885a1e39201f5b0b0a SHA512 0d82582e6d40ceabcc32419bf0423dd9f49b72b72c91a0f575181f92b355699a88f0426a192c46ca47f3105e47cb45dc3ac1a6499f4c83e01fa31e31c1ffdfbb +DIST mercurial-6.3.2.tar.gz 8092710 BLAKE2B c64759736719af4a675abddd0f4d3578c815fc11a1644c52d7aaddfafb547faf018253d9a47e6ac869e7c1de91ca518b0106e77104e998deed9cbeadd6d3cee2 SHA512 5ca7e448bf336c2a2d4db174c4f486f66f41eef33db14f152abb09b8d82416124d251784cb5898499580083ca104113d0763e27baa9b77feb90ba2fd96d40be5 DIST micro-timer-0.3.1.crate 3357 BLAKE2B 13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a SHA512 197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7 DIST micro-timer-0.4.0.crate 3513 BLAKE2B cc189b0db3d6fff554dec8548243894f70ea0445e095179bbe5b0d06dae4de6c09bcded31f00507d2f238523a3ef300e25054102d37cc4768aeef569ee7fc6a0 SHA512 33f1b5c65d9fb293fd86d52509687b7f9adb7af6bdcb3904f24740a9ad58ba9b30987d2a63fc19afcd6a55467f294ab098401f53bafafbd15c48b30d87232585 DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B 148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa SHA512 9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917 @@ -100,6 +101,7 @@ DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e058c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f +DIST once_cell-1.14.0.crate 31614 BLAKE2B b9ac8f889c86d4160ee026fca20b5135aa7bd60e8bfaf23946d003bcf0b666929a4da5859d874449d15b6ba0ec4c26e98273d020be50184b9d44ae90b8608175 SHA512 81531f06f32854e1794555e10ccd6ee2b6913bfefdd9eed52dd44a02e799fa6371cdf102cc67bc70d581a0cc4abb7dd16c9c12ede6df4ff38b20dc5908bad186 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae DIST ouroboros-0.15.0.crate 6177 BLAKE2B 70989f764e3b83cf3f3ed598290540370a305a9b5e22f76954117a19c9bb0ccd4723892c0cbccd361a13e4961c49b3383a3f216b368d70de9d4908da87db1f72 SHA512
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
commit: af66a14056c9c073c2db5e5ac2ce5d071421e610
Author: Cédric Krier gentoo org>
AuthorDate: Sat Feb 5 08:54:58 2022 +
Commit: Cédric Krier gentoo org>
CommitDate: Sat Feb 5 08:55:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af66a140
dev-vcs/mercurial: version bumps
Closes: https://bugs.gentoo.org/830430
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Cédric Krier gentoo.org>
dev-vcs/mercurial/Manifest | 2 +-
.../mercurial-6.0.2-testing-pygments211.patch | 64 ++
...rcurial-6.0.1.ebuild => mercurial-6.0.2.ebuild} | 4 ++
3 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 1e2a4b7fef32..f45fea807a89 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -57,7 +57,7 @@ DIST memmap2-0.4.0.crate 19851 BLAKE2B
6bf418db7ad4af69121cc525be4ecb834c6ace06a
DIST memoffset-0.6.1.crate 7706 BLAKE2B
351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52
SHA512
74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
DIST mercurial-5.8.1.tar.gz 7988000 BLAKE2B
7805a7141a503f8533a25d0cfd3c58c421c966cb9ec83503c855e02aeb8a7fff98bf529f4807bf6fc5f606ae110c4a0571e0e249441bd4be6b5eefb07284958e
SHA512
d17c809fc48c55d646b677ad23b5cf4a1755f5a81790988109cd50ac259acc230edad7bf5ccc7a6384a490aeba4a7492327bb9878a541d5fa7207e2c378be966
DIST mercurial-5.8.tar.gz 7985326 BLAKE2B
3b64343b692c389368b9c61baf367fe739bb79a7b555308fcd4f09069472b393343f57608954017038c849d6812cd6fe5e1e20bbc6a95974d827d7e402c60bd7
SHA512
79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
-DIST mercurial-6.0.1.tar.gz 8072365 BLAKE2B
45c510249580cb175e08096c84889d7f742933bc80321c834c45311e7a22d0867c324f4f02d69189bae828ddec7ebdfe2385b7dd621792c238eaa027b98bcd80
SHA512
dae18c38e7df001177867ed9cb1c9cea6f25fff6c23fd307c56c89bba0e4641d6cf993aabefe1fcb6ab99bd32732b858411f722bea839690fbc04c0a91c1dc53
+DIST mercurial-6.0.2.tar.gz 8089180 BLAKE2B
3141e20e844c451717c93c347bc30843d11b3f66fbea3808199ea3a18a992be0fdb8f8dabe0010e1f038cf797b6148b224e7d7cfb067c184bcfd4ca2060d9980
SHA512
1591618840a3e4b862f0eb9e560d511b59eb34815de2e6e6cc1179d32f88a1e9a6f14abf3e02d76e17dbab1ffe384e52d97721e39da252ac5ba98a2233853c9a
DIST micro-timer-0.3.1.crate 3357 BLAKE2B
13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a
SHA512
197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7
DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B
148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa
SHA512
9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917
DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B
bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d
SHA512
8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
diff --git a/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch
b/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch
new file mode 100644
index ..31dab2c0c0b2
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Cédric Krier
+# Date 1641731730 -3600
+# Sun Jan 09 13:35:30 2022 +0100
+# Node ID 21c0ae0693bc048907b6e26a4fe160d1b7b48384
+# Parent 28f0092ec89f53ccf6d7b2b92dcaf8e1b02e8c13
+tests: support pygments 2.11 (issue6628)
+
+Differential Revision: https://phab.mercurial-scm.org/D11970
+
+diff --git a/tests/hghave.py b/tests/hghave.py
+--- a/tests/hghave.py
b/tests/hghave.py
+@@ -663,6 +663,22 @@ def pygments25():
+ return (major, minor) >= (2, 5)
+
+
++@check("pygments211", "Pygments version >= 2.11")
++def pygments211():
++try:
++import pygments
++
++v = pygments.__version__
++except ImportError:
++return False
++
++parts = v.split(".")
++major = int(parts[0])
++minor = int(parts[1])
++
++return (major, minor) >= (2, 11)
++
++
+ @check("outer-repo", "outer repo")
+ def has_outer_repo():
+ # failing for other reasons than 'no repo' imply that there is a repo
+diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
+--- a/tests/test-run-tests.t
b/tests/test-run-tests.t
+@@ -176,14 +176,19 @@ test diff colorisation
+ running 1 tests using 1 parallel processes
+
+ \x1b[38;5;124m---
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
commit: 87329b8bc3ba12f7fd6ac5ac335991b3685221a7 Author: Cédric Krier gentoo org> AuthorDate: Sat Jan 1 16:49:08 2022 + Commit: Cédric Krier gentoo org> CommitDate: Sat Jan 1 16:49:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87329b8b dev-vcs/mercurial: version bumps Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Cédric Krier gentoo.org> dev-vcs/mercurial/Manifest | 10 +- .../files/mercurial-6.0-testing-bigendian.patch| 255 + ...mercurial-5.9.3.ebuild => mercurial-6.0.ebuild} | 24 +- 3 files changed, 271 insertions(+), 18 deletions(-) diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 921ad8eef9c3..94b7d9e3a2af 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -18,7 +18,7 @@ DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42 DIST const_fn-0.4.4.crate 16138 BLAKE2B 80885ad10a5649876d37635dc6eb8b426e68f23d7bfdac234ae32816e7fae6d246ff0657d904a3b18dc5ab93fcaa3d4ff28984a1144fa3557d082c1c4d064fd1 SHA512 d79f07982c8ead364f314672ed471d41c6f31431cf511eff5e4c42ebdde324842110ffb8238394d9e8ba2ac19d884fa5f359ba04cef83acb1ca9431e14acb030 DIST cpufeatures-0.1.4.crate 10129 BLAKE2B a497cb23661b52c8627ec7a794a6ded37277ecc6aa3a405258e712cca4194811645947368ac5db4e22360f52a98205d9420de2288879635e5269e3de3aa684ea SHA512 8d6fbdf934359f4fa5f65df30801fef2ef1d011107884060b542a8f521c86ad3ce808f39bd78e971794a888d53df8dc045efc00e208df8c26ccaa9d951e5570c DIST cpython-0.5.2.crate 118024 BLAKE2B f50bfbc15b280cda22a7c7c47ec5453139fb8591b66c78de7897937296bb3805d7fd356ab09233293cedb5fe131699cf4517fcbf9b1ef61bb7ebb99d1c21e84a SHA512 9b2406afa2e309f9c748e42ac8d7d875b125e5cd40b8dc515c45ec87d1610bce50ab1ba2d95d7bec584de98e171377f08cb8a3ce0a0268383f030ed8631b728e -DIST cpython-0.6.0.crate 120585 BLAKE2B e5d39cf53d982839125cc74f362974a8fa455f19094c6cd1955e9a7012dd2d4b6172e1a74a3fd609ca0063af48099b48f2f1fcd6f1ba903ee3127b5357165dc5 SHA512 d656b3671c5d50216f80d757278d2b25c91a6da659f65832fbc621b7aa2e5975318189e33139fa31d84dad1cf052fd7af2c6b1fa6287ab19dc4ec89939e537c5 +DIST cpython-0.7.0.crate 125875 BLAKE2B 7965a16c7f25423703eb041c02f9b31ddfbed7290bcbac57ba09496021fb1effe934bb0a0ca597ecbef2221f916964e71bad307c02b69e65e017757f5e1dfcd0 SHA512 74508ee2a58bf20ed374c92c8ee67fb850f807c84a6b53c01007db87541c4ede8690c376fe9958903f716b2d0024c3f8562377b63abf630dd6c8964c7946d40f DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2 @@ -53,10 +53,11 @@ DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca1 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364ceddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa +DIST memmap2-0.4.0.crate 19851 BLAKE2B 6bf418db7ad4af69121cc525be4ecb834c6ace06a0ab011e536f52d7b7f02659747891f26aaccefc9805865b7e336386a36d7d747c30e4fd50eb9962c2adf2e9 SHA512 80a688941af4fa7a6d78909bed0cb08652bba0a045b7808449fec011771428154eb0199d74891247532c9a679076c6b662cfaa9b8510a8cd06a4865ade20dd32 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
commit: 63a6ef31f0b29dc5ba2469f2844c91301d75f202
Author: Cédric Krier gentoo org>
AuthorDate: Sun Jan 26 11:55:06 2020 +
Commit: Cédric Krier gentoo org>
CommitDate: Sun Jan 26 11:55:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a6ef31
dev-vcs/mercurial: Use absolute import for zstd
Fake zstd.py does not work on Python 2.7
And synchronize mercurial-
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Cédric Krier gentoo.org>
dev-vcs/mercurial/files/zstd.py| 2 --
.../{mercurial-5.2.2.ebuild => mercurial-5.2.2-r1.ebuild} | 5 -
dev-vcs/mercurial/mercurial-.ebuild| 7 +--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dev-vcs/mercurial/files/zstd.py b/dev-vcs/mercurial/files/zstd.py
deleted file mode 100644
index 29ae5eacd0c..000
--- a/dev-vcs/mercurial/files/zstd.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from zstd import *
-from zstd import __version__
diff --git a/dev-vcs/mercurial/mercurial-5.2.2.ebuild
b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
similarity index 96%
rename from dev-vcs/mercurial/mercurial-5.2.2.ebuild
rename to dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
index e189226b04d..7d67135fc8a 100644
--- a/dev-vcs/mercurial/mercurial-5.2.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
@@ -46,7 +46,10 @@ python_prepare_all() {
# fix up logic that won't work in Gentoo Prefix (also won't outside in
# certain cases), bug #362891
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
- cp "${FILESDIR}/zstd.py" mercurial/
+ # Use absolute import for zstd
+ sed -i -e 's/from \.* import zstd/import zstd/' \
+ mercurial/utils/compression.py \
+ mercurial/wireprotoframing.py || die
distutils-r1_python_prepare_all
}
diff --git a/dev-vcs/mercurial/mercurial-.ebuild
b/dev-vcs/mercurial/mercurial-.ebuild
index 9c47a383e79..8c12d545eb8 100644
--- a/dev-vcs/mercurial/mercurial-.ebuild
+++ b/dev-vcs/mercurial/mercurial-.ebuild
@@ -48,14 +48,17 @@ python_prepare_all() {
# certain cases), bug #362891
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
sed -i -e '/hgenv =/a\' -e 'hgenv.pop("PYTHONPATH", None)'
setup.py || die
- cp "${FILESDIR}/zstd.py" mercurial/
+ # Use absolute import for zstd
+ sed -i -e 's/from \.* import zstd/import zstd/' \
+ mercurial/utils/compression.py \
+ mercurial/wireprotoframing.py || die
distutils-r1_python_prepare_all
}
python_compile() {
strip-flags -ftracer -ftree-vectorize
- python_is_python3 || append-flags -fno-strict-aliasing
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
distutils-r1_python_compile build_ext --no-zstd
}
