Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/
Date: Wed, 24 Nov 2021 14:44:11
Message-Id: 1637765031.cdfcab5d246095245d15a509494e5cc0073bd2c2.sam@gentoo
1 commit: cdfcab5d246095245d15a509494e5cc0073bd2c2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 24 14:43:51 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 24 14:43:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdfcab5d
7
8 sci-electronics/kicad: fix oce logic for live too
9
10 Bug: https://bugs.gentoo.org/827102
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sci-electronics/kicad/kicad-9999.ebuild | 8 +++++---
14 1 file changed, 5 insertions(+), 3 deletions(-)
15
16 diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
17 index 5286a402f8bc..966cb9420562 100644
18 --- a/sci-electronics/kicad/kicad-9999.ebuild
19 +++ b/sci-electronics/kicad/kicad-9999.ebuild
20 @@ -109,10 +109,12 @@ src_configure() {
21 -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
22 -DPYTHON_LIBRARY="$(python_get_library_path)"
23 )
24 +
25 + local OCC_P=$(best_version sci-libs/opencascade)
26 + OCC_P=${OCC_P#sci-libs/}
27 + OCC_P=${OCC_P%-r*}
28 +
29 use occ && mycmakeargs+=(
30 - local OCC_P=$(best_version sci-libs/opencascade)
31 - OCC_P=${OCC_P#sci-libs/}
32 - OCC_P=${OCC_P%-r*}
33 -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
34 -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}