Ebuild cleaning, make sure metis is linked

(Portage version: 2.1.10.10/cvs/Linux x86_64)

5 files changed, 29 insertions, 125 deletions

diff --git a/sci-libs/umfpack/ChangeLog b/sci-libs/umfpack/ChangeLog
index d7d1ac295848..43fe15ce695c 100644
--- a/sci-libs/umfpack/ChangeLog
+++ b/sci-libs/umfpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/umfpack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.24 2011/06/21 14:45:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.25 2011/08/04 17:36:44 bicatali Exp $
+
+  04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/5.5.1-autotools.patch, -umfpack-5.4.0.ebuild, -umfpack-5.5.0.ebuild,
+  -files/umfpack-5.5.0-autotools.patch, umfpack-5.5.1.ebuild:
+  Ebuild cleaning, make sure metis is linked
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> umfpack-5.2.0.ebuild,
   umfpack-5.4.0.ebuild, umfpack-5.5.0.ebuild, umfpack-5.5.1.ebuild:
diff --git a/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch b/sci-libs/umfpack/files/5.5.1-autotools.patch
index 3da771940d66..645ea56f27fd 100644
--- a/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch
+++ b/sci-libs/umfpack/files/5.5.1-autotools.patch
@@ -1,6 +1,5 @@
-diff -Nur UMFPACK.orig/acx_blas.m4 UMFPACK/acx_blas.m4
---- UMFPACK.orig/acx_blas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/acx_blas.m4	2010-05-16 16:36:04.000000000 +0100
+--- acx_blas.m4	1970-01-01 01:00:00.000000000 +0100
++++ acx_blas.m4	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,191 @@
 +##### http://autoconf-archive.cryp.to/acx_blas.html
 +#
@@ -193,13 +192,12 @@ diff -Nur UMFPACK.orig/acx_blas.m4 UMFPACK/acx_blas.m4
 +        $2
 +fi
 +])dnl ACX_BLAS
-diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac
---- UMFPACK.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/configure.ac	2010-05-16 16:37:29.000000000 +0100
-@@ -0,0 +1,45 @@
+--- configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2010-05-16 16:37:29.000000000 +0100
+@@ -0,0 +1,47 @@
 +#                                               -*- Autoconf -*-
 +AC_PREREQ(2.59)
-+AC_INIT(umfpack, 5.5.0, davis@cise.ufl.edu)
++AC_INIT(umfpack, 5.5.1, davis@cise.ufl.edu)
 +AC_CONFIG_SRCDIR([Source/umf_solve.c])
 +AM_INIT_AUTOMAKE([foreign])
 +AC_PROG_INSTALL
@@ -228,9 +226,11 @@ diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac
 +       PKG_CHECK_MODULES([metis], [metis])
 +    else
 +	AC_CHECK_HEADERS(metis.h)
-+    	AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
++    	AC_CHECK_LIB(metis, METIS_NodeND, [metis_LIBS=-lmetis], \
 +		[AC_MSG_ERROR([CHOLMOD needs metis. Cannot find libmetis])])
 +    fi
++    LIBS="${LIBS} ${metis_LIBS}"
++    CPPFLAGS="${CPPFLAGS} ${metis_CFLAGS}"
 +else
 +    AC_DEFINE(NCHOLMOD)
 +fi
@@ -242,9 +242,8 @@ diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac
 +		 Demo/Makefile	
 +		 Makefile])
 +AC_OUTPUT
-diff -Nur UMFPACK.orig/Demo/Makefile.am UMFPACK/Demo/Makefile.am
---- UMFPACK.orig/Demo/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Demo/Makefile.am	2010-05-16 16:36:04.000000000 +0100
+--- Demo/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ Demo/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,44 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/Include
 +LDADD = $(top_builddir)/Source/libumfpack.la
@@ -290,9 +289,8 @@ diff -Nur UMFPACK.orig/Demo/Makefile.am UMFPACK/Demo/Makefile.am
 +		echo "*** ERROR: $$failed/$$total tests failed!!!"; \
 +		echo "Please check the failures before reporting"; \
 +	fi
-diff -Nur UMFPACK.orig/Include/Makefile.am UMFPACK/Include/Makefile.am
---- UMFPACK.orig/Include/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Include/Makefile.am	2010-05-16 16:36:04.000000000 +0100
+--- Include/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ Include/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,34 @@
 +include_HEADERS = \
 +	umfpack.h \
@@ -328,15 +326,13 @@ diff -Nur UMFPACK.orig/Include/Makefile.am UMFPACK/Include/Makefile.am
 +	umfpack_transpose.h \
 +	umfpack_triplet_to_col.h \
 +	umfpack_wsolve.h
-diff -Nur UMFPACK.orig/Makefile.am UMFPACK/Makefile.am
---- UMFPACK.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Makefile.am	2010-05-16 16:36:04.000000000 +0100
+--- Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,2 @@
 +SUBDIRS = Source Include Demo
 +EXTRA_DIST = README.txt
-diff -Nur UMFPACK.orig/Source/Makefile.am UMFPACK/Source/Makefile.am
---- UMFPACK.orig/Source/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Source/Makefile.am	2010-05-16 16:36:04.000000000 +0100
+--- Source/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ Source/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,221 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/Include
 +lib_LTLIBRARIES = libumfpack.la
diff --git a/sci-libs/umfpack/umfpack-5.4.0.ebuild b/sci-libs/umfpack/umfpack-5.4.0.ebuild
deleted file mode 100644
index c20d941d1090..000000000000
--- a/sci-libs/umfpack/umfpack-5.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.4.0.ebuild,v 1.4 2011/06/21 14:45:09 jlec Exp $
-
-EAPI=2
-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"
-RDEPEND="
-	virtual/fortran
-	virtual/blas
-	sci-libs/amd"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.2.0-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-blas="$(pkg-config --libs blas)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/*.pdf || die "doins failed"
-	fi
-}
diff --git a/sci-libs/umfpack/umfpack-5.5.0.ebuild b/sci-libs/umfpack/umfpack-5.5.0.ebuild
deleted file mode 100644
index 2a5cbd1d0331..000000000000
--- a/sci-libs/umfpack/umfpack-5.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.5.0.ebuild,v 1.4 2011/06/21 14:45:09 jlec Exp $
-
-EAPI=2
-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/fortran
-	virtual/blas
-	sci-libs/amd
-	metis? ( sci-libs/cholmod[metis] )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PN}-5.5.0-autotools.patch
-	cd "${S}"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-blas="$(pkg-config --libs blas)" \
-		$(use_enable static-libs static) \
-		$(use_with metis cholmod)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/*.pdf || die "doins failed"
-	fi
-}
diff --git a/sci-libs/umfpack/umfpack-5.5.1.ebuild b/sci-libs/umfpack/umfpack-5.5.1.ebuild
index 884468c8dbbd..72fb560562e7 100644
--- a/sci-libs/umfpack/umfpack-5.5.1.ebuild
+++ b/sci-libs/umfpack/umfpack-5.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.3 2011/06/21 14:45:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.5.1.ebuild,v 1.4 2011/08/04 17:36:44 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils fortran-2
 
 MY_PN=UMFPACK
@@ -26,9 +26,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}"
 
 src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PN}-5.5.0-autotools.patch
-	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-autotools.patch
 	eautoreconf
 }
 
@@ -40,10 +38,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/*.pdf || die "doins failed"
-	fi
+	default
+	dodoc README.txt Doc/ChangeLog
+	use doc && dodoc Doc/*.pdf
 }