Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
Date: Mon, 21 Dec 2015 15:22:42
Message-Id: 1450711336.f56beb80a544a650d18ffb944c8f2d0ef5f5f969.grobian@gentoo
1 commit: f56beb80a544a650d18ffb944c8f2d0ef5f5f969
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 21 15:22:16 2015 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 21 15:22:16 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f56beb80
7
8 dev-lang/python: fix building on Darwin due to SLOT, bug #568858
9
10 Package-Manager: portage-2.2.20-prefix
11
12 dev-lang/python/python-3.4.3-r5.ebuild | 8 ++++----
13 dev-lang/python/python-3.5.1.ebuild | 8 ++++----
14 2 files changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/dev-lang/python/python-3.4.3-r5.ebuild b/dev-lang/python/python-3.4.3-r5.ebuild
17 index 4fdcfed..1d61ff7 100644
18 --- a/dev-lang/python/python-3.4.3-r5.ebuild
19 +++ b/dev-lang/python/python-3.4.3-r5.ebuild
20 @@ -282,10 +282,10 @@ src_install() {
21 install_Python install_PythonLauncher install_IDLE \
22 || die
23
24 - local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${SLOT}
25 - ln -s "${EPREFIX}"/usr/include/python${SLOT} \
26 + local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${PYVER}
27 + ln -s "${EPREFIX}"/usr/include/python${PYVER} \
28 "${ED}${fwdir}"/Headers || die
29 - ln -s "${EPREFIX}"/usr/lib/libpython${SLOT}.dylib \
30 + ln -s "${EPREFIX}"/usr/lib/libpython${PYVER}.dylib \
31 "${ED}${fwdir}"/Python || die
32 fi
33
34 @@ -323,7 +323,7 @@ src_install() {
35 if use aqua ; then
36 # we do framework, so the emake trick below returns a pathname
37 # since that won't work here, use a (cheap) trick instead
38 - local libname=libpython${SLOT}
39 + local libname=libpython${PYVER}
40 else
41 local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
42 emake --no-print-directory -s -f - 2>/dev/null)
43
44 diff --git a/dev-lang/python/python-3.5.1.ebuild b/dev-lang/python/python-3.5.1.ebuild
45 index 00810ba..42acfd9 100644
46 --- a/dev-lang/python/python-3.5.1.ebuild
47 +++ b/dev-lang/python/python-3.5.1.ebuild
48 @@ -285,10 +285,10 @@ src_install() {
49 install_Python install_PythonLauncher install_IDLE \
50 || die
51
52 - local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${SLOT}
53 - ln -s "${EPREFIX}"/usr/include/python${SLOT} \
54 + local fwdir=/usr/$(get_libdir)/Python.framework/Versions/${PYVER}
55 + ln -s "${EPREFIX}"/usr/include/python${PYVER} \
56 "${ED}${fwdir}"/Headers || die
57 - ln -s "${EPREFIX}"/usr/lib/libpython${SLOT}.dylib \
58 + ln -s "${EPREFIX}"/usr/lib/libpython${PYVER}.dylib \
59 "${ED}${fwdir}"/Python || die
60 fi
61
62 @@ -326,7 +326,7 @@ src_install() {
63 if use aqua ; then
64 # we do framework, so the emake trick below returns a pathname
65 # since that won't work here, use a (cheap) trick instead
66 - local libname=libpython${SLOT}
67 + local libname=libpython${PYVER}
68 else
69 local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
70 emake --no-print-directory -s -f - 2>/dev/null)