diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2020-01-26 12:55:06 +0100 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2020-01-26 12:55:21 +0100 |
| commit | 63a6ef31f0b29dc5ba2469f2844c91301d75f202 (patch) | |
| tree | fd469f081f123b5862eeb8719785712b7058b680 /dev-vcs | |
| parent | dev-util/kdevelop-clang-tidy: Remove last-rited (diff) | |
| download | gentoo-63a6ef31f0b29dc5ba2469f2844c91301d75f202.tar.gz gentoo-63a6ef31f0b29dc5ba2469f2844c91301d75f202.tar.bz2 gentoo-63a6ef31f0b29dc5ba2469f2844c91301d75f202.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/mercurial/files/zstd.py | 2 | ||||
| -rw-r--r-- | dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild (renamed from dev-vcs/mercurial/mercurial-5.2.2.ebuild) | 5 | ||||
| -rw-r--r-- | 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 29ae5eacd0cf..000000000000 --- 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 index e189226b04d1..7d67135fc8ab 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 9c47a383e79e..8c12d545eb87 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 } |