From 1220629606e4287bc60274825ccb9ab3f9db76f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 12 Nov 2015 16:05:18 +0100 Subject: [PATCH] dev-python/pypy*: Fix epython.py module first install --- dev-python/pypy-bin/pypy-bin-2.4.0.ebuild | 9 ++++++--- dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild | 9 ++++++--- dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild | 9 ++++++--- dev-python/pypy-bin/pypy-bin-4.0.0.ebuild | 9 ++++++--- dev-python/pypy/pypy-2.4.0.ebuild | 9 ++++++--- dev-python/pypy/pypy-2.5.1.ebuild | 9 ++++++--- dev-python/pypy/pypy-2.6.0.ebuild | 9 ++++++--- dev-python/pypy/pypy-4.0.0.ebuild | 9 ++++++--- dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild | 9 ++++++--- dev-python/pypy3/pypy3-2.4.0.ebuild | 9 ++++++--- 10 files changed, 60 insertions(+), 30 deletions(-) diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild index 24849b662992..55e1fc219962 100644 --- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild +++ b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild @@ -146,11 +146,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild index 52a15ef0f675..52c27982ad07 100644 --- a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild +++ b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild @@ -146,11 +146,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild index 9de657f4105e..5459d26ffb82 100644 --- a/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild +++ b/dev-python/pypy-bin/pypy-bin-2.6.0-r1.ebuild @@ -150,11 +150,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild index 85644981b21d..1b916dd04be6 100644 --- a/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild +++ b/dev-python/pypy-bin/pypy-bin-4.0.0.ebuild @@ -150,11 +150,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild index 21af59eba0de..9442c709f36c 100644 --- a/dev-python/pypy/pypy-2.4.0.ebuild +++ b/dev-python/pypy/pypy-2.4.0.ebuild @@ -194,11 +194,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild index 87af793b5dad..d12930ce2cc4 100644 --- a/dev-python/pypy/pypy-2.5.1.ebuild +++ b/dev-python/pypy/pypy-2.5.1.ebuild @@ -194,11 +194,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy/pypy-2.6.0.ebuild b/dev-python/pypy/pypy-2.6.0.ebuild index 15820ef0dba1..779b81c5d63f 100644 --- a/dev-python/pypy/pypy-2.6.0.ebuild +++ b/dev-python/pypy/pypy-2.6.0.ebuild @@ -200,11 +200,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy/pypy-4.0.0.ebuild b/dev-python/pypy/pypy-4.0.0.ebuild index da155c286eac..0bf61efb04ba 100644 --- a/dev-python/pypy/pypy-4.0.0.ebuild +++ b/dev-python/pypy/pypy-4.0.0.ebuild @@ -200,11 +200,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + python_export pypy EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild index 4ab07bc2033e..45e75f7e5a1c 100644 --- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild +++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild @@ -139,11 +139,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy3 EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages + python_export pypy3 EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild index 47a824e12292..9c15e466801f 100644 --- a/dev-python/pypy3/pypy3-2.4.0.ebuild +++ b/dev-python/pypy3/pypy3-2.4.0.ebuild @@ -192,11 +192,14 @@ src_install() { einfo "Generating caches and byte-compiling ..." - python_export pypy3 EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages + python_export pypy3 EPYTHON - echo "EPYTHON='${EPYTHON}'" > epython.py + echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # Generate Grammar and PatternGrammar pickles. -- 2.26.2