From: Michał Górny Date: Mon, 4 Jan 2016 16:47:23 +0000 (+0100) Subject: dev-lang/python: Fix invalid PYVER references, #570542 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f21ac182f8d6eed7b4dbc69cdbce40ca44776d17;p=gentoo.git dev-lang/python: Fix invalid PYVER references, #570542 --- diff --git a/dev-lang/python/python-2.7.10-r5.ebuild b/dev-lang/python/python-2.7.10-r5.ebuild index e4d9824406d6..2a468aed12c3 100644 --- a/dev-lang/python/python-2.7.10-r5.ebuild +++ b/dev-lang/python/python-2.7.10-r5.ebuild @@ -339,7 +339,7 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/pydoc" || die # idle if use tk; then - ln -s "../../../bin/idle${PYVER}" \ + ln -s "../../../bin/idle${SLOT}" \ "${D}${PYTHON_SCRIPTDIR}/idle" || die fi } diff --git a/dev-lang/python/python-2.7.11-r1.ebuild b/dev-lang/python/python-2.7.11-r1.ebuild index 3cf1079074b2..8f8ae73215ad 100644 --- a/dev-lang/python/python-2.7.11-r1.ebuild +++ b/dev-lang/python/python-2.7.11-r1.ebuild @@ -340,7 +340,7 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/pydoc" || die # idle if use tk; then - ln -s "../../../bin/idle${PYVER}" \ + ln -s "../../../bin/idle${SLOT}" \ "${D}${PYTHON_SCRIPTDIR}/idle" || die fi } diff --git a/dev-lang/python/python-3.3.5-r1.ebuild b/dev-lang/python/python-3.3.5-r1.ebuild index 37e68f3b95fd..79a844f6022c 100644 --- a/dev-lang/python/python-3.3.5-r1.ebuild +++ b/dev-lang/python/python-3.3.5-r1.ebuild @@ -290,7 +290,7 @@ src_install() { vars=( PYTHON "${vars[@]}" ) fi - python_export "python${PYVER}" "${vars[@]}" + python_export "python${SLOT}" "${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 f35f7efc7e10..b8b458b6054a 100644 --- a/dev-lang/python/python-3.3.5-r2.ebuild +++ b/dev-lang/python/python-3.3.5-r2.ebuild @@ -296,7 +296,7 @@ src_install() { vars=( PYTHON "${vars[@]}" ) fi - python_export "python${PYVER}" "${vars[@]}" + python_export "python${SLOT}" "${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 aea8b53602d9..1e2c2c5cd987 100644 --- a/dev-lang/python/python-3.4.3-r2.ebuild +++ b/dev-lang/python/python-3.4.3-r2.ebuild @@ -277,7 +277,7 @@ src_install() { vars=( PYTHON "${vars[@]}" ) fi - python_export "python${PYVER}" "${vars[@]}" + python_export "python${SLOT}" "${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 67231a25b429..0f32b9467bb0 100644 --- a/dev-lang/python/python-3.4.3.ebuild +++ b/dev-lang/python/python-3.4.3.ebuild @@ -285,7 +285,7 @@ src_install() { vars=( PYTHON "${vars[@]}" ) fi - python_export "python${PYVER}" "${vars[@]}" + python_export "python${SLOT}" "${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 e67b55e388e6..cde95c3b5aca 100644 --- a/dev-lang/python/python-3.5.0-r1.ebuild +++ b/dev-lang/python/python-3.5.0-r1.ebuild @@ -283,7 +283,7 @@ src_install() { vars=( PYTHON "${vars[@]}" ) fi - python_export "python${PYVER}" "${vars[@]}" + python_export "python${SLOT}" "${vars[@]}" echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py }