[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/, dev-vcs/mercurial/files/

[Cédric Krier]

commit:     63a6ef31f0b29dc5ba2469f2844c91301d75f202
Author:     Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 11:55:06 2020 +0000
Commit:     Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 11:55:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a6ef31

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 <AT> gentoo.org>

 dev-vcs/mercurial/files/zstd.py                                    | 2 --
 .../{mercurial-5.2.2.ebuild => mercurial-5.2.2-r1.ebuild}          | 5 ++++-
 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 29ae5eacd0c..00000000000
--- 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
similarity index 96%
rename from dev-vcs/mercurial/mercurial-5.2.2.ebuild
rename to dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
index e189226b04d..7d67135fc8a 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 9c47a383e79..8c12d545eb8 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
 }