From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EA3E139695 for ; Tue, 11 Jul 2017 20:01:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9F64274158; Tue, 11 Jul 2017 20:01:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9ED86274158 for ; Tue, 11 Jul 2017 20:01:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9D6F341BBA for ; Tue, 11 Jul 2017 20:01:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3D3774B0 for ; Tue, 11 Jul 2017 20:01:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1499803277.80850af0ef41f77d8b11f1fca6adf56559fdb258.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-4.0.5-r1.ebuild sci-electronics/kicad/kicad-4.0.6.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 80850af0ef41f77d8b11f1fca6adf56559fdb258 X-VCS-Branch: master Date: Tue, 11 Jul 2017 20:01:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 030c418f-87c2-49cd-8c79-538ab1b072a4 X-Archives-Hash: 7c89fbd687e69831ecb4977b6db47703 commit: 80850af0ef41f77d8b11f1fca6adf56559fdb258 Author: Zoltan Puskas sinustrom info> AuthorDate: Sun Jun 25 23:30:26 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jul 11 20:01:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80850af0 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(-) diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild index 3e7cb453e50..85d80609cb0 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 3e7cb453e50..85d80609cb0 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"