commit: bc46e49ff67cf1e5157ab95b41e780067f433685
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 14:44:34 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:03:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc46e49f
dev-lang/python: Fix epython.py module first install
Fix the issues in obtaining sitedir for epython.py module install when
dev-lang/python is not yet installed.
dev-lang/python/python-2.7.10-r2.ebuild | 10 ++++++----
dev-lang/python/python-2.7.10-r3.ebuild | 10 ++++++----
dev-lang/python/python-2.7.10.ebuild | 10 ++++++----
dev-lang/python/python-2.7.9-r1.ebuild | 10 ++++++----
dev-lang/python/python-3.3.5-r1.ebuild | 10 ++++++----
dev-lang/python/python-3.3.5-r2.ebuild | 10 ++++++----
dev-lang/python/python-3.3.5-r3.ebuild | 10 ++++++----
dev-lang/python/python-3.4.1.ebuild | 9 ++++++---
dev-lang/python/python-3.4.3-r2.ebuild | 10 ++++++----
dev-lang/python/python-3.4.3-r3.ebuild | 10 ++++++----
dev-lang/python/python-3.4.3.ebuild | 10 ++++++----
dev-lang/python/python-3.5.0-r1.ebuild | 10 ++++++----
dev-lang/python/python-3.5.0-r2.ebuild | 10 ++++++----
13 files changed, 78 insertions(+), 51 deletions(-)
diff --git a/dev-lang/python/python-2.7.10-r2.ebuild
b/dev-lang/python/python-2.7.10-r2.ebuild
index a8eeb9f..2bb8c27 100644
--- a/dev-lang/python/python-2.7.10-r2.ebuild
+++ b/dev-lang/python/python-2.7.10-r2.ebuild
@@ -306,16 +306,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild
b/dev-lang/python/python-2.7.10-r3.ebuild
index 31c6506..b6aeaf7 100644
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -304,16 +304,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-2.7.10.ebuild
b/dev-lang/python/python-2.7.10.ebuild
index 2d6f00d..8f7a676 100644
--- a/dev-lang/python/python-2.7.10.ebuild
+++ b/dev-lang/python/python-2.7.10.ebuild
@@ -314,16 +314,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-2.7.9-r1.ebuild
b/dev-lang/python/python-2.7.9-r1.ebuild
index 20cdedb..1e9eb6a 100644
--- a/dev-lang/python/python-2.7.9-r1.ebuild
+++ b/dev-lang/python/python-2.7.9-r1.ebuild
@@ -315,16 +315,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.3.5-r1.ebuild
b/dev-lang/python/python-3.3.5-r1.ebuild
index 64e520b..c790c99 100644
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ b/dev-lang/python/python-3.3.5-r1.ebuild
@@ -280,16 +280,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.3.5-r2.ebuild
b/dev-lang/python/python-3.3.5-r2.ebuild
index b6256f8..f35f7ef 100644
--- a/dev-lang/python/python-3.3.5-r2.ebuild
+++ b/dev-lang/python/python-3.3.5-r2.ebuild
@@ -286,16 +286,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.3.5-r3.ebuild
b/dev-lang/python/python-3.3.5-r3.ebuild
index 4b773d2..3049ce1 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -291,16 +291,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${PYVER}"
"${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
- python_export python${PYVER} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.4.1.ebuild
b/dev-lang/python/python-3.4.1.ebuild
index 5c5df4c..2f271ee 100644
--- a/dev-lang/python/python-3.4.1.ebuild
+++ b/dev-lang/python/python-3.4.1.ebuild
@@ -276,15 +276,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.4.3-r2.ebuild
b/dev-lang/python/python-3.4.3-r2.ebuild
index 86ebb5e..aea8b53 100644
--- a/dev-lang/python/python-3.4.3-r2.ebuild
+++ b/dev-lang/python/python-3.4.3-r2.ebuild
@@ -267,16 +267,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.4.3-r3.ebuild
b/dev-lang/python/python-3.4.3-r3.ebuild
index dba49e8..aaaa72a 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r3.ebuild
@@ -274,16 +274,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${PYVER}"
"${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
- python_export python${PYVER} EPYTHON PYTHON PYTHON_SITEDIR
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.4.3.ebuild
b/dev-lang/python/python-3.4.3.ebuild
index 3ab43cf..2f95394 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -275,16 +275,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.5.0-r1.ebuild
b/dev-lang/python/python-3.5.0-r1.ebuild
index d808c83..e67b55e 100644
--- a/dev-lang/python/python-3.5.0-r1.ebuild
+++ b/dev-lang/python/python-3.5.0-r1.ebuild
@@ -273,16 +273,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
- python_export python${SLOT} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.5.0-r2.ebuild
b/dev-lang/python/python-3.5.0-r2.ebuild
index e3293e3..caa9e35 100644
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -277,16 +277,18 @@ src_install() {
-i "${ED}etc/conf.d/pydoc-${PYVER}"
"${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
- python_export python${PYVER} EPYTHON PYTHON
- export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
+ local vars=( EPYTHON PYTHON_SITEDIR )
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
- local PYTHON=./python
+ local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
fi
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
