gentoo auto-resync : 08:02:2024 - 15:59:10

6 files changed, 238 insertions, 13 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 46aaee36c584..ab1a1b2a6f4c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 3c374309b6d4..74e09c17005c 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,8 +1,10 @@
 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 3633 BLAKE2B 55fedfb2b25df9f0a610a175527821fe4df574030e1658813dff5c2f349bae492340f68a9d3cf7930f8c65c281c0fdaa68cf3fa52fea7b632cad7114b8e88a0e SHA512 ff576dadb10f631a62a91dedf433660477ea2ce12ef6731889be7eb96d4e149d08307b244a113c6bb9768ae7398b73c160bdf9bf9b541e089e3a3b3d100ed7a8
-EBUILD cantera-3.0.0.ebuild 3296 BLAKE2B ff4a59638214fc933e2c8263ce595e14faa4efc2c32afb281040e8311eb10cc4c5acdb00c477599f779180d0440c42114d0439abe97c1e904b43880ad5fbd3e1 SHA512 040f0504fcb4e419dc52d5f5b233f891dc419f20999b400246ccc9fa4580e6772ef6588d3ba81245b96ab7e3394bc6462806207d1f4a5888bdabb9481f4de63d
+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
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-r1.ebuild b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..8ab4a8c5f104
--- /dev/null
+++ b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
@@ -0,0 +1,144 @@
+# 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}/${P}_env.patch"
+	"${FILESDIR}/${P}_enable_python-3.12.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/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="
diff --git a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch b/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch
new file mode 100644
index 000000000000..8efa7b0df9c5
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch
@@ -0,0 +1,75 @@
+From 27f8362f537fc313f8fdb5c07649ef0d92e3b7f6 Mon Sep 17 00:00:00 2001
+From: "Mark E. Fuller" <mark.e.fuller@gmx.de>
+Date: Sat, 26 Aug 2023 01:04:03 +0300
+Subject: [PATCH] mods to enable python3.12
+
+---
+ .github/workflows/main.yml             | 2 +-
+ interfaces/cython/setup.cfg.in         | 1 +
+ interfaces/python_minimal/setup.cfg.in | 1 +
+ interfaces/python_sdist/setup.cfg.in   | 1 +
+ src/base/application.h                 | 2 +-
+ 5 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
+index 60822189bb..366ddd8435 100644
+--- a/.github/workflows/main.yml
++++ b/.github/workflows/main.yml
+@@ -65,7 +65,7 @@ jobs:
+     timeout-minutes: 60
+     strategy:
+       matrix:
+-        python-version: ['3.8', '3.10', '3.11']
++        python-version: ['3.8', '3.10', '3.11', '3.12']
+         os: ['ubuntu-20.04', 'ubuntu-22.04']
+       fail-fast: false
+     env:
+diff --git a/interfaces/cython/setup.cfg.in b/interfaces/cython/setup.cfg.in
+index 1a0358a77d..fd3c0b53c4 100644
+--- a/interfaces/cython/setup.cfg.in
++++ b/interfaces/cython/setup.cfg.in
+@@ -27,6 +27,7 @@ classifiers =
+     Programming Language :: Python :: 3.9
+     Programming Language :: Python :: 3.10
+     Programming Language :: Python :: 3.11
++    Programming Language :: Python :: 3.12
+     Programming Language :: Python :: Implementation :: CPython
+     Topic :: Scientific/Engineering :: Chemistry
+     Topic :: Scientific/Engineering :: Physics
+diff --git a/interfaces/python_minimal/setup.cfg.in b/interfaces/python_minimal/setup.cfg.in
+index 2d96c75eda..753b619ede 100644
+--- a/interfaces/python_minimal/setup.cfg.in
++++ b/interfaces/python_minimal/setup.cfg.in
+@@ -23,6 +23,7 @@ classifiers =
+     Programming Language :: Python :: 3.9
+     Programming Language :: Python :: 3.10
+     Programming Language :: Python :: 3.11
++    Programming Language :: Python :: 3.12
+     Topic :: Scientific/Engineering :: Chemistry
+     Topic :: Scientific/Engineering :: Physics
+ project_urls =
+diff --git a/interfaces/python_sdist/setup.cfg.in b/interfaces/python_sdist/setup.cfg.in
+index 219e53a3f0..e356b422b8 100644
+--- a/interfaces/python_sdist/setup.cfg.in
++++ b/interfaces/python_sdist/setup.cfg.in
+@@ -27,6 +27,7 @@ classifiers =
+     Programming Language :: Python :: 3.9
+     Programming Language :: Python :: 3.10
+     Programming Language :: Python :: 3.11
++    Programming Language :: Python :: 3.12
+     Programming Language :: Python :: Implementation :: CPython
+     Topic :: Scientific/Engineering :: Chemistry
+     Topic :: Scientific/Engineering :: Physics
+diff --git a/src/base/application.h b/src/base/application.h
+index 76a6c671a2..b03c049f14 100644
+--- a/src/base/application.h
++++ b/src/base/application.h
+@@ -434,7 +434,7 @@ class Application
+     vector<string> inputDirs;
+ 
+     //! Versions of Python to consider when attempting to load user extensions
+-    vector<string> m_pythonSearchVersions = {"3.11", "3.10", "3.9", "3.8"};
++    vector<string> m_pythonSearchVersions = {"3.12", "3.11", "3.10", "3.9", "3.8"};
+ 
+     //! Set of deprecation warnings that have been emitted (to suppress duplicates)
+     set<string> warnings;