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
johu · Jul 11, 2017 · 80850af · 80850af
1 parent 6f62f0f
commit 80850af
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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"