dev-cpp/eigen: version bump

4 files changed, 31 insertions, 112 deletions

diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog
index 564da533b..1b012129c 100644
--- a/dev-cpp/eigen/ChangeLog
+++ b/dev-cpp/eigen/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-cpp/eigen
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 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.1.0 (29 Jun 2012)
+
+  29 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -eigen-3.0.4.ebuild,
+  -eigen-3.1.0_alpha2.ebuild, +eigen-3.1.0.ebuild:
+  Version bump. Still work in progress, should be fine with -fortran
+
 * eigen-3.1.0_alpha2 (25 Feb 2012)
 
   25 Feb 2012; Andrea Arteaga <andyspiros@gmail.com> eigen-3.1.0_alpha2.ebuild
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index ff96f44a2..4a5ee6236 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,2 @@
-DIST eigen-3.0.4.tar.bz2 957932 RMD160 2f2e2da8d906b7ac576e0b8d80bb2d983797b581 SHA1 fe17f6994e8bf7cec37ece58fe462a6d06e2e154 SHA256 23300291c29212d3b1dba7fc7bc4f2f7fbc272246e168e48cc622e5648ed92aa
 DIST eigen-3.0.5.tar.bz2 960679 SHA256 eea706ea59b534d0c8dba6f94f022158e54f812f171c9956f89873ecb1ee577c SHA512 37d0bf932d97fc7315ef836976cdba7aaa9938aba6abf6ed7562bd0ef7de7f01b9bdb7980bae13f5432ff0342b230883f00aea5bcf96d3364007694b40fc566e WHIRLPOOL 5f0060cb80b6824782ab39274b8763288b90bfad0e446dfe3965b40b8502e7660986ac7924c6f1e127f57cbe6e37ed51cb374442b8d24e5babd7559d161e2b8b
-DIST eigen-3.1.0_alpha2.tar.bz2 1008576 SHA256 c9b4ac5aeea83b988bccf84eff9a04909ded519c843e22e471a66c132ce07d44 SHA512 59224891253a531e34469760f1f5626ad90d080d78039f05d7e8c37c19da5ee2230d4704c65218732ab712b3642512bffbc15e1d0374f1191c40c8017edbf142 WHIRLPOOL fade5a12b5e17a6852e079970f9d1766094542e884bd28c88a13f2d81ff2cd470585c67b32212f02a1a7c6ec9f07fe948fc194e8305c06c8f688dc87b3e0188f
+DIST eigen-3.1.0.tar.bz2 1023451 RMD160 30fdea44ffc09a48ddf546903aef9c23d43d60ef SHA1 6afc46e7d44e85622024341500c3464e0e04beb4 SHA256 3c64a6792a55d8ee672ce45d5a1d1de1ffc50daaf6e8a3677bf8580ad99f036c SHA512 dbe39e5a0314d658b7d34f5a4216d4b11a92a37dd35e1d54d68ee2ec653af3b6a6d1107bff87d705660c04749ab15deaaf31adcbb0ae4b69b82beb94cc71b345 WHIRLPOOL a57f21a033c6d38757733ee300db36b7bf9d24945bf4a0cc3aca8972a400fe1ae64d77334f9b009685fe870a1f389a9275b2b9dac5e273ffb45b49ba7baed9ba
diff --git a/dev-cpp/eigen/eigen-3.0.4.ebuild b/dev-cpp/eigen/eigen-3.0.4.ebuild
deleted file mode 100644
index 57a955794..000000000
--- a/dev-cpp/eigen/eigen-3.0.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils alternatives-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-3 GPL-2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="3"
-IUSE="adolc fortran fftw doc gmp sparse static-libs test"
-
-CDEPEND="adolc? ( sci-libs/adolc[sparse?] )
-	fftw? ( >=sci-libs/fftw-3 )
-	gmp? ( dev-libs/gmp dev-libs/mpfr )
-	sparse? ( dev-cpp/sparsehash
-			sci-libs/cholmod
-			sci-libs/superlu
-			sci-libs/umfpack )"
-
-DEPEND="doc? ( app-doc/doxygen )
-	test? ( ${CDEPEND} )"
-
-RDEPEND="!dev-cpp/eigen:0
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${A} && mv ${PN}* ${P}
-}
-
-src_configure() {
-	#TOFIX: static-libs for blas are always built with PIC
-	#TOFIX: BTL benchmarks
-	#TOFIX: is it worth fixing all the automagic given no library is built?
-	mycmakeargs=(
-		-DEIGEN_BUILD_BTL=OFF
-	)
-	CMAKE_BUILD_TYPE="release" cmake-utils_src_configure
-	use fortran && FORTRAN_LIBS="blas" # lapack not ready yet
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	pushd "${S}_build" > /dev/null
-	use doc && emake doc
-	use fortran && emake ${FORTRAN_LIBS}
-	use test && emake buildtests
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
-	local x
-	for x in ${FORTRAN_LIBS}; do
-		local libname="eigen_${x}"
-		cd "${CMAKE_BUILD_DIR}"/${x}
-		dolib.so lib${libname}.so
-		use static-libs && newlib.a lib${libname}_static.a lib${libname}.a
-		#TOFIX: lapack implementation needs a Requires: field in pc file.
-		cat <<-EOF > ${libname}.pc
-			prefix="${EPREFIX}"/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ${PN}
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -l${libname}
-			Libs.private: -lm
-		EOF
-		alternatives_for ${x} eigen 0 \
-			/usr/$(get_libdir)/pkgconfig/${x}.pc ${libname}.pc
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins ${libname}.pc
-	done
-}
diff --git a/dev-cpp/eigen/eigen-3.1.0_alpha2.ebuild b/dev-cpp/eigen/eigen-3.1.0.ebuild
index a8f69ba22..af3759a06 100644
--- a/dev-cpp/eigen/eigen-3.1.0_alpha2.ebuild
+++ b/dev-cpp/eigen/eigen-3.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit cmake-utils alternatives-2
+inherit cmake-utils alternatives-2 fortran-2 multilib
 
 DESCRIPTION="C++ template library for linear algebra"
 HOMEPAGE="http://eigen.tuxfamily.org/"
@@ -13,46 +13,49 @@ MYPV=${PV/_/-}
 SRC_URI="http://bitbucket.org/eigen/eigen/get/${MYPV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="|| ( LGPL-3 GPL-2 )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="3"
-IUSE="adolc fortran fftw doc gmp sparse static-libs test"
+IUSE="adolc doc fortran fftw gmp mkl sparse static-libs test"
 
+# TODO: support for pastix
 CDEPEND="adolc? ( sci-libs/adolc[sparse?] )
 	fftw? ( >=sci-libs/fftw-3 )
 	gmp? ( dev-libs/gmp dev-libs/mpfr )
+	mkl? ( sci-libs/mkl )
 	sparse? ( dev-cpp/sparsehash
-			sci-libs/cholmod
+			sci-libs/cholmod[metis]
 			sci-libs/superlu
 			sci-libs/umfpack )"
 
-DEPEND="doc? ( app-doc/doxygen )
+DEPEND="doc? ( app-doc/doxygen[dot,latex] )
 	test? ( ${CDEPEND} )"
 
 RDEPEND="!dev-cpp/eigen:0
 	${CDEPEND}"
 
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A} && mv ${PN}* ${P}
 }
 
 src_configure() {
-	#TOFIX: static-libs for blas are always built with PIC
-	#TOFIX: BTL benchmarks
-	#TOFIX: is it worth fixing all the automagic given no library is built?
+	# TOFIX: static-libs for blas are always built with PIC
+	# TOFIX: BTL benchmarks
+	# TOFIX: is it worth fixing all the automagic given no library is built?
 	mycmakeargs=(
 		-DEIGEN_BUILD_BTL=OFF
 	)
 	CMAKE_BUILD_TYPE="release" cmake-utils_src_configure
-	use fortran && FORTRAN_LIBS="blas lapack" # lapack not ready yet
+	use fortran && FORTRAN_LIBS="blas lapack"
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	pushd "${S}_build" > /dev/null
-	use doc && emake doc
-	use fortran && emake ${FORTRAN_LIBS}
-	use test && emake buildtests
-	popd > /dev/null
+	local targets="${FORTRAN_LIBS}"
+	use doc && targets+=" doc"
+	cmake-utils_src_compile ${targets}
 }
 
 src_install() {
@@ -64,24 +67,17 @@ src_install() {
 		cd "${CMAKE_BUILD_DIR}"/${x}
 		dolib.so lib${libname}.so
 		use static-libs && newlib.a lib${libname}_static.a lib${libname}.a
-
-		if [[ $x = "lapack" ]]; then
-			requires="Requires: blas"
-		else
-			requires=""
-		fi
-
-		cat <<-EOF > ${libname}.pc
-			prefix="${EPREFIX}"/usr
+		cat > ${libname}.pc <<-EOF
+			prefix=${EPREFIX}/usr
 			libdir=\${prefix}/$(get_libdir)
 			includedir=\${prefix}/include
 			Name: ${PN}
-			Description: ${DESCRIPTION}
+			Description: ${DESCRIPTION} ${x^^} implementation
 			Version: ${PV}
 			URL: ${HOMEPAGE}
 			Libs: -L\${libdir} -l${libname}
 			Libs.private: -lm
-			${requires}
+			$([[ ${x} == lapack ]] && echo "Requires: blas")
 		EOF
 		alternatives_for ${x} eigen 0 \
 			/usr/$(get_libdir)/pkgconfig/${x}.pc ${libname}.pc