eigen, bump version (#9285)

dev-cpp/eigen/eigen-3.4.0.recipe

@@ -26,10 +26,14 @@ programmers, thanks to expression templates.
 HOMEPAGE="http://eigen.tuxfamily.org"
 COPYRIGHT="2006-2011 Benoit Jacob
 	2008-2012 Gael Guennebaud, et al."
-LICENSE="MPL v2"
-REVISION="4"
+LICENSE="MPL v2
+	Apache v2
+	BSD (3-clause)
+	GNU GPL v3
+	GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://gitlab.com/libeigen/eigen/-/archive/$portVersion/eigen-$portVersion.tar.gz"
-CHECKSUM_SHA256="7985975b787340124786f092b3a07d594b2e9cd53bbfe5f3d9b1daee7d55f56f"
+CHECKSUM_SHA256="8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72"
 PATCHES="eigen-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -41,6 +45,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
 	devel:libcholmod$secondaryArchSuffix
 	devel:libfftw3f$secondaryArchSuffix
@@ -54,22 +62,6 @@ REQUIRES="
 	devel:libspqr$secondaryArchSuffix
 	devel:libtbb$secondaryArchSuffix
 	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libboost_system$secondaryArchSuffix >= 1.69.0
-	devel:libcholmod$secondaryArchSuffix
-	devel:libfftw3f$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix
-	devel:libgmp$secondaryArchSuffix
-	devel:libmetis$secondaryArchSuffix
-	devel:libmpfr$secondaryArchSuffix >= 6
-	devel:libopenblas$secondaryArchSuffix
-	devel:libumfpack$secondaryArchSuffix
-	devel:libsuperlu$secondaryArchSuffix
-	devel:libspqr$secondaryArchSuffix
-	devel:libtbb$secondaryArchSuffix
-	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
@@ -80,29 +72,22 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-	cmake .. \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DINCLUDE_INSTALL_DIR=$relativeIncludeDir
-	make $jobArgs
+		-DINCLUDE_INSTALL_DIR=$includeDir \
+		-DCMAKEPACKAGE_INSTALL_DIR=$libDir/cmake/eigen3 \
+		-DPKGCONFIG_INSTALL_DIR=$developLibDir/pkgconfig \
+		-DEIGEN_MPL2_ONLY=ON
+
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install PREFIX=$prefix
-
-	mv $prefix/share/eigen3 $dataDir
-	mkdir -p $developLibDir
-	mv $prefix/share/pkgconfig $developLibDir
-	rmdir $prefix/share
-
-	fixPkgconfig
+	make -C build install
 }
 
 TEST()
 {
-	cd build
-	make check -j 4
+	make -C build check -j 4
 }

dev-cpp/eigen/patches/eigen-3.4.0.patchset

@@ -1,14 +1,11 @@
-From 48dd773e90210054e48cb53df40222bf8a8af12f Mon Sep 17 00:00:00 2001
+From 2bfa85572efefb2ff16ecd57762aa6397f6c532e Mon Sep 17 00:00:00 2001
 From: Calvin Hill <calvin@hakobaito.co.uk>
 Date: Mon, 1 May 2017 04:17:23 +0100
 Subject: [PATCH] Eigen patch to run tests for Haiku
 
----
- unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h b/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h
-index 02916ea..7bd2713 100644
+index 02916ea..3b4911a 100644
 --- a/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h
 +++ b/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h
 @@ -193,11 +193,13 @@ class MatrixMarketIterator
@@ -25,10 +22,10 @@ index 02916ea..7bd2713 100644
 +         struct stat st_buf;
 +         stat (curfile.c_str(), &st_buf);
 +         if (S_ISDIR(st_buf.st_mode)) continue;
-+#endif        
++#endif
          // Determine from the header if it is a matrix or a right hand side 
          bool isvector,iscomplex=false;
          if(!getMarketHeader(curfile,m_sym,iscomplex,isvector)) continue;
 -- 
-2.12.2
+2.37.3