From 80850af0ef41f77d8b11f1fca6adf56559fdb258 Mon Sep 17 00:00:00 2001 From: Zoltan Puskas Date: Sun, 25 Jun 2017 16:30:26 -0700 Subject: 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 --- sci-electronics/kicad/kicad-4.0.5-r1.ebuild | 10 ++++++---- sci-electronics/kicad/kicad-4.0.6.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'sci-electronics/kicad') diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild index 3e7cb453e509..85d80609cb07 100644 --- 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 3e7cb453e509..85d80609cb07 100644 --- 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" -- cgit v1.2.3-65-gdbad