Tar ball changed, dependence on metis is now through cholmod only

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

5 files changed, 20 insertions, 60 deletions

diff --git a/sci-libs/umfpack/ChangeLog b/sci-libs/umfpack/ChangeLog
index 118adce50f54..258a332279bd 100644
--- a/sci-libs/umfpack/ChangeLog
+++ b/sci-libs/umfpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/umfpack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.40 2012/11/19 22:51:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.41 2012/11/21 21:27:42 bicatali Exp $
+
+*umfpack-5.6.1-r1 (21 Nov 2012)
+
+  21 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> +umfpack-5.6.1-r1.ebuild,
+  -umfpack-5.5.1.ebuild, -umfpack-5.6.1.ebuild, metadata.xml:
+  Tar ball changed, dependence on metis is now through cholmod only
 
   19 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> umfpack-5.6.1.ebuild:
   cholmod only needed with metis
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 0c0b78101e59..46850b405dad 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -4,19 +4,17 @@ Hash: SHA256
 AUX 5.5.1-autotools.patch 19071 SHA256 3d45dfdb89d6eb7b2eed1dabda7a16f406491916735f9237e41758f11e869cc8 SHA512 57336b3735956a9b1465bc93fe79f65f473be86262c5eb13c9d13985b88fb67a79528b4786c13966824635e106de1723805f7fcca4f0d6929c8eaaecacc47d47 WHIRLPOOL 074c316dfeacc3e488aef10669b8afad87c40a127301ecb80dd94d7684b7e20b768f033c156a971f08945b74c5304fbe1a29411fb8c69c3d267e5248c8b4ed91
 AUX umfpack-5.2.0-autotools.patch 18317 SHA256 1fc1b6465d73582e61c0782b2d44f3b4e0f73ff22de9f65ffcdfc537c04d1452 SHA512 1b6f53c7d4d53a0cdca754c69d56002c5c1461b2cf48c72b673f5de801b52dec9f14e5ec6fd523ff2601ee326d532e78dea045fc280cea7c92d473eb6c9b0b28 WHIRLPOOL d9a692611d907b20a42a024b6cb692d20f46b98956b5674538ba4c38e57fec2956daaed5cef76c9fedf67bd33a2c0b6181b5f110b5bc508e169cc8613396392f
 DIST UMFPACK-5.2.0.tar.gz 1122066 SHA256 cdf1061c551625f7d572f6f887bad978b4e0e90c6e448a08013ba72c95691c1c SHA512 cd9186ae4feb5c935883ec149c7cdccce980d383bcec33a40d96bd3bc7e0a10ea9d80e678eb689f5eb495acdd320bbee97593a06d1211f05a0ec4a188045939d WHIRLPOOL 9a790a8f5170f0b42bbc75e75c8a2ff851c697276be4865f8edb6e33842df7d78bece6f115eed599c3b64fd489d68a51d4899c98ded683d4ed8edbb3151dfd70
-DIST UMFPACK-5.5.1.tar.gz 1306153 SHA256 79526b74d31aa3630a62bf4cf587b04b8b949837c2a357a4e99c61932475cb50
 DIST UMFPACK-5.5.2.tar.gz 1302074 SHA256 4a6fec454671ea5619bfaaa913ad6e37e37ca3361ba717eba2740d5df4d06a3f SHA512 9ee3c6e9db894793bfc9425f3da39e7052d4783c27db5b2cb5b8d7b0d8d29da44f056153d9493b0d7c9abb35c483366657595f52ad0ae53fee146248be0648a8 WHIRLPOOL 479d8d0e04c70b656d1c286c68cc558469e6b5e9255593d94d6c87700fddf5e7cbea99123dff7ae14e9c4030a6be0c5b6d616bfb624622b18c428222d03fe144
-DIST umfpack-5.6.1.tar.gz 983602 SHA256 e7b4ee6eb2f957330fd25a1cba52d672a0db654cf507adb21a517d53358286dd SHA512 0ea6a70daaeb8862d5f51fee0802b85b0c9b8e503a69db16d9fd751b7c8191471faa502edc53d42ec490aa1c39ee3e8a09f72a9879da6c573d8542932747aee1 WHIRLPOOL 8e6f7e55891fc66c03513e69ca6c7cc4c5533bad03b49e30196831d1a93fed364d5ecae650dccf82d25a362640a4bee167b9af2c2f142a3ddf484ea2b48ce139
+DIST umfpack-5.6.1.tar.gz 985172 SHA256 4fb347da5880c51008c305f158debb0525c43737259c78bb25a683cb32919a1d SHA512 cf528e078f17cfe66dd29a676b5b1a28583ae8bb48f617dfb1fe009372547e7b131e3c7e65442bb2981843f3cb8e6cdb7c5e4779e59897ef70a211f56fd20bc6 WHIRLPOOL da4e6bcbca8a083079c9cebfbdd9377f39c944ba8d17b9cbae79035212a080311e2ad6f76bef7e52995d9bd76062ab5bec8723b74476e4c6a4ebe8d0e7cf1cee
 EBUILD umfpack-5.2.0.ebuild 1090 SHA256 66bb7e16f85f76c39e06424786f2cca87476b9f30d3f66669858ea787fb60804 SHA512 b749baf6dc7bbd8ce2a42bd986f478cd39508a1a25640404c1f92cac5715681949ca2f3e998de2052d11e51033e0b4173d4a01e6b3b92b0d7c9586e935d89a8b WHIRLPOOL b573d7fbd1fee8e7e7ee704392ef6c8361023aad9f48046696de4c9cbf35e69af5cd5baaf2832ce8b979b3e165f787a93c869ff689c9d2b913f4f40150adad1d
-EBUILD umfpack-5.5.1.ebuild 1073 SHA256 203d0350a764664d3dc76a159f5be601dbf741afd0c241ba0184d416b283c62f SHA512 dded2eb7a26e217749164cb5b0aee57fdf7262f99da8d8c59d85905a8608353a81dc3758ad9314cf3b5bb57e0f1b40f9f34b7a2491c77896833550e93291231c WHIRLPOOL 8afa9aeff06769270bfb2bd41d1bd4d3572d5b2e8f5442c11e5637d04b171b491419707714cf804d9aeaf48b285e1bca7bc32bfa92ea67d98eec1726c92d58dc
 EBUILD umfpack-5.5.2.ebuild 1117 SHA256 3cb3123a164e4c52c6861c08ccd74a168d34eed80b7789593e5247ea199ccacb SHA512 b2bc893b5aef9f72c89a4261766334cc6d60b7be74dfc6b487771582124d10bc2dfb63e50ba8b9a467beecaea45dda81e4b6f33dff14be5b4b873e39a4ce2bf0 WHIRLPOOL 42d18290f46c39f26d2afb834046b53207d13ac9190b5c30acf823ee63e56916859ee55f52362798bd13c7a6c155038f53b6d862f59ac7ad76d7377446fccdc7
-EBUILD umfpack-5.6.1.ebuild 949 SHA256 4a0a034e78f55144d12c05438ea9f039f2d1a30b79c19929bfd8bb9d0aec46f5 SHA512 6dbd41efbfc63af2d4e0bfaa4a521c1ec127d46e5580833d8be9d424849e10835e7689fbf722b6eb136bacc8ce26aa0be9942a2f73c7f32b8a683fafbc52a749 WHIRLPOOL bed1e9556761c75a842aa7133596cb80b3404cc002293e14f0d3b434d343e4d3f47a7c16e7972b0e6a66e4d7029d8dec52d2fed3881143f7f5492f7986c3a43e
-MISC ChangeLog 5913 SHA256 c7ce25510dc221a9ce55b5c1fe6b1f622afd21293601029763dff4ca14b91121 SHA512 fc9e03ba2c1a273857e751de43491bfb0428db7e77973d46e4539920f73f97f3a4df39f67084e17261988ebc1e895b759c562dd732d7a322a86aaa80200cb3b9 WHIRLPOOL 27215eae6c63f4c40dec4e57889261c92d33cda06c5c9f7456028b72bcd67c4024ee599c0c9a734160275943637f82e732296e33b39c717c498f151903fbb8ea
-MISC metadata.xml 568 SHA256 def6df08df43dde1f9e0368e61b7ba62cb6b67ef89ec9a617ab6fb8aaa4aa2cc SHA512 e91852793d0c6bbe97b424dd7bed0225eb0606be3ad87a5aff1ae54bd2505665dfd4bba76d7fa9faeb840ea6a163a5d4a799c5e9b10fcdc1ba1649c562a3ae94 WHIRLPOOL 77da35eba6e3c4be240baceacab283c598a13c0009e6cd559119e2316d692fc0821695b5b135a7cca63075ad3bc04e3bf055460ed228fecb3fb2c21a69ef1ac4
+EBUILD umfpack-5.6.1-r1.ebuild 945 SHA256 87707d2f8031f52f8ae7632925481d099cc9d28bb9dac1b99e603d2d400c6d7a SHA512 0d139c23713a6046fadb11ec0d556c9121e1642b07182940035b841f4ff291d5fee956cba21322266b2d1191259cc012b577ae27356dcfc49c582f229e1a48af WHIRLPOOL e32c84f44f88160dddd717ca037e145efa0d4043cfd3eddc42895f013313f07623745561e9be557356fc409da9cecbcc25f4270d4186d102c92e71a398559d00
+MISC ChangeLog 6158 SHA256 22b73ffc80673fcd0a593411531fc6dae443c72a4eb1769b44902312961580d6 SHA512 66d3db000b8a0c44cb0a3e557a4ca3cb7eaa98c51d88718707714f92a41f1a399ea5d552dd08e342dee30ebacd588f3bf0cee28122ffa732f54ca6a9341737b3 WHIRLPOOL 14fec90fe06faf51b1213d2e407f88c24d5870182e1697963d5995071e4573f15eaba35b2773193c45a897c117e52d3369bab1d7b2b330d1d4bf509389f6722f
+MISC metadata.xml 555 SHA256 d7ae6a2f50469de402021c5fe14b8d1f57ac32dfe975c99ff9532015b891bc6c SHA512 8e886c644ab090a6bda4e9020d17d2d4490ea0e3a03d068314546527cab0f197e1761d8833220564fd9ca176baf58038e1d2fa03bf7546bf6356c76e61e23363 WHIRLPOOL 6b4910ca7212509ab292f57c18cbe64b55e305a93ac88c9980d7d289f94855e24f1ef334755f4a6e11969c0816b7f10ab8f05c40afc8558463bfb8abf8e6f0af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCqt+kACgkQ1ycZbhPLE2D+XwCgno7X6fEcl9qn1RFCQTykuToA
-cQMAoKlYvSLBTG0JyqqPA+k7TfzuYGtr
-=2wZQ
+iEYEAREIAAYFAlCtR1IACgkQ1ycZbhPLE2CaZgCggVZf48dyoIUO5FqKfQn2702w
+Pw8An2knYjXgGajM7hkxxsoq9ShxQfbb
+=wHNZ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/umfpack/metadata.xml b/sci-libs/umfpack/metadata.xml
index ce54cbd66619..b6c65e40a571 100644
--- a/sci-libs/umfpack/metadata.xml
+++ b/sci-libs/umfpack/metadata.xml
@@ -9,6 +9,6 @@
   MATLAB routines are not included in the Gentoo package.
 </longdescription>
 <use>
-  <flag name="metis">Use METIS via CHOLMOD(<pkg>sci-libs/cholmod</pkg>) for partitioning</flag>
+  <flag name="cholmod">Use <pkg>sci-libs/cholmod</pkg> for matrrix ordering</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-libs/umfpack/umfpack-5.5.1.ebuild b/sci-libs/umfpack/umfpack-5.5.1.ebuild
deleted file mode 100644
index e55dd2b5c7e5..000000000000
--- a/sci-libs/umfpack/umfpack-5.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.5.1.ebuild,v 1.7 2012/10/16 19:17:03 jlec Exp $
-
-EAPI=4
-
-inherit autotools eutils fortran-2
-
-MY_PN=UMFPACK
-
-DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/umfpack"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc metis static-libs"
-
-RDEPEND="
-	virtual/blas
-	sci-libs/amd
-	metis? ( sci-libs/cholmod[metis] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-blas="$(pkg-config --libs blas)" \
-		$(use_enable static-libs static) \
-		$(use_with metis cholmod)
-}
-
-src_install() {
-	default
-	dodoc README.txt Doc/ChangeLog
-	use doc && dodoc Doc/*.pdf
-}
diff --git a/sci-libs/umfpack/umfpack-5.6.1.ebuild b/sci-libs/umfpack/umfpack-5.6.1-r1.ebuild
index dde07926eda1..744ea329dc9b 100644
--- a/sci-libs/umfpack/umfpack-5.6.1.ebuild
+++ b/sci-libs/umfpack/umfpack-5.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.6.1.ebuild,v 1.8 2012/11/19 22:51:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.6.1-r1.ebuild,v 1.1 2012/11/21 21:27:42 bicatali Exp $
 
 EAPI=4
 
@@ -13,22 +13,23 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc metis static-libs"
+IUSE="doc +cholmod static-libs"
 
 RDEPEND="
 	>=sci-libs/amd-1.3
 	sci-libs/suitesparseconfig
 	virtual/blas
-	metis? ( >=sci-libs/cholmod-2[metis] )"
+	cholmod? ( >=sci-libs/cholmod-2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( virtual/latex-base )"
 
+
 src_configure() {
 	local myeconfargs+=(
 		--with-blas="$(pkg-config --libs blas)"
 		$(use_with doc)
-		$(use_with metis cholmod)
+		$(use_with cholmod)
 	)
 	autotools-utils_src_configure
 }