Version bump, switch to EAPI5 and new tar ball

Package-Manager: portage-2.2.01.22013-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 78 insertions, 7 deletions

diff --git a/sci-libs/cholmod/ChangeLog b/sci-libs/cholmod/ChangeLog
index b62a2ee39d9e..8d3d54be0535 100644
--- a/sci-libs/cholmod/ChangeLog
+++ b/sci-libs/cholmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cholmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.38 2013/04/10 06:06:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.39 2013/06/24 23:10:08 bicatali Exp $
+
+*cholmod-2.1.2 (24 Jun 2013)
+
+  24 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +cholmod-2.1.2.ebuild:
+  Version bump, switch to EAPI5 and new tar ball
 
   10 Apr 2013; Justin Lecher <jlec@gentoo.org> cholmod-2.0.1.ebuild:
   Fix typo for pkg-config usage
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 7e809d77abd8..61f8c0d2694c 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cholmod-1.7.4-debug.patch 435 SHA256 826b6e7f5fe50501ce7542bf264e043a454b1be268351a9de33546ef6e7344fc SHA512 7482b966d89012e565b05bc00f800149a81929a9bbca29890c8dc984ccfd9a34e78832a4dd3831995ee9d2439d64e3ddd68d8f8cef8f13263cf516980db0a4fc WHIRLPOOL f8e81a9011ec83baefe4e5ab83c973a4fa9b44dfb068adde2735ae8e187f74b52aaa61daca2ad697bf4ab30be34bcf82b4f46a14e88995fcffcc46fe67208b62
 AUX cholmod-1.7.4-parmetis32.patch 702 SHA256 fb8f2950c908d21ee649c16f8e26bbe5e37284c1417cf9b7f22e6f82532944f8 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc WHIRLPOOL ce45b6ad88acebba64df6209d12cfca54a22d7cee9b529b8f20d9f8d855dcdcda6d9485e110bac15b99a86af8b996fccedc0fd43f87bdff83a824d1c2cba1aa6
@@ -8,15 +8,17 @@ DIST CHOLMOD-1.7.4.tar.gz 1169002 SHA256 0cefc540d4e341afd614dfc107fe9f38afb504d
 DIST cholmod-1.6.0-autotools.patch.bz2 5388 SHA256 141762b6657924f52a557d8d79ea672dcc16a3f08022ac6b4f2ff3f5c895798e
 DIST cholmod-1.7.0-autotools.patch.bz2 5534 SHA256 901b83939ce09a51baa9431639d4fbebde1bfd70998b4b66d2753a91daed931c
 DIST cholmod-2.0.1.tar.gz 839977 SHA256 e2840fbc9d60182b19a865a39baaaf85e311cc678367f05b7edcf18dde9083ef SHA512 67b095b1ec2baba6ef542fd15c15d469844526c2ef832667bc0753cf278ffe65a951104df6127496c6cf1438d7edffb9d141cfe73e4c8588ab351a0bc16e1a62 WHIRLPOOL ebd74ab547ebf2cf16cd3ede1f103fb92a708b771451b34020ceba05537e9ec0a359a9ef007090e77c6948ce0323e2a46c9b1ea101965b021b54e5c821ebd640
+DIST cholmod-2.1.2.tar.bz2 656458 SHA256 eea80ad7b797866df1505feafa8c33279f6bc7e7e5aec4f00a167a0a0e73675f SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089 WHIRLPOOL 8f8f2c4f504f30905c442422042d0b3a203cb24ab289b51bdb4ee6606ca006eef3afb2611bcc6074c1532893caa5ec5a63e4c4d46d115e2528700d98b65dcb27
 EBUILD cholmod-1.6.0-r1.ebuild 2696 SHA256 d6a30f38f5da559076315c7706ed968e2e342c53fe1383ca012d57de22e63a43 SHA512 3b2d6fe65f454235496f9e4859595fbb91044610a3bb9ee364dc0bf3ee2e7cebb8fcbf0a360e7bd7cf9f4b4345c769842251a1bfb110d7ecb2151f29c59b0e2f WHIRLPOOL 97fccf9405b8ed93112674644f218f42a1dc2f3cba79ad99ea5ec61ce772a721705331017f2e0b49ac8890cc5a66a42bf8e2ae5d1a06caffb13c9a9abb935911
 EBUILD cholmod-1.7.4.ebuild 2954 SHA256 82de6c38f37324f2caaaa50d428b0db22249831d816d53449af85cd82d3acbc2 SHA512 6dc6bfa20bb8aa48484e4d7c9197e937429cf8d832a9a70f36c7ca9d67d1bc59ed9b45dcbc073e552953588c7c303e0934f6602b3e5769007153b33a41449be2 WHIRLPOOL fe935e296a48d5010cc3a772193dbf5e382c8fab8ddb8061528244423f2ed82fb2db7ce5acd193ca932e40bfbe2d8ecee2b3eb7d0f8931750e0d1042ecb4cc77
 EBUILD cholmod-2.0.1.ebuild 1808 SHA256 8cc64024f113ed1dee2f43b223e2b031dd649470f5ba9a291c2b8f706887e4d1 SHA512 ee6dc0d1422e1b93b3a44ef9c1e7a576e69e3ddccfec624193a5c4957e43b250d2943d3fb04eebd7394f6fbd8245a7d58f29817bf71742ce22fba5df51e83350 WHIRLPOOL f86ff3b0dbaaeb956d2d785b3c7b566fbec0b53e3ca30d3cff50e7c1049fe93bac17bd40d3ea2e42a00b098e8214be7c443940027aaaeb325097483876bf88d5
-MISC ChangeLog 5267 SHA256 d1d8f941c8290b39f87cff7c1b3fd4b7d8af7eb9fff3eb3596994c9b9b532355 SHA512 2f36980857dc931c795e9065e3c59e350739746236b2c7b8670f05f1929c2f49b2d7ef292ad67fe73e29e8ea1f3f3aa6e117b70eae69f976d0310bd30e1d4750 WHIRLPOOL c65aeea2b357ae0d40ae6b05a8eefa666d3dde90be7bff39505fe6cb9dbdaddc1513ebaa63d846d2d2c20908f00bce03936c5c0ce105a7c7a7d060c3dea3f050
+EBUILD cholmod-2.1.2.ebuild 1871 SHA256 5ddf3014b61ead0c748d9e7f6261654f138210975a3085105dd1714453236e43 SHA512 bcfe809fe4021732911f21b4967bc80a2fbc8a2fe232b4eee6c8bc9dbdf0b83e227cc9fdf4d41ae713457098c30b5569de2058241afaaf9ac594ab343ea8db90 WHIRLPOOL 703e1660fad49efd13b4af548dca0bd3d50d15cce0774fa68e19c17a2a7df9202c182920bacb3686f7d6c25da74de94a0ee290045a813e57e263d23ea5f70825
+MISC ChangeLog 5429 SHA256 942683cb74a629064243456e81d36cf44b42659a595c5e4f1cfd37f7d485f34a SHA512 fe71d15fecc9751d94252fa1f51e37699fbe33f971d705b085d419d3d6a8650ea7a163eb0930e1d7937cbe6efc90de35fa52822831b09d3a527d3a3ad4eda923 WHIRLPOOL 73370878ee2defd770933d5cf783e239c9b576a6544442faaed3e1402672a2706c4a70b2492d782d9c7a156ed83ea011bc4185e0dabdc153354038a569ffb947
 MISC metadata.xml 600 SHA256 cc4ad19e1aceca9ca09dc11a373941f51b582b39320151e4e20e178f587d43aa SHA512 51f25b694ee6a22738a0a6622f360792a89b0c6df97ad17c243bc95274c1d10e629e4d3c882a99943ec2b6db96443a2da87288365aff761eddb246e187f0dbbb WHIRLPOOL 6e63202d599828641afeb98dc7fe8f719105c48446f2f0fea6499b8d9318aa545196808cd39362d0e7042d65fbc42db7ca974dd3e2afe2e1b1a89ccc9a71d819
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlFlAVUACgkQgAnW8HDreRY1zQCdHEvDP7LUO90PozTbFJ0gIOB+
-nLMAnj7Y1aLovKEnPep/0BpQCwwqi/mF
-=wvAH
+iEYEAREIAAYFAlHI0dEACgkQ1ycZbhPLE2ARNgCgtJqUexG1UXdbbiw0t1OAvhky
+Cw8An34epeViG0+Wl1vfYRXiNF76wEeK
+=CSgH
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
new file mode 100644
index 000000000000..0d03363ba557
--- /dev/null
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -0,0 +1,64 @@
+# 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.1.2.ebuild,v 1.1 2013/06/24 23:10:08 bicatali Exp $
+
+EAPI=5
+
+inherit autotools-utils multilib toolchain-funcs
+
+DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
+HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod/"
+SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
+
+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 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 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+
+src_prepare() {
+	# bug #399483 does not build with parmetis-3.2
+	has_version "=sci-libs/parmetis-3.2*" && \
+		epatch "${FILESDIR}"/${PN}-1.7.4-parmetis32.patch
+}
+
+src_configure() {
+	local lapack_libs=no
+	local blas_libs=no
+	if use lapack; then
+		blas_libs=$($(tc-getPKG_CONFIG) --libs blas)
+		lapack_libs=$($(tc-getPKG_CONFIG) --libs lapack)
+	fi
+	local myeconfargs=(
+		--with-blas="${blas_libs}"
+		--with-lapack="${lapack_libs}"
+		$(use_with doc)
+		$(use_with !minimal modify)
+		$(use_with !minimal matrixops)
+		$(use_with !minimal partition)
+		$(use_with metis camd)
+		$(use_with metis partition)
+		$(use_with lapack supernodal)
+	)
+	if use cuda; then
+		myeconfargs+=(
+			--with-cuda
+			--with-cublas-libs="-L${EPREFIX}/opt/cuda/$(get_libdir) -lcublas"
+			--with-cublas-cflags="-I${EPREFIX}/opt/cuda/include"
+		)
+	fi
+	autotools-utils_src_configure
+}