Fix SRC_URI (thanks to renihs in #-cluster) and general cleanup.

Package-Manager: portage-2.1.9.33/cvs/Linux x86_64

3 files changed, 30 insertions, 21 deletions

diff --git a/sys-cluster/hpl/ChangeLog b/sys-cluster/hpl/ChangeLog
index 75d3c16cb113..5a69cd594ae9 100644
--- a/sys-cluster/hpl/ChangeLog
+++ b/sys-cluster/hpl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/hpl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.16 2010/09/13 15:21:23 jsbronder Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.17 2011/02/01 18:27:08 jsbronder Exp $
+
+*hpl-2.0-r1 (01 Feb 2011)
+
+  01 Feb 2011; Justin Bronder <jsbronder@gentoo.org> -hpl-2.0.ebuild,
+  +hpl-2.0-r1.ebuild:
+  Fix SRC_URI (thanks to renihs in #-cluster) and general cleanup.
 
   13 Sep 2010; Justin Bronder <jsbronder@gentoo.org> hpl-2.0.ebuild:
   Respect LDFLAGS #336969.
diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest
index d0eff133819b..6b14d915c665 100644
--- a/sys-cluster/hpl/Manifest
+++ b/sys-cluster/hpl/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST hpl.tgz 523139 RMD160 3a2baecfe746d8ab5b5a9d6e1579a1aa5d249294 SHA1 42ae3b5173b22be41282568effccf46041079c1c SHA256 c0a08079a4c54e0ac32901d68d135fe17fffc3df322c95fbd9b23cb5d400827e
-EBUILD hpl-2.0.ebuild 1725 RMD160 8142819f3abd785a2d734b6c386b0f3def06c215 SHA1 85ad9a1e38c5afdcebb76d3dad39da541b34cfbb SHA256 b5c7ca5655409be47fe1b8c98cfa1fe97659fac07386e65cc3b51265da5dd05e
-MISC ChangeLog 2195 RMD160 10f767cf747abf12d0d204528a5a137514aaede1 SHA1 d64f0dc1546d5c96aecae6c165da344957066f58 SHA256 965aa99ed6a65abfe147b6fc2de4f0e6c4e94c9c8aa5975d848a4097fac2cbce
+DIST hpl-2.0.tar.gz 591087 RMD160 f9182ee706147c118fcf95cc0db878e02698c18a SHA1 1c199640146e9d87916475aa153c45f30e42f803 SHA256 d8d118c310d34a5a2acf5a689270a9f7bea60245552d24af8641599651909bec
+EBUILD hpl-2.0-r1.ebuild 1814 RMD160 22678dbaa32843210cb1062ce14d66c1a446cc0f SHA1 56d38e88779c69525fec0d51c1dc027884de273d SHA256 b9fd1ae707c45b86e5a1ecb1f9e23a2ee04953bead29b210525f30fe44f2e93a
+MISC ChangeLog 2382 RMD160 f6910541b7a67e35aeab34c8ea249f0822d5c196 SHA1 83c6b420dd592392786893bb32b40e36471c5073 SHA256 bea3709cffe388ec74f59b23e1419b6cff2257dae130dffb78a6c1b6198ab54b
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyOQXUACgkQ4MrvBE1wQ8m89wCeLQsOruxLbIWFeJqmNYs5VNEj
-5BsAn3m2eSVzGECWhez0CMML1YSz75AA
-=50Wu
+iEYEARECAAYFAk1IUIIACgkQ4MrvBE1wQ8k+MACgnVEefEzgx0PDEiuTHGxSR6uI
+BbMAn1pqjiSjjkSDcoH4TX0JTwHDNxOK
+=8j7J
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/hpl/hpl-2.0.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild
index 0a471d98eb53..74b4e88f8f2c 100644
--- a/sys-cluster/hpl/hpl-2.0.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0.ebuild,v 1.4 2010/09/13 15:21:23 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild,v 1.1 2011/02/01 18:27:08 jsbronder Exp $
 
 inherit eutils
 
 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.tgz"
+SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
 LICENSE="HPL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
-S="${WORKDIR}/${PN}"
 
+IUSE="doc"
 DEPEND="virtual/mpi
 	virtual/blas
 	virtual/lapack"
@@ -23,6 +22,7 @@ src_unpack() {
 	cd "${S}"
 	cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86
 	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,= .*,=,' \
@@ -40,16 +40,19 @@ src_compile() {
 }
 
 src_install() {
-	doman man/man3/*.3
-	dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING
-	dobin bin/gentoo_hpl_fblas_x86/xhpl || die "Failed to install bins"
-	insinto /usr/share/hpl
-	doins bin/gentoo_hpl_fblas_x86/HPL.dat || die "Failed to install HPL parameters"
-	dohtml -r www/*
-	dolib lib/gentoo_hpl_fblas_x86/libhpl.a || die "Failed to install lib"
+	dobin bin/gentoo_hpl_fblas_x86/xhpl || die
+	dolib lib/gentoo_hpl_fblas_x86/libhpl.a || die
+	dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING \
+		bin/gentoo_hpl_fblas_x86/HPL.dat || die
+	doman man/man3/*.3 || die
+	if use doc; then
+		dohtml -r www/* || die
+	fi
 }
 
 pkg_postinst() {
 	einfo "Remember to copy /usr/share/hpl/HPL.dat to your working directory"
-	einfo "before running xhpl."
+	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."
 }