commit: 95eccece0ac1413544a5f45bd40b50271d5cb65e Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Fri May 6 21:36:41 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 13 20:03:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95eccece
sci-libs/cantera: 2.6.0 version bump dev-python/pip is used to install python bindings and dev-python/pytest is used for python tests since this release Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/25357 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/cantera/Manifest | 1 + sci-libs/cantera/cantera-2.6.0.ebuild | 147 +++++++++++++++++++++++++ sci-libs/cantera/files/cantera-2.6.0_env.patch | 57 ++++++++++ 3 files changed, 205 insertions(+) diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 67533340104e..beccad729392 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1 +1,2 @@ DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc +DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 diff --git a/sci-libs/cantera/cantera-2.6.0.ebuild b/sci-libs/cantera/cantera-2.6.0.ebuild new file mode 100644 index 000000000000..35884d896367 --- /dev/null +++ b/sci-libs/cantera/cantera-2.6.0.ebuild @@ -0,0 +1,147 @@ +# 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 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 + <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}] + 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 +} diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch new file mode 100644 index 000000000000..e49fb4679dd7 --- /dev/null +++ b/sci-libs/cantera/files/cantera-2.6.0_env.patch @@ -0,0 +1,57 @@ +diff -Naur old/SConstruct new/SConstruct +--- old/SConstruct ++++ new/SConstruct +@@ -178,6 +178,10 @@ + + config_options = [ + Option( ++ "AR", ++ "The archiver to use.", ++ "${AR}"), ++ Option( + "CXX", + "The C++ compiler to use.", + "${CXX}"), +@@ -740,7 +744,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) + +@@ -775,7 +779,7 @@ + + add_RegressionTest(env) + +-opts.AddVariables(*config.to_scons(["CC", "CXX"], env=env)) ++opts.AddVariables(*config.to_scons(["AR", "CC", "CXX"], env=env)) + opts.Update(env) + + # Check if this is actually Apple's clang on macOS +@@ -861,11 +865,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"] = get_command_output("git", "rev-parse", "--short", "HEAD") +- logger.info(f"Building Cantera from git commit '{env['git_commit']}'") +-except (subprocess.CalledProcessError, FileNotFoundError): +- env["git_commit"] = "unknown" ++env["git_commit"] = "unknown" + + # Print values of all build options: + # the (updated) "cantera.conf" combines all options that were specified by the user +diff -Naur old/test_problems/SConscript new/test_problems/SConscript +--- old/test_problems/SConscript ++++ new/test_problems/SConscript +@@ -233,7 +233,7 @@ + artifacts=['vcs_equilibrate_res.csv']) + + CompileAndTest('clib', 'clib_test', 'clib_test', +- extensions=['^clib_test.c'], libs=localenv['cantera_shared_libs']) ++ extensions=['^clib_test.c']) + + # C++ Samples + Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,
