Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/sundials/files/, sci-libs/sundials/
Date: Thu, 05 Mar 2020 12:21:15
Message-Id: 1583409269.7817c436150b75be5fb955ac60ed110e6248e9a1.juippis@gentoo
1 commit: 7817c436150b75be5fb955ac60ed110e6248e9a1
2 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
3 AuthorDate: Fri Feb 28 22:42:30 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 11:54:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7817c436
7
8 sci-libs/sundials: 5.1.0 version bump
9
10 The following changes within ebuild were made:
11
12 - FORTRAN_STANDARD=90 changed to FORTRAN_STANDARD="77 90"
13 (with comment that "FFLAGS and FCFLAGS if set should e equal",
14 otherwhise the cmake configurations error takes place);
15 - sorted inherit items;
16 - cmake-utils eclass replaced by cmake eclass;
17 - assignment of KLU_LIBRARY cmake variable moved to use condition expression.
18
19 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
20 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
21
22 sci-libs/sundials/Manifest | 1 +
23 .../sundials-5.1.0-fix-license-install-path.patch | 16 +++++
24 sci-libs/sundials/sundials-5.1.0.ebuild | 70 ++++++++++++++++++++++
25 3 files changed, 87 insertions(+)
26
27 diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
28 index b98d5eaf31f..7e84ebcb147 100644
29 --- a/sci-libs/sundials/Manifest
30 +++ b/sci-libs/sundials/Manifest
31 @@ -2,3 +2,4 @@ DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad62
32 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
33 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
34 DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
35 +DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
36
37 diff --git a/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
38 new file mode 100644
39 index 00000000000..48b019611cb
40 --- /dev/null
41 +++ b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
42 @@ -0,0 +1,16 @@
43 +diff --git a/CMakeLists.txt b/CMakeLists.txt
44 +index d5436bf..76b27c5 100644
45 +--- a/CMakeLists.txt
46 ++++ b/CMakeLists.txt
47 +@@ -1146,9 +1146,9 @@ endif()
48 + # install license and notice files
49 + install(
50 + FILES ${PROJECT_SOURCE_DIR}/LICENSE
51 +- DESTINATION include/sundials
52 ++ DESTINATION share/doc/sundials-5.1.0
53 + )
54 + install(
55 + FILES ${PROJECT_SOURCE_DIR}/NOTICE
56 +- DESTINATION include/sundials
57 ++ DESTINATION share/doc/sundials-5.1.0
58 + )
59
60 diff --git a/sci-libs/sundials/sundials-5.1.0.ebuild b/sci-libs/sundials/sundials-5.1.0.ebuild
61 new file mode 100644
62 index 00000000000..c6bc6848c81
63 --- /dev/null
64 +++ b/sci-libs/sundials/sundials-5.1.0.ebuild
65 @@ -0,0 +1,70 @@
66 +# Copyright 1999-2020 Gentoo Authors
67 +# Distributed under the terms of the GNU General Public License v2
68 +
69 +EAPI=7
70 +
71 +CMAKE_MAKEFILE_GENERATOR="emake"
72 +FORTRAN_NEEDED=fortran
73 +FORTRAN_STANDARD="77 90"
74 +# if FFLAGS and FCFLAGS are set then should be equal
75 +
76 +inherit cmake fortran-2 toolchain-funcs
77 +
78 +DESCRIPTION="Suite of nonlinear solvers"
79 +HOMEPAGE="https://computation.llnl.gov/projects/sundials"
80 +SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
81 +
82 +LICENSE="BSD"
83 +SLOT="0/$(ver_cut 1)"
84 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
85 +IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
86 +REQUIRED_USE="hypre? ( mpi )"
87 +
88 +BDEPEND="virtual/pkgconfig"
89 +RDEPEND="
90 + lapack? ( virtual/lapack )
91 + mpi? ( virtual/mpi sci-libs/hypre:= )
92 + sparse? ( sci-libs/klu )
93 + superlumt? ( sci-libs/superlu_mt:= )
94 +"
95 +DEPEND="${RDEPEND}"
96 +
97 +PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
98 +
99 +pkg_setup() {
100 + if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
101 + ewarn "OpenMP is not available in your current selected gcc"
102 + die "need openmp capable gcc"
103 + fi
104 +}
105 +
106 +src_configure() {
107 + mycmakeargs+=(
108 + -DBUILD_SHARED_LIBS=ON
109 + -DBUILD_STATIC_LIBS="$(usex static-libs)"
110 + -DCXX_ENABLE="$(usex cxx)"
111 + -DFCMIX_ENABLE="$(usex fortran)"
112 + -DF90_ENABLE="$(usex fortran)"
113 + -DHYPRE_ENABLE="$(usex hypre)"
114 + -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
115 + -DKLU_ENABLE="$(usex sparse)"
116 + -DLAPACK_ENABLE="$(usex lapack)"
117 + -DMPI_ENABLE="$(usex mpi)"
118 + -DOPENMP_ENABLE="$(usex openmp)"
119 + -DPTHREAD_ENABLE="$(usex threads)"
120 + -DSUPERLUMT_ENABLE="$(usex superlumt)"
121 + -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
122 + -DSUPERLUMT_LIBRARY="-lsuperlu_mt"
123 + -DEXAMPLES_ENABLE="$(usex examples)"
124 + -DEXAMPLES_INSTALL=ON
125 + -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
126 + -DUSE_GENERIC_MATH=ON
127 + )
128 + use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
129 + cmake_src_configure
130 +}
131 +
132 +src_install() {
133 + cmake_src_install
134 + use doc && dodoc doc/*/*.pdf
135 +}