summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-01-03 05:26:13 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-01-03 05:26:13 +0000
commit2299e95c650fe9f49c26e2b0f3b05c50e0363922 (patch)
treec7fb6bc41640dd35e3e60dada0890407126c34be /sci-libs/cholmod
parentRemove old. (diff)
downloadhistorical-2299e95c650fe9f49c26e2b0f3b05c50e0363922.tar.gz
historical-2299e95c650fe9f49c26e2b0f3b05c50e0363922.tar.bz2
historical-2299e95c650fe9f49c26e2b0f3b05c50e0363922.zip
Use generic pkg-config, replace supernodal with easier lapack use flag
Package-Manager: portage-2.2.01.21476-prefix/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs/cholmod')
-rw-r--r--sci-libs/cholmod/ChangeLog7
-rw-r--r--sci-libs/cholmod/Manifest10
-rw-r--r--sci-libs/cholmod/cholmod-2.0.1.ebuild20
3 files changed, 20 insertions, 17 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/Manifest b/sci-libs/cholmod/Manifest
index 74412f469d53..180439c2381b 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -10,13 +10,13 @@ DIST cholmod-1.7.0-autotools.patch.bz2 5534 SHA256 901b83939ce09a51baa9431639d4f
DIST cholmod-2.0.1.tar.gz 839977 SHA256 e2840fbc9d60182b19a865a39baaaf85e311cc678367f05b7edcf18dde9083ef SHA512 67b095b1ec2baba6ef542fd15c15d469844526c2ef832667bc0753cf278ffe65a951104df6127496c6cf1438d7edffb9d141cfe73e4c8588ab351a0bc16e1a62 WHIRLPOOL ebd74ab547ebf2cf16cd3ede1f103fb92a708b771451b34020ceba05537e9ec0a359a9ef007090e77c6948ce0323e2a46c9b1ea101965b021b54e5c821ebd640
EBUILD cholmod-1.6.0-r1.ebuild 2664 SHA256 bbabdc3141eb64963e98a29ae918abaf1c594fdad96b15124d3ab52166ee9512 SHA512 011f993789c033a231423b64cd9b4412abacd6bad32e56742cbebeb94a35b095688268fcb2dace8d280e1df8c3f86a9fb747788a9d7f92816b8ccd15bd5bbe6f WHIRLPOOL 2961bcf1f8b9e6bf821da845dd9f29c3eb44de46923157948e32f4a6a71ccbf69605e385eb87a77b313e99d75aa9643e9fb4f1ee0961f1f1a67540b8af5a3b2c
EBUILD cholmod-1.7.4.ebuild 2921 SHA256 513cfa4e8ad30a388b97641dc5e26ce894fbc5614812bf6886deb5b1c7c1804a SHA512 1388b9e3597e630e122bf4992be728a7207e64296f2900f36cc31649e05c57fe5d3335a9ae76ee35ccbb30d5ca282d8c32ed51f5a0369aab18dadddbf3405c19 WHIRLPOOL db5294e60d24c916140174f77b89ce076f14f1757f85d63a8137d1cbedc92fb87aab007b7e22150473bfa228fbde84d08841bd647452f096d33668d29186dda0
-EBUILD cholmod-2.0.1.ebuild 1784 SHA256 caea6ba8a4025050e02e6a0e238fe42e3c3e460cafe7a21bbd6867047950539c SHA512 a4c6bd3b94878453ef5a66456698d68cab604dd15b1816d6450547146076d90f2db66ec229c0101a881ae2b5c8928caa2fab88908b52729510f8a167c092f606 WHIRLPOOL 79398b28e8ca9cffe57cbd18ff2b04d5de942539a16c2e46e70516276d40eb8e42095a9435f4652a6e04278d8f2d4ac377ab2bb9e69019b85c871f2b4b0ed801
-MISC ChangeLog 4828 SHA256 c4a1c6d4b373bd3fcc985ceafcf865b9e67723d2754656a0b33039b2b1c3addd SHA512 bce0dd21422d287f3bcb088ddf6ebc7053176a0f5750026373e9cb8fbb0edfcefffe6974af06aef5c670ed9dd12684f24d01d32ab51bb05b5b2f556a3a2432cf WHIRLPOOL 21575afcda16695f35ae8b5b449f9b099cb79ef787a70ade03502b2513c4c0e4672372dcdcaa30a2c50b2547a444dad102c9c6fd21fac1ce84bd2bc66368eb35
+EBUILD cholmod-2.0.1.ebuild 1810 SHA256 e20a5026644d5efac940e9ed41f4018a927e4d3f56398089082f9b4c85008ac6 SHA512 66c23c27dbd2fa57449c721354c26329c2400723556fd0ce24591312725c8bae036704580967b63b3d5acfdde11781003e754bb6a3cfd7a7d8127eb0aac2f2c4 WHIRLPOOL 4c59e9f6c1674274a7adc75736aaf7155cf6f3e0454d8797161ad49e3b772a940346e09126d642792dd59a2341fa8d467c4a44b54f3bdd8dee9f2db8b27a77ae
+MISC ChangeLog 4979 SHA256 a45185e55c4802725caddbb2194c29807c4ab417350e5b7bccb4abca9acec82f SHA512 3660639de91884be744b96845563637cf32cda879f9d382c88549c6c9b5a13456aaad70fd34529995ca3ca941006478df46a90175df49157493c47dd1dd241cc WHIRLPOOL 9a37b3f82982ad49e7bdbbc275c08249d2fb47006259f147df50831953065f2173f4da69ae7eacd47105b38441ef54b8e2598cc6a522c327a04a64513a6578e9
MISC metadata.xml 586 SHA256 6b71b8acc78ac818c522e0d20b4acd086d483a74aaf70fcdd011391489313f82 SHA512 e400253318f847871934e10bc56d72b236df5d3ca7de9916b778c26b5817c57ab9bb07db0fe6f13412e6ba7c3cea8cb46d5539b6fa5a6ee023cee7a88087c283 WHIRLPOOL 6f78a2efea3f1bc83f579cfe1f36e90b3cd089249a210dbd78f30051079c57ba70e19303a8459bfb92b7efb1ab0454cbf0e779e9f47d7e638bfbf859698eb21a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCtZ8EACgkQ1ycZbhPLE2A/wQCdHAULIR5yfCIQSE+QN/99/Eq2
-nOIAoIbH7euS5Gbw9jlDtZBx2cDxGgvQ
-=eETt
+iEYEAREIAAYFAlDlFm8ACgkQ1ycZbhPLE2CU1gCePN5uo+ntlfZ1kMMei6j9w5xh
+jiYAnjsEPqLLfWTpCV7butwEpxniK5gJ
+=uCqu
-----END PGP SIGNATURE-----
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+=(