[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/

[Sam James]

commit:     0fc68f7b19e264bd48cb566371f1c801389817c2
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Mon May 10 03:06:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 23:11:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc68f7b

sci-electronics/kicad: Bump to 5.1.10

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-electronics/kicad/Manifest                     |  2 +-
 .../{kicad-5.1.9.ebuild => kicad-5.1.10.ebuild}    | 31 +++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index a3d6d27bf93..cf4bdc5e3f7 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1 +1 @@
-DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B 
bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108
 SHA512 
565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
+DIST kicad-5.1.10.tar.bz2 18586889 BLAKE2B 
2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975
 SHA512 
3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0

diff --git a/sci-electronics/kicad/kicad-5.1.9.ebuild 
b/sci-electronics/kicad/kicad-5.1.10.ebuild
similarity index 85%
rename from sci-electronics/kicad/kicad-5.1.9.ebuild
rename to sci-electronics/kicad/kicad-5.1.10.ebuild
index f738cbde21d..b7970b620c2 100644
--- a/sci-electronics/kicad/kicad-5.1.9.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ COMMON_DEPEND="
        ngspice? (
                >sci-electronics/ngspice-27[shared]
        )
-       occ? ( >=sci-libs/opencascade-6.8.0:= )
+       occ? ( sci-libs/opencascade:=[vtk(+)] )
        oce? ( sci-libs/oce )
        python? (
                $(python_gen_cond_dep '
@@ -79,6 +79,15 @@ src_unpack() {
        mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || 
die "Appdata move failed"
 }
 
+src_prepare() {
+       # Fix OpenCASCADE lookup
+       sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+               -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+               -i CMakeModules/FindOpenCASCADE.cmake || die
+
+       cmake_src_prepare
+}
+
 src_configure() {
        xdg_environment_reset
 
@@ -104,10 +113,20 @@ src_configure() {
                -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
                -DPYTHON_LIBRARY="$(python_get_library_path)"
        )
-       use occ && mycmakeargs+=(
-               -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-               -DOCC_LIBRARY_DIR="${CASROOT}"/lib
-       )
+       if use occ; then
+               if has_version ">=sci-libs/opencascade-7.5"; then
+                       mycmakeargs+=(
+                               
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
+                               
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
+                       )
+               else
+                       # <occ-7.5 uses different layout
+                       mycmakeargs+=(
+                               
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+                               -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+                       )
+               fi
+       fi
 
        cmake_src_configure
 }