[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/sionlibl/files/, sys-cluster/sionlibl/

[Haelwenn Monnier]

commit:     800e9271018c20096922f6daa0ba1ffb74c30e2d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Aug 26 14:37:11 2021 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Aug 26 14:37:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=800e9271

sys-cluster/sionlibl: move sed to patch

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 ...espect-flags.patch => sionlibl-respect-flags-v2.patch} | 15 ++++++++++++++-
 sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild             |  8 +-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch 
b/sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
similarity index 87%
rename from sys-cluster/sionlibl/files/sionlibl-respect-flags.patch
rename to sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
index a7ac351ea..6f21f3b95 100644
--- a/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch
+++ b/sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
@@ -8,6 +8,19 @@
  COMP=
  if [ -z "$CC" ]; then
    echo "No 'cc' located!"
+--- a/config/determine-compiler-version.sh
++++ b/config/determine-compiler-version.sh
+@@ -24,8 +24,8 @@
+          | cut -d\  -f 1`
+        COMPVER="${CVER}/${FVER}"
+        ;;
+-  gnu) COMPVER=`gcc -dumpfullversion -dumpversion`
+-       #COMPVER=`gcc -v 2>&1 | grep -i 'Version [0-9]' \
++  gnu) COMPVER=`${CC} -dumpfullversion -dumpversion`
++       #COMPVER=`${CC} -v 2>&1 | grep -i 'Version [0-9]' \
+        #  | sed -e 's/^.*ersion \(.\..\..\).*$/\1/'`
+        ;;
+   *)   ErrorAndExit "Unknown compiler '${COMP}'"
 --- a/config/select-compiler.sh
 +++ b/config/select-compiler.sh
 @@ -9,7 +9,7 @@
@@ -93,7 +106,7 @@
  
 --- a/src/fortraninterface/Makefile
 +++ b/src/fortraninterface/Makefile
-@@ -121,21 +122,21 @@
+@@ -121,21 +121,21 @@
        $(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib 
sion_f90_mpi.F90 > sion_f90_mpi.f90
  sion_f90_mpi.mod : sion_f90_mpi.o
  sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS)

diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild 
b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
index c31355c5a..7af52bec0 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 "
 
 REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
 
 pkg_setup() {
        FORTRAN_NEED_OPENMP=0
@@ -45,12 +45,6 @@ pkg_setup() {
        fortran-2_pkg_setup
 }
 
-src_prepare() {
-       default
-       sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || 
die
-       sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die
-}
-
 src_configure() {
        tc-export AR CC CXX F77 FC
        export MPICC=/usr/bin/mpicc