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.60) (envelope-from ) id 1SkP3H-00066m-1t for garchives@archives.gentoo.org; Fri, 29 Jun 2012 00:27:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C53C5E0764; Fri, 29 Jun 2012 00:27:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 84A48E0764 for ; Fri, 29 Jun 2012 00:27:03 +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 BF1D81B4083 for ; Fri, 29 Jun 2012 00:27:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8914AE5432 for ; Fri, 29 Jun 2012 00:27:01 +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: <1340929605.6e42abef05166f8b5ff4b9c13acecfca56125da4.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.4.ebuild dev-cpp/eigen/eigen-3.1.0.ebuild dev-cpp/eigen/eigen-3.1.0_alpha2.ebuild X-VCS-Directories: dev-cpp/eigen/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 6e42abef05166f8b5ff4b9c13acecfca56125da4 X-VCS-Branch: master Date: Fri, 29 Jun 2012 00:27:01 +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: c699054c-053c-4787-83dd-0381c73c88ff X-Archives-Hash: bb60487007982fd2f3101ef20fc67349 commit: 6e42abef05166f8b5ff4b9c13acecfca56125da4 Author: Sebastien Fabbro uvic ca> AuthorDate: Fri Jun 29 00:26:45 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Fri Jun 29 00:26:45 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D6e42abef 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 =3D> 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/0= 3/25 16:01:28 jlec Exp $ =20 +*eigen-3.1.0 (29 Jun 2012) + + 29 Jun 2012; Sebastien Fabbro -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) =20 25 Feb 2012; Andrea Arteaga 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=3D4 - -inherit cmake-utils alternatives-2 - -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" - -LICENSE=3D"|| ( LGPL-3 GPL-2 )" -KEYWORDS=3D"~amd64 ~x86" -SLOT=3D"3" -IUSE=3D"adolc fortran fftw doc gmp sparse static-libs test" - -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/superlu - sci-libs/umfpack )" - -DEPEND=3D"doc? ( app-doc/doxygen ) - test? ( ${CDEPEND} )" - -RDEPEND=3D"!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=3D( - -DEIGEN_BUILD_BTL=3DOFF - ) - CMAKE_BUILD_TYPE=3D"release" cmake-utils_src_configure - use fortran && FORTRAN_LIBS=3D"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=3D"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=3D"${EPREFIX}"/usr - libdir=3D\${prefix}/$(get_libdir) - includedir=3D\${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/eige= n-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: $ =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/" @@ -13,46 +13,49 @@ MYPV=3D${PV/_/-} SRC_URI=3D"http://bitbucket.org/eigen/eigen/get/${MYPV}.tar.bz2 -> ${P}.= tar.bz2" =20 LICENSE=3D"|| ( LGPL-3 GPL-2 )" -KEYWORDS=3D"" +KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" 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?] ) 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} } =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: BTL benchmarks + # TOFIX: is it worth fixing all the automagic given no library is built= ? mycmakeargs=3D( -DEIGEN_BUILD_BTL=3DOFF ) CMAKE_BUILD_TYPE=3D"release" cmake-utils_src_configure - use fortran && FORTRAN_LIBS=3D"blas lapack" # lapack not ready yet + use fortran && FORTRAN_LIBS=3D"blas lapack" } =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" + cmake-utils_src_compile ${targets} } =20 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 =3D "lapack" ]]; then - requires=3D"Requires: blas" - else - requires=3D"" - fi - - 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 - ${requires} + $([[ ${x} =3D=3D lapack ]] && echo "Requires: blas") EOF alternatives_for ${x} eigen 0 \ /usr/$(get_libdir)/pkgconfig/${x}.pc ${libname}.pc