sci-chemistry/sparky: Adopt to ABIFLAGS change in python
authorJustin Lecher <jlec@gentoo.org>
Wed, 11 Nov 2015 14:42:48 +0000 (15:42 +0100)
committerJustin Lecher <jlec@gentoo.org>
Wed, 11 Nov 2015 15:09:16 +0000 (16:09 +0100)
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>
sci-chemistry/sparky/sparky-3.115-r1.ebuild

index b28e5351dc5bcc245f012fb3c5bbe7a6c74452d8..3aba74046d46adb6d2e9b9ed63e01716a2670414 100644 (file)
@@ -18,7 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-RDEPEND="
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
        app-shells/tcsh
        dev-lang/tcl:0=
        dev-lang/tk:0="
@@ -45,7 +47,7 @@ src_prepare() {
        epatch ${PATCHES[@]}
 
        sed -i \
-               -e "s:^\(set PYTHON =\).*:\1 ${EPREFIX}/usr/bin/${EPYTHON}:g" \
+               -e "s:^\(set PYTHON =\).*:\1 ${PYTHON}:g" \
                -e "s:^\(setenv SPARKY_INSTALL[[:space:]]*\).*:\1 ${EPREFIX}/usr/$(get_libdir)/${PN}:g" \
                -e "s:tcl8.4:tcl${TKVER}:g" \
                -e "s:tk8.4:tk${TKVER}:g" \
@@ -60,7 +62,7 @@ src_compile() {
                PYTHON_VERSION="${PYVER}" \
                PYTHON_PREFIX="${EPREFIX}/usr" \
                PYTHON_LIB="${EPREFIX}/usr/$(get_libdir)" \
-               PYTHON_INC="${EPREFIX}/usr/include/${EPYTHON}" \
+               PYTHON_INC="$(python_get_includedir)" \
                TK_PREFIX="${EPREFIX}/usr" \
                TCLTK_VERSION="${TKVER}" \
                TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk -ltcl -lX11" \
@@ -76,7 +78,7 @@ src_compile() {
                PYTHON_VERSION="${PYVER}" \
                PYTHON_PREFIX="${EPREFIX}/usr" \
                PYTHON_LIB="${EPREFIX}/usr/$(get_libdir)" \
-               PYTHON_INC="${EPREFIX}/usr/include/${EPYTHON}" \
+               PYTHON_INC="$(python_get_includedir)" \
                TK_PREFIX="${EPREFIX}/usr" \
                TCLTK_VERSION="${TKVER}" \
                TKLIBS="-L${EPREFIX}/usr/$(get_libdir)/ -ltk -ltcl -lX11" \