summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2021-01-06 10:24:15 +0100
committerCédric Krier <cedk@gentoo.org>2021-01-06 10:24:41 +0100
commit05f063dc477fdbb858b81e1bdf754e04594b133d (patch)
tree870bdb77a522262d84dca345b32b779313ec3eda /dev-vcs/mercurial
parentmedia-libs/zita-resampler: Version bump to 1.8.0 (diff)
downloadgentoo-05f063dc477fdbb858b81e1bdf754e04594b133d.tar.gz
gentoo-05f063dc477fdbb858b81e1bdf754e04594b133d.tar.bz2
gentoo-05f063dc477fdbb858b81e1bdf754e04594b133d.zip
dev-vcs/mercurial: import zstandard instead of zstd
zstandard >=0.15 does not provide anymore zstd. Closes: https://bugs.gentoo.org/763984 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Cédric Krier <cedk@gentoo.org>
Diffstat (limited to 'dev-vcs/mercurial')
-rw-r--r--dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild (renamed from dev-vcs/mercurial/mercurial-5.6.1.ebuild)2
-rw-r--r--dev-vcs/mercurial/mercurial-9999.ebuild4
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-vcs/mercurial/mercurial-5.6.1.ebuild b/dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild
index 6572c97f8b6..3e10d92383d 100644
--- a/dev-vcs/mercurial/mercurial-5.6.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild
@@ -151,7 +151,7 @@ python_prepare_all() {
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
# Use absolute import for zstd
- sed -i -e 's/from \.* import zstd/import zstd/' \
+ sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \
mercurial/utils/compression.py \
mercurial/wireprotoframing.py || die
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index e30523a3f04..05d2c589315 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,7 +53,7 @@ python_prepare_all() {
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 zstd/' \
+ sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \
mercurial/utils/compression.py \
mercurial/wireprotoframing.py || die