[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/sparky/

[Justin Lecher]

commit:     4f2a88148bc78bc05aa5b16f3da60e80f3589d5f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 14:42:48 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 15:09:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2a8814

sci-chemistry/sparky: Adopt to ABIFLAGS change in python

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/sparky/sparky-3.115-r1.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/sparky/sparky-3.115-r1.ebuild 
b/sci-chemistry/sparky/sparky-3.115-r1.ebuild
index b28e535..3aba740 100644
--- a/sci-chemistry/sparky/sparky-3.115-r1.ebuild
+++ b/sci-chemistry/sparky/sparky-3.115-r1.ebuild
@@ -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" \