diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-31 20:59:14 +0100 |
commit | e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch) | |
tree | 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /sci-libs/cantera | |
parent | 908778078736bd36f7a60a2d576d415cb8e000fa (diff) |
gentoo resync : 31.05.2021
Diffstat (limited to 'sci-libs/cantera')
-rw-r--r-- | sci-libs/cantera/Manifest | 9 | ||||
-rw-r--r-- | sci-libs/cantera/cantera-2.4.0-r5.ebuild | 131 | ||||
-rw-r--r-- | sci-libs/cantera/cantera-2.5.1-r1.ebuild | 2 | ||||
-rw-r--r-- | sci-libs/cantera/cantera-2.5.1.ebuild | 137 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera-2.5.0_env.patch | 49 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera_2.4.0_env.patch | 73 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch | 17 | ||||
-rw-r--r-- | sci-libs/cantera/files/cantera_2.4.0_sundials4.patch | 207 |
8 files changed, 2 insertions, 623 deletions
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 91352bc67780..49bf55216748 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,11 +1,4 @@ -AUX cantera-2.5.0_env.patch 2218 BLAKE2B b4fa7e25081ba5818163a16b970c8fde8a7faec64495a566b805d593151a48cd67722052e73ce1df70c751852d5e5e58e70d5ff110f0c8e4ef46262ddd951a1d SHA512 7045812de7d8cbcefaa8a22f2caf831bb0811d0c8b73a9f0550462fd2f8778f7f61aeaa8d1f6381a303063fbf7364a7cf22bcd40127bf0e1bc08418b8b10399c AUX cantera-2.5.1_env.patch 4600 BLAKE2B ed131f2b3d061102f197d50105176332fd07424ddff81b0af05bdc2eb3e514bcb17da85e285d80dd717d685a10a8eaa0a08769171cbb2df5103d2283519ef311 SHA512 92083e331a1ddd712d21602e50960cf0251ca688a90121f67c35b21b79851c7baa6d9373a67bec1beade53d44e6dfe2e0faf7385305d2c8cfdee2d9698b21c67 -AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528 -AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa212325c3883b9cead668ed294f23a2ac768f28e593916d07f2322e21846b97b40e336dfc742ed45a9b95f8f49531cd82d2055499f810e13c2f SHA512 a7ebfd8f9a6fa406d5a5847ad98e91aa9cbf53d194ec87d8479b88ad322df13308947fae61574ebd6254eeaa1bcb49a4cd3e30db2981cebcbf13241ab8e050d6 -AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a -DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc -EBUILD cantera-2.4.0-r5.ebuild 3069 BLAKE2B 39717e82093e45822879a61834b49b64bab571b850d3e2efccc09e8f2667d9729edea788afb15fc056030d1239ff25bff7e6868ebd62000acd7efc72c3c55e4f SHA512 df6942fc36890820efc815873423b63aea4448b180b201c6ce4e85c4ae9cd67e54f21935de4a9351581f8913ae732c7c85bdb6348ed8dfe0da43cc503e1c1537 -EBUILD cantera-2.5.1-r1.ebuild 3469 BLAKE2B d93bb296e10fd82d3f237c05c6de8bfe14bfa6944c5790ded35a546a64cb821c5164910021f0930edc7cfbf968d6d57b17a69517e38f6b700e5e18350abe3647 SHA512 8a96107d237ffa1794c162b1edf5993fec05e25cb12b595251730ace675c45e3fcc91dc65103db4138c32dc028730150f80bd24e777c632d87da52c775161b5e -EBUILD cantera-2.5.1.ebuild 3309 BLAKE2B c2719033675b6e1162ad13ff7499562932933c1ed21839cb3998fa1946697f939357a32a5d5c097ec01c38dbcf3b6ad782ef62d76d0602efbadb935b13cb05f5 SHA512 315c10d38a537fd5fe1166bd7018cd889f187b6f587fda0c8e2be42d14cd9904b2cef6605fa061e6f9df8f8a08042147a09e3bd6e46428e543400beb4eefe99b +EBUILD cantera-2.5.1-r1.ebuild 3468 BLAKE2B 111b26d493dc8627991be85031ee4a9d01b0c29a98fc6acade73777520b64e5ed06273f05a926bdb15ad6fcf2818b58af74b8f8e41dca5424c0487976891298f SHA512 442a7cd16d14ae967ca7b64bfdba8c1395dea07089d3c1dbc0b05c56cd0ce6bb2bb9b63671005ef7134ef6b4f60d1f7c014b65b7cead8039e8910182a43eba2a MISC metadata.xml 841 BLAKE2B 6e302ea58d1e915a7b8f868c9e9e5f151434a3c1f8bd4583d0a2c3d28bd7cbd2d381b4c04dc9f2a3e63b3123ea566727ee275c9d4a13ada36f5fab34502fbac1 SHA512 59ffb087b063eeeb0446f66de657b745bea260ae96953673696d2780cb0d4ed86de718e0a3eaab6503e3395044c8c7291cc11e193d0bd72e720640f5df3d962a diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild deleted file mode 100644 index 9e953bbc0bc4..000000000000 --- a/sci-libs/cantera/cantera-2.4.0-r5.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD=90 - -inherit desktop 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 pch +python test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( cti ) - ${PYTHON_REQUIRED_USE} - " - -RDEPEND=" - ${PYTHON_DEPS} - python? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ') - ) - <sci-libs/sundials-5.3.0:0= -" - -DEPEND=" - ${RDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - dev-libs/libfmt - python? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_MULTI_USEDEP}] - ') - ) - test? ( - >=dev-cpp/gtest-1.8.0 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}_${PV}_env.patch" - "${FILESDIR}/${PN}_${PV}_env_python_install_prefix.patch" - "${FILESDIR}/${PN}_${PV}_sundials4.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=( - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - cc_flags="${CXXFLAGS}" - cxx_flags="-std=c++11" - debug="no" - FORTRAN="$(tc-getFC)" - FORTRANFLAGS="${FFLAGS}" - optimize_flags="-Wno-inline" - renamed_shared_libraries="no" - use_pch=$(usex pch) -## In some cases other order can break the detection of right location of Boost: ## - system_fmt="y" - system_sundials="y" - system_eigen="y" - env_vars="all" - extra_inc_dirs="/usr/include/eigen3" - ) - use test || scons_vars+=( googletest="none" ) - - scons_targets=( - f90_interface=$(usex fortran y n) - python2_package="none" - ) - - if use cti ; then - local scons_python=$(usex python full minimal) - scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" ) - else - scons_targets+=( python3_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)" python3_prefix="$(python_get_sitedir)" - 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 -} - -pkg_postinst() { - if use cti && ! use python ; then - elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'" - 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-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild index 6f5345f106d5..db21ef944ead 100644 --- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild +++ b/sci-libs/cantera/cantera-2.5.1-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="+cti fortran lapack pch +python test" RESTRICT="!test? ( test )" diff --git a/sci-libs/cantera/cantera-2.5.1.ebuild b/sci-libs/cantera/cantera-2.5.1.ebuild deleted file mode 100644 index 71ba0f78c0f2..000000000000 --- a/sci-libs/cantera/cantera-2.5.1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" - -inherit desktop 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 pch +python test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( cti ) - ${PYTHON_REQUIRED_USE} -" - -RDEPEND=" - ${PYTHON_DEPS} - python? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}] - ') - ) - dev-cpp/yaml-cpp - <sci-libs/sundials-5.3.0:0= -" - -DEPEND=" - ${RDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - dev-libs/libfmt - python? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_MULTI_USEDEP}] - ') - ) - test? ( - >=dev-cpp/gtest-1.8.0 - python? ( - $(python_gen_cond_dep ' - dev-python/h5py[${PYTHON_MULTI_USEDEP}] - dev-python/pandas[${PYTHON_MULTI_USEDEP}] - ') - ) - ) -" - -PATCHES=( "${FILESDIR}/${PN}-2.5.0_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=( - 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=$(usex pch) - ## 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 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)" python_prefix="$(python_get_sitedir)" - 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 - - # We install static libs unconditionally here - # See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565 -} - -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.5.0_env.patch b/sci-libs/cantera/files/cantera-2.5.0_env.patch deleted file mode 100644 index 9551d4b4ca1c..000000000000 --- a/sci-libs/cantera/files/cantera-2.5.0_env.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur old/SConstruct new/SConstruct ---- old/SConstruct 2021-02-13 01:18:43.000000000 +0300 -+++ new/SConstruct 2021-02-13 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) - -@@ -724,10 +724,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:") -diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript ---- old/interfaces/cython/SConscript 2021-02-13 01:18:43.000000000 +0300 -+++ new/interfaces/cython/SConscript 2021-02-13 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/test_problems/SConscript new/test_problems/SConscript ---- old/test_problems/SConscript 2021-02-13 01:18:43.000000000 +0300 -+++ new/test_problems/SConscript 2021-02-13 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.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch deleted file mode 100644 index 8b0926f7b916..000000000000 --- a/sci-libs/cantera/files/cantera_2.4.0_env.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct ---- old/SConstruct 2018-08-24 16:24:45.000000000 +0300 -+++ new/SConstruct 2019-07-17 15:50:06.000000000 +0300 -@@ -189,7 +189,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) - -@@ -327,6 +327,14 @@ - 'prefix', - 'Set this to the directory where Cantera should be installed.', - defaults.prefix, PathVariable.PathAccept), -+ PathVariable( -+ 'libdirname', -+ """Set this to the directory where Cantera libraries should be installed. -+ Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems -+ or could use some other library directory name instead of 'lib' depends -+ on architecture and profile (e.g. Gentoo 'libx32' on x32 profile). -+ If user didn't set 'libdirname' configuration variable set it to default value 'lib'""", -+ 'lib', PathVariable.PathAccept), - EnumVariable( - 'python_package', - """If you plan to work in Python, then you need the ``full`` Cantera Python -@@ -723,10 +731,7 @@ - env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version) - env['cantera_short_version'] = '.'.join(str(x) for x in ctversion.version[:2]) - --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:") -@@ -1061,7 +1066,7 @@ - - # Ignore the minor version, e.g. 2.4.x -> 2.4 - env['sundials_version'] = '.'.join(sundials_version.split('.')[:2]) -- if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1'): -+ if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'): - print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version']) - sys.exit(1) - print("""INFO: Using system installation of Sundials version %s.""" % sundials_version) -@@ -1465,12 +1470,6 @@ - # *** Set additional configuration variables *** - # ********************************************** - --# Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems --if any(name.startswith('/usr/lib64/python') for name in sys.path): -- env['libdirname'] = 'lib64' --else: -- env['libdirname'] = 'lib' -- - # On Debian-based systems, need to special-case installation to - # /usr/local because of dist-packages vs site-packages - env['debian'] = any(name.endswith('dist-packages') for name in sys.path) -diff -Nur old/cantera-2.4.0/test_problems/SConscript new/cantera-2.4.0/test_problems/SConscript ---- old/test_problems/SConscript 2018-08-24 16:24:45.000000000 +0300 -+++ new/test_problems/SConscript 2019-07-17 15:41:35.000000000 +0300 -@@ -282,7 +282,7 @@ - CompileAndTest('VPsilane_test', 'VPsilane_test', 'VPsilane_test', 'output_blessed.txt') - - CompileAndTest('clib', 'clib_test', 'clib_test', 'output_blessed.txt', -- extensions=['^clib_test.c'], libs=['cantera_shared']) -+ extensions=['^clib_test.c']) - - # Force explicitly-named tests to run even if SCons thinks they're up to date - for command in COMMAND_LINE_TARGETS: diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch deleted file mode 100644 index 838907996361..000000000000 --- a/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript ---- old/interfaces/cython/SConscript 2018-08-24 16:24:45.000000000 +0300 -+++ new/interfaces/cython/SConscript 2019-08-14 04:28:41.000000000 +0300 -@@ -83,10 +83,10 @@ - extra = '' - elif localenv['OS'] == 'Darwin': - extra = localenv.subst(' --prefix=${python%s_prefix}' % major) -- elif localenv['libdirname'] == 'lib64': -- # 64-bit RHEL / Fedora -+ elif localenv['libdirname'] != 'lib': -+ # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile - extra = localenv.subst( -- ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor)) -+ ' --prefix=${stage_dir}${prefix} --install-lib=${python%s_prefix}' % (major)) - else: - extra = '--user' - localenv.AppendENVPath( diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch deleted file mode 100644 index 0b4d3abf8541..000000000000 --- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -Naur a/SConstruct b/SConstruct ---- a/SConstruct 2020-04-21 13:55:06.000000000 +0300 -+++ b/SConstruct 2020-04-21 13:55:54.000000000 +0300 -@@ -1013,23 +1013,29 @@ - - import SCons.Conftest, SCons.SConf - context = SCons.SConf.CheckContext(conf) --ret = SCons.Conftest.CheckLib(context, -- ['sundials_cvodes'], -- header='#include "cvodes/cvodes.h"', -- language='C++', -- call='CVodeCreate(CV_BDF, CV_NEWTON);', -- autoadd=False, -- extra_libs=env['blas_lapack_libs']) --if ret: -+ -+# Check initially for Sundials<=3.2 and then for Sundials>=4.0 -+for cvode_call in ['CVodeCreate(CV_BDF, CV_NEWTON);','CVodeCreate(CV_BDF);']: -+ ret = SCons.Conftest.CheckLib(context, -+ ['sundials_cvodes'], -+ header='#include "cvodes/cvodes.h"', -+ language='C++', -+ call=cvode_call, -+ autoadd=False, -+ extra_libs=env['blas_lapack_libs']) - # CheckLib returns False to indicate success -+ if not ret: -+ if env['system_sundials'] == 'default': -+ env['system_sundials'] = 'y' -+ break -+ -+# Execute if the cycle ends without 'break' -+else: - if env['system_sundials'] == 'default': - env['system_sundials'] = 'n' - elif env['system_sundials'] == 'y': - config_error('Expected system installation of Sundials, but it could ' - 'not be found.') --elif env['system_sundials'] == 'default': -- env['system_sundials'] = 'y' -- - - # Checkout Sundials submodule if needed - if (env['system_sundials'] == 'n' and -@@ -1066,13 +1072,14 @@ - - # Ignore the minor version, e.g. 2.4.x -> 2.4 - env['sundials_version'] = '.'.join(sundials_version.split('.')[:2]) -- if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'): -+ sundials_ver = LooseVersion(env['sundials_version']) -+ if sundials_ver < LooseVersion('2.4') or sundials_ver >= LooseVersion('6.0'): - print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version']) - sys.exit(1) - print("""INFO: Using system installation of Sundials version %s.""" % sundials_version) - - #Determine whether or not Sundials was built with BLAS/LAPACK -- if LooseVersion(env['sundials_version']) < LooseVersion('2.6'): -+ if sundials_ver < LooseVersion('2.6'): - # In Sundials 2.4 / 2.5, SUNDIALS_BLAS_LAPACK is either 0 or 1 - sundials_blas_lapack = get_expression_value(['"sundials/sundials_config.h"'], - 'SUNDIALS_BLAS_LAPACK') -@@ -1690,7 +1697,7 @@ - - if env['system_sundials'] == 'y': - env['sundials_libs'] = ['sundials_cvodes', 'sundials_ida', 'sundials_nvecserial'] -- if env['use_lapack'] and LooseVersion(env['sundials_version']) >= LooseVersion('3.0'): -+ if env['use_lapack'] and sundials_ver >= LooseVersion('3.0'): - if env.get('has_sundials_lapack'): - env['sundials_libs'].extend(('sundials_sunlinsollapackdense', - 'sundials_sunlinsollapackband')) -diff -Naur a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h ---- a/include/cantera/numerics/CVodesIntegrator.h 2018-08-24 16:24:45.000000000 +0300 -+++ b/include/cantera/numerics/CVodesIntegrator.h 2020-04-21 13:55:54.000000000 +0300 -@@ -49,7 +49,6 @@ - m_maxord = n; - } - virtual void setMethod(MethodType t); -- virtual void setIterator(IterType t); - virtual void setMaxStepSize(double hmax); - virtual void setMinStepSize(double hmin); - virtual void setMaxSteps(int nmax); -diff -Naur a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h ---- a/include/cantera/numerics/Integrator.h 2018-08-24 16:24:45.000000000 +0300 -+++ b/include/cantera/numerics/Integrator.h 2020-04-21 13:55:54.000000000 +0300 -@@ -34,17 +34,6 @@ - Adams_Method //! Adams - }; - --//! Specifies the method used for iteration. --/*! -- * Not all methods are supported by all integrators. -- */ --enum IterType { -- //! Newton Iteration -- Newton_Iter, -- //! Functional Iteration -- Functional_Iter --}; -- - //! Abstract base class for ODE system integrators. - /*! - * @ingroup odeGroup -@@ -163,11 +152,6 @@ - warn("setMethodType"); - } - -- //! Set the linear iterator. -- virtual void setIterator(IterType t) { -- warn("setInterator"); -- } -- - //! Set the maximum step size - virtual void setMaxStepSize(double hmax) { - warn("setMaxStepSize"); -diff -Naur a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp ---- a/src/kinetics/ImplicitSurfChem.cpp 2018-08-24 16:24:45.000000000 +0300 -+++ b/src/kinetics/ImplicitSurfChem.cpp 2020-04-21 13:55:54.000000000 +0300 -@@ -79,7 +79,6 @@ - // numerically, and use a Newton linear iterator - m_integ->setMethod(BDF_Method); - m_integ->setProblemType(DENSE + NOJAC); -- m_integ->setIterator(Newton_Iter); - m_work.resize(ntmax); - } - -diff -Naur a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp ---- a/src/numerics/CVodesIntegrator.cpp 2018-08-24 16:24:45.000000000 +0300 -+++ b/src/numerics/CVodesIntegrator.cpp 2020-04-21 13:55:54.000000000 +0300 -@@ -88,7 +88,6 @@ - m_type(DENSE+NOJAC), - m_itol(CV_SS), - m_method(CV_BDF), -- m_iter(CV_NEWTON), - m_maxord(0), - m_reltol(1.e-9), - m_abstols(1.e-15), -@@ -218,17 +217,6 @@ - } - } - --void CVodesIntegrator::setIterator(IterType t) --{ -- if (t == Newton_Iter) { -- m_iter = CV_NEWTON; -- } else if (t == Functional_Iter) { -- m_iter = CV_FUNCTIONAL; -- } else { -- throw CanteraError("CVodesIntegrator::setIterator", "unknown iterator"); -- } --} -- - void CVodesIntegrator::sensInit(double t0, FuncEval& func) - { - m_np = func.nparams(); -@@ -284,7 +272,11 @@ - //! Specify the method and the iteration type. Cantera Defaults: - //! CV_BDF - Use BDF methods - //! CV_NEWTON - use Newton's method -- m_cvode_mem = CVodeCreate(m_method, m_iter); -+ #if CT_SUNDIALS_VERSION < 40 -+ m_cvode_mem = CVodeCreate(m_method, CV_NEWTON); -+ #else -+ m_cvode_mem = CVodeCreate(m_method); -+ #endif - if (!m_cvode_mem) { - throw CanteraError("CVodesIntegrator::initialize", - "CVodeCreate failed."); -@@ -394,7 +386,11 @@ - #if CT_SUNDIALS_VERSION >= 30 - SUNLinSolFree((SUNLinearSolver) m_linsol); - SUNMatDestroy((SUNMatrix) m_linsol_matrix); -- m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl); -+ #if CT_SUNDIALS_VERSION < 40 -+ m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl); -+ #else -+ m_linsol_matrix = SUNBandMatrix(N, nu, nl); -+ #endif - #if CT_SUNDIALS_USE_LAPACK - m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix); - #else -diff -Naur a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp ---- a/src/numerics/IDA_Solver.cpp 2018-08-24 16:24:45.000000000 +0300 -+++ b/src/numerics/IDA_Solver.cpp 2020-04-21 13:55:54.000000000 +0300 -@@ -442,7 +442,11 @@ - #if CT_SUNDIALS_VERSION >= 30 - SUNLinSolFree((SUNLinearSolver) m_linsol); - SUNMatDestroy((SUNMatrix) m_linsol_matrix); -- m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl); -+ #if CT_SUNDIALS_VERSION < 40 -+ m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl); -+ #else -+ m_linsol_matrix = SUNBandMatrix(N, nu, nl); -+ #endif - #if CT_SUNDIALS_USE_LAPACK - m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix); - #else -diff -Naur a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp ---- a/src/zeroD/ReactorNet.cpp 2018-08-24 16:24:45.000000000 +0300 -+++ b/src/zeroD/ReactorNet.cpp 2020-04-21 13:55:54.000000000 +0300 -@@ -28,7 +28,6 @@ - // numerically, and use a Newton linear iterator - m_integ->setMethod(BDF_Method); - m_integ->setProblemType(DENSE + NOJAC); -- m_integ->setIterator(Newton_Iter); - } - - void ReactorNet::setInitialTime(double time) |