* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
@ 2020-01-26 11:55 Cédric Krier
0 siblings, 0 replies; 5+ messages in thread
From: Cédric Krier @ 2020-01-26 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 63a6ef31f0b29dc5ba2469f2844c91301d75f202
Author: Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 11:55:06 2020 +0000
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 11:55:21 2020 +0000
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-9999
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Cédric Krier <cedk <AT> 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-9999.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..00000000000
--- 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-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 9c47a383e79..8c12d545eb8 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.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
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
@ 2022-01-01 16:49 Cédric Krier
0 siblings, 0 replies; 5+ messages in thread
From: Cédric Krier @ 2022-01-01 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 87329b8bc3ba12f7fd6ac5ac335991b3685221a7
Author: Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 1 16:49:08 2022 +0000
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 16:49:38 2022 +0000
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 <cedk <AT> 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 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 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 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-5.9.3.tar.gz 8126023 BLAKE2B 8799f7ec1533a1b1b97b683cf002a0562f5feb52ec02b2b627a2467b83a3ec667b39b28ad8a38a0b5f7f1d1a4561cdf68c83c3332f7d3d2f3740a3d4157b8565 SHA512 d2a91cf63ca8f7621a2d36af7993c9878a2a36c7c95a027f2ff9d5ec3cdb01b9f86a60108cf3ca674b5b306488f61f749c3d8c5f814d6c90c04941d551d458dd
+DIST mercurial-6.0.tar.gz 8137797 BLAKE2B d6b4021e3ee249280c99e4f84f393801ac1feb0560fe20333c2b5c99eac46d704afe6788a1ca27ba22b8fd2a2f363869da05d2880e7ad6a19774a297310b89aa SHA512 342440af75b8e48b75ca604ee4f81298b652413a07f84cb475d9ed3c875a8b69bc22289c2a22d6f07c7bc54fdb1bc25a51a179eb9dcdc299b85fdd0fa4827dad
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
@@ -74,9 +75,9 @@ DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e675
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
DIST python27-sys-0.5.2.crate 37459 BLAKE2B a122bf29fbb16b46876c885811219e08376f666e385055ddc4976a0ba9a7d90954143a55a68033113d1e52375bdba68519fbade2cc8bba56174ada9e89448790 SHA512 670087e6edf55084fbe005f33baddd7936900f18753181288d9fb06deec56bc09cb78cd2ec2c94529be5ae603b95de364ea7f92e5d4cd2aad727672fe96754ec
-DIST python27-sys-0.6.0.crate 37198 BLAKE2B 9d35f3ceb1be97d9404d5a3de6419696a13a941522701b6b6506a3f8e936ead2046eeb62986a70fa35fd5283c451379288b80d5ce1bc358ff1b57365368023bc SHA512 8104d7675ef9e92d17bcb34b2e7919a5dd7163be3fee66f4802c99153787a2d38f3959bb72f8d975e2cbca3d35949408d1911bc79e31b20905a5ee173775504d
+DIST python27-sys-0.7.0.crate 37506 BLAKE2B 739d2094fa5d7ead7508acf54073692a0e5e40989034fb91edd5e3a23fc1470a71e7a9e0294daa0e4715d4205f4cc8c04bc775faec8000b7d2a3a4464615955f SHA512 5748e7db36a97ba1b9d44096aab5dec9e18b1eb8723f301921f430edfee7f9bde54b205c6f8816eb1c0f1aa9d8e9a1da1fe046bf381da6a56548eeb058db3ea2
DIST python3-sys-0.5.2.crate 44605 BLAKE2B 72e68e32334e709bb291ef609b1da2f123cb0f080f6bc517bedc9eb46ae68fe37b6fe4655aca9b478a65726f03097ef6400c351b7a301885e019fa45328161d2 SHA512 abcc7624b5c8b018f553c5971414a33974e759056b50a20883c98168e790b26b94287f111fa1e00c6c78841cc5cc1a7462262462e6a9e72e5991140b729d4046
-DIST python3-sys-0.6.0.crate 44905 BLAKE2B 2cd2d4379182a5af623fa7b1f35c4c999a02235600d669e717e34e7550161ff5702f300d84bb148790cbc3517a1f1c4d34e61af71f24a85b111d2f09682f23bc SHA512 c5fa01dffd12aa95794c71798de21ac8619c42da2b6f408203032d6c4d1c17b72716cab7c54e981fb1eb1983dbaf0a845c6294893058c2ce2ce818e5378e72fd
+DIST python3-sys-0.7.0.crate 46268 BLAKE2B 0c79cd30c69c10ec3dc30f574e7cbefd465e7d8f13c8495e8090cfd8a69ae6d6095eace734bff5b4ff0b8b7de76425aa1b61aadf798ac3e5a2633397fe762b2c SHA512 f2debc89c6f415a5e5eb00699e2d40e30b9f2bf5b82f3ffcc62695e45a9345a8c30f39a823e01fb13ce8a22624b09d6a4f40729614b826964203c3787f99951f
DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
@@ -103,6 +104,7 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
DIST sha-1-0.9.6.crate 13758 BLAKE2B 8199c2cbdab2954edd44aae6bee8fdbaa883f27993722845179aa2117849c5ea86df08ef58da514d0bb78612381977f9d101928a764a62b8b14ac04e86e83d6b SHA512 10a37e30b0c65cdb64a49e14185faf7d0bb776910f87c5dff128674762b4375aa1f9f2bf90b38ef37c521ad365d3a2f02c0e33157593fac15fecf9b33a5fa9fc
DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST syn-1.0.54.crate 228322 BLAKE2B bf4455927b913902fcf1804284660c0b7c9fbe3c50a9f854b8e44d3fc726825fcde85c563f3df4404406d51b517299eda19dbd085bde552dfe5d4f0d9a7510f4 SHA512 2cbed3fafcb3c628623273b83678238d0e66f899599e3364a6511c59c881ad4a3299b806462c06f19ddabfade096c1a7dedea95273461ea3f8ae347a2b3c1ecb
diff --git a/dev-vcs/mercurial/files/mercurial-6.0-testing-bigendian.patch b/dev-vcs/mercurial/files/mercurial-6.0-testing-bigendian.patch
new file mode 100644
index 000000000000..c47eaff7b385
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-6.0-testing-bigendian.patch
@@ -0,0 +1,255 @@
+# HG changeset patch
+# User Julien Cristau <jcristau@debian.org>
+# Date 1629904487 -7200
+# Wed Aug 25 17:14:47 2021 +0200
+# Branch stable
+# Node ID e11f903fd7a6e80b6168c7ef6e28f20349e681e2
+# Parent 132819e1fa1565b45fc09093ebbfbe991b0a0f5d
+tests: allow for variation in zstd output as seen on s390x and powerpc
+
+--- a/tests/hghave.py
++++ b/tests/hghave.py
+@@ -1141,8 +1141,13 @@ def has_lzma():
+ return True
+ except ImportError:
+ return False
+
+
+ @check("bash", "bash shell")
+ def has_bash():
+ return matchoutput("bash -c 'echo hi'", b'^hi$')
++
++
++@check("bigendian", "big-endian CPU")
++def has_bigendian():
++ return sys.byteorder == 'big'
+--- a/tests/test-clone-stream.t
++++ b/tests/test-clone-stream.t
+@@ -399,21 +399,23 @@ getbundle requests with stream=1 are unc
+ 00b0: 00 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff |................|
+ 00c0: 80 29 63 a0 49 d3 23 87 bf ce fe 56 67 92 67 2c |.)c.I.#....Vg.g,|
+ 00d0: 69 d1 ec 39 00 00 00 00 00 00 00 00 00 00 00 00 |i..9............|
+ 00e0: 75 30 73 26 45 64 61 74 61 2f 30 30 63 68 61 6e |u0s&Edata/00chan|
+ 00f0: 67 65 6c 6f 67 2d 61 62 33 34 39 31 38 30 61 30 |gelog-ab349180a0|
+ #endif
+ #if zstd no-rust
+ $ f --size --hex --bytes 256 body
+- body: size=116340
++ body: size=116340 (no-bigendian !)
++ body: size=116335 (bigendian !)
+ 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
+ 0010: 9a 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
+ 0020: 06 09 04 0c 5e 62 79 74 65 63 6f 75 6e 74 31 30 |....^bytecount10|
+- 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
++ 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-bigendian !)
++ 0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (bigendian !)
+ 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
+ 0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
+ 0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
+ 0070: 32 43 72 65 76 6c 6f 67 2d 63 6f 6d 70 72 65 73 |2Crevlog-compres|
+ 0080: 73 69 6f 6e 2d 7a 73 74 64 25 32 43 72 65 76 6c |sion-zstd%2Crevl|
+ 0090: 6f 67 76 31 25 32 43 73 70 61 72 73 65 72 65 76 |ogv1%2Csparserev|
+ 00a0: 6c 6f 67 25 32 43 73 74 6f 72 65 00 00 80 00 73 |log%2Cstore....s|
+ 00b0: 08 42 64 61 74 61 2f 30 2e 69 00 03 00 01 00 00 |.Bdata/0.i......|
+@@ -528,17 +530,18 @@ Clone with background file closing enabl
+ 1093 files to transfer, 102 KB of data (no-zstd !)
+ 1093 files to transfer, 98.9 KB of data (zstd !)
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing
+ updating the branch cache
+ transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+ bundle2-input-part: total payload size 118984 (no-zstd !)
+ transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
+- bundle2-input-part: total payload size 116145 (zstd !)
++ bundle2-input-part: total payload size 116145 (zstd no-bigendian !)
++ bundle2-input-part: total payload size 116140 (zstd bigendian !)
+ bundle2-input-part: "listkeys" (params: 1 mandatory) supported
+ bundle2-input-bundle: 2 parts total
+ checking for updated bookmarks
+ updating the branch cache
+ (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
+ #endif
+
+ Cannot stream clone when there are secret changesets
+--- a/tests/test-generaldelta.t
++++ b/tests/test-generaldelta.t
+@@ -285,21 +285,24 @@ test maxdeltachainspan
+ 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
+ 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
+ 49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000 (no-zstd !)
+ 50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000 (no-zstd !)
+ 51 4 3 50 prev 356 594 611 1.02862 611 0 0.00000 (no-zstd !)
+ 52 4 4 51 p1 58 640 669 1.04531 669 0 0.00000 (no-zstd !)
+ 49 4 1 -1 base 205 316 205 0.64873 205 0 0.00000 (zstd !)
+ 50 4 2 49 p1 58 362 263 0.72652 263 0 0.00000 (zstd !)
+- 51 4 3 50 prev 366 594 629 1.05892 629 0 0.00000 (zstd !)
+- 52 4 4 51 p1 58 640 687 1.07344 687 0 0.00000 (zstd !)
++ 51 4 3 50 prev 366 594 629 1.05892 629 0 0.00000 (zstd no-bigendian !)
++ 52 4 4 51 p1 58 640 687 1.07344 687 0 0.00000 (zstd no-bigendian !)
++ 51 4 3 50 prev 367 594 630 1.06061 630 0 0.00000 (zstd bigendian !)
++ 52 4 4 51 p1 58 640 688 1.07500 688 0 0.00000 (zstd bigendian !)
+ 53 5 1 -1 base 0 0 0 0.00000 0 0 0.00000
+ 54 6 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
+- 54 6 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
++ 54 6 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
++ 54 6 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
+ $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 55 changesets with 53 changes to 53 files (+2 heads)
+ new changesets 61246295ee1e:c930ac4a5b32
+ updating to branch default
+@@ -357,20 +360,22 @@ test maxdeltachainspan
+ 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
+ 49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000 (no-zstd !)
+ 50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000 (no-zstd !)
+ 51 2 13 17 p1 58 594 739 1.24411 2781 2042 2.76319 (no-zstd !)
+ 52 5 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
+ 49 4 1 -1 base 205 316 205 0.64873 205 0 0.00000 (zstd !)
+ 50 4 2 49 p1 58 362 263 0.72652 263 0 0.00000 (zstd !)
+ 51 2 13 17 p1 58 594 739 1.24411 2789 2050 2.77402 (zstd !)
+- 52 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
++ 52 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
++ 52 5 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
+ 53 6 1 -1 base 0 0 0 0.00000 0 0 0.00000
+ 54 7 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
+- 54 7 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
++ 54 7 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
++ 54 7 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
+ $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 55 changesets with 53 changes to 53 files (+2 heads)
+ new changesets 61246295ee1e:c930ac4a5b32
+ updating to branch default
+@@ -427,9 +432,10 @@ test maxdeltachainspan
+ 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
+ 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
+ 49 1 7 5 p1 58 316 389 1.23101 2857 2468 6.34447
+ 50 1 8 49 p1 58 362 447 1.23481 2915 2468 5.52125
+ 51 2 13 17 p1 58 594 739 1.24411 2642 1903 2.57510
+ 52 2 14 51 p1 58 640 797 1.24531 2700 1903 2.38770
+ 53 4 1 -1 base 0 0 0 0.00000 0 0 0.00000
+ 54 5 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
+- 54 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
++ 54 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
++ 54 5 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
+--- a/tests/test-persistent-nodemap.t
++++ b/tests/test-persistent-nodemap.t
+@@ -1017,17 +1017,18 @@ Simple case
+ No race condition
+
+ $ hg clone -U --stream ssh://user@dummy/test-repo stream-clone --debug | egrep '00(changelog|manifest)'
+ adding [s] 00manifest.n (62 bytes)
+ adding [s] 00manifest-*.nd (118 KB) (glob)
+ adding [s] 00changelog.n (62 bytes)
+ adding [s] 00changelog-*.nd (118 KB) (glob)
+ adding [s] 00manifest.d (452 KB) (no-zstd !)
+- adding [s] 00manifest.d (491 KB) (zstd !)
++ adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
++ adding [s] 00manifest.d (492 KB) (zstd bigendian !)
+ adding [s] 00changelog.d (360 KB) (no-zstd !)
+ adding [s] 00changelog.d (368 KB) (zstd !)
+ adding [s] 00manifest.i (313 KB)
+ adding [s] 00changelog.i (313 KB)
+ $ ls -1 stream-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
+ 00changelog-*.nd (glob)
+ 00changelog.n
+ 00manifest-*.nd (glob)
+@@ -1057,17 +1058,18 @@ setup the step-by-step stream cloning
+ > [extensions]
+ > steps=$RUNTESTDIR/testlib/ext-stream-clone-steps.py
+ > EOF
+
+ Check and record file state beforehand
+
+ $ f --size test-repo/.hg/store/00changelog*
+ test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
+- test-repo/.hg/store/00changelog.d: size=376891 (zstd !)
++ test-repo/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
++ test-repo/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
+ test-repo/.hg/store/00changelog.d: size=368890 (no-zstd !)
+ test-repo/.hg/store/00changelog.i: size=320384
+ test-repo/.hg/store/00changelog.n: size=62
+ $ hg -R test-repo debugnodemap --metadata | tee server-metadata.txt
+ uid: * (glob)
+ tip-rev: 5005
+ tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
+ data-length: 121088
+@@ -1087,28 +1089,30 @@ Do a mix of clone and commit at the same
+ $ touch $HG_TEST_STREAM_WALKED_FILE_2
+ $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
+ $ cat clone-output
+ adding [s] 00manifest.n (62 bytes)
+ adding [s] 00manifest-*.nd (118 KB) (glob)
+ adding [s] 00changelog.n (62 bytes)
+ adding [s] 00changelog-*.nd (118 KB) (glob)
+ adding [s] 00manifest.d (452 KB) (no-zstd !)
+- adding [s] 00manifest.d (491 KB) (zstd !)
++ adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
++ adding [s] 00manifest.d (492 KB) (zstd bigendian !)
+ adding [s] 00changelog.d (360 KB) (no-zstd !)
+ adding [s] 00changelog.d (368 KB) (zstd !)
+ adding [s] 00manifest.i (313 KB)
+ adding [s] 00changelog.i (313 KB)
+
+ Check the result state
+
+ $ f --size stream-clone-race-1/.hg/store/00changelog*
+ stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
+ stream-clone-race-1/.hg/store/00changelog.d: size=368890 (no-zstd !)
+- stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd !)
++ stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
++ stream-clone-race-1/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
+ stream-clone-race-1/.hg/store/00changelog.i: size=320384
+ stream-clone-race-1/.hg/store/00changelog.n: size=62
+
+ $ hg -R stream-clone-race-1 debugnodemap --metadata | tee client-metadata.txt
+ uid: * (glob)
+ tip-rev: 5005
+ tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
+ data-length: 121088
+@@ -1152,17 +1156,18 @@ get changed, however to make thing simpl
+ this test.
+
+ Check the initial state
+
+ $ f --size test-repo/.hg/store/00changelog*
+ test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
+ test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
+ test-repo/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
+- test-repo/.hg/store/00changelog.d: size=376950 (zstd !)
++ test-repo/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
++ test-repo/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
+ test-repo/.hg/store/00changelog.d: size=368949 (no-zstd !)
+ test-repo/.hg/store/00changelog.i: size=320448
+ test-repo/.hg/store/00changelog.n: size=62
+ $ hg -R test-repo debugnodemap --metadata | tee server-metadata-2.txt
+ uid: * (glob)
+ tip-rev: 5006
+ tip-node: ed2ec1eef9aa2a0ec5057c51483bc148d03e810b
+ data-length: 121344 (rust !)
+@@ -1203,17 +1208,18 @@ Performe the mix of clone and full refre
+ adding [s] 00changelog.i (313 KB)
+
+ Check the result.
+
+ $ f --size stream-clone-race-2/.hg/store/00changelog*
+ stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
+ stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
+ stream-clone-race-2/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
+- stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd !)
++ stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
++ stream-clone-race-2/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
+ stream-clone-race-2/.hg/store/00changelog.d: size=368949 (no-zstd !)
+ stream-clone-race-2/.hg/store/00changelog.i: size=320448
+ stream-clone-race-2/.hg/store/00changelog.n: size=62
+
+ $ hg -R stream-clone-race-2 debugnodemap --metadata | tee client-metadata-2.txt
+ uid: * (glob)
+ tip-rev: 5006
+ tip-node: ed2ec1eef9aa2a0ec5057c51483bc148d03e810b
diff --git a/dev-vcs/mercurial/mercurial-5.9.3.ebuild b/dev-vcs/mercurial/mercurial-6.0.ebuild
similarity index 94%
rename from dev-vcs/mercurial/mercurial-5.9.3.ebuild
rename to dev-vcs/mercurial/mercurial-6.0.ebuild
index 018cd801cb82..2626b7df8aeb 100644
--- a/dev-vcs/mercurial/mercurial-5.9.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.0.ebuild
@@ -27,7 +27,7 @@ CRATES="
clap-2.33.3
const_fn-0.4.4
cpufeatures-0.1.4
- cpython-0.6.0
+ cpython-0.7.0
crc32fast-1.2.1
crossbeam-channel-0.4.4
crossbeam-channel-0.5.0
@@ -59,7 +59,7 @@ CRATES="
log-0.4.11
maybe-uninit-2.0.0
memchr-2.3.4
- memmap-0.7.0
+ memmap2-0.4.0
memoffset-0.6.1
micro-timer-0.3.1
micro-timer-macros-0.3.1
@@ -75,8 +75,8 @@ CRATES="
pretty_assertions-0.6.1
proc-macro-hack-0.5.19
proc-macro2-1.0.24
- python27-sys-0.6.0
- python3-sys-0.6.0
+ python27-sys-0.7.0
+ python3-sys-0.7.0
quick-error-1.2.3
quote-1.0.7
rand-0.7.3
@@ -96,6 +96,7 @@ CRATES="
scopeguard-1.1.0
sha-1-0.9.6
sized-chunks-0.6.2
+ stable_deref_trait-1.2.0
static_assertions-1.1.0
strsim-0.8.0
syn-1.0.54
@@ -123,7 +124,7 @@ CRATES="
zstd-sys-1.4.17+zstd.1.4.5
"
-inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
DESCRIPTION="Scalable distributed SCM"
HOMEPAGE="https://www.mercurial-scm.org/"
@@ -148,6 +149,10 @@ DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
dev-python/pygments[${PYTHON_USEDEP}]
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-testing-bigendian.patch
+)
+
SITEFILE="70${PN}-gentoo.el"
RESTRICT="!test? ( test )"
@@ -261,13 +266,6 @@ src_test() {
rm -f test-largefiles* # tends to time out
rm -f test-https* # requires to support tls1.0
rm -rf test-removeemptydirs* # requires access to access parent directories
- if [[ $(tc-endian) == "big" ]]; then
- # tests no working on big-endian
- # https://bz.mercurial-scm.org/show_bug.cgi?id=6607
- rm -f test-clone-uncompressed.t
- rm -f test-generaldelta.t
- rm -f test-persistent-nodemap.t
- fi
if [[ ${EUID} -eq 0 ]]; then
einfo "Removing tests which require user privileges to succeed"
rm -f test-convert*
@@ -283,8 +281,6 @@ src_test() {
}
python_test() {
- local TEST_DIR
-
distutils_install_for_testing
cd tests || die
PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
@ 2022-02-05 8:55 Cédric Krier
0 siblings, 0 replies; 5+ messages in thread
From: Cédric Krier @ 2022-02-05 8:55 UTC (permalink / raw
To: gentoo-commits
commit: af66a14056c9c073c2db5e5ac2ce5d071421e610
Author: Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 5 08:54:58 2022 +0000
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Sat Feb 5 08:55:26 2022 +0000
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 <cedk <AT> 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 000000000000..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 <ced@b2ck.com>
+# 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--- $TESTTMP/test-failure.t\x1b[39m (esc)
+- \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc)
++ \x1b[38;5;28m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (pygments211 !)
++ \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (no-pygments211 !)
+ \x1b[38;5;90;01m@@ -1,4 +1,4 @@\x1b[39;00m (esc)
+- $ echo "bar-baz"; echo "bar-bad"; echo foo
+- \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc)
+- bar*bad (glob)
++ \x1b[38;5;250m \x1b[39m $ echo "bar-baz"; echo "bar-bad"; echo foo (esc) (pygments211 !)
++ $ echo "bar-baz"; echo "bar-bad"; echo foo (no-pygments211 !)
++ \x1b[38;5;28m+ bar*baz (glob)\x1b[39m (esc) (pygments211 !)
++ \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc) (no-pygments211 !)
++ \x1b[38;5;250m \x1b[39m bar*bad (glob) (esc) (pygments211 !)
++ bar*bad (glob) (no-pygments211 !)
+ \x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc)
+ \x1b[38;5;124m- | fo (re)\x1b[39m (esc)
+- \x1b[38;5;34m+ foo\x1b[39m (esc)
++ \x1b[38;5;28m+ foo\x1b[39m (esc) (pygments211 !)
++ \x1b[38;5;34m+ foo\x1b[39m (esc) (no-pygments211 !)
+
+ \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc)
+ !
diff --git a/dev-vcs/mercurial/mercurial-6.0.1.ebuild b/dev-vcs/mercurial/mercurial-6.0.2.ebuild
similarity index 99%
rename from dev-vcs/mercurial/mercurial-6.0.1.ebuild
rename to dev-vcs/mercurial/mercurial-6.0.2.ebuild
index 0f6e2e2856c6..2950dfdbe4ba 100644
--- a/dev-vcs/mercurial/mercurial-6.0.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.0.2.ebuild
@@ -149,6 +149,10 @@ DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
dev-python/pygments[${PYTHON_USEDEP}]
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-testing-pygments211.patch
+)
+
SITEFILE="70${PN}-gentoo.el"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
@ 2023-01-28 20:04 Cédric Krier
0 siblings, 0 replies; 5+ messages in thread
From: Cédric Krier @ 2023-01-28 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 344daed170af3fae72cc031684585281efca896a
Author: Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 20:03:34 2023 +0000
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 20:04:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344daed1
dev-vcs/mercurial: add 6.3.2
Signed-off-by: Cédric Krier <cedk <AT> 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 e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f 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 20e1dd42bd5789d3822c7f7d862f69c11695c19475cd943ce049b33184e231dac32d89745cf57a2db822f5f2967ee84b29320f40708612610e336aedb0c08be8
DIST ouroboros_macro-0.15.0.crate 16239 BLAKE2B 6e40a0bd4f04dfe5f1b93f2ff0f9d169792e8f5c9c57089061f488b4d0907d0b45c63d0ccfe2ee7e0989c7009d96760bb4c873afa688e1359db09c1ee8ce0a68 SHA512 78003e89f1a062957d66261474392b32d67a75ab1933b2dadf9c6a8c8ecd29d184ef4a1f25cadd7e1afb23aa58dacf69ca6969c327405be5dc97b8fbc09568ae
@@ -170,6 +172,7 @@ DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d67
DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
DIST twox-hash-1.6.0.crate 21402 BLAKE2B 97a3e7ea21a891ca514438c249dd792c7bba299543dd477d6eb77d0268c2f67dc8df15139ad8c18df52455936656e4def72346ffc554f2e5ad1b7abc32b8a3e0 SHA512 e271c72920a9ad6a551005063b85b26f6525290983b799741ddae708d0dfa9d312a60953c05de4e9c3049e2a49293860bc18280b1dbfed9819ca2abac9f9cb50
DIST twox-hash-1.6.2.crate 21880 BLAKE2B c073cf7feb4e8714b8e73a1c9247178b5571dc4b79b84ce84f9020b6e66370b0c4c14259c88393230a13302dd18e449e2dc2939782f17c66d095a450a3e485a9 SHA512 8171cf6970f18143cf2bd186014fe5a72d3ec5b2cd1e718b45dbc94e5cb6bea1b2485a6f6332d52411ffb85d746266c408b3b3dbd6c7c18a98cc0dc953cc21b1
diff --git a/dev-vcs/mercurial/files/mercurial-6.3.2-setup-rust-makedirs.patch b/dev-vcs/mercurial/files/mercurial-6.3.2-setup-rust-makedirs.patch
new file mode 100644
index 000000000000..d2082ec6cd24
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-6.3.2-setup-rust-makedirs.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Cédric Krier <ced@b2ck.com>
+# Date 1674932937 -3600
+# Sat Jan 28 20:08:57 2023 +0100
+# Node ID 65a97b8b1268169fecc21749b7472fd155bfb399
+# Parent a1123772333204cbeb766b17de8089a1d13d4a68
+# EXP-Topic setup-rust-build-makedirs-target
+Ensure target directory exists with building rust extension
+
+When the rust extension is the first to be build, the target directory may not
+exist so the copy fails.
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -1454,11 +1454,13 @@ class RustStandaloneExtension(RustExtens
+ target = [target_dir]
+ target.extend(self.name.split('.'))
+ target[-1] += DYLIB_SUFFIX
++ target = os.path.join(*target)
++ os.makedirs(os.path.dirname(target), exist_ok=True)
+ shutil.copy2(
+ os.path.join(
+ self.rusttargetdir, self.dylibname + self.rustdylibsuffix()
+ ),
+- os.path.join(*target),
++ target,
+ )
+
+
diff --git a/dev-vcs/mercurial/mercurial-6.3.2.ebuild b/dev-vcs/mercurial/mercurial-6.3.2.ebuild
new file mode 100644
index 000000000000..606ff35a8f45
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-6.3.2.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+CARGO_OPTIONAL=1
+
+CRATES="
+ Inflector-0.11.4
+ adler-0.2.3
+ ahash-0.4.7
+ aho-corasick-0.7.18
+ aliasable-0.1.3
+ ansi_term-0.12.1
+ atty-0.2.14
+ autocfg-1.0.1
+ bitflags-1.3.2
+ bitmaps-2.1.0
+ block-buffer-0.9.0
+ block-buffer-0.10.2
+ byteorder-1.4.3
+ bytes-cast-0.2.0
+ bytes-cast-derive-0.1.0
+ cc-1.0.66
+ cfg-if-0.1.10
+ cfg-if-1.0.0
+ chrono-0.4.19
+ clap-2.34.0
+ const_fn-0.4.4
+ convert_case-0.4.0
+ cpufeatures-0.1.4
+ cpufeatures-0.2.1
+ cpython-0.7.0
+ crc32fast-1.2.1
+ crossbeam-channel-0.5.2
+ crossbeam-deque-0.8.0
+ crossbeam-epoch-0.9.1
+ crossbeam-utils-0.8.1
+ crypto-common-0.1.2
+ ctor-0.1.16
+ derive_more-0.99.17
+ diff-0.1.12
+ digest-0.9.0
+ digest-0.10.2
+ either-1.6.1
+ env_logger-0.9.0
+ fastrand-1.7.0
+ flate2-1.0.22
+ format-bytes-0.3.0
+ format-bytes-macros-0.4.0
+ generic-array-0.14.4
+ getrandom-0.1.15
+ getrandom-0.2.4
+ glob-0.3.0
+ hashbrown-0.9.1
+ hermit-abi-0.1.17
+ hex-0.4.3
+ home-0.5.3
+ humantime-2.1.0
+ im-rc-15.0.0
+ instant-0.1.12
+ itertools-0.9.0
+ itertools-0.10.3
+ jobserver-0.1.21
+ lazy_static-1.4.0
+ libc-0.2.124
+ libm-0.2.1
+ libz-sys-1.1.2
+ log-0.4.14
+ memchr-2.4.1
+ memmap2-0.5.7
+ memoffset-0.6.1
+ micro-timer-0.4.0
+ micro-timer-macros-0.4.0
+ miniz_oxide-0.4.3
+ num-integer-0.1.44
+ num-traits-0.2.14
+ num_cpus-1.13.0
+ once_cell-1.14.0
+ opaque-debug-0.3.0
+ ouroboros-0.15.0
+ ouroboros_macro-0.15.0
+ output_vt100-0.1.2
+ paste-1.0.5
+ pkg-config-0.3.19
+ ppv-lite86-0.2.10
+ pretty_assertions-1.1.0
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro2-1.0.24
+ python3-sys-0.7.0
+ quote-1.0.7
+ rand-0.7.3
+ rand-0.8.5
+ rand_chacha-0.2.2
+ rand_chacha-0.3.1
+ rand_core-0.5.1
+ rand_core-0.6.3
+ rand_distr-0.4.3
+ rand_hc-0.2.0
+ rand_pcg-0.3.1
+ rand_xoshiro-0.4.0
+ rayon-1.5.1
+ rayon-core-1.9.1
+ redox_syscall-0.2.11
+ regex-1.5.5
+ regex-syntax-0.6.25
+ remove_dir_all-0.5.3
+ rustc_version-0.4.0
+ same-file-1.0.6
+ scopeguard-1.1.0
+ semver-1.0.6
+ sha-1-0.9.6
+ sha-1-0.10.0
+ sized-chunks-0.6.2
+ stable_deref_trait-1.2.0
+ static_assertions-1.1.0
+ strsim-0.8.0
+ syn-1.0.54
+ tempfile-3.3.0
+ termcolor-1.1.2
+ textwrap-0.11.0
+ thread_local-1.1.4
+ time-0.1.44
+ twox-hash-1.6.2
+ typenum-1.12.0
+ unicode-width-0.1.9
+ unicode-xid-0.2.1
+ users-0.11.0
+ vcpkg-0.2.11
+ vcsgraph-0.2.0
+ vec_map-0.8.2
+ version_check-0.9.2
+ wasi-0.9.0+wasi-snapshot-preview1
+ wasi-0.10.0+wasi-snapshot-preview1
+ which-4.2.5
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ zstd-0.5.4+zstd.1.4.7
+ zstd-safe-2.0.6+zstd.1.4.7
+ zstd-sys-1.4.18+zstd.1.4.7
+"
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+ rust? ( $(cargo_crate_uris ${CRATES}) )"
+
+LICENSE="GPL-2+
+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT MPL-2.0 PSF-2 Unlicense ZLIB )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+chg emacs gpg test tk rust"
+
+BDEPEND="rust? ( ${RUST_DEPEND} )"
+RDEPEND="
+ app-misc/ca-certificates
+ gpg? ( app-crypt/gnupg )
+ tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+ test? (
+ app-arch/unzip
+ dev-python/pygments[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-setup-rust-makedirs.patch
+)
+
+SITEFILE="70${PN}-gentoo.el"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+ default_src_unpack
+ if use rust; then
+ local S="${S}/rust/hg-cpython"
+ cargo_src_unpack
+ fi
+}
+
+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
+ sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_compile() {
+ if use rust; then
+ pushd rust/hg-cpython || die
+ cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+ popd || die
+ fi
+ distutils-r1_src_compile
+}
+
+python_compile() {
+ filter-flags -ftracer -ftree-vectorize
+ if use rust; then
+ local -x HGWITHRUSTEXT="cpython"
+ fi
+ distutils-r1_python_compile build_ext
+}
+
+python_compile_all() {
+ rm -r contrib/win32 || die
+ if use chg; then
+ emake -C contrib/chg
+ fi
+ if use emacs; then
+ cd contrib || die
+ elisp-compile mercurial.el || die "elisp-compile failed!"
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+}
+
+python_install() {
+ if use rust; then
+ local -x HGWITHRUSTEXT="cpython"
+ fi
+
+ distutils-r1_python_install build_ext
+ python_doscript contrib/hg-ssh
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newbashcomp contrib/bash_completion hg
+
+ insinto /usr/share/zsh/site-functions
+ newins contrib/zsh_completion _hg
+
+ dobin hgeditor
+ if use tk; then
+ dobin contrib/hgk
+ fi
+
+ if use emacs; then
+ elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+ if use chg; then
+ dobin contrib/chg/chg
+ doman contrib/chg/chg.1
+ RM_CONTRIB+=( chg )
+ fi
+
+ for f in ${RM_CONTRIB[@]}; do
+ rm -rf contrib/${f} || die
+ done
+
+ dodoc -r contrib
+ docompress -x /usr/share/doc/${PF}/contrib
+ doman doc/*.?
+ dodoc CONTRIBUTORS hgweb.cgi
+
+ insinto /etc/mercurial/hgrc.d
+ doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+ pushd tests &>/dev/null || die
+ rm -rf *svn* # Subversion tests fail with 1.5
+ rm -f test-archive* # Fails due to verbose tar output changes
+ rm -f test-convert-baz* # GNU Arch baz
+ rm -f test-convert-cvs* # CVS
+ rm -f test-convert-darcs* # Darcs
+ rm -f test-convert-git* # git
+ rm -f test-convert-mtn* # monotone
+ rm -f test-convert-tla* # GNU Arch tla
+ rm -f test-largefiles* # tends to time out
+ rm -f test-https* # requires to support tls1.0
+ rm -rf test-removeemptydirs* # requires access to access parent directories
+ if [[ ${EUID} -eq 0 ]]; then
+ einfo "Removing tests which require user privileges to succeed"
+ rm -f test-convert*
+ rm -f test-lock-badness*
+ rm -f test-permissions*
+ rm -f test-pull-permission*
+ rm -f test-journal-exists*
+ rm -f test-repair-strip*
+ fi
+
+ popd &>/dev/null || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ if [[ ${EPYTHON} == python3.10 ]]; then
+ einfo "Skipping tests for unsupported Python 3.10"
+ return
+ fi
+ distutils_install_for_testing
+ cd tests || die
+ PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
+ --jobs $(makeopts_jobs) \
+ --timeout 0 \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+
+ elog "If you want to convert repositories from other tools using convert"
+ elog "extension please install correct tool:"
+ elog " dev-vcs/cvs"
+ elog " dev-vcs/darcs"
+ elog " dev-vcs/git"
+ elog " dev-vcs/monotone"
+ elog " dev-vcs/subversion"
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/
@ 2023-07-03 17:51 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2023-07-03 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 94280e8cb588f3b855879561a870ec602f194276
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 29 17:25:56 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 17:50:48 2023 +0000
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 <ulm <AT> 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-9999.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..000000000000
--- 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-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 13d27e773bce..2fb319d58180 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.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 )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-03 17:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-28 20:04 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/ Cédric Krier
-- strict thread matches above, loose matches on Subject: below --
2023-07-03 17:51 Ulrich Müller
2022-02-05 8:55 Cédric Krier
2022-01-01 16:49 Cédric Krier
2020-01-26 11:55 Cédric Krier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox