sys-cluster/*: merge sionlibl with sionlib

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

4 files changed, 27 insertions, 35 deletions

diff --git a/sys-cluster/sionlib/Manifest b/sys-cluster/sionlib/Manifest
index 9046f5a2b..8fc118f36 100644
--- a/sys-cluster/sionlib/Manifest
+++ b/sys-cluster/sionlib/Manifest
@@ -1 +1,2 @@
-DIST sionlib-1.7.6.tar.gz 486418 BLAKE2B 885eb2012ec6da031f5ae8b093ee4f3e5bbe31c9b24a11576f2ad01b32ddd8a85051565034f0e6c756af51409fb89f9c79f80b35c8337f2dc7912cb9e54d909b SHA512 afdd8520f489bc940edc51ffa636a25cad778de07bfbb21d2bd2ab767e57b16044990d85ef44d2e6482a376196f5c6a2a6f1a71556dd987f8094dd396a971d1c
+DIST sionlib-1.7.7.tar.gz 489080 BLAKE2B 1ffd06d1b245034b28700af1249135347cdd731a7af23ad96a27b5b5a11d64d9a67249fcd1c44cea43face1066e7ae1d59681e84cef2041e18f02e0c3e8f70ee SHA512 f270467e09893adf1af6103557365acbc9a3e73fe08716a21de6f59b25be9b187ee1c1ec1d878a9599e735f98da470b5e2e184774c27ed0ff0c330c5bf0a5677
+DIST sionlibl-1.7.7.tar.gz 490515 BLAKE2B 76971dd6d80222144b40da345d58311911aab09c6a5250b85d4a2731d2f93cdbd39d87dd6bbafdeaba88f06603105076267f6956417916f118ec45e07fa59269 SHA512 6ef46a0905552c558595bf6b72225a290d73dc87fa33c9862de5e4bd4d683792437646f7b4ab8a463b4a50d1b4a79aec96a66e577e815de3f23e9274be2681af
diff --git a/sys-cluster/sionlib/files/respect-flags.patch b/sys-cluster/sionlib/files/sionlib-respect-flags.patch
index 9ff5bd384..a7ac351ea 100644
--- a/sys-cluster/sionlib/files/respect-flags.patch
+++ b/sys-cluster/sionlib/files/sionlib-respect-flags.patch
@@ -1,6 +1,5 @@
-diff '--color=auto' -ru a/config/determine-cc.sh b/config/determine-cc.sh
---- a/config/determine-cc.sh	2021-04-25 01:09:35.175990108 +0200
-+++ b/config/determine-cc.sh	2021-04-25 01:10:02.876433713 +0200
+--- a/config/determine-cc.sh
++++ b/config/determine-cc.sh
 @@ -1,7 +1,6 @@
  #!/bin/sh
  # determine what compiler is behind "cc" (and presumably "CC" and "ftn") wrapper
@@ -9,9 +8,8 @@ diff '--color=auto' -ru a/config/determine-cc.sh b/config/determine-cc.sh
  COMP=
  if [ -z "$CC" ]; then
    echo "No 'cc' located!"
-diff '--color=auto' -ru a/config/select-compiler.sh b/config/select-compiler.sh
---- a/config/select-compiler.sh	2021-04-25 01:09:35.175990108 +0200
-+++ b/config/select-compiler.sh	2021-04-25 01:10:26.882817842 +0200
+--- a/config/select-compiler.sh
++++ b/config/select-compiler.sh
 @@ -9,7 +9,7 @@
  CPS=""
  COMP=""
@@ -21,9 +19,8 @@ diff '--color=auto' -ru a/config/select-compiler.sh b/config/select-compiler.sh
  if [ -n "${GNU}" ]
  then
    NCPS=`expr ${NCPS} + 1`
-diff '--color=auto' -ru a/config/select-mpi.sh b/config/select-mpi.sh
---- a/config/select-mpi.sh	2021-04-25 01:09:35.175990108 +0200
-+++ b/config/select-mpi.sh	2021-04-25 01:12:41.269962840 +0200
+--- a/config/select-mpi.sh
++++ b/config/select-mpi.sh
 @@ -76,7 +76,6 @@
    if [ -z "${MPIS}" ]; then MPIS="${MPI}"; else MPIS="${MPIS}|${MPI}"; fi
  fi
@@ -41,9 +38,8 @@ diff '--color=auto' -ru a/config/select-mpi.sh b/config/select-mpi.sh
    MINCDIR=`cat mpiconf.txt | sed -e 's#^.* "##' -e 's#/mpi.h".*##'`
    if [ -n "${MINCDIR}" ]
    then
-diff '--color=auto' -ru a/mf/Makefile.defs.linux-gomp b/mf/Makefile.defs.linux-gomp
---- a/mf/Makefile.defs.linux-gomp	2021-04-25 01:09:35.119989211 +0200
-+++ b/mf/Makefile.defs.linux-gomp	2021-04-25 01:52:32.378951608 +0200
+--- a/mf/Makefile.defs.linux-gomp
++++ b/mf/Makefile.defs.linux-gomp
 @@ -23,24 +23,19 @@
  #------------------------------------------------------------------------------
  # SIONlib General Settings
@@ -95,23 +91,13 @@ diff '--color=auto' -ru a/mf/Makefile.defs.linux-gomp b/mf/Makefile.defs.linux-g
  SZLIB_LIBPATH  = -L$(TOPDIR)/utils/szlib
  SZLIB_LIB      = -lsc.z
  
-diff '--color=auto' -ru a/src/fortraninterface/Makefile b/src/fortraninterface/Makefile
---- a/src/fortraninterface/Makefile	2021-04-25 01:09:35.141989563 +0200
-+++ b/src/fortraninterface/Makefile	2021-04-25 01:23:48.055976593 +0200
-@@ -109,7 +110,7 @@
- 	$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90.F90 > sion_f90.f90
- sion_f90.mod : sion_f90.o
- sion_f90.o : sion_f90.f90 sion_f77.h $(SION_HDRS)
--	$(F90) -c sion_f90.f90
-+	$(F90) $(F90FLAGS) -c sion_f90.f90
- 
- sion_f90_omp.o: sion_f90.o
- sion_f90_mpi.o: sion_f90.o
+--- a/src/fortraninterface/Makefile
++++ b/src/fortraninterface/Makefile
 @@ -121,21 +122,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)
--	$(MPIF90) -c sion_f90_mpi.f90
+-	$(MPIF90) $(F90FLAGS) -c sion_f90_mpi.f90
 +	$(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_mpi.f90
  
  # F90 Interface (OMP)
@@ -119,7 +105,7 @@ diff '--color=auto' -ru a/src/fortraninterface/Makefile b/src/fortraninterface/M
  	$(CPP) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_omp.F90 > sion_f90_omp.f90
  sion_f90_omp.mod : sion_f90_omp.o 
  sion_f90_omp.o : sion_f90_omp.f90 sion_f90.mod $(SION_HDRS)
--	$(OMPF90) -c sion_f90_omp.f90
+-	$(OMPF90) $(F90FLAGS) -c sion_f90_omp.f90
 +	$(OMPF90) $(F90FLAGS) $(F90OMPFLAGS) -c sion_f90_omp.f90
  
  # F90 Interface (OMPI)
@@ -127,7 +113,7 @@ diff '--color=auto' -ru a/src/fortraninterface/Makefile b/src/fortraninterface/M
  	$(CPP) $(F90MPIFLAGS) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_ompi.F90 > sion_f90_ompi.f90
  sion_f90_ompi.mod : sion_f90_ompi.o
  sion_f90_ompi.o : sion_f90_ompi.f90 $(SION_HDRS)
--	$(MPIF90) -c sion_f90_ompi.f90
+-	$(MPIF90) $(F90FLAGS) -c sion_f90_ompi.f90
 +	$(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_ompi.f90
  
  
diff --git a/sys-cluster/sionlib/metadata.xml b/sys-cluster/sionlib/metadata.xml
index 55c6754ef..df4593cce 100644
--- a/sys-cluster/sionlib/metadata.xml
+++ b/sys-cluster/sionlib/metadata.xml
@@ -20,7 +20,7 @@ SIONlib provides two different interfaces: one for parallel access (with impleme
 	</longdescription>
 	<use>
 		<!--<flag name="cuda">enable CUDA aware interface</flag>-->
-		<flag name="cxx">Disable C++ support</flag>
+		<flag name="cxx">Enable C++ support</flag>
 		<flag name="debug">enable SIONlib debug</flag>
 		<flag name="fortran">Enable Fortran support</flag>
 		<flag name="mpi">enable mpi</flag>
@@ -30,5 +30,6 @@ SIONlib provides two different interfaces: one for parallel access (with impleme
 		<flag name="parutils">Enable compilation of parutils (used for benchmarking)</flag>
 		<flag name="pthreads">configure SIONlib to use pthreads for locking</flag>
 		<!--<flag name="sionfwd">enable I/O forwarding with SIONfwd</flag>-->
+		<flag name="tools">Build the tooling version instead</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild b/sys-cluster/sionlib/sionlib-1.7.7.ebuild
index a63c7bc0f..e00956e3a 100644
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7.ebuild
@@ -1,27 +1,32 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DOCS_BUILDER="doxygen"
 DOCS_CONFIG_NAME="doxy"
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
 inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Scalable I/O library for parallel access to task-local files"
 HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html"
-SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P}.tar.gz"
+SRC_URI="
+	!tools? ( http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P}.tar.gz )
+	tools? ( http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV}l -> ${PN}l-${PV}.tar.gz )
+"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python"
+IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python tools"
 #TODO: cuda sionfwd msa
 #--enable-sionfwd=/path/to/sionfwd
 #--msa=(hostname-regex|deep-est-sdv)]	MSA aware collective operations for the given system
 
-PATCHES=( "${FILESDIR}/respect-flags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
 
 RDEPEND="
 	mpi? ( virtual/mpi )
@@ -35,7 +40,6 @@ DEPEND="
 	${RDEPEND}
 	${PYTHON_DEPS}
 "
-S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	FORTRAN_NEED_OPENMP=0