From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 248C4138010 for ; Thu, 25 Oct 2012 15:54:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B058421C02C; Thu, 25 Oct 2012 15:54:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1D2FB21C02C for ; Thu, 25 Oct 2012 15:54:26 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50355335E2B for ; Thu, 25 Oct 2012 15:54:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E640DE5436 for ; Thu, 25 Oct 2012 15:54:23 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1351180441.523e75bce6f5acc7354ae8a4e09d270d6570137e.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-cpp/eigen/ X-VCS-Repository: proj/sci X-VCS-Files: dev-cpp/eigen/ChangeLog dev-cpp/eigen/eigen-3.0.6-r1.ebuild dev-cpp/eigen/eigen-9999.ebuild dev-cpp/eigen/metadata.xml X-VCS-Directories: dev-cpp/eigen/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 523e75bce6f5acc7354ae8a4e09d270d6570137e X-VCS-Branch: master Date: Thu, 25 Oct 2012 15:54:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4433b061-ba95-413a-a930-0ddec208a13a X-Archives-Hash: a950069d16323c395edba0565005ec70 commit: 523e75bce6f5acc7354ae8a4e09d270d6570137e Author: Justin Lecher gentoo org> AuthorDate: Thu Oct 25 15:54:01 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Oct 25 15:54:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=523e75bc dev-cpp/eigen: Use vcs-snapshot.eclass, correct usage of fortran-2.eclass, some layout improvements Package-Manager: portage-2.2.0_alpha141 --- dev-cpp/eigen/ChangeLog | 5 ++++ dev-cpp/eigen/eigen-3.0.6-r1.ebuild | 37 +++++++++++++++++------------------ dev-cpp/eigen/eigen-9999.ebuild | 34 +++++++++++++++----------------- dev-cpp/eigen/metadata.xml | 15 ++++++++----- 4 files changed, 48 insertions(+), 43 deletions(-) diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog index 595a02d..471649a 100644 --- a/dev-cpp/eigen/ChangeLog +++ b/dev-cpp/eigen/ChangeLog @@ -2,6 +2,11 @@ # 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 $ + 25 Oct 2012; Justin Lecher eigen-3.0.6-r1.ebuild, + eigen-9999.ebuild, metadata.xml: + Use vcs-snapshot.eclass, correct usage of fortran-2.eclass, some layout + improvements + *eigen-3.1.1-r1 (26 Jul 2012) 26 Jul 2012; Sébastien Fabbro +eigen-3.1.1-r1.ebuild, diff --git a/dev-cpp/eigen/eigen-3.0.6-r1.ebuild b/dev-cpp/eigen/eigen-3.0.6-r1.ebuild index c98fb2e..1ad9b15 100644 --- a/dev-cpp/eigen/eigen-3.0.6-r1.ebuild +++ b/dev-cpp/eigen/eigen-3.0.6-r1.ebuild @@ -4,39 +4,37 @@ EAPI=4 -inherit cmake-utils alternatives-2 fortran-2 multilib +FORTRAN_NEEDED=fortran + +inherit alternatives-2 cmake-utils fortran-2 multilib vcs-snapshot 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" +SLOT="3" LICENSE="|| ( LGPL-3 GPL-2 )" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -SLOT="3" IUSE="adolc fortran fftw doc gmp sparse static-libs test" -CDEPEND="adolc? ( sci-libs/adolc[sparse?] ) +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[metis] - sci-libs/superlu - sci-libs/umfpack )" + sparse? ( + dev-cpp/sparsehash + sci-libs/cholmod[metis] + sci-libs/superlu + sci-libs/umfpack + )" -DEPEND="doc? ( app-doc/doxygen[dot,latex] ) +DEPEND=" + doc? ( app-doc/doxygen[dot,latex] ) test? ( ${CDEPEND} )" - -RDEPEND="!dev-cpp/eigen:0 +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: is it worth fixing all the automagic given no library is built? @@ -46,7 +44,8 @@ src_configure() { $(cmake-utils_use !fortran EIGEN_TEST_NO_FORTRAN) ) CMAKE_BUILD_TYPE="release" cmake-utils_src_configure - use fortran && FORTRAN_LIBS="blas" # lapack not ready yet + # lapack not ready yet? + use fortran && FORTRAN_LIBS="blas" } src_compile() { diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild index 973ffbf..9d52cff 100644 --- a/dev-cpp/eigen/eigen-9999.ebuild +++ b/dev-cpp/eigen/eigen-9999.ebuild @@ -4,6 +4,8 @@ EAPI=4 +FORTRAN_NEEDED=fortran + if [[ ${PV} == "9999" ]] ; then _SCM=mercurial EHG_REPO_URI="https://bitbucket.org/eigen/eigen" @@ -14,40 +16,36 @@ else KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit cmake-utils alternatives-2 fortran-2 multilib ${_SCM} +inherit alternatives-2 cmake-utils fortran-2 multilib vcs-snapshot ${_SCM} DESCRIPTION="C++ template library for linear algebra" HOMEPAGE="http://eigen.tuxfamily.org/" -LICENSE="MPL-2.0" SLOT="3" +LICENSE="MPL-2.0" IUSE="adolc doc fortran fftw gmp mkl sparse static-libs test" # TODO: support for pastix -CDEPEND="adolc? ( sci-libs/adolc[sparse?] ) - fortran? ( virtual/fortran ) +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[metis] - sci-libs/superlu - sci-libs/umfpack )" + sparse? ( + dev-cpp/sparsehash + sci-libs/cholmod[metis] + sci-libs/superlu + sci-libs/umfpack + )" -DEPEND="doc? ( app-doc/doxygen[dot,latex] ) +DEPEND=" + doc? ( app-doc/doxygen[dot,latex] ) test? ( ${CDEPEND} )" -RDEPEND="!dev-cpp/eigen:0 +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: is it worth fixing all the automagic given no library is built? diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml index 6e9235c..bb9ba2f 100644 --- a/dev-cpp/eigen/metadata.xml +++ b/dev-cpp/eigen/metadata.xml @@ -1,20 +1,23 @@ -sci - + sci + 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. - - + + Enable use for automatic differentiation using sci-libs/adolc - + + Use propertary intel blas/lapack implementation through sci-libs/mkl + + Enable use for extra sparse matrix with sci-libs/umfpack, sci-libs/cholmod, sci-libs/superlu and dev-cpp/sparsehash - +