From f3f49e2a3e477631a44479a119b0620fb4e0a90e Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 4 Mar 2018 09:38:42 +0100
Subject: [PATCH] LIS : bump (#2230)

* LIS : bump

* Cleanup

* Cleanup
---
 sci-libs/lis/lis-2.0.6.recipe | 109 -------------------------------
 sci-libs/lis/lis-2.0.7.recipe | 118 ++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+), 109 deletions(-)
 delete mode 100644 sci-libs/lis/lis-2.0.6.recipe
 create mode 100644 sci-libs/lis/lis-2.0.7.recipe

diff --git a/sci-libs/lis/lis-2.0.6.recipe b/sci-libs/lis/lis-2.0.6.recipe
deleted file mode 100644
index 9cd0203a1..000000000
--- a/sci-libs/lis/lis-2.0.6.recipe
+++ /dev/null
@@ -1,109 +0,0 @@
-SUMMARY="Library of Iterative Solvers for Linear Systems"
-DESCRIPTION="Lis is a parallel software library for solving linear equations \
-and eigenvalue problems that arise in the numerical solution of partial \
-differential equations using iterative methods."
-HOMEPAGE="http://www.ssisc.org/lis/"
-COPYRIGHT="2005 The Scalable Software Infrastructure Project"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://github.com/anishida/lis/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="4c97bb82aafc20167c7bd117e7862e38522f35a3162c3e233e4fa10f3c5c5040"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
-
-PROVIDES="
-	lis$secondaryArchSuffix = $portVersion
-	cmd:esolve = $portVersion
-	cmd:esolver = $portVersion
-	cmd:gesolve = $portVersion
-	cmd:gesolver = $portVersion
-	cmd:hpcg_kernel = $portVersion
-	cmd:hpcg_spmvtest = $portVersion
-	cmd:lsolve = $portVersion
-	cmd:spmvtest1 = $portVersion
-	cmd:spmvtest2 = $portVersion
-	cmd:spmvtest2b = $portVersion
-	cmd:spmvtest3 = $portVersion
-	cmd:spmvtest3b = $portVersion
-	cmd:spmvtest4 = $portVersion
-	cmd:spmvtest5 = $portVersion
-	lib:liblis$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libgomp$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	lis${secondaryArchSuffix}_devel = $portVersion
-	devel:liblis$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	lis$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:gfortran$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-defineDebugInfoPackage lis$secondaryArchSuffix \
-	$libDir/liblis.so.0.0.0 \
-	$prefix/bin/esolve \
-	$prefix/bin/esolver \
-	$prefix/bin/gesolve \
-	$prefix/bin/gesolver \
-	$prefix/bin/hpcg_kernel \
-	$prefix/bin/hpcg_spmvtest \
-	$prefix/bin/lsolve \
-	$prefix/bin/spmvtest1 \
-	$prefix/bin/spmvtest2 \
-	$prefix/bin/spmvtest2b \
-	$prefix/bin/spmvtest3 \
-	$prefix/bin/spmvtest3b \
-	$prefix/bin/spmvtest4 \
-	$prefix/bin/spmvtest5
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake --add-missing
-
-	runConfigure ./configure \
-		--enable-f90 \
-		--enable-shared
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	rm $libDir/liblis.la
-	rm -rf $prefix/share
-
-	prepareInstalledDevelLib liblis
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	make check
-}
diff --git a/sci-libs/lis/lis-2.0.7.recipe b/sci-libs/lis/lis-2.0.7.recipe
new file mode 100644
index 000000000..2e9a629df
--- /dev/null
+++ b/sci-libs/lis/lis-2.0.7.recipe
@@ -0,0 +1,118 @@
+SUMMARY="Library of Iterative Solvers for Linear Systems"
+DESCRIPTION="Lis is a parallel software library for solving linear equations \
+and eigenvalue problems that arise in the numerical solution of partial \
+differential equations using iterative methods."
+HOMEPAGE="http://www.ssisc.org/lis/"
+COPYRIGHT="2005 The Scalable Software Infrastructure Project"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/anishida/lis/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="e6724b05a06f49ef686fecf340436262357f6829ae296cbcb356d6959e23cc71"
+SOURCE_FILENAME="lis-$portVersion.tar.gz"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	lis$secondaryArchSuffix = $portVersion
+	cmd:esolve$commandSuffix = $portVersion
+	cmd:esolver$commandSuffix = $portVersion
+	cmd:gesolve$commandSuffix = $portVersion
+	cmd:gesolver$commandSuffix = $portVersion
+	cmd:hpcg_kernel$commandSuffix = $portVersion
+	cmd:hpcg_spmvtest$commandSuffix = $portVersion
+	cmd:lsolve$commandSuffix = $portVersion
+	cmd:spmvtest1$commandSuffix = $portVersion
+	cmd:spmvtest2$commandSuffix = $portVersion
+	cmd:spmvtest2b$commandSuffix = $portVersion
+	cmd:spmvtest3$commandSuffix = $portVersion
+	cmd:spmvtest3b$commandSuffix = $portVersion
+	cmd:spmvtest4$commandSuffix = $portVersion
+	cmd:spmvtest5$commandSuffix = $portVersion
+	lib:liblis$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgomp$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	lis${secondaryArchSuffix}_devel = $portVersion
+	devel:liblis$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	lis$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:autoreconf
+	cmd:awk
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:gfortran$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage lis$secondaryArchSuffix \
+	$commandBinDir/esolve \
+	$commandBinDir/esolver \
+	$commandBinDir/gesolve \
+	$commandBinDir/gesolver \
+	$commandBinDir/hpcg_kernel \
+	$commandBinDir/hpcg_spmvtest \
+	$commandBinDir/lsolve \
+	$commandBinDir/spmvtest1 \
+	$commandBinDir/spmvtest2 \
+	$commandBinDir/spmvtest2b \
+	$commandBinDir/spmvtest3 \
+	$commandBinDir/spmvtest3b \
+	$commandBinDir/spmvtest4 \
+	$commandBinDir/spmvtest5 \
+	$libDir/liblis.so.$libVersion
+
+BUILD()
+{
+	autoreconf -vfi
+
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--enable-f90 \
+		--enable-shared
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/liblis.la
+	mkdir -p $developDocDir
+	mv $prefix/share/examples $developDocDir
+	rm -rf $prefix/share
+
+	prepareInstalledDevelLib liblis
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}