| 1 |
commit: ed92943627a2995fd815d7ba7a383e2a85826150 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 8 05:44:45 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 8 05:44:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed929436 |
| 7 |
|
| 8 |
sci-electronics/kicad: fix finding opencascade |
| 9 |
|
| 10 |
Sync with logic in newer ebuilds to accommodate opencascade ebuild changes |
| 11 |
(slotting was abandoned). |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/832874 |
| 14 |
Thanks-to: David Flogeras <dflogeras2 <AT> gmail.com> |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
...icad-5.1.12-r1.ebuild => kicad-5.1.12-r2.ebuild} | 21 ++++----------------- |
| 18 |
1 file changed, 4 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-electronics/kicad/kicad-5.1.12-r1.ebuild b/sci-electronics/kicad/kicad-5.1.12-r2.ebuild |
| 21 |
similarity index 88% |
| 22 |
rename from sci-electronics/kicad/kicad-5.1.12-r1.ebuild |
| 23 |
rename to sci-electronics/kicad/kicad-5.1.12-r2.ebuild |
| 24 |
index 733f5b237d03..943fd0124280 100644 |
| 25 |
--- a/sci-electronics/kicad/kicad-5.1.12-r1.ebuild |
| 26 |
+++ b/sci-electronics/kicad/kicad-5.1.12-r2.ebuild |
| 27 |
@@ -111,23 +111,10 @@ src_configure() { |
| 28 |
-DPYTHON_LIBRARY="$(python_get_library_path)" |
| 29 |
) |
| 30 |
if use occ; then |
| 31 |
- if has_version "~sci-libs/opencascade-7.5.2"; then |
| 32 |
- mycmakeargs+=( |
| 33 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2 |
| 34 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2 |
| 35 |
- ) |
| 36 |
- elif has_version "~sci-libs/opencascade-7.5.1"; then |
| 37 |
- mycmakeargs+=( |
| 38 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1 |
| 39 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1 |
| 40 |
- ) |
| 41 |
- else |
| 42 |
- # <occ-7.5 uses different layout |
| 43 |
- mycmakeargs+=( |
| 44 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade |
| 45 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) |
| 46 |
- ) |
| 47 |
- fi |
| 48 |
+ mycmakeargs+=( |
| 49 |
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade |
| 50 |
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade |
| 51 |
+ ) |
| 52 |
fi |
| 53 |
|
| 54 |
cmake_src_configure |
Archives