From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2B4B158020 for ; Sat, 24 Dec 2022 14:03:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D627E0909; Sat, 24 Dec 2022 14:03:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F001E08F7 for ; Sat, 24 Dec 2022 14:03:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 534FC340C77 for ; Sat, 24 Dec 2022 14:03:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBA677EB for ; Sat, 24 Dec 2022 14:03:17 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1671890580.1f14111e918ed86bf6c33212946cf5004dbde8cd.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/, sci-libs/sundials/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/sundials/Manifest sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch sci-libs/sundials/sundials-5.2.0.ebuild X-VCS-Directories: sci-libs/sundials/files/ sci-libs/sundials/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1f14111e918ed86bf6c33212946cf5004dbde8cd X-VCS-Branch: master Date: Sat, 24 Dec 2022 14:03:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e8804d7-b11d-49ce-b11e-33eef6dff28c X-Archives-Hash: 3473803a023fda1baae811d6deb76e06 commit: 1f14111e918ed86bf6c33212946cf5004dbde8cd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 24 14:02:07 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 24 14:03:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f14111e sci-libs/sundials: Revert "drop 5.2.0" This reverts commit 891f1ee8e6fd6c8576a274d836e18fd259651265. Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/sundials/Manifest | 1 + .../sundials-5.2.0-fix-license-install-path.patch | 15 ++++ sci-libs/sundials/sundials-5.2.0.ebuild | 79 ++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest index e9bc6740cff3..dc11161c3fdd 100644 --- a/sci-libs/sundials/Manifest +++ b/sci-libs/sundials/Manifest @@ -1,2 +1,3 @@ +DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch new file mode 100644 index 000000000000..8fb6c977ca76 --- /dev/null +++ b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch @@ -0,0 +1,15 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-04-01 00:03:37.000000000 +0300 ++++ b/CMakeLists.txt 2020-04-21 13:27:58.000000000 +0300 +@@ -1146,9 +1146,9 @@ + # install license and notice files + install( + FILES ${PROJECT_SOURCE_DIR}/LICENSE +- DESTINATION include/sundials ++ DESTINATION share/doc/sundials-5.2.0 + ) + install( + FILES ${PROJECT_SOURCE_DIR}/NOTICE +- DESTINATION include/sundials ++ DESTINATION share/doc/sundials-5.2.0 + ) diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild new file mode 100644 index 000000000000..5af24cd4ed75 --- /dev/null +++ b/sci-libs/sundials/sundials-5.2.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD="77 90" +# if FFLAGS and FCFLAGS are set then should be equal + +inherit cmake fortran-2 toolchain-funcs flag-o-matic + +DESCRIPTION="Suite of nonlinear solvers" +HOMEPAGE="https://computation.llnl.gov/projects/sundials" +SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1)" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads" +REQUIRED_USE="hypre? ( mpi )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + lapack? ( virtual/lapack ) + mpi? ( virtual/mpi sci-libs/hypre:= ) + sparse? ( sci-libs/klu ) + superlumt? ( sci-libs/superlu_mt:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # bug #707240 + append-cflags -fcommon + + cmake_src_prepare +} + +src_configure() { + mycmakeargs+=( + -DBUILD_SHARED_LIBS=ON + -DBUILD_STATIC_LIBS="$(usex static-libs)" + -DCXX_ENABLE="$(usex cxx)" + -DFCMIX_ENABLE="$(usex fortran)" + -DF90_ENABLE="$(usex fortran)" + -DHYPRE_ENABLE="$(usex hypre)" + -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre" + -DKLU_ENABLE="$(usex sparse)" + -DLAPACK_ENABLE="$(usex lapack)" + -DMPI_ENABLE="$(usex mpi)" + -DOPENMP_ENABLE="$(usex openmp)" + -DPTHREAD_ENABLE="$(usex threads)" + -DSUPERLUMT_ENABLE="$(usex superlumt)" + -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt" + -DSUPERLUMT_LIBRARY="-lsuperlu_mt" + -DEXAMPLES_ENABLE="$(usex examples)" + -DEXAMPLES_INSTALL=ON + -DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples" + -DUSE_GENERIC_MATH=ON + ) + use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" ) + cmake_src_configure +} + +src_install() { + cmake_src_install + use doc && dodoc doc/*/*.pdf +}