| 1 |
commit: 59999e26785058fcbe8dc9b49455c14b7abda758 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Fri Feb 28 22:49:41 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 5 11:54:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59999e26 |
| 7 |
|
| 8 |
sci-libs/cantera: 2.4.0-r4 fix sci-libs/sundials-5.1.0 compatibility |
| 9 |
|
| 10 |
As cantera-2.4.0-r3 was stabilized against sci-libs/sundials-3.2.0 |
| 11 |
therefore the changes allowing to build cantera agains sundials-5.1.0 |
| 12 |
don't affect the stability and avoid of dublicate patches |
| 13 |
with trivial changes. Revision bump to -r4 saving stabilization. |
| 14 |
|
| 15 |
The Sundials 5.1 has the same CVODES API as Sundials 4.0, 4.1, 5.0 |
| 16 |
so there is no any additional changes required to to build Cantera |
| 17 |
against Sundials 5.1 except allowing in configuration check. |
| 18 |
|
| 19 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 20 |
Closes: https://github.com/gentoo/gentoo/pull/14801 |
| 21 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 22 |
|
| 23 |
sci-libs/cantera/{cantera-2.4.0-r3.ebuild => cantera-2.4.0-r4.ebuild} | 2 +- |
| 24 |
sci-libs/cantera/files/cantera_2.4.0_sundials4.patch | 2 +- |
| 25 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 26 |
|
| 27 |
diff --git a/sci-libs/cantera/cantera-2.4.0-r3.ebuild b/sci-libs/cantera/cantera-2.4.0-r4.ebuild |
| 28 |
similarity index 99% |
| 29 |
rename from sci-libs/cantera/cantera-2.4.0-r3.ebuild |
| 30 |
rename to sci-libs/cantera/cantera-2.4.0-r4.ebuild |
| 31 |
index 29345e36058..d3f8fb2e514 100644 |
| 32 |
--- a/sci-libs/cantera/cantera-2.4.0-r3.ebuild |
| 33 |
+++ b/sci-libs/cantera/cantera-2.4.0-r4.ebuild |
| 34 |
@@ -32,7 +32,7 @@ RDEPEND=" |
| 35 |
dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 36 |
') |
| 37 |
) |
| 38 |
- <sci-libs/sundials-5.1.0:0= |
| 39 |
+ <sci-libs/sundials-5.2.0:0= |
| 40 |
" |
| 41 |
|
| 42 |
DEPEND=" |
| 43 |
|
| 44 |
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch |
| 45 |
index 0345a98e252..8c44228019b 100644 |
| 46 |
--- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch |
| 47 |
+++ b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch |
| 48 |
@@ -47,7 +47,7 @@ diff -Nur old/SConstruct new/SConstruct |
| 49 |
# Ignore the minor version, e.g. 2.4.x -> 2.4 |
| 50 |
env['sundials_version'] = '.'.join(sundials_version.split('.')[:2]) |
| 51 |
- if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'): |
| 52 |
-+ 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'): |
| 53 |
++ 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','5.1'): |
| 54 |
print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version']) |
| 55 |
sys.exit(1) |
| 56 |
print("""INFO: Using system installation of Sundials version %s.""" % sundials_version) |
Archives