diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
commit | b49088575eb777ced2551f484da86317332d6087 (patch) | |
tree | bf9a151cf2d61956340d555659ffc098ee1da466 /dev-vcs/mercurial | |
parent | 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff) |
gentoo resync : 24.07.2021
Diffstat (limited to 'dev-vcs/mercurial')
-rw-r--r-- | dev-vcs/mercurial/Manifest | 4 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-5.8.1.ebuild | 2 | ||||
-rw-r--r-- | dev-vcs/mercurial/mercurial-9999.ebuild | 36 |
3 files changed, 20 insertions, 22 deletions
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index a93a9008da6a..03b0cecc0296 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -119,7 +119,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30 -EBUILD mercurial-5.8.1.ebuild 6539 BLAKE2B ef357b3e9436bd096323853c7006c0c07e1173c91b80519cc89e2f9046eb3760c0124f6406c8c5c8b5a5f032c5a1f202c3213bd3d79d28cbb9c96b1988874c42 SHA512 c960787e85e1788c7626b12763688ce420898c6fd8942dbd0efa9be3f40b9d742c47f51d29f729c38775bef4f7e888f84fb18704c7c4ccecdda74c90f5761bd0 +EBUILD mercurial-5.8.1.ebuild 6567 BLAKE2B 2dcce7d10b14de07c75121905e7a350f3e634efa8c4ece5864bb062635045930f9b1aea928c38dd3fd280a600b3274e865370a92ebb10abcc9346ffa97f8b34a SHA512 8875884de5a50eaceb45ad82bed02275eae4ae0fff6c348e13885580dea9d03446c5101e436c072943a76a9f0c65f23f1fef652c947646e90b25d4a53a591025 EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d -EBUILD mercurial-9999.ebuild 4433 BLAKE2B 0fdd9ea821d61deb3e7edc2c14f5406f9d407220c20b40199d4fc82f6a02bbefda3b90427d1e1bd4e2a7143a73ce95162b63f5b4bb0a9730f34316f4688b27e7 SHA512 690cca0e6d2da5e453c5d4507e0861eaff27b2abb995f332dd3f5dff8e11d7be07c6e1ec2fdfef0425de6259a4262f5e650486498a73c1d619a9ff573ee7dfe2 +EBUILD mercurial-9999.ebuild 4246 BLAKE2B 0e975acf5ad01cf1ff7fcba3e7ddf8a21752d72a35faf7cdee242f3dd579b48b7ecb8c745bb5da4fc713f4222ea2bb9c59134477723c2a4960a33148fea8ddb0 SHA512 0347db61939c870577c2beb0a67e6451d359cc7ba43c4a7217e0904680b90148a5d0093137c683333e6abce95623e13d8b9cc21c4112ef77c0e7de2600c4a079 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08 diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild index ec426005148e..f189a3abc49a 100644 --- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild +++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild @@ -158,6 +158,8 @@ PATCHES=( SITEFILE="70${PN}-gentoo.el" +RESTRICT="!test? ( test )" + src_unpack() { default_src_unpack if use rust; then diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 516f17871e10..1fa18749e4a6 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)" DISTUTILS_USE_SETUPTOOLS=no CARGO_OPTIONAL=1 -inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic +inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic multiprocessing DESCRIPTION="Scalable distributed SCM" HOMEPAGE="https://www.mercurial-scm.org/" @@ -25,18 +25,18 @@ BDEPEND=" RDEPEND=" app-misc/ca-certificates - dev-python/zstandard[${PYTHON_USEDEP}] gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) -" + tk? ( dev-lang/tk )" + DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" + test? ( + app-arch/unzip + dev-python/pygments[${PYTHON_USEDEP}] + )" SITEFILE="70${PN}-gentoo.el" -# Too many tests fail #608720 -RESTRICT="test" +RESTRICT="!test? ( test )" src_unpack() { mercurial_src_unpack @@ -50,11 +50,7 @@ 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 '/ hgenv =/a\' -e ' hgenv.pop("PYTHONPATH", None)' setup.py || die - # Use absolute import for zstd - sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \ - mercurial/utils/compression.py \ - mercurial/wireprotoframing.py || die + sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die distutils-r1_python_prepare_all } @@ -62,7 +58,7 @@ python_prepare_all() { src_compile() { if use rust; then pushd rust/hg-cpython || die - cargo_src_compile + cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs) popd fi distutils-r1_src_compile @@ -74,7 +70,7 @@ python_compile() { if use rust; then local -x HGWITHRUSTEXT="cpython" fi - distutils-r1_python_compile build_ext --no-zstd + distutils-r1_python_compile build_ext } python_compile_all() { @@ -97,7 +93,7 @@ python_install() { if use rust; then local -x HGWITHRUSTEXT="cpython" fi - distutils-r1_python_install build_ext --no-zstd + distutils-r1_python_install build_ext } python_install_all() { @@ -151,6 +147,7 @@ src_test() { 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 if [[ ${EUID} -eq 0 ]]; then einfo "Removing tests which require user privileges to succeed" rm -f test-convert* @@ -168,12 +165,11 @@ src_test() { python_test() { local TEST_DIR - rm -rf "${TMPDIR}"/test distutils_install_for_testing cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ + "${PYTHON}" run-tests.py \ + --jobs $(makeopts_jobs) \ + --timeout 0 \ || die "Tests fail with ${EPYTHON}" } |