From 59999e26785058fcbe8dc9b49455c14b7abda758 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 29 Feb 2020 01:49:41 +0300 Subject: [PATCH] sci-libs/cantera: 2.4.0-r4 fix sci-libs/sundials-5.1.0 compatibility As cantera-2.4.0-r3 was stabilized against sci-libs/sundials-3.2.0 therefore the changes allowing to build cantera agains sundials-5.1.0 don't affect the stability and avoid of dublicate patches with trivial changes. Revision bump to -r4 saving stabilization. The Sundials 5.1 has the same CVODES API as Sundials 4.0, 4.1, 5.0 so there is no any additional changes required to to build Cantera against Sundials 5.1 except allowing in configuration check. Signed-off-by: Sergey Torokhov Closes: https://github.com/gentoo/gentoo/pull/14801 Signed-off-by: Joonas Niilola --- .../{cantera-2.4.0-r3.ebuild => cantera-2.4.0-r4.ebuild} | 2 +- sci-libs/cantera/files/cantera_2.4.0_sundials4.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sci-libs/cantera/{cantera-2.4.0-r3.ebuild => cantera-2.4.0-r4.ebuild} (99%) diff --git a/sci-libs/cantera/cantera-2.4.0-r3.ebuild b/sci-libs/cantera/cantera-2.4.0-r4.ebuild similarity index 99% rename from sci-libs/cantera/cantera-2.4.0-r3.ebuild rename to sci-libs/cantera/cantera-2.4.0-r4.ebuild index 29345e36058c..d3f8fb2e514b 100644 --- a/sci-libs/cantera/cantera-2.4.0-r3.ebuild +++ b/sci-libs/cantera/cantera-2.4.0-r4.ebuild @@ -32,7 +32,7 @@ RDEPEND=" dev-python/numpy[${PYTHON_MULTI_USEDEP}] ') ) - 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','5.0'): ++ 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'): 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) -- 2.26.2