Respect CFLAGS (#452984). Remove old.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

4 files changed, 14 insertions, 73 deletions

diff --git a/sys-cluster/hpl/ChangeLog b/sys-cluster/hpl/ChangeLog
index 7d9384b52932..afa39cac2fdf 100644
--- a/sys-cluster/hpl/ChangeLog
+++ b/sys-cluster/hpl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/hpl
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.20 2013/07/01 23:28:25 jsbronder Exp $
+
+*hpl-2.0-r3 (01 Jul 2013)
+
+  01 Jul 2013; Justin Bronder <jsbronder@gentoo.org> -hpl-2.0-r1.ebuild,
+  -hpl-2.0-r2.ebuild, +hpl-2.0-r3.ebuild:
+  Respect CFLAGS (#452984). Remove old.
 
 *hpl-2.0-r2 (27 Feb 2013)
 
diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest
index 31283d6a4ea4..d3b65b286db8 100644
--- a/sys-cluster/hpl/Manifest
+++ b/sys-cluster/hpl/Manifest
@@ -2,14 +2,13 @@
 Hash: SHA256
 
 DIST hpl-2.0.tar.gz 591087 SHA256 d8d118c310d34a5a2acf5a689270a9f7bea60245552d24af8641599651909bec SHA512 3aa76144526b01ec40d940cae50d47e480e2760a36d1e95bc6e431b216407db190946fc3d99a6a7caf7b61bcc76d805d28da3ef0b141ff467854e1cdf10bb274 WHIRLPOOL 79da0950089d8e7d6128a2af7a44de704c2666aeb74de08e9e0a06fc23f8c4d17da2ab5107b5f6a82ca073800ec2af4f003c7792ae84e1ec032d9572e78bc0b2
-EBUILD hpl-2.0-r1.ebuild 1923 SHA256 ca7c0a98b3a1332bea7687baca65b68a334ede73917a850682f121953f8be806 SHA512 c2d73254c7b41562aa98bbb5383a8df5c696ad6cd6d473fef2c71dfbc1b3328f244aadb9a59ed859bc5a07ac5d61fde1c4e039fb6d0441c9be84f644560d0bf7 WHIRLPOOL 87a801c5b41c2f532ce724e0a52a049a09835f28c4fca04bf2cbace86d0e3883471a8b0b1ebd20b075a7bbfc218acb6ed4dd487de69685e8f9a0c967b2479ca6
-EBUILD hpl-2.0-r2.ebuild 1923 SHA256 72fd8e4404ec38741aad811b03b34c3ff4f78a99a9439871c796b58c39877929 SHA512 408e5518842ae5ff4b2f51ebac2fb2e15a32be720124b9d2f2d7975bd4e3a8e3c96ac8290e42d1380c19b36da8cf08102d4bb57174aa8852a955595ba618dea9 WHIRLPOOL e3e386e8d3b784f7e77702f0dac40b9573c3f52c7471d084b698f1d1c4988b7a38e0c553c78fe7166618afa3a8b3701956ffa126091ba590042e91a096e6ce09
-MISC ChangeLog 2689 SHA256 4fdd954e9f2cb9aca5573fbcc0e3916cd0c5acff709a1af723981188fcfc5a5a SHA512 2bd447f8cb1a226e36e970a996eea814d3e62d7131bddaf4bd3ae00f9bd798e00dff4d69a017770ca6cd836be5126591fff32649ee2b92a221825c2fbaeb41df WHIRLPOOL e6aac575bc40414d15ab93f3ef17feb4c311d381130e8ea74cadfd2a0df55719d811338fab5f15510a19234368804476fe0799dbaf225c48265dda6e292bd353
+EBUILD hpl-2.0-r3.ebuild 1981 SHA256 c3411525524af7ac85249eff7fe5cba56a217d6fe22343b41443fcd1c551399e SHA512 5c7eb67f1a213cbd5165046dc877edafdb9ae15a07433eb185b7da51538ddc44778362e22c4ba94974a2b78e99594654492ef712ae05363a796601a7bcfeb3a7 WHIRLPOOL f9634aa1fa9cfd5f2b6057a3b731cf5a6f80aa2fd8fc813f1a9ec7ef98676dfad1dd5b9ee8a18d97d92a047e1359a5e26509af33744b6de73804a95a071974b7
+MISC ChangeLog 2877 SHA256 29cd80428af6c0c8afe050c55129012340c21d04b7840f37047a313a6803924a SHA512 46e6d320ec24bb7f5b8542c6f57a4e1ddaeec6d79e73b8e2f1ff8414a16b1c2d01872d00b01486f5a8072eccd57540824a200612a75e2f6d74499f8d5b4a60f9 WHIRLPOOL 19887f341c3439b2a5589ed4677fd506a039de9652382e672d4ef96f0c481f1f08375798bf0be626d24037176711dea9f30ad0858f6df7952f580ce4c8a915c2
 MISC metadata.xml 162 SHA256 ba8ac4b0fbb2acb09677330e980feed7de66b52d6ec4ee0ff9e44cccea58fa7c SHA512 2f5b58b83e2be686d8c7a0151b76ec40b9139b62065464f629b8f27d0e46d0a3e314e85c5d8f376372dd4b66ec8d21570f043a7bbeba3684a40517fa1b04bc37 WHIRLPOOL e9aa5ace065aeac9ec418a0bf1fba7321e970f49b853af8201983aa73563ec8a9ecc6a8177d378b7f122178667501865dab9f16136b09ab7cf08a46faa179d3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEuLPIACgkQgAnW8HDreRYznwCfSDYhq4FC4ujaPsSCSURvcy27
-7/4AoJKbnVNrbmEsJq4jdSliRZpKGMKp
-=ke4I
+iEYEAREIAAYFAlHSEL0ACgkQ4MrvBE1wQ8nw1ACfbsZQpB/eTw536e4TvzSam/4f
+WhUAn3ds37wGpSmah+sI4vZxfTQC56g/
+=98VB
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/hpl/hpl-2.0-r2.ebuild b/sys-cluster/hpl/hpl-2.0-r2.ebuild
deleted file mode 100644
index 7aec0ca0be7c..000000000000
--- a/sys-cluster/hpl/hpl-2.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r3.ebuild
index f50d003120be..1130b617491e 100644
--- a/sys-cluster/hpl/hpl-2.0-r1.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2013/02/27 15:57:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r3.ebuild,v 1.1 2013/07/01 23:28:25 jsbronder Exp $
 
 EAPI=4
 
@@ -37,6 +37,7 @@ src_prepare() {
 		-e "/^LAlib\>/s,= .*,= ${localblas}," \
 		-e '/^LINKER\>/s,= .*,= mpicc,' \
 		-e '/^CC\>/s,= .*,= mpicc,' \
+		-e '/^CCFLAGS\>/s|= .*|= $(HPL_DEFS) ${CFLAGS}|' \
 		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
 		Make.gentoo_hpl_fblas_x86 || die
 }