gentoo resync : 22.01.2021

3 files changed, 4 insertions, 227 deletions

diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index e0b35e33b55a..ddd4bb13b153 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,6 +1,4 @@
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
-DIST trilinos-13.0.0.tar.gz 157960946 BLAKE2B 6336d71f469dd4561786092b175ec3396d6b7956aeec6ab8d9d6e87a1b1158a0840661a87514888fc16ea36c44d628dadb865a3244785c2c5d4b24213aca2096 SHA512 74b1e852971c8f040e8640688c879659bf6b03eed0bc6f76f31d768e7c4eb50b23fb8bfb9997d7f630001d80150161aac80fbd3237f52071657908320c1d723d
 DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
-EBUILD trilinos-13.0.0.ebuild 6530 BLAKE2B 655911a00a65ff877f2c3eae666ab44136db8b9651683120f0e8f85fbb883206c3ebce2f5464d9d140e9246102af741d2ed2ff688e0146055ac1c9aae15d47bb SHA512 ab20c26d14b3b03e4e5d66c4aa5f69913bafa34d933891269007613694fb2ec7c54bde1164e81daf9f8cad33bcd221532773e2b79cd693fa18d96e8bb0f1a2d0
-EBUILD trilinos-13.0.1.ebuild 6503 BLAKE2B 4610913cfba5220f83712b93a5dbc6e684bdd3da572171ee80bbf3375ff28466c7e1f57a68b9c1e0baf62a1375a12c2401f5700798be3a39820a113375cc7dd1 SHA512 28ec65d1bfe227f59585d5dc81aed40ed5a15236a40e38141bb658075dc28e6f6c76e1de9598cdfdc18fa9307c66dc05f41e994b02442d3348df4889835c0214
+EBUILD trilinos-13.0.1.ebuild 6486 BLAKE2B 4e8818107f9b7252031d4c006813e48cda70b03ccb4f45fefe81bac57b44ae75bea8ec59203995d55c27a6bf67e7ebfec6d156db928efe5ea94e02f1f8bd6333 SHA512 48948df368a736614b2a89fcea6d58b35d248f88a7098f5ba20d8a7f26d8ed7c849cf274e07ea4f3e5f8c07a4d1e53a1651596cd96064fee95f9574104197b40
 MISC metadata.xml 2778 BLAKE2B 45cb2a647a1730c9b6b21271364b5f4acaf145f6ae33db356d0b9be7584705c29a645d3f96abfe0a9b87540ae55ab586ec202191776f4472b66291c274b9f24b SHA512 c58e98197353efe1c6fef038dd53d4a938e85aa66fc53f00cab0133d8ee89c629eead55c270c88583778b193f0a85b498c7235fc3f1e8f45a1abfff2d5f0cbec
diff --git a/sci-libs/trilinos/trilinos-13.0.0.ebuild b/sci-libs/trilinos/trilinos-13.0.0.ebuild
deleted file mode 100644
index efce4176d970..000000000000
--- a/sci-libs/trilinos/trilinos-13.0.0.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-MY_PV="${PV//\./-}"
-PATCHSET="r0"
-SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	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
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	glpk? ( sci-mathematics/glpk )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	scalapack? ( sci-libs/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
-
-PATCHES=(
-	"${WORKDIR}"/patches
-)
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-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_PyTrilinos=OFF
-		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_SEACASChaco=OFF
-		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
-		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
-		-DTrilinos_ENABLE_TESTS="$(usex test)"
-		-DZoltan2_ENABLE_Experimental=ON
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_ADOLC="$(usex adolc)"
-		-DTPL_ENABLE_AMD="$(usex sparse)"
-		-DTPL_ENABLE_ARPREC="$(usex arprec)"
-		-DTPL_ENABLE_BLACS="$(usex scalapack)"
-		-DTPL_ENABLE_BoostLib="$(usex boost)"
-		-DTPL_ENABLE_Boost="$(usex boost)"
-		-DTPL_ENABLE_Clp="$(usex clp)"
-		-DTPL_ENABLE_CSparse="$(usex sparse)"
-		-DTPL_ENABLE_CUDA="$(usex cuda)"
-		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
-		-DTPL_ENABLE_Eigen="$(usex eigen)"
-		-DTPL_ENABLE_GLPK="$(usex glpk)"
-		-DTPL_ENABLE_gtest="$(usex gtest)"
-		-DTPL_ENABLE_HDF5="$(usex hdf5)"
-		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
-		-DTPL_ENABLE_HYPRE="$(usex hypre)"
-		-DTPL_ENABLE_Matio="$(usex matio)"
-		-DTPL_ENABLE_METIS="$(usex metis)"
-		-DTPL_ENABLE_MKL="$(usex mkl)"
-		-DTPL_ENABLE_MUMPS="$(usex mumps)"
-		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
-		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
-		-DTPL_ENABLE_PETSC="$(usex petsc)"
-		-DTPL_ENABLE_Pthread="$(usex threads)"
-		-DTPL_ENABLE_QD="$(usex qd)"
-		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
-		-DTPL_ENABLE_Scotch="$(usex scotch)"
-		-DTPL_ENABLE_SuperLU="$(usex superlu)"
-		-DTPL_ENABLE_TAUCS="$(usex taucs)"
-		-DTPL_ENABLE_TBB="$(usex tbb)"
-		-DTPL_ENABLE_Thrust="$(usex cuda)"
-		-DTPL_ENABLE_TVMET="$(usex tvmet)"
-		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
-		-DTPL_ENABLE_X11="$(usex X)"
-		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
-		-DTPL_ENABLE_Zlib="$(usex zlib)"
-		-DML_ENABLE_SuperLU:BOOL=OFF
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	#
-	# Make sure we use the compiler wrappers in order to build trilinos.
-	#
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	#
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	#
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Clean up the mess:
-	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
-	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
-	if [ -f "${ED}"/lib/exodus.py ]; then
-		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	fi
-	if [[ $(get_libdir) != lib ]]; then
-		mv "${ED}"/usr/lib/pkgconfig "${ED}/usr/$(get_libdir)"
-	fi
-
-	mv "${ED}"/include/* "${ED}"/usr/include || die "mv failed"
-	rmdir "${ED}"/include
-
-	#
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	#
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
-	EOF
-	doenvd "${T}"/99trilinos
-}
diff --git a/sci-libs/trilinos/trilinos-13.0.1.ebuild b/sci-libs/trilinos/trilinos-13.0.1.ebuild
index c7868ab5db28..511aa77ec426 100644
--- a/sci-libs/trilinos/trilinos-13.0.1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils toolchain-funcs multilib
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
@@ -14,7 +14,6 @@ SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz
 	https://dev.gentoo.org/~tamiko/distfiles/${PN}-13.0.0-patches-${PATCHSET}.tar.xz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
 LICENSE="BSD LGPL-2.1"
 SLOT="0"