4 files changed, 13 insertions, 51 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/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
 }