dev-cpp/eigen: Version bump

Package-Manager: portage-2.2.8-prefix

5 files changed, 23 insertions, 12 deletions

diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog
index fc5132694..b0143114c 100644
--- a/dev-cpp/eigen/ChangeLog
+++ b/dev-cpp/eigen/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/ChangeLog,v 1.44 2011/03/25 16:01:28 jlec Exp $
 
+*eigen-3.2.1-r1 (22 Apr 2014)
+
+  22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +eigen-3.2.1-r1.ebuild,
+  -eigen-3.2.0.ebuild, eigen-9999.ebuild, metadata.xml:
+  dev-cpp/eigen: Version bump
+
 *eigen-3.2.0-r1 (16 Jan 2014)
 
   16 Jan 2014; Justin Lecher <jlec@gentoo.org> +eigen-3.2.0-r1.ebuild,
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 6d2fb6df8..a698ef866 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,4 @@
 DIST eigen-3.1.4.tar.bz2 1052745 SHA256 80ea2d76b649e9ea413090f96c32bd408f07872b50cc6844bc3136e635492414 SHA512 555aea79b5dcdb8a1c15f223bb64191d69012a9f895e15218a2e0478bc7dc3d8a61d257c072ca29cd9e5788541ac0540af45320cfdb4095360dce841dfaba692 WHIRLPOOL b0e52eb7f6a89a75e67a3f0f3ad73abd0e51bfc639960c9f5699ae48c628e6160f6b3059178f4fa5b5212357b7cd5fe31082f06e0bfe1557d4dad1332999d62f
 DIST eigen-3.2.0-cmake.patch 3294 SHA256 2be458affc18b833f31b767b823b1e490e6d0115d040a802eb334c5884c8ad88 SHA512 229c0c1f3d95ae505b5accd1aeba19f59a064218cf9b0d844dbc4c660a4cddb666f818268ba1899370877034a70a87317ca8bf14822e3b85d0bbe7f3bb5c7cf6 WHIRLPOOL ae78de8cc7f3b58749dcfefc6ac4fd96cca84e048b0337b1590d5097b4838c751c237844b4aa996ce75d10e830d406fa52ef68f509d0ae8e21a75fc589a1a6d3
 DIST eigen-3.2.0.tar.bz2 1135851 SHA256 011f78960d939227f9276173d0c4cc0053bb9e0a7356539a9a6c7c89d984fab6 SHA512 ab30077c845b09aa3f652e4695f1e256c7c7ff1c0f850e38cf9867ab9659ec6008fa646c2796796ca718b996764e7e3d2811a2c6a24abacbe50a2513fc670ca5 WHIRLPOOL f1cbbc7405173ab1904a6f8272a0b7a558ec37060ce60f51b38e89f762e610844989dc99a3ba09cf34a0e94ca048ad56856adfbe69a4a54fe8c2abfd3d9ef24c
+DIST eigen-3.2.1.tar.bz2 1138080 SHA256 66e6f2ede78d0ef650ae95aa570f548c095690b011000f9163c32618736c928a SHA512 0c60139d23c6e51883d06c92d4c089f1b3eb3b75738d7064cfa3bc79148dd23bb00c98a53636fe396d89a3734d950ef938993c5662181d5327a8ae930afeb4e5 WHIRLPOOL 85f25256732bf995b9431dfae6c44d2c42c7f610b351854f1c0e92ebe795578a9d0dac3d2444b535760bee0dc0c009808fcfe7e74a03737291777ff47a959b17
diff --git a/dev-cpp/eigen/eigen-3.2.0.ebuild b/dev-cpp/eigen/eigen-3.2.1-r1.ebuild
index eafd77401..eafd77401 120000
--- a/dev-cpp/eigen/eigen-3.2.0.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.1-r1.ebuild
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 1bc32cd09..0256605cd 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -23,17 +23,19 @@ HOMEPAGE="http://eigen.tuxfamily.org/"
 
 SLOT="3"
 LICENSE="MPL-2.0"
-IUSE="adolc doc fortran fftw gmp mkl sparse static-libs test"
+IUSE="adolc doc fortran fftw gmp metis mkl sparse static-libs test"
 
 # TODO: support for pastix
 CDEPEND="
 	adolc? ( sci-libs/adolc[sparse?] )
-	fftw? ( >=sci-libs/fftw-3 )
+	fftw? ( sci-libs/fftw:3.0 )
 	gmp? ( dev-libs/gmp dev-libs/mpfr )
+	metis? ( sci-libs/metis )
 	mkl? ( sci-libs/mkl )
 	sparse? (
 		dev-cpp/sparsehash
-		sci-libs/cholmod[metis]
+		sci-libs/cholmod[metis?]
+		sci-libs/spqr
 		sci-libs/superlu
 		sci-libs/umfpack )"
 DEPEND="
@@ -50,7 +52,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DEIGEN_BUILD_BTL=OFF
 		-DEIGEN_TEST_NO_OPENGL=ON
-		$(cmake-utils_use test EIGEN_BUILD_TESTS)
+		$(cmake-utils_use test BUILD_TESTING)
 		$(cmake-utils_use !fortran EIGEN_TEST_NO_FORTRAN)
 	)
 	export VARTEXFONTS="${T}/fonts"
@@ -62,7 +64,7 @@ src_configure() {
 src_compile() {
 	local targets="${FORTRAN_LIBS}"
 	use doc && targets+=" doc"
-	use test && targets+=" buildtests"
+	use test && targets+=" check"
 	cmake-utils_src_compile ${targets}
 }
 
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index a7abef913..19bd7acd2 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   Eigen is a lightweight C++ template library for vector and matrix math,
   a.k.a. linear algebra. Unlike most other linear algebra libraries, Eigen
   focuses on the simple mathematical needs of applications: games and other
   OpenGL apps, spreadsheets and other office apps, etc. Eigen is dedicated to
   providing optimal speed with GCC.
 </longdescription>
-  <use>
-    <flag name="adolc">
+<use>
+  <flag name="adolc">
     Enable use for automatic differentiation using <pkg>sci-libs/adolc</pkg>
   </flag>
-    <flag name="mkl">
+  <flag name="metis">
+    Enable matrix partitioning using <pkg>sci-libs/metis</pkg></flag>
+  <flag name="mkl">
     Use propertary intel blas/lapack implementation through <pkg>sci-libs/mkl</pkg>
   </flag>
-    <flag name="sparse">
+  <flag name="sparse">
     Enable use for extra sparse matrix with <pkg>sci-libs/umfpack</pkg>, <pkg>sci-libs/cholmod</pkg>, <pkg>sci-libs/superlu</pkg> and <pkg>dev-cpp/sparsehash</pkg>
   </flag>
-  </use>
+</use>
 </pkgmetadata>