commit: e48d47568a6d300dce1d2980a0f221c53b1295a4
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Feb 13 12:52:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 18:39:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48d4756
sci-libs/cantera: 2.5.0 version bump
Cantera now use yaml as input format and thus depends on
'dev-cpp/yaml-cpp' and 'dev-python/ruamel-yaml'.
The following dependences in DEPEND are actually not required to build
and if absence the appropriate 2 tests just will be skipped:
test? (
python? (
$(python_gen_cond_dep '
dev-python/h5py[${PYTHON_MULTI_USEDEP}]
dev-python/pandas[${PYTHON_MULTI_USEDEP}]
')
)
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19448
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cantera/Manifest | 1 +
sci-libs/cantera/cantera-2.5.0.ebuild | 134 +++++++++++++++++++++++++
sci-libs/cantera/files/cantera-2.5.0_env.patch | 49 +++++++++
sci-libs/cantera/metadata.xml | 2 +-
4 files changed, 185 insertions(+), 1 deletion(-)
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index a4660bf3bfd..679cdd81f64 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1 +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
diff --git a/sci-libs/cantera/cantera-2.5.0.ebuild
b/sci-libs/cantera/cantera-2.5.0.ebuild
new file mode 100644
index 00000000000..5f3b8c1280b
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.5.0.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}/${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
+}
diff --git a/sci-libs/cantera/files/cantera-2.5.0_env.patch
b/sci-libs/cantera/files/cantera-2.5.0_env.patch
new file mode 100644
index 00000000000..9551d4b4ca1
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-2.5.0_env.patch
@@ -0,0 +1,49 @@
+diff -Naur old/SConstruct new/SConstruct
+--- old/SConstruct 2021-02-13 01:18:43.000000000 +0300
++++ new/SConstruct 2021-02-13 01:27:06.000000000 +0300
+@@ -193,7 +193,7 @@
+ toolchain = ['default']
+
+ env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall',
'wix', 'gch'],
+- ENV={'PATH': os.environ['PATH']},
++ ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR':
os.environ.get('CCACHE_DIR','')},
+ toolchain=toolchain,
+ **extraEnvArgs)
+
+@@ -724,10 +724,7 @@
+ env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)',
env['cantera_version']).group(0)
+ env['cantera_short_version'] = re.match(r'(\d+\.\d+)',
env['cantera_version']).group(0)
+
+-try:
+- env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short',
'HEAD')
+-except Exception:
+- env['git_commit'] = 'unknown'
++env['git_commit'] = 'unknown'
+
+ # Print values of all build options:
+ print("Configuration variables read from 'cantera.conf' and command line:")
+diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript 2021-02-13 01:18:43.000000000 +0300
++++ new/interfaces/cython/SConscript 2021-02-13 01:59:29.000000000 +0300
+@@ -108,8 +108,7 @@
+ elif localenv['libdirname'] != 'lib':
+ # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
+ extra = localenv.subst(
+- ' --prefix=${{python_prefix}}'
+- '
--install-lib=${{python_prefix}}/${{libdirname}}/python{}/site-packages'.format(py_version))
++ ' --prefix=${stage_dir}${prefix} --install-lib=${python_prefix}')
+ else:
+ extra = '--user'
+ localenv.AppendENVPath(
+diff -Naur old/test_problems/SConscript new/test_problems/SConscript
+--- old/test_problems/SConscript 2021-02-13 01:18:43.000000000 +0300
++++ new/test_problems/SConscript 2021-02-13 01:42:19.000000000 +0300
+@@ -222,7 +222,7 @@
+ CompileAndTest('VPsilane_test')
+
+ CompileAndTest('clib', 'clib_test', 'clib_test',
+- extensions=['^clib_test.c'], libs=['cantera_shared'])
++ extensions=['^clib_test.c'])
+
+ # C++ Samples
+ Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index 47bc86a9630..5ee7890c136 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -14,7 +14,7 @@
for problems involving chemical kinetics, thermodynamics, and/or transport
processes.
</longdescription>
<use>
- <flag name="cti">Install CTI tools (ck2cti, ctml_writer) for conversion of
Chemkin files to Cantera format</flag>
+ <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>
