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:43:22
Message-Id: 1637764983.c54acff8e9f994aa321e26da3d24120166553ba2.sam@gentoo
1 commit: c54acff8e9f994aa321e26da3d24120166553ba2
2 Author: Yehoshua Pesach Wallach <yehoshuapw <AT> gmail <DOT> com>
3 AuthorDate: Wed Nov 24 13:26:16 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 24 14:43:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54acff8
7
8 sci-electronics/kicad: fix cmake flags for occ
9
10 Closes: https://bugs.gentoo.org/827102
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Yehoshua Pesach Wallach <yehoshuapw <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/23067
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 sci-electronics/kicad/kicad-6.0.0_rc1.ebuild | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19 diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
20 index 5286a402f8bc..eeaa25c07338 100644
21 --- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
22 +++ b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
23 @@ -109,10 +109,10 @@ src_configure() {
24 -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
25 -DPYTHON_LIBRARY="$(python_get_library_path)"
26 )
27 + local OCC_P=$(best_version sci-libs/opencascade)
28 + OCC_P=${OCC_P#sci-libs/}
29 + OCC_P=${OCC_P%-r*}
30 use occ && mycmakeargs+=(
31 - local OCC_P=$(best_version sci-libs/opencascade)
32 - OCC_P=${OCC_P#sci-libs/}
33 - OCC_P=${OCC_P%-r*}
34 -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
35 -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}