sys-cluster/hpl: Add missing dep on virtual/pkgconfig; use pc config to detect blas/lapack

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 93 insertions, 14 deletions

diff --git a/sys-cluster/hpl/ChangeLog b/sys-cluster/hpl/ChangeLog
index 4e252477a536..7d9384b52932 100644
--- a/sys-cluster/hpl/ChangeLog
+++ b/sys-cluster/hpl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/hpl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.18 2011/02/01 21:44:39 jsbronder Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.19 2013/02/27 15:57:37 jlec Exp $
+
+*hpl-2.0-r2 (27 Feb 2013)
+
+  27 Feb 2013; Justin Lecher <jlec@gentoo.org> hpl-2.0-r1.ebuild,
+  +hpl-2.0-r2.ebuild, metadata.xml:
+  Add missing dep on virtual/pkgconfig; use pc config to detect blas/lapack
 
   01 Feb 2011; Justin Bronder <jsbronder@gentoo.org> hpl-2.0-r1.ebuild:
   Bump EAPI thanks to scarabeus.
diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
index 315555ab3cc3..f50d003120be 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -1,32 +1,40 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild,v 1.2 2011/02/01 21:44:39 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild,v 1.3 2013/02/27 15:57:37 jlec Exp $
 
 EAPI=4
-inherit eutils
+
+inherit eutils multilib
 
 DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers"
 HOMEPAGE="http://www.netlib.org/benchmark/hpl/"
 SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
-LICENSE="HPL"
+
 SLOT="0"
+LICENSE="HPL"
 KEYWORDS="~x86 ~amd64"
-
 IUSE="doc"
-DEPEND="virtual/mpi
+
+RDEPEND="
 	virtual/blas
-	virtual/lapack"
-RDEPEND="${DEPEND}"
+	virtual/lapack
+	virtual/mpi"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
-	cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86
+	local a=""
+	local locallib="${EPREFIX}/usr/$(get_libdir)/lib"
+	local localblas="$(for i in $($(tc-getPKG_CONFIG) --libs-only-l blas lapack);do a="${a} ${i/-l/${locallib}}.so "; done; echo ${a})"
+
+	cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 || die
 	sed -i \
 		-e "/^TOPdir/s,= .*,= ${S}," \
 		-e '/^HPL_OPTS\>/s,=,= -DHPL_DETAILED_TIMING -DHPL_COPY_L,' \
 		-e '/^ARCH\>/s,= .*,= gentoo_hpl_fblas_x86,' \
 		-e '/^MPdir\>/s,= .*,=,' \
 		-e '/^MPlib\>/s,= .*,=,' \
-		-e "/^LAlib\>/s,= .*,= /usr/$(get_libdir)/libblas.so /usr/$(get_libdir)/liblapack.so," \
+		-e "/^LAlib\>/s,= .*,= ${localblas}," \
 		-e '/^LINKER\>/s,= .*,= mpicc,' \
 		-e '/^CC\>/s,= .*,= mpicc,' \
 		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
@@ -34,7 +42,7 @@ src_prepare() {
 }
 
 src_compile() {
-	# parallel make failure — bug #321539
+	# parallel make failure bug #321539
 	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
 }
 
diff --git a/sys-cluster/hpl/hpl-2.0-r2.ebuild b/sys-cluster/hpl/hpl-2.0-r2.ebuild
new file mode 100644
index 000000000000..7aec0ca0be7c
--- /dev/null
+++ b/sys-cluster/hpl/hpl-2.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r2.ebuild,v 1.1 2013/02/27 15:57:37 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib
+
+DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers"
+HOMEPAGE="http://www.netlib.org/benchmark/hpl/"
+SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="HPL"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	virtual/mpi"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	local a=""
+	local locallib="${EPREFIX}/usr/$(get_libdir)/lib"
+	local localblas="$(for i in $($(tc-getPKG_CONFIG) --libs-only-l blas lapack);do a="${a} ${i/-l/${locallib}}.so "; done; echo ${a})"
+
+	cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 || die
+	sed -i \
+		-e "/^TOPdir/s,= .*,= ${S}," \
+		-e '/^HPL_OPTS\>/s,=,= -DHPL_DETAILED_TIMING -DHPL_COPY_L,' \
+		-e '/^ARCH\>/s,= .*,= gentoo_hpl_fblas_x86,' \
+		-e '/^MPdir\>/s,= .*,=,' \
+		-e '/^MPlib\>/s,= .*,=,' \
+		-e "/^LAlib\>/s,= .*,= ${localblas}," \
+		-e '/^LINKER\>/s,= .*,= mpicc,' \
+		-e '/^CC\>/s,= .*,= mpicc,' \
+		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
+		Make.gentoo_hpl_fblas_x86 || die
+}
+
+src_compile() {
+	# parallel make failure bug #321539
+	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
+}
+
+src_install() {
+	dobin bin/gentoo_hpl_fblas_x86/xhpl
+	dolib lib/gentoo_hpl_fblas_x86/libhpl.a
+	dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING \
+		bin/gentoo_hpl_fblas_x86/HPL.dat
+	doman man/man3/*.3
+	if use doc; then
+		dohtml -r www/*
+	fi
+}
+
+pkg_postinst() {
+	einfo "Remember to copy /usr/share/hpl/HPL.dat to your working directory"
+	einfo "before running xhpl.  Typically one may run hpl by executing:"
+	einfo "\"mpiexec -np 4 /usr/bin/xhpl\""
+	einfo "where -np specifies the number of processes."
+}
diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index 348e6c4de815..081af556e9a2 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+  <herd>cluster</herd>
 </pkgmetadata>