gentoo auto-resync : 30:01:2023 - 14:58:12

4 files changed, 67 insertions, 143 deletions

diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 0b4adc5be0e4..3c9fa5f2c920 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,7 +1,6 @@
-AUX cantera-2.5.1_env.patch 5928 BLAKE2B d6d0792527a5f50c34d4d6a05c651992a82af7ed864b68178023d6a7c44632f124851fe5e79306d0b91fde82336d72f8600bd9a2ccfc9a719b07ad44da63913d SHA512 5a1d0e238cfb5f24731acfb59cd66d1dc564a9e2485405e64771735ae72b529ef64475692394cb06c68f447bffc106d73edb901df26587e4203a8c59efea3dfc
+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
-DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
 DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856
-EBUILD cantera-2.5.1-r4.ebuild 3470 BLAKE2B 346437c80174796a555d02f51beb6800cbad13b02ab04c482b35b4e73d0240d00be08bf4465844f3b200669cbe4ba4ade41afefbca1d2dde424bcc767c4bf27a SHA512 779bf4da112fc984ace4dfa8d6ee5be1ff4e05ec91892d4d4c507b620d1cd05c7e595e914d5546664742cee2b85813fcea0aa871e523f6a1821b9d6e80883ffc
 EBUILD cantera-2.6.0-r1.ebuild 3542 BLAKE2B 212ea3d12fa2aa83430abdd2c700859d59a7ab0e540bd0e32dbd486370d2c98233e071e80e505eaf3bdc5722c953e6d83815d6985411db531d182551124e974f SHA512 62fee7f0d26c328786732ce3f76493d96dac4db944af3d585291be8bb10e1a8de88c24d2e60a3145e67877b568d2963092a09deeea0e6f17b982fe87f849a84b
+EBUILD cantera-2.6.0-r2.ebuild 3603 BLAKE2B b067bc62850c4b74e56cbea1cb9929fbc91ae8a45af353cb69c8cd6aac76aae6a1b52c92f7f8c00118420eef9ac04a68edac45c97e7ac725d8734e5108d09caa SHA512 c33fd8b9185ea4fadc4e32a7ae60063166545fcd56036af66816548ca1c9568b7a1633603a50b90b3acaabbbeb7928b545dd60872513481d1190c4926a8b3904
 MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704
diff --git a/sci-libs/cantera/cantera-2.5.1-r4.ebuild b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
index 9d87e7aa5b6f..31d393df1c40 100644
--- a/sci-libs/cantera/cantera-2.5.1-r4.ebuild
+++ b/sci-libs/cantera/cantera-2.6.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
@@ -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="+cti fortran lapack +python test"
 RESTRICT="!test? ( test )"
 
@@ -39,32 +39,38 @@ RDEPEND="
 		')
 	)
 	dev-cpp/yaml-cpp
-	!lapack? ( <sci-libs/sundials-5.9.0:0= )
-	lapack? ( <sci-libs/sundials-5.3.0:0=[lapack] )
+	!lapack? ( sci-libs/sundials:0= )
+	lapack? ( >=sci-libs/sundials-6.5.0:0=[lapack?] )
 "
 
 DEPEND="
 	${RDEPEND}
 	dev-cpp/eigen:3
-	dev-libs/boost
+	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.8.0
+		>=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" )
+PATCHES=(
+	"${FILESDIR}/${P}_env.patch"
+	"${FILESDIR}/${P}_drop_deprecated_open_U_option.patch"
+)
 
 pkg_setup() {
 	fortran-2_pkg_setup
@@ -79,7 +85,7 @@ src_configure() {
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
 		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
+		cxx_flags="-std=c++14"
 		debug="no"
 		FORTRAN="$(tc-getFC)"
 		FORTRANFLAGS="${FCFLAGS}"
@@ -118,7 +124,7 @@ src_test() {
 }
 
 src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
+	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
diff --git a/sci-libs/cantera/files/cantera-2.5.1_env.patch b/sci-libs/cantera/files/cantera-2.5.1_env.patch
deleted file mode 100644
index 77004803b127..000000000000
--- a/sci-libs/cantera/files/cantera-2.5.1_env.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur old/SConstruct new/SConstruct
---- old/SConstruct	2021-03-21 01:18:43.000000000 +0300
-+++ new/SConstruct	2021-03-21 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)
- 
-@@ -239,6 +239,9 @@
-     sys.exit(1)
- 
- compiler_options = [
-+     ('AR',
-+     """The archiver to use.""",
-+     env['AR']),
-     ('CXX',
-      """The C++ compiler to use.""",
-      env['CXX']),
-@@ -734,10 +734,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:")
-@@ -1149,10 +1149,24 @@
-         if retcode == 0:
-             config_error("Failed to determine Sundials BLAS/LAPACK.")
-         env['has_sundials_lapack'] = int(has_sundials_lapack.strip())
--    else:
--        # In Sundials 2.6, SUNDIALS_BLAS_LAPACK is either defined or undefined
-+    elif sundials_ver < parse_version('5.5'):
-+        # In Sundials 2.6-5.5, SUNDIALS_BLAS_LAPACK is either defined or undefined
-         env['has_sundials_lapack'] = conf.CheckDeclaration('SUNDIALS_BLAS_LAPACK',
-                 '#include "sundials/sundials_config.h"', 'C++')
-+    else:
-+        # In Sundials 5.5 and higher, two defines are included specific to the
-+        # SUNLINSOL packages indicating whether SUNDIALS has been built with LAPACK
-+        lapackband = conf.CheckDeclaration(
-+            "SUNDIALS_SUNLINSOL_LAPACKBAND",
-+            '#include "sundials/sundials_config.h"',
-+            "C++",
-+        )
-+        lapackdense = conf.CheckDeclaration(
-+            "SUNDIALS_SUNLINSOL_LAPACKDENSE",
-+            '#include "sundials/sundials_config.h"',
-+            "C++",
-+        )
-+        env["has_sundials_lapack"] = lapackband and lapackdense
- 
-     # In the case where a user is trying to link Cantera to an external BLAS/LAPACK
-     # library, but Sundials was configured without this support, print a Warning.
-diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
---- old/interfaces/cython/SConscript	2021-03-21 01:18:43.000000000 +0300
-+++ new/interfaces/cython/SConscript	2021-03-21 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/interfaces/python_minimal/SConscript new/interfaces/python_minimal/SConscript
---- old/interfaces/python_minimal/SConscript	2021-02-13 00:57:15.000000000 +0300
-+++ new/interfaces/python_minimal/SConscript	2021-04-09 23:26:28.000000000 +0300
-@@ -8,7 +8,7 @@
- make_setup = build(localenv.SubstFile('setup.py', 'setup.py.in'))
- 
- # copy scripts from the full Cython module
--for script in ['ctml_writer', 'ck2cti']:
-+for script in ['ctml_writer', 'ck2cti', 'ck2yaml', 'cti2yaml', 'ctml2yaml']:
-     # The actual script
-     s = build(env.Command('cantera/{}.py'.format(script),
-                           '#interfaces/cython/cantera/{}.py'.format(script),
-@@ -38,8 +38,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/interfaces/python_minimal/cantera/__init__.py new/interfaces/python_minimal/cantera/__init__.py
---- old/interfaces/python_minimal/cantera/__init__.py	2021-02-13 00:57:15.000000000 +0300
-+++ new/interfaces/python_minimal/cantera/__init__.py	2021-04-10 00:07:38.000000000 +0300
-@@ -1,2 +1,5 @@
- from . import ck2cti
- from . import ctml_writer
-+from . import ck2yaml
-+from . import cti2yaml
-+from . import ctml2yaml
-diff -Naur old/interfaces/python_minimal/setup.py.in new/interfaces/python_minimal/setup.py.in
---- old/interfaces/python_minimal/setup.py.in	2021-02-13 00:57:15.000000000 +0300
-+++ new/interfaces/python_minimal/setup.py.in	2021-04-09 23:32:09.000000000 +0300
-@@ -12,6 +12,9 @@
-         'console_scripts': [
-             'ck2cti=cantera.ck2cti:script_entry_point',
-             'ctml_writer=cantera.ctml_writer:main',
-+            'ck2yaml=cantera.ck2yaml:script_entry_point',
-+            'cti2yaml=cantera.cti2yaml:main',
-+            'ctml2yaml=cantera.ctml2yaml:main',
-         ],
-       },
- )
-diff -Naur old/test_problems/SConscript new/test_problems/SConscript
---- old/test_problems/SConscript	2021-03-21 01:18:43.000000000 +0300
-+++ new/test_problems/SConscript	2021-03-21 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/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
new file mode 100644
index 000000000000..41243da82f68
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-2.6.0_drop_deprecated_open_U_option.patch
@@ -0,0 +1,49 @@
+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 = []