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 F21F4158086 for ; Wed, 24 Nov 2021 14:43:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B844E086E; Wed, 24 Nov 2021 14:43:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 2402EE086E for ; Wed, 24 Nov 2021 14:43:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C80B342DCD for ; Wed, 24 Nov 2021 14:43:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C76A1164 for ; Wed, 24 Nov 2021 14:43:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637764983.c54acff8e9f994aa321e26da3d24120166553ba2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-6.0.0_rc1.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c54acff8e9f994aa321e26da3d24120166553ba2 X-VCS-Branch: master Date: Wed, 24 Nov 2021 14:43:19 +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: 237be9eb-9bbe-45fb-b299-9df9bf3c4ccd X-Archives-Hash: 9163d0545c58eb4fb4411a37c8e8dae7 commit: c54acff8e9f994aa321e26da3d24120166553ba2 Author: Yehoshua Pesach Wallach gmail com> AuthorDate: Wed Nov 24 13:26:16 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 24 14:43:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54acff8 sci-electronics/kicad: fix cmake flags for occ Closes: https://bugs.gentoo.org/827102 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Yehoshua Pesach Wallach gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23067 Signed-off-by: Sam James gentoo.org> sci-electronics/kicad/kicad-6.0.0_rc1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild index 5286a402f8bc..eeaa25c07338 100644 --- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild +++ b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild @@ -109,10 +109,10 @@ src_configure() { -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" ) + local OCC_P=$(best_version sci-libs/opencascade) + OCC_P=${OCC_P#sci-libs/} + OCC_P=${OCC_P%-r*} use occ && mycmakeargs+=( - local OCC_P=$(best_version sci-libs/opencascade) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}