diff options
| -rw-r--r-- | sci-libs/cholmod/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/cholmod/cholmod-2.0.1.ebuild | 20 |
2 files changed, 15 insertions, 12 deletions
diff --git a/sci-libs/cholmod/ChangeLog b/sci-libs/cholmod/ChangeLog index 95ce754f5098..4448ee128c21 100644 --- a/sci-libs/cholmod/ChangeLog +++ b/sci-libs/cholmod/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/cholmod -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.35 2012/11/14 20:29:00 bicatali Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.36 2013/01/03 05:26:05 bicatali Exp $ + + 03 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> cholmod-2.0.1.ebuild: + Use generic pkg-config, replace supernodal with easier lapack use flag 14 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> cholmod-2.0.1.ebuild: Roll new version supporting USE=-metis diff --git a/sci-libs/cholmod/cholmod-2.0.1.ebuild b/sci-libs/cholmod/cholmod-2.0.1.ebuild index d9b378801ee8..17d890d86493 100644 --- a/sci-libs/cholmod/cholmod-2.0.1.ebuild +++ b/sci-libs/cholmod/cholmod-2.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-2.0.1.ebuild,v 1.3 2012/11/14 20:29:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-2.0.1.ebuild,v 1.4 2013/01/03 05:26:05 bicatali Exp $ EAPI=4 -inherit autotools-utils multilib +inherit autotools-utils multilib toolchain-funcs DESCRIPTION="Sparse Cholesky factorization and update/downdate library" HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod/" @@ -13,17 +13,17 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz" LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos" -IUSE="cuda doc metis minimal static-libs +supernodal" +IUSE="cuda doc lapack metis minimal static-libs" RDEPEND=" >=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) + lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 - || ( sci-libs/metis sci-libs/parmetis ) ) - supernodal? ( virtual/lapack )" + || ( sci-libs/metis sci-libs/parmetis ) )" DEPEND="${RDEPEND} virtual/pkgconfig @@ -38,9 +38,9 @@ src_prepare() { src_configure() { local lapack_libs=no local blas_libs=no - if use supernodal; then - blas_libs=$(pkg-config --libs blas) - lapack_libs=$(pkg-config --libs lapack) + if use lapack; then + blas_libs=$($(tc-getPKGCONFIG) --libs blas) + lapack_libs=$($(tc-getPKGCONFIG) --libs lapack) fi local myeconfargs=( --with-blas="${blas_libs}" @@ -49,7 +49,7 @@ src_configure() { $(use_with !minimal modify) $(use_with !minimal matrixops) $(use_with metis partition) - $(use_with supernodal) + $(use_with lapack supernodal) ) if use cuda; then myeconfargs+=( |