sci-electronics/kicad: Fix configure issue w/ USE='-python', #620130

Make sure only to set python library and executable paths, when python
scripting is requested

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
index 3e7cb453e5090e9914ad821136a160a4286414ef..85d80609cb07264f35c2fb8322382513c15c5e6b 100644 (file)
--- a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
@@ -125,10 +125,6 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               -DPYTHON_DEST="$(python_get_sitedir)"
-               -DPYTHON_EXECUTABLE="${PYTHON}"
-               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-               -DPYTHON_LIBRARY="$(python_get_library_path)"
                -DKICAD_DOCS="/usr/share/doc/${PF}"
                -DKICAD_HELP="/usr/share/doc/${PF}/help"
                -DwxUSE_UNICODE=ON
@@ -140,6 +136,12 @@ src_configure() {
                -DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
                -DCMAKE_CXX_FLAGS="-std=c++11"
        )
+       use python && mycmakeargs+=(
+               -DPYTHON_DEST="$(python_get_sitedir)"
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+               -DPYTHON_LIBRARY="$(python_get_library_path)"
+       )
        if use debug; then
                append-cxxflags "-DDEBUG"
                append-cflags "-DDEBUG"

diff --git a/sci-electronics/kicad/kicad-4.0.6.ebuild b/sci-electronics/kicad/kicad-4.0.6.ebuild
index 3e7cb453e5090e9914ad821136a160a4286414ef..85d80609cb07264f35c2fb8322382513c15c5e6b 100644 (file)
--- a/sci-electronics/kicad/kicad-4.0.6.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.6.ebuild
@@ -125,10 +125,6 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               -DPYTHON_DEST="$(python_get_sitedir)"
-               -DPYTHON_EXECUTABLE="${PYTHON}"
-               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-               -DPYTHON_LIBRARY="$(python_get_library_path)"
                -DKICAD_DOCS="/usr/share/doc/${PF}"
                -DKICAD_HELP="/usr/share/doc/${PF}/help"
                -DwxUSE_UNICODE=ON
@@ -140,6 +136,12 @@ src_configure() {
                -DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
                -DCMAKE_CXX_FLAGS="-std=c++11"
        )
+       use python && mycmakeargs+=(
+               -DPYTHON_DEST="$(python_get_sitedir)"
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+               -DPYTHON_LIBRARY="$(python_get_library_path)"
+       )
        if use debug; then
                append-cxxflags "-DDEBUG"
                append-cflags "-DDEBUG"