gentoo auto-resync : 28:02:2024 - 17:40:54

7 files changed, 3 insertions, 433 deletions

diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 74e09c17005c..0e7256bfcebc 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,10 +1,5 @@
-AUX cantera-2.6.0_drop_deprecated_open_U_option.patch 1363 BLAKE2B 236dc4ee368d0c172e372d9e263318460a8b7a3c6fca02e97a0d71fb1852a2bef00c8375e72957d9a5fff2091f3aae968bd73a872509e3890ab91871eb90ae81 SHA512 4f9f18874bab308462261e0efdfdbb1c1f7ad35382aed5a594da45190e18d9264ed314ca4f7cab29d16a83b5c30ba8fdc213461a549ec84bd201211848d63f1e
-AUX cantera-2.6.0_env.patch 3119 BLAKE2B 16844230d86a292c764da1aa4043b2eff177f2b8a94ed154c3f6a69c1737e85f6ddc9330d5ba6f26936994306381dcb40ab4e70c7b7b44bdbaf7d920ee1ef902 SHA512 12cdabc7cee106ee17050918b483245b39f927b5a5bb8f92bd6177c1d660cc18cd3a91b2710991fa09c44f58aaac464495b15ceb7ae13bf235d34a6caabe7bc4
 AUX cantera-3.0.0_enable_python-3.12.patch 3182 BLAKE2B 30d2af004ee4d5097bf114fc1f8cd8e5589c9a0d643d87da544a9de0d824df1c04f461f89415dfc6b27c385e520c9b8f53ce82fcc7c4ca5dbb59f03a4a443544 SHA512 65261a618d93f0f84a3ba9a2aad8cccfee8490c78a44acddc4cc7c8ff3065bbde2370b6fcf06e8c1091efa9f244553a3810d362553194699104b19fed8647aea
 AUX cantera-3.0.0_env.patch 1439 BLAKE2B 8f4cd901f24f0b526887501ba16a0552acf8572f154f8494d66d3dd8096434621d6f2baaa57f905233919fc1b7872993bada9f373950330663c8315075d507b9 SHA512 065cdbcf620a3036c1bb0bb8b79503f76dbe7e6b2522e9f53fc582c15e5e10f1790f1b40cf0315d64cab4f858764446f4094370124bb9b5c4ee6dbcfd5e61b87
-DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856
 DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca
-EBUILD cantera-2.6.0-r2.ebuild 3625 BLAKE2B f9e5b3a7712e3f62325862abea320637e623f63bd218c6e4d5b5d1751212952c9c0a3f7e2a430d3b1a29651fc897548592aeb9110a193bce1ba4baae2c8987b6 SHA512 72a25d8b40744fea38d64317984345db86da691e4c5dd136a8af4dc2370c4dec0ef08cb6999c2b228790a890a8a371498d9dea03644cefe6218e7c54e9f82f65
-EBUILD cantera-3.0.0-r1.ebuild 3333 BLAKE2B 72f6e7481f7983c44fd57e14724a5e27a50805b87a28870f0a1a905b5f134a4b1d0058b4d031a3db9ff49999020b87001a74559e68a406c05d6fce4abb42f8a6 SHA512 c93278335e0602cd45ed43195a33f5b44789af42b18bb8b7748e29b3306a5221c3edbaa81963c4cee6fa891a18a4e26eb0ad570916c3c67821a32b8c98f117e3
-EBUILD cantera-3.0.0.ebuild 3288 BLAKE2B d1129867031688b8bcaf6daab1ab1938bdaeba19b9d469fac4b464b0dd46eac2273303e8b0d8894456d010e6e099e8e9839e38564058475707f938030af9c322 SHA512 f2b1b4fd3afd7f8eb7e2f029583771fd67c32e2afda79971a2858bcc55a5f1c9c07079bf9104f971cb30b9e6105ff038fec6d107141afd9e71c632222f51e51f
-MISC metadata.xml 999 BLAKE2B 7df519878d03842a580eecd2730557f3aa607fc965b8551f63164eee3b533a3b9724bd1cc1e5dbda1635d415363041539d67cd5ca854adc5c1fda10b52e682df SHA512 e625b03f70c0c55f9ac4493cb203f96f7f2482fe31852e272e42ce12710da99a284c2f86fe2e2411ad251738fc95f2ab5c7c12051d52671fd0aad3e4a59fb2e2
+EBUILD cantera-3.0.0-r1.ebuild 3332 BLAKE2B 456bc6bf09d46deec64badef49a6e500cba362dc4c7d17eb2b18cd9a2e091ff4ee3a557ca8f250dbe4a4060207537484bdadb59ec550655cd2546b894762f959 SHA512 56d41d45c946a6b90c53aefa214a97ca3983106a25225088bc5d0a813eff4ae102e3b983cd2f89dcc3ee494c8f1fdd8e96f38e8b90d441522042d5ad5ffe60b1
+MISC metadata.xml 884 BLAKE2B 0f67510f6c09c58b0af3b820c9b38b88b0c60b0adb28c64148550f07df085cd8ea3d46f5afb59105c56bb7ccf2ca3fee4f2000bee2592ebafb835b9cf415b660 SHA512 0cdbc4cbd0dfdc90bb74c79f06d5f5d28a4edd0dcfacbddcc83ed804c592694eba27f337ce20a2a57248dd0456517bab2298faa22b78154f03e9369973fc174b
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 d024ceeacfc7..000000000000
--- 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}]
-		')
-	)
-"
-
-# <cython-3 for bug #913141
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			<dev-python/cython-3[${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"
-	"${FILESDIR}/${P}_drop_deprecated_open_U_option.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++14"
-		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/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 )"
 
diff --git a/sci-libs/cantera/cantera-3.0.0.ebuild b/sci-libs/cantera/cantera-3.0.0.ebuild
deleted file mode 100644
index d53ba2538180..000000000000
--- a/sci-libs/cantera/cantera-3.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..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="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}/${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++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."
-}
diff --git a/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch b/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch
deleted file mode 100644
index 41243da82f68..000000000000
--- a/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0b407e11fe0bae4707286ab3cbf6a7a72a906817 Mon Sep 17 00:00:00 2001
-From: "Mark E. Fuller" <mark.e.fuller@gmx.de>
-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 15a1e65857e4..000000000000
--- 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 fbc827be0db4..d3c6628839c0 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.
   </longdescription>
   <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>