commit: 05f063dc477fdbb858b81e1bdf754e04594b133d Author: Cédric Krier <cedk <AT> gentoo <DOT> org> AuthorDate: Wed Jan 6 09:24:15 2021 +0000 Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> CommitDate: Wed Jan 6 09:24:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f063dc
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 <AT> gentoo.org> .../mercurial/{mercurial-5.6.1.ebuild => mercurial-5.6.1-r1.ebuild} | 2 +- dev-vcs/mercurial/mercurial-9999.ebuild | 4 ++-- 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 similarity index 99% rename from dev-vcs/mercurial/mercurial-5.6.1.ebuild rename to 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
