commit: ab667ccf4d8420c4b23ded26624d3aac2d46d8b4
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 20:01:16 2025 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun May 18 21:48:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab667ccf
sci-libs/trilinos: fix install paths; remove install dir workaround
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../{trilinos-16.1.0.ebuild => trilinos-16.1.0-r1.ebuild} | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/sci-libs/trilinos/trilinos-16.1.0.ebuild
b/sci-libs/trilinos/trilinos-16.1.0-r1.ebuild
similarity index 96%
rename from sci-libs/trilinos/trilinos-16.1.0.ebuild
rename to sci-libs/trilinos/trilinos-16.1.0-r1.ebuild
index c29cca61f6a2..6c5e5b01a20c 100644
--- a/sci-libs/trilinos/trilinos-16.1.0.ebuild
+++ b/sci-libs/trilinos/trilinos-16.1.0-r1.ebuild
@@ -100,7 +100,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DCMAKE_SKIP_RPATH=ON
-DCMAKE_SKIP_INSTALL_RPATH=ON
-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
@@ -223,13 +223,6 @@ src_configure() {
src_install() {
cmake_src_install
- # Clean up the mess:
-
- # Let us move the bin directory out of the way to avoid potential
- # clashes due to very generically named binaries such as
- # »nvcc_wrapper«, etc.
- mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-
# Move the cmake directory to the right location:
mkdir -p "${ED}/usr/$(get_libdir)"/cmake
mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/*
"${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
