sci-libs/cholmod: Drop unnessecary die

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 21 insertions, 15 deletions

diff --git a/sci-libs/cholmod/ChangeLog b/sci-libs/cholmod/ChangeLog
index 854e1754ef81..03d2b86e70a7 100644
--- a/sci-libs/cholmod/ChangeLog
+++ b/sci-libs/cholmod/ChangeLog
@@ -1,6 +1,10 @@
 # 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.28 2012/03/13 04:15:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.29 2012/04/25 17:51:13 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> cholmod-1.6.0-r1.ebuild,
+  cholmod-1.7.4.ebuild:
+  Drop unnessecary die
 
   13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -cholmod-1.7.1.ebuild,
   -cholmod-1.7.3.ebuild, cholmod-1.7.4.ebuild,
diff --git a/sci-libs/cholmod/cholmod-1.6.0-r1.ebuild b/sci-libs/cholmod/cholmod-1.6.0-r1.ebuild
index 56beeb7f1866..fdbec8bb34fc 100644
--- a/sci-libs/cholmod/cholmod-1.6.0-r1.ebuild
+++ b/sci-libs/cholmod/cholmod-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.6.0-r1.ebuild,v 1.15 2010/07/09 10:16:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.6.0-r1.ebuild,v 1.16 2012/04/25 17:51:13 jlec Exp $
 
 inherit autotools eutils
 
@@ -8,7 +8,8 @@ MY_PN=CHOLMOD
 
 DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz
+SRC_URI="
+	http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz
 	mirror://gentoo/${P}-autotools.patch.bz2"
 
 LICENSE="LGPL-2.1 GPL-2"
@@ -16,16 +17,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc metis minimal supernodal"
 
-RDEPEND="supernodal? ( virtual/lapack )
+RDEPEND="
 	sci-libs/amd
 	sci-libs/colamd
-	metis? ( sci-libs/camd
-			 sci-libs/ccolamd
-			 || ( sci-libs/metis sci-libs/parmetis ) )"
+	metis? (
+		sci-libs/camd
+		 sci-libs/ccolamd
+		 || ( sci-libs/metis sci-libs/parmetis ) )
+	supernodal? ( virtual/lapack )"
 
 DEPEND="${RDEPEND}
-	supernodal? ( dev-util/pkgconfig )
-	metis? ( dev-util/pkgconfig )"
+	metis? ( dev-util/pkgconfig )
+	supernodal? ( dev-util/pkgconfig )"
 
 S="${WORKDIR}/${MY_PN}"
 
@@ -70,8 +73,7 @@ src_compile() {
 		$(use_enable supernodal mod-supernodal) \
 		$(use_enable !minimal mod-modify) \
 		$(use_enable !minimal mod-matrixops) \
-		$(use_enable metis mod-partition) \
-		|| die "econf failed"
+		$(use_enable metis mod-partition)
 	emake || die "emake failed"
 }
 
diff --git a/sci-libs/cholmod/cholmod-1.7.4.ebuild b/sci-libs/cholmod/cholmod-1.7.4.ebuild
index fc1043bbe1ae..73f3594520e1 100644
--- a/sci-libs/cholmod/cholmod-1.7.4.ebuild
+++ b/sci-libs/cholmod/cholmod-1.7.4.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/cholmod/cholmod-1.7.4.ebuild,v 1.3 2012/03/13 04:15:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.4.ebuild,v 1.4 2012/04/25 17:51:13 jlec Exp $
 
 EAPI=4
 
@@ -68,7 +68,7 @@ src_prepare() {
 		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NPARTITION 1\n:}' \
 		Include/cholmod_config.h
 	fi
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
@@ -78,7 +78,7 @@ src_configure() {
 		blas_libs=$(pkg-config --libs blas)
 		lapack_libs=$(pkg-config --libs lapack)
 	fi
-	myeconfargs+=(
+	local myeconfargs+=(
 		--with-blas="${blas_libs}"
 		--with-lapack="${lapack_libs}"
 		$(use_enable supernodal mod-supernodal)