commit: 10761906ac3abdae54cd6542f23679efb6e1588d Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sun Jun 12 03:36:40 2022 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sun Jun 12 03:51:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10761906
sci-libs/trilinos: add 13.4.0 Closes: https://bugs.gentoo.org/847034 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> sci-libs/trilinos/Manifest | 2 ++ sci-libs/trilinos/trilinos-13.0.1-r4.ebuild | 2 +- ...rilinos-13.0.1-r4.ebuild => trilinos-13.4.0.ebuild} | 18 +++++------------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest index cf213f061639..a496f7169115 100644 --- a/sci-libs/trilinos/Manifest +++ b/sci-libs/trilinos/Manifest @@ -1,2 +1,4 @@ DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57 +DIST trilinos-13.4.0-patches-r0.tar.xz 8740 BLAKE2B 333ab9ff1acb2f4b08007c7b99b96f023f6c742e4f991fc0ab9dd6595be7e3e319a77d5e329790cedca72d7a9060df837549d28e8a6cb4b8a838570d455ae356 SHA512 f30c16801cadec2a612ab2f7d3ca05c5ddfdfc513343a182562253cdfb58d38fa8b771ab07f7bc6bcb2505d146469da2ddda478f74447de746d5eca850da123e +DIST trilinos-13.4.0.tar.gz 168733479 BLAKE2B 3c4a1c89b792ec771c6347eebb6bb54a82fa5f172d1c5934bbd42c8bc9708a71451bd030ec0f5264191a62169b3c1305ac7a1290b3ab4845fb6e8ffef15ee03c SHA512 27a5636bac8106a0705948ca4705b739878f0d8afa74264d1cd31036811084457e27e03e86dfad59a80d5e9ee798237fa930b50574ec3e43979e53c6ab5da535 diff --git a/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild b/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild index 29c01b3b1752..8f5af315e03e 100644 --- a/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild +++ b/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs multilib +inherit cmake toolchain-funcs DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/"; diff --git a/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild b/sci-libs/trilinos/trilinos-13.4.0.ebuild similarity index 92% copy from sci-libs/trilinos/trilinos-13.0.1-r4.ebuild copy to sci-libs/trilinos/trilinos-13.4.0.ebuild index 29c01b3b1752..321a4fa33c27 100644 --- a/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild +++ b/sci-libs/trilinos/trilinos-13.4.0.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs multilib +inherit cmake 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/${PN}-13.0.0-patches-${PATCHSET}.tar.xz"; + https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"; KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="BSD LGPL-2.1" @@ -109,7 +109,7 @@ src_configure() { -DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)" -DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)" -DTrilinos_ENABLE_SEACAS=OFF - -DTrilinos_ENABLE_ADELUS=OFF + -DTrilinos_ENABLE_Adelus=OFF -DTrilinos_ENABLE_TESTS="$(usex test)" -DTPL_ENABLE_BinUtils=ON -DTPL_ENABLE_BLAS=ON @@ -203,18 +203,10 @@ src_install() { cmake_src_install # Clean up the mess: + rm "${ED}"/TrilinosRepoVersion.txt || die "rm failed" 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
