[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Andrew Savchenko]

commit:     cc48bc0ad688ed446d0a2c5ed538659c7e83e189
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Nov 27 20:34:23 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Nov 27 20:34:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cc48bc0a

hpl: fix build with MKL blas and/or lapack libraries

---
 sys-cluster/hpl/ChangeLog      | 16 ++++++++++++++++
 sys-cluster/hpl/hpl-2.1.ebuild |  3 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/hpl/ChangeLog b/sys-cluster/hpl/ChangeLog
index 9a1784a..2c18ce8 100644
--- a/sys-cluster/hpl/ChangeLog
+++ b/sys-cluster/hpl/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Nov 2013; Andrew Savchenko <bircoph@gmail.com> hpl-2.1.ebuild:
+  Fix build failure with MKL used for blas and lapack
+
+  Ebuild stripped -L$path and -l from pkg-config output for blas and
+  lapack. This works fine for atlas, gotoblas2, openblas, eigen or reference
+  implementations — for all those installing libraries directly to
+  /usr/lib/. But MKL is different and is installed to /opt/...
+  outside of gcc default library path. That's why build with MKL
+  failed and is fixed now. (I also checked that other implementations
+  build fine.)
+
+  I have no idea why -L$path and -l were stripped originally,
+  probably because they may contain coma symbols which will broke
+  original sed script. This is fixed by switching to another sed
+  delimiter sign.
+
 *hpl-2.1 (29 Jun 2013)
 
   29 Jun 2013; Andrew Savchenko <bircoph@gmail.com> +hpl-2.1.ebuild:

diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild
index ac06624..65c09f1 100644
--- a/sys-cluster/hpl/hpl-2.1.ebuild
+++ b/sys-cluster/hpl/hpl-2.1.ebuild
@@ -26,7 +26,6 @@ src_prepare() {
 	local mpicc_path="$(mpi_pkg_cc)"
 	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 \
@@ -35,7 +34,7 @@ src_prepare() {
 		-e '/^ARCH\>/s,= .*,= gentoo_hpl_fblas_x86,' \
 		-e '/^MPdir\>/s,= .*,=,' \
 		-e '/^MPlib\>/s,= .*,=,' \
-		-e "/^LAlib\>/s,= .*,= ${localblas}," \
+		-e "/^LAlib\>/s%= .*%= $($(tc-getPKG_CONFIG) --libs blas lapack)%" \
 		-e "/^LINKER\>/s,= .*,= ${mpicc_path}," \
 		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
 		-e "/^CCFLAGS\>/s|= .*|= \$(HPL_DEFS) ${CFLAGS}|" \

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Aisha Tammy]

commit:     ad9ae04669682cf6c0a78070f46e8e5e101e612e
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sat Oct 10 01:26:01 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sat Oct 10 01:26:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ad9ae046

sys-cluster/hpl: drop package

present in ::gentoo

Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sys-cluster/hpl/hpl-2.0-r1.ebuild | 67 ------------------------------------
 sys-cluster/hpl/hpl-2.1.ebuild    | 71 ---------------------------------------
 sys-cluster/hpl/metadata.xml      |  8 -----
 3 files changed, 146 deletions(-)

diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
deleted file mode 100644
index 8b80e4c1c..000000000
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils mpi toolchain-funcs
-
-DESCRIPTION="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="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(mpi_pkg_deplist)
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	local mpicc_path="$(mpi_pkg_cc)"
-
-	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,= .*,= $($(tc-getPKG_CONFIG) --libs-only-l blas lapack)," \
-		-e "/^LINKER\>/s,= .*,= ${mpicc_path}," \
-		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
-		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS} $($(tc-getPKG_CONFIG) --libs-only-L blas lapack)|" \
-		Make.gentoo_hpl_fblas_x86 || die
-	default
-}
-
-src_compile() {
-	# do NOT use emake here
-	mpi_pkg_set_env
-	# parallel make failure bug #321539
-	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
-	mpi_pkg_restore_env
-}
-
-src_install() {
-	mpi_dobin bin/gentoo_hpl_fblas_x86/xhpl
-	mpi_dolib.a lib/gentoo_hpl_fblas_x86/libhpl.a
-	mpi_dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING \
-		bin/gentoo_hpl_fblas_x86/HPL.dat
-	mpi_doman man/man3/*.3
-	if use doc; then
-		mpi_dohtml -r www/*
-	fi
-}
-
-pkg_postinst() {
-	local d=$(mpi_root)
-	einfo "Remember to copy $(mpi_root)usr/share/doc/${PF}/HPL.dat to your working directory first!"
-	einfo "Typically one may run hpl by executing the following:"
-	einfo "\"mpiexec -np 4 /usr/bin/xhpl\""
-	einfo "where -np specifies the number of processes."
-}

diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild
deleted file mode 100644
index ba91a5d66..000000000
--- a/sys-cluster/hpl/hpl-2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils mpi multilib
-
-DESCRIPTION="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="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(mpi_pkg_deplist)
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	local mpicc_path="$(mpi_pkg_cc)"
-	local a=""
-	local locallib="${EPREFIX}/usr/$(get_libdir)/lib"
-
-	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%= .*%= $($(tc-getPKG_CONFIG) --libs blas lapack)%" \
-		-e "/^LINKER\>/s,= .*,= ${mpicc_path}," \
-		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
-		-e "/^CCFLAGS\>/s|= .*|= \$(HPL_DEFS) ${CFLAGS}|" \
-		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
-		Make.gentoo_hpl_fblas_x86 || die
-	default
-}
-
-src_compile() {
-	# do NOT use emake here
-	mpi_pkg_set_env
-	# parallel make failure bug #321539
-	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
-	mpi_pkg_restore_env
-}
-
-src_install() {
-	mpi_dobin bin/gentoo_hpl_fblas_x86/xhpl
-	mpi_dolib.a lib/gentoo_hpl_fblas_x86/libhpl.a
-	mpi_dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING
-	mpi_doman man/man3/*.3
-	if use doc; then
-		mpi_dohtml -r www/*
-	fi
-	insinto $(mpi_root)usr/share/hpl
-	mpi_doins bin/gentoo_hpl_fblas_x86/HPL.dat
-}
-
-pkg_postinst() {
-	local d=$(mpi_root)
-	einfo "Remember to copy $(mpi_root)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
deleted file mode 100644
index 8bf4b5f36..000000000
--- a/sys-cluster/hpl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-</pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Justin Lecher]

commit:     8a0ba08cb29477f1544d5514541b2930d24aac74
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 16:52:37 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:52:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8a0ba08c

sys-cluster/hpl: Chop DESCRIPTION to 80 chars

* Bump EAPI to 6

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sys-cluster/hpl/hpl-2.0-r1.ebuild | 10 ++++++----
 sys-cluster/hpl/hpl-2.1.ebuild    | 10 ++++++----
 sys-cluster/hpl/metadata.xml      |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
index 06f6f4c..2b1eccd 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils mpi toolchain-funcs
 
@@ -10,8 +10,8 @@ DESCRIPTION="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"
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	local mpicc_path="$(mpi_pkg_cc)"
 
-	cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86
+	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,' \
@@ -37,11 +37,13 @@ src_prepare() {
 		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
 		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS} $($(tc-getPKG_CONFIG) --libs-only-L blas lapack)|" \
 		Make.gentoo_hpl_fblas_x86 || die
+	default
 }
 
 src_compile() {
 	# do NOT use emake here
 	mpi_pkg_set_env
+	# parallel make failure bug #321539
 	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
 	mpi_pkg_restore_env
 }

diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild
index f2dcf8c..b4b3a8e 100644
--- a/sys-cluster/hpl/hpl-2.1.ebuild
+++ b/sys-cluster/hpl/hpl-2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils mpi multilib
 
-DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers"
+DESCRIPTION="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"
 
@@ -19,7 +19,7 @@ RDEPEND="
 	$(mpi_pkg_deplist)
 	virtual/blas
 	virtual/lapack"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -40,9 +40,11 @@ src_prepare() {
 		-e "/^CCFLAGS\>/s|= .*|= \$(HPL_DEFS) ${CFLAGS}|" \
 		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
 		Make.gentoo_hpl_fblas_x86 || die
+	default
 }
 
 src_compile() {
+	# do NOT use emake here
 	mpi_pkg_set_env
 	# parallel make failure bug #321539
 	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86

diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index 9b28d5e..6f14b2f 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/metadata.xml
@@ -6,7 +6,7 @@
     <name>Michael Imhof</name>
     <description>Release manager, patch manager</description>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Andrew Savchenko]

commit:     cb2f01fdf5234265ca97a3dee2a58dd0b4964214
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jun 29 03:02:08 2013 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Jun 29 03:02:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cb2f01fd

sys-cluster/hpl: version bump and fixes

---
 sys-cluster/hpl/ChangeLog      |  8 +++++
 sys-cluster/hpl/hpl-2.1.ebuild | 71 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/sys-cluster/hpl/ChangeLog b/sys-cluster/hpl/ChangeLog
index b061ae1..9a1784a 100644
--- a/sys-cluster/hpl/ChangeLog
+++ b/sys-cluster/hpl/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*hpl-2.1 (29 Jun 2013)
+
+  29 Jun 2013; Andrew Savchenko <bircoph@gmail.com> +hpl-2.1.ebuild:
+  Version bump.
+  Fix bug 452984 (use system CFLAGS).
+  Install HPL.dat properly.
+  Import ebuild improvements from portage.
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> hpl-2.0-r1.ebuild:
   Sort *DEPEND correctly
 

diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild
new file mode 100644
index 0000000..ac06624
--- /dev/null
+++ b/sys-cluster/hpl/hpl-2.1.ebuild
@@ -0,0 +1,71 @@
+# 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=5
+
+inherit eutils mpi 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="
+	$(mpi_pkg_deplist)
+	virtual/blas
+	virtual/lapack"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	local mpicc_path="$(mpi_pkg_cc)"
+	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_path}," \
+		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
+		-e "/^CCFLAGS\>/s|= .*|= \$(HPL_DEFS) ${CFLAGS}|" \
+		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
+		Make.gentoo_hpl_fblas_x86 || die
+}
+
+src_compile() {
+	mpi_pkg_set_env
+	# parallel make failure bug #321539
+	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
+	mpi_pkg_restore_env
+}
+
+src_install() {
+	mpi_dobin bin/gentoo_hpl_fblas_x86/xhpl
+	mpi_dolib.a lib/gentoo_hpl_fblas_x86/libhpl.a
+	mpi_dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING
+	mpi_doman man/man3/*.3
+	if use doc; then
+		mpi_dohtml -r www/*
+	fi
+	insinto $(mpi_root)usr/share/hpl
+	mpi_doins bin/gentoo_hpl_fblas_x86/HPL.dat
+}
+
+pkg_postinst() {
+	local d=$(mpi_root)
+	einfo "Remember to copy $(mpi_root)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."
+}

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Justin Lecher]

commit:     edcc2c3994fa87e67d786effe13a8f993fc65705
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 22:15:25 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 22:15:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=edcc2c39

sys-cluster/hpl: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; add missing dep on virtual/pkgconfig

Package-Manager: portage-2.2.0_alpha163

---
 sys-cluster/hpl/ChangeLog         |    6 +++++-
 sys-cluster/hpl/hpl-2.0-r1.ebuild |   20 ++++++++++++--------
 sys-cluster/hpl/metadata.xml      |   12 ++++++------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/sys-cluster/hpl/ChangeLog b/sys-cluster/hpl/ChangeLog
index fdac651..e04d23e 100644
--- a/sys-cluster/hpl/ChangeLog
+++ b/sys-cluster/hpl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-cluster/hpl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> hpl-2.0-r1.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  add missing dep on virtual/pkgconfig
+
   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 bec5092..2db9213 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -1,22 +1,26 @@
-# 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-1.0-r2.ebuild,v 1.1 2005/09/01 11:59:18 pbienst Exp $
 
 EAPI=4
-inherit eutils mpi
 
-DESCRIPTION="Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers"
+inherit eutils mpi toolchain-funcs
+
+DESCRIPTION="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"
 KEYWORDS="~x86 ~amd64"
-
 IUSE="doc"
-DEPEND="$(mpi_pkg_deplist)
+
+DEPEND="
+	$(mpi_pkg_deplist)
 	virtual/blas
 	virtual/lapack"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	local mpicc_path="$(mpi_pkg_cc)"
@@ -28,10 +32,10 @@ src_prepare() {
 		-e '/^ARCH\>/s,= .*,= gentoo_hpl_fblas_x86,' \
 		-e '/^MPdir\>/s,= .*,=,' \
 		-e '/^MPlib\>/s,= .*,=,' \
-		-e "/^LAlib\>/s,= .*,= $(pkg-config --libs-only-l blas lapack)," \
+		-e "/^LAlib\>/s,= .*,= $($(tc-getPKG_CONFIG) --libs-only-l blas lapack)," \
 		-e "/^LINKER\>/s,= .*,= ${mpicc_path}," \
 		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
-		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS} $(pkg-config --libs-only-L blas lapack)|" \
+		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS} $($(tc-getPKG_CONFIG) --libs-only-L blas lapack)|" \
 		Make.gentoo_hpl_fblas_x86 || die
 }
 

diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index db933d7..c4c0f8c 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
-<maintainer>
-  <email>tantive@gentoo.org</email>
-  <name>Michael Imhof</name>
-  <description>Release manager, patch manager</description>
-</maintainer>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>tantive@gentoo.org</email>
+    <name>Michael Imhof</name>
+    <description>Release manager, patch manager</description>
+  </maintainer>
 </pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Kacper Kowalik]

commit:     e74ef268d2dd16df24963be64fa6a1bc9db319ad
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 09:44:24 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Thu May 24 09:44:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e74ef268

[sys-cluster/hpl] add -Lflags from lapack and blas, fixes #400785 by Aleksandr Yakimov <yaleks <AT> gentoo.ru>

---
 sys-cluster/hpl/hpl-2.0-r1.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
index ffc3901..bec5092 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 		-e "/^LAlib\>/s,= .*,= $(pkg-config --libs-only-l blas lapack)," \
 		-e "/^LINKER\>/s,= .*,= ${mpicc_path}," \
 		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
-		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
+		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS} $(pkg-config --libs-only-L blas lapack)|" \
 		Make.gentoo_hpl_fblas_x86 || die
 }
 

[gentoo-commits] proj/sci:master commit in: sys-cluster/hpl/

[Alexey Shvetsov]

commit:     ee03454af41dd8f57629cf5d37b05a4851773350
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 18:46:53 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 18:46:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee03454a

Fix blas + lapack for hpl

(Portage version: 2.2.0_alpha72/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/hpl/hpl-2.0-r1.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
index af88dde..ffc3901 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 		-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,= .*,= $(pkg-config --libs-only-l blas lapack)," \
 		-e "/^LINKER\>/s,= .*,= ${mpicc_path}," \
 		-e "/^CC\>/s,= .*,= ${mpicc_path}," \
 		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \