sci-libs/trilinos: ebuild maintenance

 * fix rm/mv paths to clean up installation

 * remove obsolete configuration options

 * skip setting an RPATH

 * fix metadata

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index 2807fa7ad7c26c2f579853adda0b0d9d70e8e817..6c8203582dc830d4bc2447860401fee264483c67 100644 (file)
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -36,13 +36,13 @@ Add support for metis (<pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg>
                <flag name="netcdf">Add support for netcdf (<pkg>sci-libs/netcdf</pkg>)</flag>
                <flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
                <flag name="qd">Add support for qd (<pkg>sci-libs/qd</pkg>)</flag>
-               <flag name="scalapack">Add support for scalapack (<pkg>virtual/scalapack</pkg>)</flag>
+               <flag name="scalapack">Add support for scalapack (<pkg>sci-libs/scalapack</pkg>)</flag>
                <flag name="scotch">Add support for scotch (<pkg>sci-libs/scotch</pkg>)</flag>
                <flag name="sparse">Add support for sparse matrix solvers (<pkg>sci-libs/umfpack</pkg>)</flag>
                <flag name="superlu">Add support for superlu (<pkg>sci-libs/superlu</pkg>)</flag>
                <flag name="taucs">Add support for taucs (<pkg>sci-libs/taucs</pkg>)</flag>
                <flag name="tbb">Add support for threading building blocks library (<pkg>dev-cpp/tbb</pkg>)</flag>
                <flag name="tvmet">Add support for tvmet (<pkg>dev-libs/tvmet</pkg>)</flag>
-               <flag name="yaml">Add support for yaml (<pkg>dev-cpp/yaml</pkg>)</flag>
+               <flag name="yaml">Add support for yaml (<pkg>dev-cpp/yaml-cpp</pkg>)</flag>
        </use>
 </pkgmetadata>

diff --git a/sci-libs/trilinos/trilinos-12.14.1.ebuild b/sci-libs/trilinos/trilinos-12.14.1.ebuild
index 55d338a0df3a59ae4efd13c627c52339c6192516..abe168f010ad3487a0a71a7832ad2b909b4909ab 100644 (file)
--- a/sci-libs/trilinos/trilinos-12.14.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.14.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="BSD LGPL-2.1"
 SLOT="0"
 
 IUSE="
-       adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
+       adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre
        matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
        superlu taucs tbb test threads tvmet yaml zlib X
 "
@@ -89,11 +89,11 @@ src_configure() {
        local mycmakeargs=(
                -DBUILD_SHARED_LIBS=ON
                -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+               -DCMAKE_SKIP_INSTALL_RPATH=ON
                -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
                -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
                -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
                -DTrilinos_ENABLE_ALL_PACKAGES=ON
-               -DTrilinos_ENABLE_CTrilinos=OFF
                -DTrilinos_ENABLE_PyTrilinos=OFF
                -DTrilinos_ENABLE_SEACASChaco=OFF
                -DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
@@ -111,7 +111,6 @@ src_configure() {
                -DTPL_ENABLE_BoostLib="$(usex boost)"
                -DTPL_ENABLE_Boost="$(usex boost)"
                -DTPL_ENABLE_Clp="$(usex clp)"
-               -DTPL_ENABLE_Cppunit="$(usex cppunit)"
                -DTPL_ENABLE_CSparse="$(usex sparse)"
                -DTPL_ENABLE_CUDA="$(usex cuda)"
                -DTPL_ENABLE_CUSPARSE="$(usex cuda)"
@@ -194,9 +193,8 @@ src_install() {
        cmake-utils_src_install
 
        # Clean up the mess:
-       rm "${ED}"/TrilinosRepoVersion.txt
        mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-       mv "${ED}"/usr/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+       mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
 
        #
        # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker