[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/

[Andrew Ammerlaan]

commit:     04dd713b4dbf8c7eb62a6598b1c826ed5e8e34f8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  5 14:13:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jun  5 14:13:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04dd713b

media-gfx/freecad: strip revision number from OCC version string

Otherwise it doesn't compile because it fails to find the dir

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-gfx/freecad/freecad-0.19.2.ebuild | 1 +
 media-gfx/freecad/freecad-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild 
b/media-gfx/freecad/freecad-0.19.2.ebuild
index 99e81bfeeed..dcceebb859a 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -241,6 +241,7 @@ src_configure() {
                # bug https://bugs.gentoo.org/788274
                local OCC_P=$(best_version sci-libs/opencascade[vtk])
                OCC_P=${OCC_P#sci-libs/}
+               OCC_P=${OCC_P%-r*}
                mycmakeargs+=(
                        -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
                        -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}

diff --git a/media-gfx/freecad/freecad-9999.ebuild 
b/media-gfx/freecad/freecad-9999.ebuild
index 26f5cab4f42..490b29d0793 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -239,6 +239,7 @@ src_configure() {
                # bug https://bugs.gentoo.org/788274
                local OCC_P=$(best_version sci-libs/opencascade[vtk])
                OCC_P=${OCC_P#sci-libs/}
+               OCC_P=${OCC_P%-r*}
                mycmakeargs+=(
                        -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
                        -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}