From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SoLbC-0001ux-SD for garchives@archives.gentoo.org; Mon, 09 Jul 2012 21:34:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 795D3E0691 for ; Mon, 9 Jul 2012 21:34:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7005DE06D6 for ; Mon, 9 Jul 2012 20:57:44 +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 AD6CA1B4002 for ; Mon, 9 Jul 2012 20:57:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 730B0E5433 for ; Mon, 9 Jul 2012 20:57:42 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1341867439.ee42e97672ffac9e93f5d7c3bccded16fe53c088.bicatali@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.5.ebuild dev-cpp/eigen/eigen-3.0.6-r1.ebuild dev-cpp/eigen/eigen-3.1.0-r1.ebuild dev-cpp/eigen/eigen-9999.ebuild dev-cpp/eigen/metadata.xml X-VCS-Directories: dev-cpp/eigen/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: ee42e97672ffac9e93f5d7c3bccded16fe53c088 X-VCS-Branch: master Date: Mon, 9 Jul 2012 20:57:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 582dbf31-257a-4798-aa1f-510e091c26d7 X-Archives-Hash: 7cccd37cfdf90f79fba2a7f8e939c1d3 commit: ee42e97672ffac9e93f5d7c3bccded16fe53c088 Author: Sebastien Fabbro uvic ca> AuthorDate: Mon Jul 9 20:57:19 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Mon Jul 9 20:57:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dee42e976 dev-cpp/eigen: version bump and more test fixes --- dev-cpp/eigen/ChangeLog | 9 +++ .../{eigen-3.0.5.ebuild =3D> eigen-3.0.6-r1.ebuild} | 39 +++++++-----= - dev-cpp/eigen/eigen-3.1.0-r1.ebuild | 1 + dev-cpp/eigen/eigen-9999.ebuild | 58 +++++++++++++-= ------ dev-cpp/eigen/metadata.xml | 17 ++++--- 5 files changed, 80 insertions(+), 44 deletions(-) diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog index 1b01212..9f17a2e 100644 --- a/dev-cpp/eigen/ChangeLog +++ b/dev-cpp/eigen/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/ChangeLog,v 1.44 2011/0= 3/25 16:01:28 jlec Exp $ =20 +*eigen-3.1.0-r1 (09 Jul 2012) +*eigen-3.0.6-r1 (09 Jul 2012) + + 09 Jul 2012; S=C3=A9bastien Fabbro -eigen-3.0.5.= ebuild, + +eigen-3.0.6-r1.ebuild, -eigen-3.1.0.ebuild, +eigen-3.1.0-r1.ebuild, + eigen-9999.ebuild, metadata.xml: + now can really build for tests, remove lapack (not yet complete). Revi= sion + bump to avoid possible conflict with main tree. Merge 3.1 and live ebu= ild + *eigen-3.1.0 (29 Jun 2012) =20 29 Jun 2012; Sebastien Fabbro -eigen-3.0.4.ebuild= , diff --git a/dev-cpp/eigen/eigen-3.0.5.ebuild b/dev-cpp/eigen/eigen-3.0.6= -r1.ebuild similarity index 65% rename from dev-cpp/eigen/eigen-3.0.5.ebuild rename to dev-cpp/eigen/eigen-3.0.6-r1.ebuild index 57a9557..c98fb2e 100644 --- a/dev-cpp/eigen/eigen-3.0.5.ebuild +++ b/dev-cpp/eigen/eigen-3.0.6-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 EAPI=3D4 =20 -inherit cmake-utils alternatives-2 +inherit cmake-utils alternatives-2 fortran-2 multilib =20 DESCRIPTION=3D"C++ template library for linear algebra" HOMEPAGE=3D"http://eigen.tuxfamily.org/" SRC_URI=3D"http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.ta= r.bz2" =20 LICENSE=3D"|| ( LGPL-3 GPL-2 )" -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" SLOT=3D"3" IUSE=3D"adolc fortran fftw doc gmp sparse static-libs test" =20 @@ -19,38 +19,41 @@ CDEPEND=3D"adolc? ( sci-libs/adolc[sparse?] ) fftw? ( >=3Dsci-libs/fftw-3 ) gmp? ( dev-libs/gmp dev-libs/mpfr ) sparse? ( dev-cpp/sparsehash - sci-libs/cholmod + sci-libs/cholmod[metis] sci-libs/superlu sci-libs/umfpack )" =20 -DEPEND=3D"doc? ( app-doc/doxygen ) +DEPEND=3D"doc? ( app-doc/doxygen[dot,latex] ) test? ( ${CDEPEND} )" =20 RDEPEND=3D"!dev-cpp/eigen:0 ${CDEPEND}" =20 +pkg_setup() { + use fortran && fortran-2_pkg_setup +} + src_unpack() { unpack ${A} && mv ${PN}* ${P} } =20 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: is it worth fixing all the automagic given no library is built= ? mycmakeargs=3D( -DEIGEN_BUILD_BTL=3DOFF + $(cmake-utils_use test EIGEN_BUILD_TESTS) + $(cmake-utils_use !fortran EIGEN_TEST_NO_FORTRAN) ) CMAKE_BUILD_TYPE=3D"release" cmake-utils_src_configure use fortran && FORTRAN_LIBS=3D"blas" # lapack not ready yet } =20 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=3D"${FORTRAN_LIBS}" + use doc && targets+=3D" doc" + use test && targets+=3D" buildtests" + cmake-utils_src_compile ${targets} } =20 src_install() { @@ -62,17 +65,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 - #TOFIX: lapack implementation needs a Requires: field in pc file. - cat <<-EOF > ${libname}.pc - prefix=3D"${EPREFIX}"/usr + cat > ${libname}.pc <<-EOF + prefix=3D${EPREFIX}/usr libdir=3D\${prefix}/$(get_libdir) includedir=3D\${prefix}/include Name: ${PN} - Description: ${DESCRIPTION} + Description: ${DESCRIPTION} ${x^^} implementation Version: ${PV} URL: ${HOMEPAGE} Libs: -L\${libdir} -l${libname} Libs.private: -lm + $([[ ${x} =3D=3D lapack ]] && echo "Requires: blas") EOF alternatives_for ${x} eigen 0 \ /usr/$(get_libdir)/pkgconfig/${x}.pc ${libname}.pc diff --git a/dev-cpp/eigen/eigen-3.1.0-r1.ebuild b/dev-cpp/eigen/eigen-3.= 1.0-r1.ebuild new file mode 120000 index 0000000..eafd774 --- /dev/null +++ b/dev-cpp/eigen/eigen-3.1.0-r1.ebuild @@ -0,0 +1 @@ +eigen-9999.ebuild \ No newline at end of file diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.e= build index 61ea9cd..610c606 100644 --- a/dev-cpp/eigen/eigen-9999.ebuild +++ b/dev-cpp/eigen/eigen-9999.ebuild @@ -1,52 +1,71 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 EAPI=3D4 =20 -inherit cmake-utils alternatives-2 mercurial +if [[ ${PV} =3D=3D "9999" ]] ; then + _SCM=3Dmercurial + EHG_REPO_URI=3D"https://bitbucket.org/eigen/eigen" + SRC_URI=3D"" + KEYWORDS=3D"" +else + SRC_URI=3D"http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.t= ar.bz2" + KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +inherit cmake-utils alternatives-2 fortran-2 multilib ${_SCM} =20 DESCRIPTION=3D"C++ template library for linear algebra" HOMEPAGE=3D"http://eigen.tuxfamily.org/" -EHG_REPO_URI=3D"https://bitbucket.org/eigen/eigen" =20 LICENSE=3D"|| ( LGPL-3 GPL-2 )" -KEYWORDS=3D"" SLOT=3D"3" -IUSE=3D"adolc fortran fftw doc gmp sparse static-libs test" +IUSE=3D"adolc doc fortran fftw gmp mkl sparse static-libs test" =20 +# TODO: support for pastix CDEPEND=3D"adolc? ( sci-libs/adolc[sparse?] ) + fortran? ( virtual/fortran ) fftw? ( >=3Dsci-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 )" =20 -DEPEND=3D"doc? ( app-doc/doxygen ) +DEPEND=3D"doc? ( app-doc/doxygen[dot,latex] ) test? ( ${CDEPEND} )" =20 RDEPEND=3D"!dev-cpp/eigen:0 ${CDEPEND}" =20 +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: is it worth fixing all the automagic given no library is built= ? mycmakeargs=3D( -DEIGEN_BUILD_BTL=3DOFF + $(cmake-utils_use test EIGEN_BUILD_TESTS) + $(cmake-utils_use !fortran EIGEN_TEST_NO_FORTRAN) ) CMAKE_BUILD_TYPE=3D"release" cmake-utils_src_configure - use fortran && FORTRAN_LIBS=3D"blas lapack" # lapack not ready yet + # lapack not ready yet? + use fortran && FORTRAN_LIBS=3D"blas" } =20 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=3D"${FORTRAN_LIBS}" + use doc && targets+=3D" doc" + use test && targets+=3D" buildtests" + cmake-utils_src_compile ${targets} } =20 src_install() { @@ -58,16 +77,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 - cat <<-EOF > ${libname}.pc + cat > ${libname}.pc <<-EOF prefix=3D${EPREFIX}/usr libdir=3D\${prefix}/$(get_libdir) includedir=3D\${prefix}/include Name: ${PN} - Description: ${DESCRIPTION} + Description: ${DESCRIPTION} ${x^^} implementation Version: ${PV} URL: ${HOMEPAGE} Libs: -L\${libdir} -l${libname} Libs.private: -lm + $([[ ${x} =3D=3D lapack ]] && echo "Requires: blas") EOF alternatives_for ${x} eigen 0 \ /usr/$(get_libdir)/pkgconfig/${x}.pc ${libname}.pc diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml index a658022..6e9235c 100644 --- a/dev-cpp/eigen/metadata.xml +++ b/dev-cpp/eigen/metadata.xml @@ -1,17 +1,20 @@ - sci - kde - +sci + Eigen is a lightweight C++ template library for vector and matrix math= , a.k.a. linear algebra. Unlike most other linear algebra libraries, Eig= en focuses on the simple mathematical needs of applications: games and ot= her OpenGL apps, spreadsheets and other office apps, etc. Eigen is dedicat= ed to providing optimal speed with GCC. - - Enable use for automatic differentiation using sci-libs/adolc - Enable use for extra sparse matrix with sci= -libs/umfpack, sci-libs/cholmod, sci-libs/superlu and dev-cpp/sparsehash - + + + Enable use for automatic differentiation using sci-libs/adolc + + + Enable use for extra sparse matrix with sci-libs/umfpack,= sci-libs/cholmod, sci-libs/superlu and dev-cp= p/sparsehash + +