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 <[email protected]>
johu · Jan 6, 2021 · 05f063d · 05f063d
1 parent ef090ee
commit 05f063d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dev-vcs/mercurial/mercurial-5.6.1.ebuild → dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild b/dev-vcs/mercurial/mercurial-5.6.1.ebuild → 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
@@ -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