gentoo resync : 25.11.2020

4 files changed, 84 insertions, 10 deletions

diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest
index 1539bf807d58..15ace0216762 100644
--- a/sys-cluster/hpl/Manifest
+++ b/sys-cluster/hpl/Manifest
@@ -1,3 +1,6 @@
+AUX hpl-2.3-respect-AR.patch 229 BLAKE2B 2a938b4bfeec0ea5030e0d4a33fb6aa4f1b6cbf78237963fc2ba65766bc1fdb570a66eae4314d2873d8a9e5b7c733b087a9e23ec9c39b31c0739c677087912de SHA512 078fc13d20ca564fd3cf41065701529761ab66728017c3aefa339e88dd1639a269ba3d8b853c00a46dbdb03c906f7f986b3a3adcb92a9eecefbd200a3e8d3999
 DIST hpl-2.0.tar.gz 591087 BLAKE2B d3fd738c40f89916c7a5a7cbb561d30c8b9defd08d552b6aeea707f2b6b87a4774d6dce4b9fd7983ee12b112f319e574b89fd8158a381e997dfb86a3572d5f95 SHA512 3aa76144526b01ec40d940cae50d47e480e2760a36d1e95bc6e431b216407db190946fc3d99a6a7caf7b61bcc76d805d28da3ef0b141ff467854e1cdf10bb274
-EBUILD hpl-2.0-r3.ebuild 1863 BLAKE2B f65572fdff6db09bcd4b9081499585dadf2a9fb52e2caad57820b5e8b55e9af8416df5a34b5e7a6e8ed59590454dd74c5506262eaec9fe5d7f5ab71005a55c14 SHA512 67be8b31451a7e1ea7ba9b16fc3c82870725091ed594823a13e291ecc3fc73ec6a0fcc0381a48c76ebd66ceb6c63ad5a53f04e83749e5ce7360d674cdd033121
+DIST hpl-2.3.tar.gz 660871 BLAKE2B c1f02a21d5ebcea1140e619a29fbaa70a7fe219e06ea26bd77ca49b95fabde413c4f09cd1670d0d628baf032d009a606a14c4d0ba66afce37e505a435db17753 SHA512 954297b6464e3f9d9315d2f1ce0c87b8486d3d60da92e6847e74b16fdf9fc6d73eb0b85317416c2fc088e72e81b8b3a3eb0148c14edcf575557cd86541d0d8cb
+EBUILD hpl-2.0-r4.ebuild 1947 BLAKE2B ce67c91cfe3a98182530798eb1089c692011e8cd17408516650f414a9385e84e8ddf27dbf4d414c671a07624b19b40f12ceee6964af48b09449c70a5dfc1efa9 SHA512 4ca93948779c9c05393561c170ae4b5a1ec12fe8fcf5daece6b11cffcf0afedb63f4d131690f2e00a227b600184a975225b2e42b0368eac21f017f3cb03843da
+EBUILD hpl-2.3.ebuild 1068 BLAKE2B c4193ef6c442ec6da1459d05ed493f67c43d055ac72df4441cc199a976c54732ae8d159515ebe5c550951ea6a2e9157e952a9cd4e533f98452e041237cc6d696 SHA512 5d262182dd88bb3a9081069bcf1dc0e6c77ccf755776a9e8c9866f8d6c97d48bcdd0d6abcb71cb96c1f5c87ee043adfec470fc8a07c957c8ef4fa196856b274e
 MISC metadata.xml 263 BLAKE2B c9db7dc7f12c1017bee420587681f80a838eba2efed271c5a1fafa4595993917ea14b69fcc865a225561fa736bd93d9bfdac7b830a50d78707428d7fec4e987e SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5
diff --git a/sys-cluster/hpl/files/hpl-2.3-respect-AR.patch b/sys-cluster/hpl/files/hpl-2.3-respect-AR.patch
new file mode 100644
index 000000000000..e7b112380c50
--- /dev/null
+++ b/sys-cluster/hpl/files/hpl-2.3-respect-AR.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index eb91dc5..cc10681 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,6 +8,8 @@ AX_PROG_CC_MPI
+ 
+ AC_PROG_RANLIB
+ 
++AM_PROG_AR
++
+ AC_PROG_INSTALL
+ 
+ AM_INIT_AUTOMAKE([subdir-objects])
diff --git a/sys-cluster/hpl/hpl-2.0-r3.ebuild b/sys-cluster/hpl/hpl-2.0-r4.ebuild
index d706f2b63d6a..dab8670c7391 100644
--- a/sys-cluster/hpl/hpl-2.0-r3.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters"
 HOMEPAGE="http://www.netlib.org/benchmark/hpl/"
@@ -14,12 +14,12 @@ LICENSE="HPL"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	virtual/blas
 	virtual/lapack
 	virtual/mpi"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	local a=""
@@ -38,28 +38,34 @@ src_prepare() {
 		-e '/^CC\>/s,= .*,= mpicc,' \
 		-e '/^CCFLAGS\>/s|= .*|= $(HPL_DEFS) ${CFLAGS}|' \
 		-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
+		-e "/^ARCHIVER\>/s|= .*|= $(tc-getAR)|" \
 		Make.gentoo_hpl_fblas_x86 || die
+
+	default
 }
 
 src_compile() {
 	# parallel make failure bug #321539
-	HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
+	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
+	dolib.a 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/*
+		docinto html
+		dodoc -r www/*
 	fi
 }
 
 pkg_postinst() {
-	einfo "Remember to copy /usr/share/hpl/HPL.dat to your working directory"
+	einfo "Remember to copy ${EROOT}/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 "\"mpiexec -np 4 ${EROOT}/usr/bin/xhpl\""
 	einfo "where -np specifies the number of processes."
 }
diff --git a/sys-cluster/hpl/hpl-2.3.ebuild b/sys-cluster/hpl/hpl-2.3.ebuild
new file mode 100644
index 000000000000..6ed3d0fbd20d
--- /dev/null
+++ b/sys-cluster/hpl/hpl-2.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters"
+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"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	virtual/mpi"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3-respect-AR.patch"
+)
+
+src_prepare() {
+	default
+
+	# Needed for the AR patch
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doman man/man3/*.3
+	dodoc testing/ptest/HPL.dat
+
+	if use doc; then
+		docinto html
+		dodoc -r www/*
+	fi
+}
+
+pkg_postinst() {
+	einfo "Remember to copy (+ extract) ${EROOT}/usr/share/${PF}/HPL.dat.bzip2 to your working directory"
+	einfo "before running xhpl. Typically one may run hpl by executing:"
+	einfo "\"mpiexec -np 4 ${EROOT}/usr/bin/xhpl\""
+	einfo "where -np specifies the number of processes."
+}