* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-05-24 13:05 Agostino Sarubbo
0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2021-05-24 13:05 UTC (permalink / raw
To: gentoo-commits
commit: ebdec96dd0307623b6433fcb49780efde95f712f
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 13:04:39 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 24 13:04:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebdec96d
sci-libs/cantera: amd64 stable wrt bug #791715
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index 6f5345f106d..db21ef944ea 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+cti fortran lapack pch +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2024-08-20 18:14 Eli Schwartz
0 siblings, 0 replies; 33+ messages in thread
From: Eli Schwartz @ 2024-08-20 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 6a51311816af3082a8e5e2be8dc36b67cd7b25fa
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 18:10:17 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 18:12:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a513118
sci-libs/cantera: mark as LTO-unsafe
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
sci-libs/cantera/cantera-3.0.0-r1.ebuild | 6 +++++-
sci-libs/cantera/cantera-3.0.1.ebuild | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sci-libs/cantera/cantera-3.0.0-r1.ebuild b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
index 9f0de3263452..c6b3ec2711e1 100644
--- a/sci-libs/cantera/cantera-3.0.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} )
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD="77 90"
-inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
+inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs
DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
HOMEPAGE="https://www.cantera.org"
@@ -78,6 +78,10 @@ pkg_setup() {
## Full list of configuration options of Cantera is presented here:
## http://cantera.org/docs/sphinx/html/compiling/config-options.html
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://github.com/Cantera/cantera/issues/1783
+ filter-lto
+
scons_vars=(
AR="$(tc-getAR)"
CC="$(tc-getCC)"
diff --git a/sci-libs/cantera/cantera-3.0.1.ebuild b/sci-libs/cantera/cantera-3.0.1.ebuild
index 7de3d3bf06df..46a9c3b2f469 100644
--- a/sci-libs/cantera/cantera-3.0.1.ebuild
+++ b/sci-libs/cantera/cantera-3.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} )
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD="77 90"
-inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
+inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs
DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
HOMEPAGE="https://www.cantera.org"
@@ -77,6 +77,10 @@ pkg_setup() {
## Full list of configuration options of Cantera is presented here:
## http://cantera.org/docs/sphinx/html/compiling/config-options.html
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://github.com/Cantera/cantera/issues/1783
+ filter-lto
+
scons_vars=(
AR="$(tc-getAR)"
CC="$(tc-getCC)"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2024-08-20 18:14 Eli Schwartz
0 siblings, 0 replies; 33+ messages in thread
From: Eli Schwartz @ 2024-08-20 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 6e8c1d5d28effae96bddfa0e27cae00f6659362b
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Aug 18 19:08:18 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 18:12:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8c1d5d
sci-libs/cantera: 3.0.1; fix build with sundials-7, tests with numpy-2
Closes: https://bugs.gentoo.org/937247
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/38188
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
sci-libs/cantera/Manifest | 1 +
sci-libs/cantera/cantera-3.0.1.ebuild | 143 ++++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index fe074558539e..0e7764e95f41 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1 +1,2 @@
DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca
+DIST cantera-3.0.1.tar.gz 2451841 BLAKE2B b05771021a81d5266dfed382e2a6357e5b70653c6d9cfb5f03a6755095f4f8f4e7c0f78b79e0bf131c01fefce46bbc647c790ee412b6457c515cda39d4fc3054 SHA512 fa993b33867c6c0a0ca539f52116c4cdea739dfcd30deb5d2f66042f290f7f2f60112d7a37c38fbd8a38a119e5af00a7a85fd80b6e36388202b666be0ddd7715
diff --git a/sci-libs/cantera/cantera-3.0.1.ebuild b/sci-libs/cantera/cantera-3.0.1.ebuild
new file mode 100644
index 000000000000..7de3d3bf06df
--- /dev/null
+++ b/sci-libs/cantera/cantera-3.0.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fortran hdf5 lapack +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/yaml-cpp
+ hdf5? ( sci-libs/HighFive )
+ !lapack? ( sci-libs/sundials:0= )
+ lapack? (
+ >=sci-libs/sundials-6.5.0:0=[lapack?]
+ virtual/lapack
+ )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-libs/libfmt
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ ')
+ )
+ test? (
+ >=dev-cpp/gtest-1.11.0
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/h5py[${PYTHON_USEDEP}]
+ dev-python/pandas[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ ')
+ )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.0_env.patch"
+)
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+src_configure() {
+ scons_vars=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ cc_flags="${CXXFLAGS}"
+ cxx_flags="-std=c++17"
+ debug="no"
+ FORTRAN="$(tc-getFC)"
+ FORTRANFLAGS="${FCFLAGS}"
+ optimize_flags="-Wno-inline"
+ renamed_shared_libraries="no"
+ use_pch="no"
+ ## In some cases other order can break the detection of right location of Boost: ##
+ system_fmt="y"
+ system_sundials="y"
+ system_eigen="y"
+ system_yamlcpp="y"
+ hdf_support=$(usex hdf5 y n)
+ system_blas_lapack=$(usex lapack y n)
+ env_vars="all"
+ extra_inc_dirs="/usr/include/eigen3"
+ use_rpath_linkage="yes"
+ extra_lib_dirs="/usr/$(get_libdir)/${PN}"
+ )
+ use hdf5 && scons_vars+=( system_highfive="y" )
+ use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
+ use test || scons_vars+=( googletest="none" )
+
+ scons_targets=(
+ f90_interface=$(usex fortran y n)
+ )
+
+ if use python ; then
+ scons_targets+=( python_package="full" python_cmd="${EPYTHON}" )
+ else
+ scons_targets+=( python_package="none" )
+ fi
+}
+
+src_compile() {
+ escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+ escons test
+}
+
+src_install() {
+ escons install stage_dir="${D}" libdirname="$(get_libdir)"
+ if ! use python ; then
+ rm -r "${D}/usr/share/man" || die "Can't remove man files."
+ else
+ # Run the byte-compile of modules
+ python_optimize "${D}$(python_get_sitedir)/${PN}"
+ fi
+
+ # User could remove this line if require static libs for development purpose
+ find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+ local post_msg=$(usex fortran "and Fortran " "")
+ elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2024-02-28 14:00 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2024-02-28 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 285b5e580b6ffbfad71e2b54e7ce4ad8c8920b89
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 14:00:01 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 14:00:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285b5e58
sci-libs/cantera: Stabilize 3.0.0-r1 amd64, #925694
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-3.0.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-3.0.0-r1.ebuild b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
index 8ab4a8c5f104..9f0de3263452 100644
--- a/sci-libs/cantera/cantera-3.0.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="fortran hdf5 lapack +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2024-02-08 9:18 Joonas Niilola
0 siblings, 0 replies; 33+ messages in thread
From: Joonas Niilola @ 2024-02-08 9:18 UTC (permalink / raw
To: gentoo-commits
commit: c2084424fb801979847ecab89239a0ebd7963862
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Jan 15 18:22:53 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 09:18:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2084424
sci-libs/cantera: sort RDEPEND items; drop USE check duplicate
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/34795
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/cantera/cantera-2.6.0-r2.ebuild | 12 +++++++-----
sci-libs/cantera/cantera-3.0.0.ebuild | 14 ++++++++------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.6.0-r2.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
index b7276b05cc38..d024ceeacfc7 100644
--- a/sci-libs/cantera/cantera-2.6.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,20 +27,22 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
- lapack? ( virtual/lapack )
+ dev-cpp/yaml-cpp
cti? (
$(python_gen_cond_dep '
dev-python/ruamel-yaml[${PYTHON_USEDEP}]
')
)
+ !lapack? ( sci-libs/sundials:0= )
+ lapack? (
+ >=sci-libs/sundials-6.5.0:0=[lapack?]
+ virtual/lapack
+ )
python? (
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
')
)
- dev-cpp/yaml-cpp
- !lapack? ( sci-libs/sundials:0= )
- lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] )
"
# <cython-3 for bug #913141
diff --git a/sci-libs/cantera/cantera-3.0.0.ebuild b/sci-libs/cantera/cantera-3.0.0.ebuild
index 27478930c415..d53ba2538180 100644
--- a/sci-libs/cantera/cantera-3.0.0.ebuild
+++ b/sci-libs/cantera/cantera-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,17 +26,19 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
- lapack? ( virtual/lapack )
+ dev-cpp/yaml-cpp
+ hdf5? ( sci-libs/HighFive )
+ !lapack? ( sci-libs/sundials:0= )
+ lapack? (
+ >=sci-libs/sundials-6.5.0:0=[lapack?]
+ virtual/lapack
+ )
python? (
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/ruamel-yaml[${PYTHON_USEDEP}]
')
)
- dev-cpp/yaml-cpp
- hdf5? ( sci-libs/HighFive )
- !lapack? ( sci-libs/sundials:0= )
- lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] )
"
DEPEND="
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2023-10-27 2:34 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2023-10-27 2:34 UTC (permalink / raw
To: gentoo-commits
commit: 68ad0f32859b28e51808b3430d140f5b6867704c
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Sep 3 21:08:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:30:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ad0f32
sci-libs/cantera: v3.0.0 add USE="hdf5" for HDF5 container file support
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-3.0.0.ebuild | 6 ++++--
sci-libs/cantera/metadata.xml | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-libs/cantera/cantera-3.0.0.ebuild b/sci-libs/cantera/cantera-3.0.0.ebuild
index da1bd0e4e645..efc3e6149962 100644
--- a/sci-libs/cantera/cantera-3.0.0.ebuild
+++ b/sci-libs/cantera/cantera-3.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="fortran lapack +python test"
+IUSE="fortran hdf5 lapack +python test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -34,6 +34,7 @@ RDEPEND="
')
)
dev-cpp/yaml-cpp
+ hdf5? ( sci-libs/HighFive )
!lapack? ( sci-libs/sundials:0= )
lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] )
"
@@ -93,11 +94,12 @@ src_configure() {
system_sundials="y"
system_eigen="y"
system_yamlcpp="y"
- hdf_support="n"
+ hdf_support=$(usex hdf5 y n)
system_blas_lapack=$(usex lapack y n)
env_vars="all"
extra_inc_dirs="/usr/include/eigen3"
)
+ use hdf5 && scons_vars+=( system_highfive="y" )
use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
use test || scons_vars+=( googletest="none" )
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index 81f17579d02a..fbc827be0db4 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -16,6 +16,7 @@
<use>
<flag name="cti">Install conversion tools (ck2cti, ck2yaml, ctml_writer) from Chemkin to Cantera format</flag>
<flag name="python">Install Python bindings and conversion tools from Chemkin to Cantera format</flag>
+ <flag name="hdf5">Add HDF5 container files support</flag>
</use>
<upstream>
<remote-id type="github">cantera/cantera</remote-id>
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2023-08-28 22:57 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2023-08-28 22:57 UTC (permalink / raw
To: gentoo-commits
commit: c9e9a1de3acf6e766bc86f39084c7b38d13f5d95
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 22:56:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 22:56:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e9a1de
sci-libs/cantera: depend on <cython-3
Fixed in new upstream release which will be packaged soon.
Bug: https://bugs.gentoo.org/913141
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-2.6.0-r2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.6.0-r2.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
index 5a8cb20337f7..b7276b05cc38 100644
--- a/sci-libs/cantera/cantera-2.6.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] )
"
+# <cython-3 for bug #913141
DEPEND="
${RDEPEND}
dev-cpp/eigen:3
@@ -50,7 +51,7 @@ DEPEND="
dev-libs/libfmt
python? (
$(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
+ <dev-python/cython-3[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
')
)
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2023-05-14 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 33+ messages in thread
From: Andreas Sturmlechner @ 2023-05-14 10:29 UTC (permalink / raw
To: gentoo-commits
commit: c6862631eb70cd4030f246fd62146078693869d5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:42:11 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6862631
sci-libs/cantera: drop 2.6.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/cantera/cantera-2.6.0-r1.ebuild | 148 -------------------------------
1 file changed, 148 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.6.0-r1.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild
deleted file mode 100644
index cba332f43a27..000000000000
--- a/sci-libs/cantera/cantera-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cti fortran lapack +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- python? ( cti )
- ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- lapack? ( virtual/lapack )
- cti? (
- $(python_gen_cond_dep '
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- ')
- )
- python? (
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
- dev-cpp/yaml-cpp
- !lapack? ( sci-libs/sundials:0= )
- lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- dev-libs/libfmt
- python? (
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- ')
- )
- test? (
- >=dev-cpp/gtest-1.11.0
- python? (
- $(python_gen_cond_dep '
- dev-python/h5py[${PYTHON_USEDEP}]
- dev-python/pandas[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- ')
- )
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}_env.patch" )
-
-pkg_setup() {
- fortran-2_pkg_setup
- python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-src_configure() {
- scons_vars=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- cc_flags="${CXXFLAGS}"
- cxx_flags="-std=c++11"
- debug="no"
- FORTRAN="$(tc-getFC)"
- FORTRANFLAGS="${FCFLAGS}"
- optimize_flags="-Wno-inline"
- renamed_shared_libraries="no"
- use_pch="no"
- ## In some cases other order can break the detection of right location of Boost: ##
- system_fmt="y"
- system_sundials="y"
- system_eigen="y"
- system_yamlcpp="y"
- env_vars="all"
- extra_inc_dirs="/usr/include/eigen3"
- )
- use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
- use test || scons_vars+=( googletest="none" )
-
- scons_targets=(
- f90_interface=$(usex fortran y n)
- )
-
- if use cti ; then
- local scons_python=$(usex python full minimal)
- scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
- else
- scons_targets+=( python_package="none" )
- fi
-}
-
-src_compile() {
- escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
- escons test
-}
-
-src_install() {
- escons install stage_dir="${D}" libdirname="$(get_libdir)"
- if ! use cti ; then
- rm -r "${D}/usr/share/man" || die "Can't remove man files."
- else
- # Run the byte-compile of modules
- python_optimize "${D}$(python_get_sitedir)/${PN}"
- fi
-
- # User could remove this line if require static libs for development purpose
- find "${ED}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
- if use cti && ! use python ; then
- elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
- elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
- fi
-
- local post_msg=$(usex fortran "and Fortran " "")
- elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
- if use python ; then
- elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
- fi
-}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2023-03-07 11:42 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2023-03-07 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 2fa96932a46f59fb2d5798abaa9b5f9b1817bfe7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 11:40:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 11:40:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa96932
sci-libs/cantera: Stabilize 2.6.0-r2 amd64, #899662
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-2.6.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.6.0-r2.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
index 31d393df1c40..5a8cb20337f7 100644
--- a/sci-libs/cantera/cantera-2.6.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+cti fortran lapack +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-12-26 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 33+ messages in thread
From: Andreas Sturmlechner @ 2022-12-26 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 3f5b25acb64e07ec67b320246aa9c818cdd49196
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 19:17:37 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 19:17:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5b25ac
sci-libs/cantera: drop 2.5.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r1.ebuild | 144 -------------------------------
1 file changed, 144 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
deleted file mode 100644
index ecacad92743b..000000000000
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cti fortran lapack pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- python? ( cti )
- ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- lapack? ( virtual/lapack )
- cti? (
- $(python_gen_cond_dep '
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- ')
- )
- python? (
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
- dev-cpp/yaml-cpp
- <sci-libs/sundials-5.3.0:0=[lapack?]
-"
-
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- dev-libs/libfmt
- python? (
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- ')
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- python? (
- $(python_gen_cond_dep '
- dev-python/h5py[${PYTHON_USEDEP}]
- dev-python/pandas[${PYTHON_USEDEP}]
- ')
- )
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}_env.patch" )
-
-pkg_setup() {
- fortran-2_pkg_setup
- python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-src_configure() {
- scons_vars=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- cc_flags="${CXXFLAGS}"
- cxx_flags="-std=c++11"
- debug="no"
- FORTRAN="$(tc-getFC)"
- FORTRANFLAGS="${FCFLAGS}"
- optimize_flags="-Wno-inline"
- renamed_shared_libraries="no"
- use_pch=$(usex pch)
- ## In some cases other order can break the detection of right location of Boost: ##
- system_fmt="y"
- system_sundials="y"
- system_eigen="y"
- system_yamlcpp="y"
- env_vars="all"
- extra_inc_dirs="/usr/include/eigen3"
- )
- use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
- use test || scons_vars+=( googletest="none" )
-
- scons_targets=(
- f90_interface=$(usex fortran y n)
- )
-
- if use cti ; then
- local scons_python=$(usex python full minimal)
- scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
- else
- scons_targets+=( python_package="none" )
- fi
-}
-
-src_compile() {
- escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
- escons test
-}
-
-src_install() {
- escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
- if ! use cti ; then
- rm -r "${D}/usr/share/man" || die "Can't remove man files."
- else
- # Run the byte-compile of modules
- python_optimize "${D}/$(python_get_sitedir)/${PN}"
- fi
-
- # We install static libs unconditionally here
- # See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565
-}
-
-pkg_postinst() {
- if use cti && ! use python ; then
- elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
- elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
- fi
-
- local post_msg=$(usex fortran "and Fortran " "")
- elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
- if use python ; then
- elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
- fi
-}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-11-06 19:06 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-11-06 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 39ae5146392d8170bfb69d66cf9eee9ffda2adf5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 19:05:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 19:05:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ae5146
sci-libs/cantera: Stabilize 2.6.0-r1 amd64, #879253
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-2.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.6.0-r1.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild
index fb800fb485b5..ef8be2906246 100644
--- a/sci-libs/cantera/cantera-2.6.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.6.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+cti fortran lapack +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-06-07 7:46 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-06-07 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 57e2c8db6b7c1f2901b304fc1db372d1fe8a0121
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 07:46:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 07:46:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e2c8db
sci-libs/cantera: fix copyright header
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index 5deadec53ca2..ecacad92743b 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-05-09 9:58 Jakov Smolić
0 siblings, 0 replies; 33+ messages in thread
From: Jakov Smolić @ 2022-05-09 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 68ca2b759c6bef19c2da555b2b030978727a5557
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 09:57:27 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon May 9 09:57:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ca2b75
sci-libs/cantera: Stabilize 2.5.1-r3 amd64, #842909
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r3.ebuild b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
index 0af208ddd56f..dad4dddb283b 100644
--- a/sci-libs/cantera/cantera-2.5.1-r3.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+cti fortran lapack +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-02-27 0:58 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-27 0:58 UTC (permalink / raw
To: gentoo-commits
commit: 02e5ab26ab6bf9ec64ab10117de5e055607f325c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 00:54:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:54:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e5ab26
sci-libs/cantera: drop desktop.eclass in -r3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r3.ebuild b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
index 99ea2dff2599..0af208ddd56f 100644
--- a/sci-libs/cantera/cantera-2.5.1-r3.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD="77 90"
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
HOMEPAGE="https://www.cantera.org"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-02-27 0:54 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2022-02-27 0:54 UTC (permalink / raw
To: gentoo-commits
commit: c51cf41931e92294277c1f9b3ef00fc9f2f632c7
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Feb 27 00:31:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:54:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c51cf419
sci-libs/cantera: 2.5.1 revision bump
Drop USE="pch".
Fix python_optimize path.
Remove static libs.
Closes: https://bugs.gentoo.org/832792
Closes: https://bugs.gentoo.org/832787
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/24367
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{cantera-2.5.1-r2.ebuild => cantera-2.5.1-r3.ebuild} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r2.ebuild b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
similarity index 93%
rename from sci-libs/cantera/cantera-2.5.1-r2.ebuild
rename to sci-libs/cantera/cantera-2.5.1-r3.ebuild
index f4fa50e5d5a0..99ea2dff2599 100644
--- a/sci-libs/cantera/cantera-2.5.1-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran lapack pch +python test"
+IUSE="+cti fortran lapack +python test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -84,7 +84,7 @@ src_configure() {
FORTRANFLAGS="${FCFLAGS}"
optimize_flags="-Wno-inline"
renamed_shared_libraries="no"
- use_pch=$(usex pch)
+ use_pch="no"
## In some cases other order can break the detection of right location of Boost: ##
system_fmt="y"
system_sundials="y"
@@ -122,11 +122,11 @@ src_install() {
rm -r "${D}/usr/share/man" || die "Can't remove man files."
else
# Run the byte-compile of modules
- python_optimize "${D}/$(python_get_sitedir)/${PN}"
+ python_optimize "${D}$(python_get_sitedir)/${PN}"
fi
- # We install static libs unconditionally here
- # See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565
+ # User could remove this line if require static libs for development purpose
+ find "${ED}" -name '*.a' -delete || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2022-01-15 9:31 Joonas Niilola
0 siblings, 0 replies; 33+ messages in thread
From: Joonas Niilola @ 2022-01-15 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 07d0669e537e00790a76d1e3fba56b361e457f1c
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Dec 18 22:38:43 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 09:31:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d0669e
sci-libs/cantera: add Python3.10, update to sci-libs/sundials-5.8
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/23413
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r2.ebuild | 144 +++++++++++++++++++++++++++++++
1 file changed, 144 insertions(+)
diff --git a/sci-libs/cantera/cantera-2.5.1-r2.ebuild b/sci-libs/cantera/cantera-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..f4fa50e5d5a0
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.5.1-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran lapack pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ python? ( cti )
+ ${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ lapack? ( virtual/lapack )
+ cti? (
+ $(python_gen_cond_dep '
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ ')
+ )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+ dev-cpp/yaml-cpp
+ <sci-libs/sundials-5.9.0:0=[lapack?]
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ dev-libs/libfmt
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ ')
+ )
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/h5py[${PYTHON_USEDEP}]
+ dev-python/pandas[${PYTHON_USEDEP}]
+ ')
+ )
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}_env.patch" )
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+src_configure() {
+ scons_vars=(
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ cc_flags="${CXXFLAGS}"
+ cxx_flags="-std=c++11"
+ debug="no"
+ FORTRAN="$(tc-getFC)"
+ FORTRANFLAGS="${FCFLAGS}"
+ optimize_flags="-Wno-inline"
+ renamed_shared_libraries="no"
+ use_pch=$(usex pch)
+ ## In some cases other order can break the detection of right location of Boost: ##
+ system_fmt="y"
+ system_sundials="y"
+ system_eigen="y"
+ system_yamlcpp="y"
+ env_vars="all"
+ extra_inc_dirs="/usr/include/eigen3"
+ )
+ use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
+ use test || scons_vars+=( googletest="none" )
+
+ scons_targets=(
+ f90_interface=$(usex fortran y n)
+ )
+
+ if use cti ; then
+ local scons_python=$(usex python full minimal)
+ scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
+ else
+ scons_targets+=( python_package="none" )
+ fi
+}
+
+src_compile() {
+ escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+ escons test
+}
+
+src_install() {
+ escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
+ if ! use cti ; then
+ rm -r "${D}/usr/share/man" || die "Can't remove man files."
+ else
+ # Run the byte-compile of modules
+ python_optimize "${D}/$(python_get_sitedir)/${PN}"
+ fi
+
+ # We install static libs unconditionally here
+ # See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565
+}
+
+pkg_postinst() {
+ if use cti && ! use python ; then
+ elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
+ elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+ fi
+
+ local post_msg=$(usex fortran "and Fortran " "")
+ elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+ if use python ; then
+ elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+ fi
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-07-17 18:18 David Seifert
0 siblings, 0 replies; 33+ messages in thread
From: David Seifert @ 2021-07-17 18:18 UTC (permalink / raw
To: gentoo-commits
commit: af180784057eba8801abb17f4ba8dae3db08020f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 18:17:03 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 18:17:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af180784
sci-libs/cantera: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r1.ebuild | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index db21ef944ea..659722a8c3c 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD="77 90"
@@ -30,12 +30,12 @@ RDEPEND="
lapack? ( virtual/lapack )
cti? (
$(python_gen_cond_dep '
- dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
')
)
python? (
$(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
')
)
dev-cpp/yaml-cpp
@@ -49,15 +49,15 @@ DEPEND="
dev-libs/libfmt
python? (
$(python_gen_cond_dep '
- dev-python/cython[${PYTHON_MULTI_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
')
)
test? (
>=dev-cpp/gtest-1.8.0
python? (
$(python_gen_cond_dep '
- dev-python/h5py[${PYTHON_MULTI_USEDEP}]
- dev-python/pandas[${PYTHON_MULTI_USEDEP}]
+ dev-python/h5py[${PYTHON_USEDEP}]
+ dev-python/pandas[${PYTHON_USEDEP}]
')
)
)
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-04-09 12:21 Joonas Niilola
0 siblings, 0 replies; 33+ messages in thread
From: Joonas Niilola @ 2021-04-09 12:21 UTC (permalink / raw
To: gentoo-commits
commit: f33e9d3ef4e035f1f823ec2e2ff2ec2d88751bc0
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Mar 22 21:11:43 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 12:20:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33e9d3e
sci-libs/cantera: 2.5.1, add USE=lapack
Add USE=lapack to use Lapack insatead of Eigen for linear algebra support
in some cases. Eigen is still required if Lapack support is enabled.
The sci-libs/sundials[lapack] is required to build with Lapack support.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/20071
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1-r1.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index 4cf4cc6c3c3..2bf3e5d6a74 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
+IUSE="+cti fortran lapack pch +python test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -27,6 +27,7 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
+ lapack? ( virtual/lapack )
python? (
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
@@ -34,7 +35,7 @@ RDEPEND="
')
)
dev-cpp/yaml-cpp
- <sci-libs/sundials-5.3.0:0=
+ <sci-libs/sundials-5.3.0:0=[lapack?]
"
DEPEND="
@@ -88,6 +89,7 @@ src_configure() {
env_vars="all"
extra_inc_dirs="/usr/include/eigen3"
)
+ use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
use test || scons_vars+=( googletest="none" )
scons_targets=(
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-03-01 8:26 Joonas Niilola
0 siblings, 0 replies; 33+ messages in thread
From: Joonas Niilola @ 2021-03-01 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 5cce4cb067f87484d0d136b38f10f3b6cacbd96b
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Feb 24 23:10:13 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 08:25:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cce4cb0
sci-libs/cantera: drop transitional 2.5.0
Cantera 2.5.0 differs from 2.5.1 only with some Documentations
and Scons build script fixes and updates.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19640
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/cantera/Manifest | 1 -
sci-libs/cantera/cantera-2.5.0.ebuild | 134 ----------------------------------
2 files changed, 135 deletions(-)
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index c85ef401c04..6a29d4e0855 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,3 +1,2 @@
DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-DIST cantera-2.5.0.tar.gz 2479888 BLAKE2B be3dd9ae1b0d9b555b9ddd6ad78a2a6a675844903e4c10ef5e4a09c66d5ca01f81f49f35ee195597d71140dcc4da9750e82f71c6553b5f0ef8a122bf63b86cc1 SHA512 4f1763a74a4a938c6d4512ab574bcbbb84ea6e8c9814c612e6ff6cba0bec1209252ef7c21004e0df98a84279cf66bd137220233dad0ebbcfc89e9a273d753478
DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
diff --git a/sci-libs/cantera/cantera-2.5.0.ebuild b/sci-libs/cantera/cantera-2.5.0.ebuild
deleted file mode 100644
index 5f3b8c1280b..00000000000
--- a/sci-libs/cantera/cantera-2.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- python? ( cti )
- ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- python? (
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
- ')
- )
- dev-cpp/yaml-cpp
- <sci-libs/sundials-5.3.0:0=
-"
-
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- dev-libs/libfmt
- python? (
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_MULTI_USEDEP}]
- ')
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- python? (
- $(python_gen_cond_dep '
- dev-python/h5py[${PYTHON_MULTI_USEDEP}]
- dev-python/pandas[${PYTHON_MULTI_USEDEP}]
- ')
- )
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}_env.patch" )
-
-pkg_setup() {
- fortran-2_pkg_setup
- python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-src_configure() {
- scons_vars=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- cc_flags="${CXXFLAGS}"
- cxx_flags="-std=c++11"
- debug="no"
- FORTRAN="$(tc-getFC)"
- FORTRANFLAGS="${FCFLAGS}"
- optimize_flags="-Wno-inline"
- renamed_shared_libraries="no"
- use_pch=$(usex pch)
- ## In some cases other order can break the detection of right location of Boost: ##
- system_fmt="y"
- system_sundials="y"
- system_eigen="y"
- system_yamlcpp="y"
- env_vars="all"
- extra_inc_dirs="/usr/include/eigen3"
- )
- use test || scons_vars+=( googletest="none" )
-
- scons_targets=(
- f90_interface=$(usex fortran y n)
- )
-
- if use cti ; then
- local scons_python=$(usex python full minimal)
- scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
- else
- scons_targets+=( python_package="none" )
- fi
-}
-
-src_compile() {
- escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
- escons test
-}
-
-src_install() {
- escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
- if ! use cti ; then
- rm -r "${D}/usr/share/man" || die "Can't remove man files."
- else
- # Run the byte-compile of modules
- python_optimize "${D}/$(python_get_sitedir)/${PN}"
- fi
-}
-
-pkg_postinst() {
- if use cti && ! use python ; then
- elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
- elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
- fi
-
- local post_msg=$(usex fortran "and Fortran " "")
- elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
- if use python ; then
- elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
- fi
-}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-02-19 16:04 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2021-02-19 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 8e4e4efc4facf846cf859b250556eab30b7f4f82
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Feb 18 22:26:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 16:02:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4e4efc
sci-libs/cantera: 2.5.1 version bump
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/Manifest | 1 +
sci-libs/cantera/cantera-2.5.1.ebuild | 134 ++++++++++++++++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 679cdd81f64..c85ef401c04 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,2 +1,3 @@
DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
DIST cantera-2.5.0.tar.gz 2479888 BLAKE2B be3dd9ae1b0d9b555b9ddd6ad78a2a6a675844903e4c10ef5e4a09c66d5ca01f81f49f35ee195597d71140dcc4da9750e82f71c6553b5f0ef8a122bf63b86cc1 SHA512 4f1763a74a4a938c6d4512ab574bcbbb84ea6e8c9814c612e6ff6cba0bec1209252ef7c21004e0df98a84279cf66bd137220233dad0ebbcfc89e9a273d753478
+DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
diff --git a/sci-libs/cantera/cantera-2.5.1.ebuild b/sci-libs/cantera/cantera-2.5.1.ebuild
new file mode 100644
index 00000000000..5be7278ee7d
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.5.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ python? ( cti )
+ ${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ dev-cpp/yaml-cpp
+ <sci-libs/sundials-5.3.0:0=
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ dev-libs/libfmt
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/h5py[${PYTHON_MULTI_USEDEP}]
+ dev-python/pandas[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.5.0_env.patch" )
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+src_configure() {
+ scons_vars=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ cc_flags="${CXXFLAGS}"
+ cxx_flags="-std=c++11"
+ debug="no"
+ FORTRAN="$(tc-getFC)"
+ FORTRANFLAGS="${FCFLAGS}"
+ optimize_flags="-Wno-inline"
+ renamed_shared_libraries="no"
+ use_pch=$(usex pch)
+ ## In some cases other order can break the detection of right location of Boost: ##
+ system_fmt="y"
+ system_sundials="y"
+ system_eigen="y"
+ system_yamlcpp="y"
+ env_vars="all"
+ extra_inc_dirs="/usr/include/eigen3"
+ )
+ use test || scons_vars+=( googletest="none" )
+
+ scons_targets=(
+ f90_interface=$(usex fortran y n)
+ )
+
+ if use cti ; then
+ local scons_python=$(usex python full minimal)
+ scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
+ else
+ scons_targets+=( python_package="none" )
+ fi
+}
+
+src_compile() {
+ escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+ escons test
+}
+
+src_install() {
+ escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
+ if ! use cti ; then
+ rm -r "${D}/usr/share/man" || die "Can't remove man files."
+ else
+ # Run the byte-compile of modules
+ python_optimize "${D}/$(python_get_sitedir)/${PN}"
+ fi
+}
+
+pkg_postinst() {
+ if use cti && ! use python ; then
+ elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
+ elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+ fi
+
+ local post_msg=$(usex fortran "and Fortran " "")
+ elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+ if use python ; then
+ elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+ fi
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-02-19 16:04 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2021-02-19 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 169f5603ac617424c397109f8e193b5543850165
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Feb 18 22:35:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 16:02:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169f5603
sci-libs/cantera: fix metadata remote-id
Remote-id now points to repository instead of organisation.
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19529
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index 5ee7890c136..cc02172de85 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -17,6 +17,6 @@
<flag name="cti">Install CTI tools (ck2cti, ck2yaml, ctml_writer) for conversion of Chemkin files to Cantera format</flag>
</use>
<upstream>
- <remote-id type="github">cantera</remote-id>
+ <remote-id type="github">cantera/cantera</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2021-02-19 16:04 Sam James
0 siblings, 0 replies; 33+ messages in thread
From: Sam James @ 2021-02-19 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 465e8e1b25a0f37b692b1ae6ba03ee1237ce7a0f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 15:49:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 16:02:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465e8e1b
sci-libs/cantera: add static libs comment
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/cantera-2.5.1.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sci-libs/cantera/cantera-2.5.1.ebuild b/sci-libs/cantera/cantera-2.5.1.ebuild
index 5be7278ee7d..71ba0f78c0f 100644
--- a/sci-libs/cantera/cantera-2.5.1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1.ebuild
@@ -117,6 +117,9 @@ src_install() {
# Run the byte-compile of modules
python_optimize "${D}/$(python_get_sitedir)/${PN}"
fi
+
+ # We install static libs unconditionally here
+ # See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2020-10-09 15:23 Agostino Sarubbo
0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2020-10-09 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 94e61c6f69ef8626ee88cab3b372c1e58f6eab97
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 15:22:46 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 15:22:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e61c6f
sci-libs/cantera: amd64 stable wrt bug #705134
Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
index ac2a89b4ddd..509fa30f426 100644
--- a/sci-libs/cantera/cantera-2.4.0-r5.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+cti fortran pch +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2020-07-21 10:03 Andreas Sturmlechner
0 siblings, 0 replies; 33+ messages in thread
From: Andreas Sturmlechner @ 2020-07-21 10:03 UTC (permalink / raw
To: gentoo-commits
commit: be238768e2f648b734137bbbf8908062019c35bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 16:22:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 10:03:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be238768
sci-libs/cantera: Drop 2.4.0-r1
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 129 -------------------------------
1 file changed, 129 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
deleted file mode 100644
index cd27ff27f63..00000000000
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="http://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- python? ( cti )
- ${PYTHON_REQUIRED_USE}
- "
-
-RDEPEND="
- ${PYTHON_DEPS}
- python? (
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- ')
- )
- <sci-libs/sundials-4.0.0:0=
-"
-
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen
- dev-libs/boost
- dev-libs/libfmt
- python? (
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_MULTI_USEDEP}]
- ')
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}_${PV}_env.patch"
- )
-
-pkg_setup() {
- fortran-2_pkg_setup
- python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-
-src_configure() {
- scons_vars=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- cc_flags="${CXXFLAGS}"
- cxx_flags="-std=c++11"
- debug="no"
- FORTRAN="$(tc-getFC)"
- FORTRANFLAGS="${CXXFLAGS}"
- optimize_flags="-Wno-inline"
- renamed_shared_libraries="no"
- use_pch=$(usex pch)
-## In some cases other order can break the detection of right location of Boost: ##
- system_fmt="y"
- system_sundials="y"
- system_eigen="y"
- env_vars="all"
- extra_inc_dirs="/usr/include/eigen3"
- )
- use test || scons_vars+=( googletest="none" )
-
- scons_targets=(
- f90_interface=$(usex fortran y n)
- python2_package="none"
- )
-
- if use cti ; then
- local scons_python=$(usex python full minimal)
- scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
- else
- scons_targets+=( python3_package="none" )
- fi
-}
-
-src_compile() {
- escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
- escons test
-}
-
-src_install() {
- escons install stage_dir="${D}" libdirname="$(get_libdir)"
- if ! use cti ; then
- rm -r "${D}/usr/share/man" || die "Can't remove man files."
- else
- # Run the byte-compile of modules
- python_optimize "${D}/$(python_get_sitedir)/${PN}"
- fi
-}
-
-pkg_postinst() {
- if use cti && ! use python ; then
- elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
- elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
- fi
-
- local post_msg=$(usex fortran "and Fortran " "")
- elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
- if use python ; then
- elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
- fi
-}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2020-05-05 16:54 Matthias Maier
0 siblings, 0 replies; 33+ messages in thread
From: Matthias Maier @ 2020-05-05 16:54 UTC (permalink / raw
To: gentoo-commits
commit: 9d648a8dc23bf7801c596ada300f56f0894d73b6
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 21 01:10:09 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 5 16:49:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d648a8d
sci-libs/cantera: Revision bump. Pass FFLAGS for FORTRANFLAGS
FFLAGS env variable is passed now for FORTRANFLAGS compile option.
FFLAGS is presented by default in profile (see https://bugs.gentoo.org/575446).
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r5.ebuild | 131 +++++++++++++++++++++++++++++++
1 file changed, 131 insertions(+)
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
new file mode 100644
index 00000000000..78f23ee905b
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ python? ( cti )
+ ${PYTHON_REQUIRED_USE}
+ "
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ <sci-libs/sundials-5.2.0:0=
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ dev-libs/libfmt
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}_${PV}_env.patch"
+ "${FILESDIR}/${PN}_${PV}_env_python_install.patch"
+ "${FILESDIR}/${PN}_${PV}_sundials4.patch"
+ )
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+
+src_configure() {
+ scons_vars=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ cc_flags="${CXXFLAGS}"
+ cxx_flags="-std=c++11"
+ debug="no"
+ FORTRAN="$(tc-getFC)"
+ FORTRANFLAGS="${FFLAGS}"
+ optimize_flags="-Wno-inline"
+ renamed_shared_libraries="no"
+ use_pch=$(usex pch)
+## In some cases other order can break the detection of right location of Boost: ##
+ system_fmt="y"
+ system_sundials="y"
+ system_eigen="y"
+ env_vars="all"
+ extra_inc_dirs="/usr/include/eigen3"
+ )
+ use test || scons_vars+=( googletest="none" )
+
+ scons_targets=(
+ f90_interface=$(usex fortran y n)
+ python2_package="none"
+ )
+
+ if use cti ; then
+ local scons_python=$(usex python full minimal)
+ scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
+ else
+ scons_targets+=( python3_package="none" )
+ fi
+}
+
+src_compile() {
+ escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+ escons test
+}
+
+src_install() {
+ escons install stage_dir="${D}" libdirname="$(get_libdir)"
+ if ! use cti ; then
+ rm -r "${D}/usr/share/man" || die "Can't remove man files."
+ else
+ # Run the byte-compile of modules
+ python_optimize "${D}/$(python_get_sitedir)/${PN}"
+ fi
+}
+
+pkg_postinst() {
+ if use cti && ! use python ; then
+ elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
+ elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+ fi
+
+ local post_msg=$(usex fortran "and Fortran " "")
+ elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+ if use python ; then
+ elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+ fi
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2020-02-09 16:36 Michał Górny
0 siblings, 0 replies; 33+ messages in thread
From: Michał Górny @ 2020-02-09 16:36 UTC (permalink / raw
To: gentoo-commits
commit: b4937ee4a074b4b6849c7fb31cd635b327995b41
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 19:04:15 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:35:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4937ee4
sci-libs/cantera: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 8 ++++++--
.../cantera/{cantera-2.4.0-r2.ebuild => cantera-2.4.0-r3.ebuild} | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index edaded328a2..cd27ff27f63 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -28,7 +28,9 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
python? (
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
)
<sci-libs/sundials-4.0.0:0=
"
@@ -39,7 +41,9 @@ DEPEND="
dev-libs/boost
dev-libs/libfmt
python? (
- dev-python/cython[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_MULTI_USEDEP}]
+ ')
)
test? (
>=dev-cpp/gtest-1.8.0
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r3.ebuild
similarity index 95%
rename from sci-libs/cantera/cantera-2.4.0-r2.ebuild
rename to sci-libs/cantera/cantera-2.4.0-r3.ebuild
index f82bfa08639..29345e36058 100644
--- a/sci-libs/cantera/cantera-2.4.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r3.ebuild
@@ -28,7 +28,9 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
python? (
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
)
<sci-libs/sundials-5.1.0:0=
"
@@ -39,7 +41,9 @@ DEPEND="
dev-libs/boost
dev-libs/libfmt
python? (
- dev-python/cython[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_MULTI_USEDEP}]
+ ')
)
test? (
>=dev-cpp/gtest-1.8.0
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2020-01-14 14:56 Agostino Sarubbo
0 siblings, 0 replies; 33+ messages in thread
From: Agostino Sarubbo @ 2020-01-14 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 5f901591f50f11106461bae832eba7571f8f5e21
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 14:55:40 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 14:55:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f901591
sci-libs/cantera: amd64 stable wrt bug #705134
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
index 79b1572e51c..f82bfa08639 100644
--- a/sci-libs/cantera/cantera-2.4.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+cti fortran pch +python test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2019-08-09 14:41 Joonas Niilola
0 siblings, 0 replies; 33+ messages in thread
From: Joonas Niilola @ 2019-08-09 14:41 UTC (permalink / raw
To: gentoo-commits
commit: d1117ab3944b97e8f77fbb9bb98dc205f97cd0f4
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Aug 9 01:19:28 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 14:40:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1117ab3
sci-libs/cantera: Fix missing RDEPEND="${PYTHON_DEPS}" warning
Closes: https://bugs.gentoo.org/691404
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Closes: https://github.com/gentoo/gentoo/pull/12650
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 15cb1776f09..c277d8d01c6 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -21,11 +21,11 @@ IUSE="+cti fortran pch +python test"
REQUIRED_USE="
python? ( cti )
- cti? ( ${PYTHON_REQUIRED_USE} )
${PYTHON_REQUIRED_USE}
"
RDEPEND="
+ ${PYTHON_DEPS}
python? (
dev-python/numpy[${PYTHON_USEDEP}]
)
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2019-07-19 16:45 Michał Górny
0 siblings, 0 replies; 33+ messages in thread
From: Michał Górny @ 2019-07-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 960d18cd7146b2462d7b1eaf09b5cb46ab6072c5
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Jul 18 10:08:02 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 16:44:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960d18cd
sci-libs/cantera: 2.4.0-r1. Switch to EAPI 7
Closes: https://github.com/gentoo/gentoo/pull/12303
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 99d4566ae1e..15cb1776f09 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
@@ -100,12 +100,12 @@ src_test() {
}
src_install() {
- escons install stage_dir="${D%/}" libdirname="$(get_libdir)"
+ escons install stage_dir="${D}" libdirname="$(get_libdir)"
if ! use cti ; then
- rm -r "${D%/}/usr/share/man" || die "Can't remove man files."
+ rm -r "${D}/usr/share/man" || die "Can't remove man files."
else
# Run the byte-compile of modules
- python_optimize "${D%/}/$(python_get_sitedir)/${PN}"
+ python_optimize "${D}/$(python_get_sitedir)/${PN}"
fi
}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2019-07-19 16:45 Michał Górny
0 siblings, 0 replies; 33+ messages in thread
From: Michał Górny @ 2019-07-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: efbb1928f3165176e350b3a3e9a28a134820d51a
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Jun 21 22:25:44 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 16:44:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efbb1928
sci-libs/cantera: 2.4.0-r1. Fix ebuild to satisfy GLEP73BackAlteration
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 707f5670106..435742d4be0 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="+cti fortran pch +python test"
REQUIRED_USE="
- cti? ( ${PYTHON_REQUIRED_USE} )
python? ( cti )
+ cti? ( ${PYTHON_REQUIRED_USE} )
${PYTHON_REQUIRED_USE}
"
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2019-07-19 16:45 Michał Górny
0 siblings, 0 replies; 33+ messages in thread
From: Michał Górny @ 2019-07-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: c0a49bf0854adc1729059f952a3f051008080a7e
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Jun 21 21:58:53 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 16:44:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a49bf0
sci-libs/cantera: 2.4.0-r1. Disable default optimization flag "-O3"
By default the optimization flag "-O3" was used with warning "-Wno-inline".
The addition of expicit build option optimize_flags="-Wno-inline"
now disables default "-O3" optimization flag in favor of options
taken from "make.conf".
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 130 +++++++++++++++++++++++++++++++
1 file changed, 130 insertions(+)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
new file mode 100644
index 00000000000..9d31e347b02
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="http://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+
+REQUIRED_USE="
+ cti? ( ${PYTHON_REQUIRED_USE} )
+ python? ( cti )
+ ${PYTHON_REQUIRED_USE}
+ "
+
+RDEPEND="
+ python? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ sci-libs/sundials:0=
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/boost
+ dev-libs/libfmt
+ python? (
+ dev-python/cython[${PYTHON_USEDEP}]
+ )
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}_${PV}_libdirname_variable.patch" )
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ # patch to work 'scons test' properly in case of set up 'renamed_shared_libraries="no"' option
+ sed -i "s/, libs=\['cantera_shared'\]//" "${S}"/test_problems/SConscript || die "failed to modify 'test_problems/SConscript'"
+ # patch env to pass CCACHE_DIR variable
+ sed -i "s/ENV={'PATH': os.environ\['PATH'\]}/ENV={'PATH': os.environ\['PATH'\], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}/" "${S}"/SConstruct || die "failed to modify 'SConstruct'"
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+
+src_configure() {
+ scons_vars=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ cc_flags="${CXXFLAGS}"
+ cxx_flags="-std=c++11"
+ debug="no"
+ FORTRAN="$(tc-getFC)"
+ FORTRANFLAGS="${CXXFLAGS}"
+ optimize_flags="-Wno-inline"
+ renamed_shared_libraries="no"
+ use_pch=$(usex pch)
+## In some cases other order can break the detection of right location of Boost: ##
+ system_fmt="y"
+ system_sundials="y"
+ system_eigen="y"
+ env_vars="all"
+ extra_inc_dirs="/usr/include/eigen3"
+ )
+ use test || scons_vars+=( googletest="none" )
+
+ scons_targets=(
+ f90_interface=$(usex fortran y n)
+ python2_package="none"
+ )
+
+ if use cti ; then
+ local scons_python=$(usex python full minimal)
+ scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
+ else
+ scons_targets+=( python3_package="none" )
+ fi
+}
+
+src_compile() {
+ escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+ escons test
+}
+
+src_install() {
+ escons install stage_dir="${D%/}" libdirname="$(get_libdir)"
+ if ! use cti ; then
+ rm -r "${D%/}/usr/share/man" || die "Can't remove man files."
+ else
+ # Run the byte-compile of modules
+ python_optimize "${D%/}/$(python_get_sitedir)/${PN}"
+ fi
+}
+
+pkg_postinst() {
+ if use cti && ! use python ; then
+ elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
+ elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+ fi
+
+ local post_msg=$(usex fortran "and Fortran " "")
+ elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+ if use python ; then
+ elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+ fi
+}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2019-07-19 16:45 Michał Górny
0 siblings, 0 replies; 33+ messages in thread
From: Michał Górny @ 2019-07-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: ccbc631dd7315cec186cd47790b501314a5e55bd
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Jun 21 22:04:14 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 16:44:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbc631d
sci-libs/cantera: 2.4.0-r1. Restrict RDEPEND <sci-libs/sundials-3.2.0:0=
Since the Cantera 2.4.0 release was early than Sundials 3.2.0
the build script of Cantera has internal checking that
installed Sundials version isn't greater than 3.1.
New RDEPEND rectriction is just to avoid failure of prepare ebuild phase.
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 9d31e347b02..235d20b70bf 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
python? (
dev-python/numpy[${PYTHON_USEDEP}]
)
- sci-libs/sundials:0=
+ <sci-libs/sundials-3.2.0:0=
"
DEPEND="
^ permalink raw reply related [flat|nested] 33+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/
@ 2019-07-19 16:45 Michał Górny
0 siblings, 0 replies; 33+ messages in thread
From: Michał Górny @ 2019-07-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 0e331ec643b7933a8d37bfb7bb9591b324231574
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Fri Jun 21 22:27:33 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 16:44:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e331ec6
sci-libs/cantera: 2.4.0-r1. Add PYTHON_COMPAT=( python3_7 )
After updated dev-util/scons (scons-3.0.5-r1.ebuild)
now it's possible to build Cantera with Python 3.7.
All tests of src_test() phase are passed.
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 435742d4be0..cd7dafba1b5 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD=90
^ permalink raw reply related [flat|nested] 33+ messages in thread
end of thread, other threads:[~2024-08-20 18:14 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-24 13:05 [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/ Agostino Sarubbo
-- strict thread matches above, loose matches on Subject: below --
2024-08-20 18:14 Eli Schwartz
2024-08-20 18:14 Eli Schwartz
2024-02-28 14:00 Sam James
2024-02-08 9:18 Joonas Niilola
2023-10-27 2:34 Sam James
2023-08-28 22:57 Sam James
2023-05-14 10:29 Andreas Sturmlechner
2023-03-07 11:42 Sam James
2022-12-26 19:19 Andreas Sturmlechner
2022-11-06 19:06 Sam James
2022-06-07 7:46 Sam James
2022-05-09 9:58 Jakov Smolić
2022-02-27 0:58 Sam James
2022-02-27 0:54 Sam James
2022-01-15 9:31 Joonas Niilola
2021-07-17 18:18 David Seifert
2021-04-09 12:21 Joonas Niilola
2021-03-01 8:26 Joonas Niilola
2021-02-19 16:04 Sam James
2021-02-19 16:04 Sam James
2021-02-19 16:04 Sam James
2020-10-09 15:23 Agostino Sarubbo
2020-07-21 10:03 Andreas Sturmlechner
2020-05-05 16:54 Matthias Maier
2020-02-09 16:36 Michał Górny
2020-01-14 14:56 Agostino Sarubbo
2019-08-09 14:41 Joonas Niilola
2019-07-19 16:45 Michał Górny
2019-07-19 16:45 Michał Górny
2019-07-19 16:45 Michał Górny
2019-07-19 16:45 Michał Górny
2019-07-19 16:45 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox