diff options
| author |   Sam James <sam@gentoo.org> | 2022-01-11 23:45:34 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-01-11 23:45:34 +0000 |
| commit | e4b2814dddcdf0bf52b99fb0769a1ae6e3643d13 (patch) | |
| tree | a4d4e2fc80e68e470d0b37c8ab9846ef050ed351 /sci-electronics/kicad | |
| parent | sci-electronics/kicad: remove dev-docs from build (diff) | |
| download | gentoo-e4b2814dddcdf0bf52b99fb0769a1ae6e3643d13.tar.gz gentoo-e4b2814dddcdf0bf52b99fb0769a1ae6e3643d13.tar.bz2 gentoo-e4b2814dddcdf0bf52b99fb0769a1ae6e3643d13.zip | |
sci-electronics/kicad: adapt to opencascade changes
No longer slotted.
Closes: https://bugs.gentoo.org/830964
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-electronics/kicad')
| -rw-r--r-- | sci-electronics/kicad/kicad-6.0.0.ebuild | 9 | ||||
| -rw-r--r-- | sci-electronics/kicad/kicad-9999.ebuild | 15 |
2 files changed, 7 insertions, 17 deletions
diff --git a/sci-electronics/kicad/kicad-6.0.0.ebuild b/sci-electronics/kicad/kicad-6.0.0.ebuild index 6d322061c84e..12fedf2f808e 100644 --- a/sci-electronics/kicad/kicad-6.0.0.ebuild +++ b/sci-electronics/kicad/kicad-6.0.0.ebuild @@ -107,14 +107,9 @@ src_configure() { -DCMAKE_SKIP_RPATH="ON" ) - local OCC_P=$(best_version sci-libs/opencascade) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - use occ && mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} - + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade ) cmake_src_configure diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 8840070ef1e9..12fedf2f808e 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -107,14 +107,9 @@ src_configure() { -DCMAKE_SKIP_RPATH="ON" ) - local OCC_P=$(best_version sci-libs/opencascade) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - use occ && mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} - + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade ) cmake_src_configure @@ -123,7 +118,7 @@ src_configure() { src_compile() { cmake_src_compile if use doc; then - cmake_src_compile dev-docs doxygen-docs + cmake_src_compile doxygen-docs fi } @@ -142,7 +137,7 @@ src_install() { if use doc ; then dodoc uncrustify.cfg cd Documentation || die - dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. + dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. fi } |