umfpack/umfpack-4.4.ebuild: changed doc behaviour and removed harcoded -j1

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@67 32389bae-6d03-0410-99cf-db05cde120eb

1 files changed, 39 insertions, 22 deletions

diff --git a/sci-libs/umfpack/umfpack-4.4.ebuild b/sci-libs/umfpack/umfpack-4.4.ebuild
index e58855307..204c99c7a 100644
--- a/sci-libs/umfpack/umfpack-4.4.ebuild
+++ b/sci-libs/umfpack/umfpack-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,6 +10,7 @@ MY_PN="`echo \"${PN}\" | tr a-z A-Z`"
 DESCRIPTION="Library for unsymmetric sparse linear algebra using the Unsymmetric MultiFrontal method"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/${PN}/"
 SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PV}/${MY_PN}${MY_PV}.tar.gz"
+# licence in tar file
 LICENSE="UMFPACK"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -19,35 +20,51 @@ DEPEND="blas? ( virtual/blas )"
 S="${WORKDIR}/${MY_PN}${MY_PV}"
 
 src_compile() {
-	local MYCONFIG="-DNBLAS"
-	local MYLIB="-lm"
-	local MYCFLAGS=${CFLAGS}
+
+	MYCONFIG="-DNBLAS"
+	MYLIB="-lm"
+	MYCFLAGS=${CFLAGS}
+
 	if use blas; then 
 		MYCFLAGS="${MYCFLAGS} $(blas-config --cflags)"
 		MYCONFIG="-DCBLAS" 
 		MYLIB="${MYLIB} $(blas-config --clibs)"
 	fi
 
-	cd ${MY_PN}
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CFLAGS="${MYCFLAGS}" \
-		LIB="${MYLIB}" \
-		CONFIG="${MYCONFIG}" lib || die "emake failed"
+	# upstream Makefile forbids to use parallell builds.
+	# given its simplicity, we reproduce it here
+
+	for udir in {AMD,UMFPACK}/Source; do
+		emake \
+			CC="$(tc-getCC)" \
+			CFLAGS="${MYCFLAGS}" \
+			LIB="${MYLIB}" \
+			CONFIG="${MYCONFIG}" -C ${udir} || die "emake in compile failed"
+	done
+}
+
+src_test() {
+
+	for udir in {AMD,UMFPACK}/Demo; do
+		emake \
+			CC="$(tc-getCC)" \
+			CFLAGS="${MYCFLAGS}" \
+			LIB="${MYLIB}" \
+			CONFIG="${MYCONFIG}" -C ${udir} || die "emake in test failed"
+	done
 }
 
 src_install() {
-	dolib.a {AMD,UMFPACK}/Lib/*.a
+	dolib.a {AMD,UMFPACK}/Lib/*.a || die "dolib failed"
 	insinto /usr/include/umfpack
-	doins {AMD,UMFPACK}/Include/*.h
-	docinto amd
-	dodoc AMD/ChangeLog
-	docinto umfpack
-	dodoc UMFPACK/ChangeLog
-	if use doc; then
-		insinto /usr/share/doc/${PF}/amd
-		doins AMD/Doc/*.pdf
-		insinto /usr/share/doc/${PF}/umfpack
-		doins UMFPACK/Doc/*.pdf
-	fi
+	doins {AMD,UMFPACK}/Include/*.h  || die "doins failed"
+
+	dodoc README.txt
+	for udir in {AMD,UMFPACK}; do
+	 	docinto ${udir}
+		dodoc ${udir}/README.txt
+		docinto ${udir}/Doc
+		dodoc ${udir}/Doc/ChangeLog
+		use doc && dopdf ${udir}/Doc/*.pdf
+	done
 }