gentoo resync : 15.01.2020

4 files changed, 10 insertions, 10 deletions

diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 219dac19d9c3..55f1808c5249 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,7 +1,7 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
 AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4
-AUX cantera_2.4.0_sundials4.patch 7492 BLAKE2B 995142708ffd02bb3bfdf94b7cad545f269b4c20ffd4c325109637d61e3544d343d0135119388a4b88dc3b037f054854064df83aff381bac6769ec62b12ebf2e SHA512 24afc5d5944966140d191b2250768e2e1331b4db5d53b2dc204b0c1888ff2a328e1dd467b69616d3aced51e6108e38bc1fd2c3a102bf3a02b4c975b677ea73c5
+AUX cantera_2.4.0_sundials4.patch 7498 BLAKE2B 8a3fa5ff6a07987bf4d35f0c6362e91414be513a79150526773f8a141271ffe772efbbb7765fc888043ccc2326e89f51a14f2eaf40765c1d05d5987abf5942fe SHA512 0ec9d7f0a0818262ebf2d694800fd6f5a438ef9a501c122ffebe703271cbfd50cc8db20fa28f9674e5740f768df9f3e5fec010c46703c01e4bfff7aea0a4c948
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-EBUILD cantera-2.4.0-r1.ebuild 2855 BLAKE2B bc6d8688fd01d8baf551a3949c34a6bf511bfde34de650415512cc3ed88e1a869e987bba1031df28967ffa32f9e0e04c5be5620e063bca58b3af8128e6936e0e SHA512 561b7807efe9fa44f34c8e320a7dd2a591c8013081ed7539504aba6be8e0bbacb4fc37c08e38104578341fe3575c0e4afa1f3dc11b29015232689bc1a01a4cfb
-EBUILD cantera-2.4.0-r2.ebuild 2953 BLAKE2B 29f8087e5598c0b55762613c6a8ddb6ba7df1636bd46cb81448ca7cefa0b064e8397fcd71400f7fdc20a296c81b20124bdb1fb8890347881355476551cddb29f SHA512 22272df2ab0c5f349a03fb4f221bc4228ecc160ac17b1040ee0217d3dc4aac4ececd688d10d8bac969d293fc04cc847b28f4325a11bf703d833d81b920b7b264
+EBUILD cantera-2.4.0-r1.ebuild 2853 BLAKE2B e3d82310324f9d2fceef870afd681a6f5a9da6c2b56519e6cd5178955601c8b0d135e9f7c9ca3d446cd47a60f30c47e72cae689e0ff9d500081e26722a700796 SHA512 06682c35592aa9f89c9fe26dcb3a1730a2e18a2ecca32acb9138198b9b7eb9a76e9dbd24c1dfb6e2723eefe17872a6c9fc1b7d07cedbbcb9b57e7fc43b58c7f6
+EBUILD cantera-2.4.0-r2.ebuild 2952 BLAKE2B 1fda0f1671adf6ee5122d3f38e7d89136ab05a052a95c57f0288266e1d8e08ba499465f27c032295476e89d0dbe6fe5d131024da1703ddcea0d2b44c7593c639 SHA512 545d7c5509d29bfcaec47be5e48c6f1189fff02da79f1c580907f9d6bb8f86b8b20fb1b0af1129b113d9b030eae4f22f85bd0d8343a7856f0e82a6f6c36499f6
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 2242246e3672..edaded328a20 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=90
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
index 2f6a89091503..f82bfa086396 100644
--- a/sci-libs/cantera/cantera-2.4.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=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 pch +python test"
 RESTRICT="!test? ( test )"
 
@@ -30,7 +30,7 @@ RDEPEND="
 	python? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
-	<sci-libs/sundials-5.0.0:0=
+	<sci-libs/sundials-5.1.0:0=
 "
 
 DEPEND="
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
index c745f6b6f7ff..0345a98e2527 100644
--- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
+++ b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
@@ -47,7 +47,7 @@ diff -Nur old/SConstruct new/SConstruct
      # 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'):
-+    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1'):
++    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1','5.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)