| 1 |
commit: 0ea126f6c797701fe675896e6a8bca989d9b82bb |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Sat Jan 15 14:52:19 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 15 22:14:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea126f6 |
| 7 |
|
| 8 |
sci-libs/opencascade: fix installation paths for 7.5 |
| 9 |
|
| 10 |
Use the same path as for the 7.6 series /usr/$(get_libdir)/${PN} |
| 11 |
instead of /usr/$(get_libdir)/${P}, so the changed environment |
| 12 |
files works for all versions. |
| 13 |
|
| 14 |
Bugs: https://bugs.gentoo.org/831054 |
| 15 |
Bugs: https://bugs.gentoo.org/831069 |
| 16 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 17 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
...de-7.5.2-r4.ebuild => opencascade-7.5.2-r5.ebuild} | 19 ++++++++++++------- |
| 21 |
...de-7.5.3-r5.ebuild => opencascade-7.5.3-r6.ebuild} | 19 ++++++++++++------- |
| 22 |
2 files changed, 24 insertions(+), 14 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild |
| 25 |
similarity index 90% |
| 26 |
rename from sci-libs/opencascade/opencascade-7.5.2-r4.ebuild |
| 27 |
rename to sci-libs/opencascade/opencascade-7.5.2-r5.ebuild |
| 28 |
index 98fad573f3a8..f4c5fd8ff1e3 100644 |
| 29 |
--- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild |
| 30 |
+++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild |
| 31 |
@@ -88,15 +88,20 @@ src_configure() { |
| 32 |
local mycmakeargs=( |
| 33 |
-DBUILD_DOC_Overview=$(usex doc) |
| 34 |
-DBUILD_Inspector=$(usex examples) |
| 35 |
- -DBUILD_WITH_DEBUG=$(usex debug) |
| 36 |
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" |
| 37 |
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" |
| 38 |
+ |
| 39 |
+ -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" |
| 40 |
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" |
| 41 |
+ -DINSTALL_DIR_DATA="share/${PN}/data" |
| 42 |
-DINSTALL_DIR_DOC="share/doc/${PF}" |
| 43 |
- -DINSTALL_DIR_LIB="$(get_libdir)/${P}" |
| 44 |
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" |
| 45 |
- -DINSTALL_DIR_WITH_VERSION=ON |
| 46 |
+ -DINSTALL_DIR_INCLUDE="include/${PN}" |
| 47 |
+ -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" |
| 48 |
+ -DINSTALL_DIR_RESOURCE="share/${PN}/resources" |
| 49 |
+ -DINSTALL_DIR_SAMPLES="share/${PN}/samples" |
| 50 |
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" |
| 51 |
+ -DINSTALL_DIR_WITH_VERSION=OFF |
| 52 |
-DINSTALL_SAMPLES=$(usex examples) |
| 53 |
-DINSTALL_TEST_CASES=NO |
| 54 |
+ |
| 55 |
-DUSE_D3D=NO |
| 56 |
-DUSE_FFMPEG=$(usex ffmpeg) |
| 57 |
-DUSE_FREEIMAGE=$(usex freeimage) |
| 58 |
@@ -160,7 +165,7 @@ src_install() { |
| 59 |
|
| 60 |
# remove examples |
| 61 |
if use !examples; then |
| 62 |
- rm -r "${ED}/usr/share/${P}/samples" || die |
| 63 |
+ rm -r "${ED}/usr/share/${PN}/samples" || die |
| 64 |
fi |
| 65 |
|
| 66 |
docompress -x /usr/share/doc/${PF}/overview/html |
| 67 |
|
| 68 |
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild |
| 69 |
similarity index 90% |
| 70 |
rename from sci-libs/opencascade/opencascade-7.5.3-r5.ebuild |
| 71 |
rename to sci-libs/opencascade/opencascade-7.5.3-r6.ebuild |
| 72 |
index 55ca127b2053..57cdfcf646b6 100644 |
| 73 |
--- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild |
| 74 |
+++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild |
| 75 |
@@ -88,15 +88,20 @@ src_configure() { |
| 76 |
local mycmakeargs=( |
| 77 |
-DBUILD_DOC_Overview=$(usex doc) |
| 78 |
-DBUILD_Inspector=$(usex examples) |
| 79 |
- -DBUILD_WITH_DEBUG=$(usex debug) |
| 80 |
- -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" |
| 81 |
- -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" |
| 82 |
+ |
| 83 |
+ -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" |
| 84 |
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" |
| 85 |
+ -DINSTALL_DIR_DATA="share/${PN}/data" |
| 86 |
-DINSTALL_DIR_DOC="share/doc/${PF}" |
| 87 |
- -DINSTALL_DIR_LIB="$(get_libdir)/${P}" |
| 88 |
- -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" |
| 89 |
- -DINSTALL_DIR_WITH_VERSION=ON |
| 90 |
+ -DINSTALL_DIR_INCLUDE="include/${PN}" |
| 91 |
+ -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" |
| 92 |
+ -DINSTALL_DIR_RESOURCE="share/${PN}/resources" |
| 93 |
+ -DINSTALL_DIR_SAMPLES="share/${PN}/samples" |
| 94 |
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" |
| 95 |
+ -DINSTALL_DIR_WITH_VERSION=OFF |
| 96 |
-DINSTALL_SAMPLES=$(usex examples) |
| 97 |
-DINSTALL_TEST_CASES=NO |
| 98 |
+ |
| 99 |
-DUSE_D3D=NO |
| 100 |
-DUSE_FFMPEG=$(usex ffmpeg) |
| 101 |
-DUSE_FREEIMAGE=$(usex freeimage) |
| 102 |
@@ -160,7 +165,7 @@ src_install() { |
| 103 |
|
| 104 |
# remove examples |
| 105 |
if use !examples; then |
| 106 |
- rm -r "${ED}/usr/share/${P}/samples" || die |
| 107 |
+ rm -r "${ED}/usr/share/${PN}/samples" || die |
| 108 |
fi |
| 109 |
|
| 110 |
docompress -x /usr/share/doc/${PF}/overview/html |
Archives