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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E38E158086 for ; Wed, 15 Dec 2021 09:57:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E010F2BC00A; Wed, 15 Dec 2021 09:57:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C80602BC00A for ; Wed, 15 Dec 2021 09:57:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FECD34351D for ; Wed, 15 Dec 2021 09:57:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74EA7D0 for ; Wed, 15 Dec 2021 09:57:20 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1639562134.ac5c4b39a40f96e2e0eae2f9a4f562ad34edd374.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/geant/geant-4.11.0.0.ebuild X-VCS-Directories: sci-physics/geant/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: ac5c4b39a40f96e2e0eae2f9a4f562ad34edd374 X-VCS-Branch: master Date: Wed, 15 Dec 2021 09:57:20 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b0bd08f-5676-4f1b-9e06-127f5254ccaa X-Archives-Hash: 022e1603c06a4f9c6a238e0a6c212cf3 commit: ac5c4b39a40f96e2e0eae2f9a4f562ad34edd374 Author: Guilherme Amadio gentoo org> AuthorDate: Wed Dec 15 09:54:57 2021 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Wed Dec 15 09:55:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac5c4b39 sci-physics/geant: pass python args to CMake only with USE=python Closes: https://bugs.gentoo.org/829231 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Guilherme Amadio gentoo.org> sci-physics/geant/geant-4.11.0.0.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sci-physics/geant/geant-4.11.0.0.ebuild b/sci-physics/geant/geant-4.11.0.0.ebuild index ebf046d14758..589a2cd089b5 100644 --- a/sci-physics/geant/geant-4.11.0.0.ebuild +++ b/sci-physics/geant/geant-4.11.0.0.ebuild @@ -80,8 +80,6 @@ S="${WORKDIR}/${MY_P}" src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages" - -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-) -DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug) -DGEANT4_BUILD_MULTITHREADED=$(usex threads) @@ -108,8 +106,17 @@ src_configure() { -DGEANT4_USE_XM=$(usex motif) -DGEANT4_USE_VTK=$(usex vtk) -DBUILD_STATIC_LIBS=$(usex static-libs) - ${EXTRA_ECONF} ) + + if use python; then + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" + -DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages" + ) + fi + + [ -v EXTRA_ECONF ] && mycmakeargs+=( ${EXTRA_ECONF} ) + cmake_src_configure }