[gentoo-commits] proj/sci:master commit in: dev-cpp/eigen/

[Sebastien Fabbro]

commit:     6e42abef05166f8b5ff4b9c13acecfca56125da4
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Fri Jun 29 00:26:45 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 00:26:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6e42abef

dev-cpp/eigen: version bump

---
 dev-cpp/eigen/ChangeLog                            |    8 ++-
 dev-cpp/eigen/eigen-3.0.4.ebuild                   |   82 --------------------
 ...igen-3.1.0_alpha2.ebuild => eigen-3.1.0.ebuild} |   50 ++++++-------
 3 files changed, 30 insertions(+), 110 deletions(-)

diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog
index 564da53..1b01212 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@g.o> -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@×××××.com> eigen-3.1.0_alpha2.ebuild

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 57a9557..0000000
--- 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
similarity index 62%
rename from dev-cpp/eigen/eigen-3.1.0_alpha2.ebuild
rename to dev-cpp/eigen/eigen-3.1.0.ebuild
index a8f69ba..af3759a 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