From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1342935-garchives=archives.gentoo.org@lists.gentoo.org>
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 20959158086
for <garchives@archives.gentoo.org>; Wed, 24 Nov 2021 14:44:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 45805E086E;
Wed, 24 Nov 2021 14:44:10 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 2A354E086E
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Nov 2021 14:44:10 +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 5D316343046
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Nov 2021 14:44:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D830B164
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Nov 2021 14:44:06 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1637765031.cdfcab5d246095245d15a509494e5cc0073bd2c2.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-9999.ebuild
X-VCS-Directories: sci-electronics/kicad/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: cdfcab5d246095245d15a509494e5cc0073bd2c2
X-VCS-Branch: master
Date: Wed, 24 Nov 2021 14:44:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bd50d54e-a143-419d-8ad5-f322f864d8df
X-Archives-Hash: 322e8f07e8934e8c73ee2d13cf76e5f3
commit: cdfcab5d246095245d15a509494e5cc0073bd2c2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 14:43:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 14:43:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdfcab5d
sci-electronics/kicad: fix oce logic for live too
Bug: https://bugs.gentoo.org/827102
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-electronics/kicad/kicad-9999.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 5286a402f8bc..966cb9420562 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -109,10 +109,12 @@ 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}