diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-01-15 15:52:19 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-01-15 22:14:47 +0000 |
| commit | 0ea126f6c797701fe675896e6a8bca989d9b82bb (patch) | |
| tree | 91f071cc6695ce5941666bc04d52df0a77c0c929 /sci-libs | |
| parent | sys-apps/systemd-tmpfiles: Stabilize 249.9 ppc, #831205 (diff) | |
| download | gentoo-0ea126f6c797701fe675896e6a8bca989d9b82bb.tar.gz gentoo-0ea126f6c797701fe675896e6a8bca989d9b82bb.tar.bz2 gentoo-0ea126f6c797701fe675896e6a8bca989d9b82bb.zip | |
sci-libs/opencascade: fix installation paths for 7.5
Use the same path as for the 7.6 series /usr/$(get_libdir)/${PN}
instead of /usr/$(get_libdir)/${P}, so the changed environment
files works for all versions.
Bugs: https://bugs.gentoo.org/831054
Bugs: https://bugs.gentoo.org/831069
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/opencascade/opencascade-7.5.2-r5.ebuild (renamed from sci-libs/opencascade/opencascade-7.5.2-r4.ebuild) | 19 | ||||
| -rw-r--r-- | sci-libs/opencascade/opencascade-7.5.3-r6.ebuild (renamed from sci-libs/opencascade/opencascade-7.5.3-r5.ebuild) | 19 |
2 files changed, 24 insertions, 14 deletions
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild index 98fad573f3a8..f4c5fd8ff1e3 100644 --- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild @@ -88,15 +88,20 @@ src_configure() { local mycmakeargs=( -DBUILD_DOC_Overview=$(usex doc) -DBUILD_Inspector=$(usex examples) - -DBUILD_WITH_DEBUG=$(usex debug) - -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" + + -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_LIB="$(get_libdir)/${P}" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_WITH_VERSION=ON + -DINSTALL_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF -DINSTALL_SAMPLES=$(usex examples) -DINSTALL_TEST_CASES=NO + -DUSE_D3D=NO -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FREEIMAGE=$(usex freeimage) @@ -160,7 +165,7 @@ src_install() { # remove examples if use !examples; then - rm -r "${ED}/usr/share/${P}/samples" || die + rm -r "${ED}/usr/share/${PN}/samples" || die fi docompress -x /usr/share/doc/${PF}/overview/html diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild index 55ca127b2053..57cdfcf646b6 100644 --- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild @@ -88,15 +88,20 @@ src_configure() { local mycmakeargs=( -DBUILD_DOC_Overview=$(usex doc) -DBUILD_Inspector=$(usex examples) - -DBUILD_WITH_DEBUG=$(usex debug) - -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" + + -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_LIB="$(get_libdir)/${P}" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_WITH_VERSION=ON + -DINSTALL_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF -DINSTALL_SAMPLES=$(usex examples) -DINSTALL_TEST_CASES=NO + -DUSE_D3D=NO -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FREEIMAGE=$(usex freeimage) @@ -160,7 +165,7 @@ src_install() { # remove examples if use !examples; then - rm -r "${ED}/usr/share/${P}/samples" || die + rm -r "${ED}/usr/share/${PN}/samples" || die fi docompress -x /usr/share/doc/${PF}/overview/html |