commit: 1e379f1f1a61be360bf9cf59030e15862c2a3d21
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 00:18:49 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 00:45:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e379f1f
dev-lang/python: Set PYTHON_SITEDIR manually
The eclass change in fd4001e9 causes python_export to call ${PYTHON}
to obtain PYTHON_SITEDIR. This returns an empty string if ${PYTHON}
has not yet been merged.
Package-Manager: portage-2.2.23_p26
dev-lang/python/python-2.7.10-r2.ebuild | 3 ++-
dev-lang/python/python-2.7.10-r3.ebuild | 3 ++-
dev-lang/python/python-2.7.10.ebuild | 3 ++-
dev-lang/python/python-2.7.9-r1.ebuild | 3 ++-
dev-lang/python/python-3.3.5-r1.ebuild | 3 ++-
dev-lang/python/python-3.3.5-r2.ebuild | 3 ++-
dev-lang/python/python-3.3.5-r3.ebuild | 3 ++-
dev-lang/python/python-3.4.3-r2.ebuild | 3 ++-
dev-lang/python/python-3.4.3-r3.ebuild | 1 +
dev-lang/python/python-3.4.3.ebuild | 3 ++-
dev-lang/python/python-3.5.0-r1.ebuild | 3 ++-
dev-lang/python/python-3.5.0-r2.ebuild | 3 ++-
12 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/dev-lang/python/python-2.7.10-r2.ebuild
b/dev-lang/python/python-2.7.10-r2.ebuild
index fbdee64..a8eeb9f 100644
--- a/dev-lang/python/python-2.7.10-r2.ebuild
+++ b/dev-lang/python/python-2.7.10-r2.ebuild
@@ -306,7 +306,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild
b/dev-lang/python/python-2.7.10-r3.ebuild
index 70d8d82..31c6506 100644
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -304,7 +304,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-2.7.10.ebuild
b/dev-lang/python/python-2.7.10.ebuild
index 393636d..2d6f00d 100644
--- a/dev-lang/python/python-2.7.10.ebuild
+++ b/dev-lang/python/python-2.7.10.ebuild
@@ -314,7 +314,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-2.7.9-r1.ebuild
b/dev-lang/python/python-2.7.9-r1.ebuild
index a31a447..20cdedb 100644
--- a/dev-lang/python/python-2.7.9-r1.ebuild
+++ b/dev-lang/python/python-2.7.9-r1.ebuild
@@ -315,7 +315,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.3.5-r1.ebuild
b/dev-lang/python/python-3.3.5-r1.ebuild
index dffc13b..64e520b 100644
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ b/dev-lang/python/python-3.3.5-r1.ebuild
@@ -280,7 +280,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.3.5-r2.ebuild
b/dev-lang/python/python-3.3.5-r2.ebuild
index f14b121..b6256f8 100644
--- a/dev-lang/python/python-3.3.5-r2.ebuild
+++ b/dev-lang/python/python-3.3.5-r2.ebuild
@@ -286,7 +286,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.3.5-r3.ebuild
b/dev-lang/python/python-3.3.5-r3.ebuild
index 3ec857b..4b773d2 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -291,7 +291,8 @@ 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
+ python_export python${PYVER} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.4.3-r2.ebuild
b/dev-lang/python/python-3.4.3-r2.ebuild
index cf15615..86ebb5e 100644
--- a/dev-lang/python/python-3.4.3-r2.ebuild
+++ b/dev-lang/python/python-3.4.3-r2.ebuild
@@ -267,7 +267,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.4.3-r3.ebuild
b/dev-lang/python/python-3.4.3-r3.ebuild
index c57324c..dba49e8 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r3.ebuild
@@ -275,6 +275,7 @@ src_install() {
# for python-exec
python_export python${PYVER} EPYTHON PYTHON PYTHON_SITEDIR
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.4.3.ebuild
b/dev-lang/python/python-3.4.3.ebuild
index e828052..3ab43cf 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -275,7 +275,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.5.0-r1.ebuild
b/dev-lang/python/python-3.5.0-r1.ebuild
index f3d4b41..d808c83 100644
--- a/dev-lang/python/python-3.5.0-r1.ebuild
+++ b/dev-lang/python/python-3.5.0-r1.ebuild
@@ -273,7 +273,8 @@ 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
+ python_export python${SLOT} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${SLOT}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
diff --git a/dev-lang/python/python-3.5.0-r2.ebuild
b/dev-lang/python/python-3.5.0-r2.ebuild
index 30e4d9f..e3293e3 100644
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -277,7 +277,8 @@ 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
+ python_export python${PYVER} EPYTHON PYTHON
+ export
PYTHON_SITEDIR="${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages"
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
