diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 782522d16b9c0..fe074558539ef 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,2 +1 @@ -DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856 DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca diff --git a/sci-libs/cantera/cantera-2.6.0-r2.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild deleted file mode 100644 index d024ceeacfc70..0000000000000 --- a/sci-libs/cantera/cantera-2.6.0-r2.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -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} - 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}] - ') - ) -" - -# -Date: Thu, 23 Jun 2022 00:04:22 +0300 -Subject: [PATCH] drop deprecated 'U' open option - ---- - site_scons/site_tools/subst.py | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/site_scons/site_tools/subst.py b/site_scons/site_tools/subst.py -index 3a1c4f6fb8..05d520491b 100644 ---- a/site_scons/site_tools/subst.py -+++ b/site_scons/site_tools/subst.py -@@ -12,7 +12,7 @@ - - from SCons.Script import * - import SCons.Errors -- -+from pathlib import Path - - # Helper/core functions - ############################################################################## -@@ -20,12 +20,7 @@ - # Do the substitution - def _subst_file(target, source, env, pattern, replace): - # Read file -- #print 'CALLING SUBST_FILE' -- f = open(source, "rU") -- try: -- contents = f.read() -- finally: -- f.close() -+ contents = Path(source).read_text() - - # Substitute, make sure result is a string - def subfn(mo): -@@ -46,11 +41,7 @@ def subfn(mo): - # Determine which keys are used - def _subst_keys(source, pattern): - # Read file -- f = open(source, "rU") -- try: -- contents = f.read() -- finally: -- f.close() -+ contents = Path(source).read_text() - - # Determine keys - keys = [] diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch deleted file mode 100644 index 15a1e65857e47..0000000000000 --- a/sci-libs/cantera/files/cantera-2.6.0_env.patch +++ /dev/null @@ -1,78 +0,0 @@ -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/interfaces/cython/SConscript new/interfaces/cython/SConscript ---- old/interfaces/cython/SConscript -+++ new/interfaces/cython/SConscript -@@ -107,7 +107,7 @@ - obj, LIBPREFIX="", SHLIBSUFFIX=module_ext, - SHLIBPREFIX="", LIBSUFFIXES=[module_ext]) - --build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps " -+build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps " - "--wheel-dir=build/python/dist build/python") - plat = info['plat'].replace('-', '_').replace('.', '_') - wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}" -@@ -172,7 +172,7 @@ - - install_cmd.append(f"--root={stage_dir.resolve()}") - --install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall", -+install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall", - "build/python")) - if localenv['PYTHON_INSTALLER'] == 'direct': - mod_inst = install(localenv.Command, 'dummy', mod, -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, diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml index fbc827be0db47..d3c6628839c0a 100644 --- a/sci-libs/cantera/metadata.xml +++ b/sci-libs/cantera/metadata.xml @@ -14,7 +14,6 @@ for problems involving chemical kinetics, thermodynamics, and/or transport processes. - Install conversion tools (ck2cti, ck2yaml, ctml_writer) from Chemkin to Cantera format Install Python bindings and conversion tools from Chemkin to Cantera format Add HDF5 container files support