sci-libs/cantera: 2.4.0-r1. Fix 'fatal' warning

The SConstruct script contains block that tries to evaluate
'git rev-parse --short HEAD` comand and returns the
"fatal: not a git repository (or any parent up to mount point /var/tmp)"
warning from git command itself if git is installed in system.
It occurs because the release package archive doesn't contain ".git" directory.
This behaviour doesn't affect emerge process but can confuse
in the case of other issues.

Closes: https://bugs.gentoo.org/689998
Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru>
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/sci-libs/cantera/files/cantera_2.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch
index 1be40dfe044631cf2e16da3bd2fe1237a0cbce73..bc018a53f8982a7aa41c0aa49c09046f234eaabf 100644 (file)
--- a/sci-libs/cantera/files/cantera_2.4.0_env.patch
+++ b/sci-libs/cantera/files/cantera_2.4.0_env.patch
@@ -10,7 +10,20 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct
                    toolchain=toolchain,
                    **extraEnvArgs)
  
-@@ -1061,7 +1061,7 @@
+@@ -727,11 +727,8 @@
+ 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:")
+ for line in open('cantera.conf'):
+@@ -1062,7 +1062,7 @@
  
      # Ignore the minor version, e.g. 2.4.x -> 2.4
      env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])