projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fa5cc11)
dev-lang/python: Set PYTHON_SITEDIR manually
authorMike Gilbert <floppym@gentoo.org>
Thu, 12 Nov 2015 00:18:49 +0000 (19:18 -0500)
committerMike Gilbert <floppym@gentoo.org>
Thu, 12 Nov 2015 00:45:27 +0000 (19:45 -0500)
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

12 files changed:
dev-lang/python/python-2.7.10-r2.ebuild patch | blob | history
dev-lang/python/python-2.7.10-r3.ebuild patch | blob | history
dev-lang/python/python-2.7.10.ebuild patch | blob | history
dev-lang/python/python-2.7.9-r1.ebuild patch | blob | history
dev-lang/python/python-3.3.5-r1.ebuild patch | blob | history
dev-lang/python/python-3.3.5-r2.ebuild patch | blob | history
dev-lang/python/python-3.3.5-r3.ebuild patch | blob | history
dev-lang/python/python-3.4.3-r2.ebuild patch | blob | history
dev-lang/python/python-3.4.3-r3.ebuild patch | blob | history
dev-lang/python/python-3.4.3.ebuild patch | blob | history
dev-lang/python/python-3.5.0-r1.ebuild patch | blob | history
dev-lang/python/python-3.5.0-r2.ebuild patch | blob | history

diff --git a/dev-lang/python/python-2.7.10-r2.ebuild b/dev-lang/python/python-2.7.10-r2.ebuild
index fbdee646c75db5e9b89949eb3b6d9800290a5212..a8eeb9f16d8113c82a24b0142f49c26ba1931886 100644 (file)
--- 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 70d8d82916b8062957990cb6f82e38c03ae3641e..31c6506f0e69ceb8306cafcff6ab24728a368b1c 100644 (file)
--- 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 393636d5cd2de9c5267e6e4c255463a3c056b04b..2d6f00d0b1bc7c7b828981e68355ea9467b9a4b6 100644 (file)
--- 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 a31a4475e30d35dffb7570b806acb2776b4fd11a..20cdedb0ea7fa26e823bc70e270813005319e50d 100644 (file)
--- 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 dffc13b9fed44b89d8cfb0ae8557215323446454..64e520ba1e96c69b12cc49962bb59cd849a2cd14 100644 (file)
--- 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 f14b1216b49d427da3f7561f66fd4f9ca6a9f998..b6256f8e709b509fc94fa94deb2aa2cb344eba10 100644 (file)
--- 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 3ec857b2d228ccc68d6fb6c04383c18b11ce8631..4b773d22ffffa9f0fc3f1ee980ae3cdd3368cd14 100644 (file)
--- 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 cf15615216164f5270c7590cdd35a65753198050..86ebb5e5c6b2c61dddf91e0125c4d03b71d68552 100644 (file)
--- 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 c57324c0dac0930753d51a33cf4421cd9ceaae10..dba49e89bb85db63d56b43b4ea46bc640c51144d 100644 (file)
--- 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 e82805238b157e2c6f396dbfc73abee868357b74..3ab43cf075af2c753d4fe03cce00d2d05913ba71 100644 (file)
--- 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 f3d4b419eab5b27c249e802f4c73374a0e0dd7f9..d808c8357f5a240c35bcf9459c8888c865a20ddc 100644 (file)
--- 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 30e4d9f8b4e700aa69cafcb23abc6e6c84f82922..e3293e3792e4e6fa7e89bc9877ecf7d7e080d924 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.