dev-python/pypy*: Fix epython.py module first install

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 24849b662992bc0c1ba79de5843950905baafa47..55e1fc219962c7004962ebf79be18375bed9a998 100644 (file)
--- 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 52a15ef0f67531180a960a3788d568dd57171216..52c27982ad07295dacac307e29304e356b1a473f 100644 (file)
--- 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 9de657f4105e047f66c2e8888db43640e548f990..5459d26ffb82303d7ecb981f2705de4958c727d4 100644 (file)
--- 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 85644981b21d4f81890eb87acdefb25a993abc74..1b916dd04be63410dc050c5bbc7c60014b6442aa 100644 (file)
--- 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 21af59eba0de4c2dd05916dcd100c5a21ba73b2b..9442c709f36c105bf0c8aef997507814967c3b6d 100644 (file)
--- 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 87af793b5dad82e19a678c79995606fc374f2e7f..d12930ce2cc4b9d369d58aa6a96d041ce5b974a6 100644 (file)
--- 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 15820ef0dba1a5d1bdcdca7f9376fae8583f6532..779b81c5d63fe2f9a14f24f8d05779d43d6c04dd 100644 (file)
--- 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 da155c286eacca070d6dfadf9c703280a171898d..0bf61efb04ba350338c3bbd4a4671ecd4ec0e4f7 100644 (file)
--- 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 4ab07bc2033ef5e150b6be7ef8840e495ffe0df8..45e75f7e5a1c7c93fb05f50511e7e50c802db73e 100644 (file)
--- 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 47a824e12292203434580909be0e649a67bb2d81..9c15e466801f3379773c91c701f3a0041b605773 100644 (file)
--- 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.