[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/

[Fabian Groffen]

commit:     f56beb80a544a650d18ffb944c8f2d0ef5f5f969
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 15:22:16 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 15:22:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f56beb80

dev-lang/python: fix building on Darwin due to SLOT, bug #568858

Package-Manager: portage-2.2.20-prefix

 dev-lang/python/python-3.4.3-r5.ebuild | 8 ++++----
 dev-lang/python/python-3.5.1.ebuild    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-lang/python/python-3.4.3-r5.ebuild 
b/dev-lang/python/python-3.4.3-r5.ebuild
index 4fdcfed..1d61ff7 100644
--- a/dev-lang/python/python-3.4.3-r5.ebuild
+++ b/dev-lang/python/python-3.4.3-r5.ebuild
@@ -282,10 +282,10 @@ src_install() {
                        install_Python install_PythonLauncher install_IDLE \
                        || die
 
-               local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${SLOT}
-               ln -s "${EPREFIX}"/usr/include/python${SLOT} \
+               local 
fwdir=/usr/$(get_libdir)/Python.framework/Versions/${PYVER}
+               ln -s "${EPREFIX}"/usr/include/python${PYVER} \
                        "${ED}${fwdir}"/Headers || die
-               ln -s "${EPREFIX}"/usr/lib/libpython${SLOT}.dylib \
+               ln -s "${EPREFIX}"/usr/lib/libpython${PYVER}.dylib \
                        "${ED}${fwdir}"/Python || die
        fi
 
@@ -323,7 +323,7 @@ src_install() {
        if use aqua ; then
                # we do framework, so the emake trick below returns a pathname
                # since that won't work here, use a (cheap) trick instead
-               local libname=libpython${SLOT}
+               local libname=libpython${PYVER}
        else
                local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude 
Makefile\n' | \
                        emake --no-print-directory -s -f - 2>/dev/null)

diff --git a/dev-lang/python/python-3.5.1.ebuild 
b/dev-lang/python/python-3.5.1.ebuild
index 00810ba..42acfd9 100644
--- a/dev-lang/python/python-3.5.1.ebuild
+++ b/dev-lang/python/python-3.5.1.ebuild
@@ -285,10 +285,10 @@ src_install() {
                        install_Python install_PythonLauncher install_IDLE \
                        || die
 
-               local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${SLOT}
-               ln -s "${EPREFIX}"/usr/include/python${SLOT} \
+               local 
fwdir=/usr/$(get_libdir)/Python.framework/Versions/${PYVER}
+               ln -s "${EPREFIX}"/usr/include/python${PYVER} \
                        "${ED}${fwdir}"/Headers || die
-               ln -s "${EPREFIX}"/usr/lib/libpython${SLOT}.dylib \
+               ln -s "${EPREFIX}"/usr/lib/libpython${PYVER}.dylib \
                        "${ED}${fwdir}"/Python || die
        fi
 
@@ -326,7 +326,7 @@ src_install() {
        if use aqua ; then
                # we do framework, so the emake trick below returns a pathname
                # since that won't work here, use a (cheap) trick instead
-               local libname=libpython${SLOT}
+               local libname=libpython${PYVER}
        else
                local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude 
Makefile\n' | \
                        emake --no-print-directory -s -f - 2>/dev/null)