summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Puskas <zoltan@sinustrom.info>2021-08-08 11:32:57 -0700
committerIonen Wolkens <ionen@gentoo.org>2021-08-09 01:45:28 -0400
commitef75326644c79abe64864916524b5bfe8e25aa44 (patch)
tree3e8bd333adf25a5ccc00466b63c54f777eddd59c /sci-electronics/kicad
parentpackage.mask: remove last-rited packages (diff)
downloadgentoo-ef75326644c79abe64864916524b5bfe8e25aa44.tar.gz
gentoo-ef75326644c79abe64864916524b5bfe8e25aa44.tar.bz2
gentoo-ef75326644c79abe64864916524b5bfe8e25aa44.zip
sci-electronics/kicad: Fixup ebuild to support opencascade-7.5.2
OpenCascade currently is hard to handle and some version pinning is neccessary. This diff updates ebuild to support all current OpenCasade versions in Portage. Closes: https://bugs.gentoo.org/800944 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info> Closes: https://github.com/gentoo/gentoo/pull/21918 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'sci-electronics/kicad')
-rw-r--r--sci-electronics/kicad/kicad-5.1.10-r1.ebuild9
1 files changed, 7 insertions, 2 deletions
diff --git a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
index ea33fd638444..586e7c949bb1 100644
--- a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
ngspice? (
>sci-electronics/ngspice-27[shared]
)
- occ? ( sci-libs/opencascade:=[vtk(+)] )
+ occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] )
oce? ( sci-libs/oce )
python? (
$(python_gen_cond_dep '
@@ -114,7 +114,12 @@ src_configure() {
-DPYTHON_LIBRARY="$(python_get_library_path)"
)
if use occ; then
- if has_version ">=sci-libs/opencascade-7.5"; then
+ if has_version "~sci-libs/opencascade-7.5.2"; then
+ mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2
+ )
+ elif has_version "~sci-libs/opencascade-7.5.1"; then
mycmakeargs+=(
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1