| 1 |
commit: e4b2814dddcdf0bf52b99fb0769a1ae6e3643d13 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 11 23:45:34 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 11 23:45:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b2814d |
| 7 |
|
| 8 |
sci-electronics/kicad: adapt to opencascade changes |
| 9 |
|
| 10 |
No longer slotted. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/830964 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-electronics/kicad/kicad-6.0.0.ebuild | 9 ++------- |
| 16 |
sci-electronics/kicad/kicad-9999.ebuild | 15 +++++---------- |
| 17 |
2 files changed, 7 insertions(+), 17 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-electronics/kicad/kicad-6.0.0.ebuild b/sci-electronics/kicad/kicad-6.0.0.ebuild |
| 20 |
index 6d322061c84e..12fedf2f808e 100644 |
| 21 |
--- a/sci-electronics/kicad/kicad-6.0.0.ebuild |
| 22 |
+++ b/sci-electronics/kicad/kicad-6.0.0.ebuild |
| 23 |
@@ -107,14 +107,9 @@ src_configure() { |
| 24 |
-DCMAKE_SKIP_RPATH="ON" |
| 25 |
) |
| 26 |
|
| 27 |
- local OCC_P=$(best_version sci-libs/opencascade) |
| 28 |
- OCC_P=${OCC_P#sci-libs/} |
| 29 |
- OCC_P=${OCC_P%-r*} |
| 30 |
- |
| 31 |
use occ && mycmakeargs+=( |
| 32 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} |
| 33 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} |
| 34 |
- |
| 35 |
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade |
| 36 |
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade |
| 37 |
) |
| 38 |
|
| 39 |
cmake_src_configure |
| 40 |
|
| 41 |
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild |
| 42 |
index 8840070ef1e9..12fedf2f808e 100644 |
| 43 |
--- a/sci-electronics/kicad/kicad-9999.ebuild |
| 44 |
+++ b/sci-electronics/kicad/kicad-9999.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2021 Gentoo Authors |
| 47 |
+# Copyright 1999-2022 Gentoo Authors |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=7 |
| 51 |
@@ -107,14 +107,9 @@ src_configure() { |
| 52 |
-DCMAKE_SKIP_RPATH="ON" |
| 53 |
) |
| 54 |
|
| 55 |
- local OCC_P=$(best_version sci-libs/opencascade) |
| 56 |
- OCC_P=${OCC_P#sci-libs/} |
| 57 |
- OCC_P=${OCC_P%-r*} |
| 58 |
- |
| 59 |
use occ && mycmakeargs+=( |
| 60 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} |
| 61 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} |
| 62 |
- |
| 63 |
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade |
| 64 |
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade |
| 65 |
) |
| 66 |
|
| 67 |
cmake_src_configure |
| 68 |
@@ -123,7 +118,7 @@ src_configure() { |
| 69 |
src_compile() { |
| 70 |
cmake_src_compile |
| 71 |
if use doc; then |
| 72 |
- cmake_src_compile dev-docs doxygen-docs |
| 73 |
+ cmake_src_compile doxygen-docs |
| 74 |
fi |
| 75 |
} |
| 76 |
|
| 77 |
@@ -142,7 +137,7 @@ src_install() { |
| 78 |
if use doc ; then |
| 79 |
dodoc uncrustify.cfg |
| 80 |
cd Documentation || die |
| 81 |
- dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. |
| 82 |
+ dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. |
| 83 |
fi |
| 84 |
} |
Archives