gentoo resync : 20.10.2021

3 files changed, 169 insertions, 2 deletions

diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 3aa5e77b4bc5..1b34c54e289a 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,6 +1,8 @@
 AUX mpich-3.3-add-external-libdir-parameter.patch 8605 BLAKE2B 56a6c60362da3004c8762f6fe62f0a9a010904a38ed7998f5617598362669e7d083b2893781e24d96100b9cefffe5f51ed1d3a921ff14b511dea12622e8a5e0e SHA512 2533f0a92f517118bf3c145d3d3a6e446b0596cc6c5c79d5eebb13e55ee1ab35ce2356fa75db4029f45a3337888ff151a78e0ec1e02ef6c7cde56f85c189eb00
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
 DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
-EBUILD mpich-3.0.4.ebuild 2776 BLAKE2B 79e5f2ec638b50bf9658e6e5817f1985fe4c61592f6a8b872b03dc5190bbe61ab58da935545ea6344e6ad0f3ccbdd423917f1ca882125be43982c732832ede83 SHA512 c0e26db5c7f43767880f4bccd2c481996aa9f39ae41c682a19eaca176854da291b7d49800d5585c725459fa10c26af852c1b471dfb65501b70a204f8cf1a203d
+DIST mpich-3.4.2.tar.gz 32850822 BLAKE2B cbbb7d8b3c6db31c9ee8f59e6a386c000480a738819c8b4398e1299c0fdfce28649a3ebc868aa48517476d0b49d4d58e66407f2116708c3d9e61ce43f6e1c32b SHA512 5f5389071c7d275a864df16aedd19f2b925c9b9ad3b304f9c9f99b5808f6b82def775b4191c03cdd3288c5e4478a40a2aae22c3cf2aabe82be1dd612efd7f2a6
+EBUILD mpich-3.0.4-r1.ebuild 2844 BLAKE2B e304d1b825dcddf10991d5cebe966f5d4912e73b4112368136c2ca5cbb55e8e710d3e9c0ef4cd3319bbb10996f9b97a15fd8a8a4c9d167b731e5ce9915029033 SHA512 83685307f607e98d5cffd3744b8f07e518953364aeaa6c2f73fd0b15808dd5b3661900ec4a73b40a3af6d56b6c17def2062caa6117919a209364ef9dea6f8c6c
 EBUILD mpich-3.3-r1.ebuild 4083 BLAKE2B d9be698bedd0d128b5ffe866ce9a27e46f467473b857390fcf7d29b06bdbe2fe328630ef1d40ab45f2b7a0ddc397d3c4d2cea065ce218726175a9ec83fffc060 SHA512 9dc29556c1d17885dfab65cdd208d28f44d400ab1de5b620d1a899bbb49663217023dc712630a2764466fa3460fe0aceed6036fc10b1c4df74daad75777d321e
+EBUILD mpich-3.4.2.ebuild 4216 BLAKE2B ed2983b987d976d40e9ec4f2b1a31a6776c7918b7d84a1d2bc0649efb80f7155f0317efcd26cf46357ec832f3a239aa90fcc23281cf83a4f957870a47309bf7b SHA512 d8c8b3ea94b1acda6fe5ac2a3589e3581f7b40e46ca23988b71856f2e55b9a09e25418f66d5ac82488d70af901e73b4b3968e3d1c4283e5e62b04f05b0b047aa
 MISC metadata.xml 395 BLAKE2B 25cbe25bce4d76de586fdfb898e1925f047edeea1b9658f09db3c17f8c80056fea93a4a8f6bcd7d91d701ef7e94d5509f215290f97fbdff500b1e50c12f4814b SHA512 9f38dd49af31cad2d458ed8bcf674caf32ef12cfd93ec9548f6598cb8b54794bf7d1ba46a431172ee2938c5e66c8a54b5b238b0d48883f20f7e5b3148317d2d8
diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4-r1.ebuild
index 828fec76358a..8d5657d59939 100644
--- a/sys-cluster/mpich/mpich-3.0.4.ebuild
+++ b/sys-cluster/mpich/mpich-3.0.4-r1.ebuild
@@ -85,8 +85,11 @@ src_configure() {
 	# dropped w/ bug #725842 fix
 	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
 
+	# Possible workaround for bug #818280
+	append-flags -fcommon
+
 	# Forcing Bash as there's quite a few bashisms in the build system
-	CONFIG_SHELL="${BROOT}/bin/bash" econf \
+	CONFIG_SHELL="${BROOT}/bin/bash" econf ${c} \
 		--with-pm=hydra \
 		--disable-mpe \
 		--disable-fast \
diff --git a/sys-cluster/mpich/mpich-3.4.2.ebuild b/sys-cluster/mpich/mpich-3.4.2.ebuild
new file mode 100644
index 000000000000..21539e686ec2
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.4.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 multilib-minimal flag-o-matic
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="https://www.mpich.org/"
+SRC_URI="https://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="mpich2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads +romio threads"
+REQUIRED_USE="mpi-threads? ( threads )"
+
+COMMON_DEPEND=">=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	sys-libs/libunwind[${MULTILIB_USEDEP}]
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich2
+	!sys-cluster/openmpi
+	!sys-cluster/nullmpi"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpicxx.h
+	/usr/include/mpi.h
+	/usr/include/opa_config.h
+)
+
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-3.3-add-external-libdir-parameter.patch
+#)
+
+src_prepare() {
+	default
+
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+
+	# Fix m4 files to satisfy lib dir with multilib.
+	#touch -r src/pm/hydra/confdb/aclocal_libs.m4 \
+	#	confdb/aclocal_libs.m4 \
+	#	|| die
+	#cp -fp confdb/aclocal_libs.m4 \
+	#	src/pm/hydra/confdb/aclocal_libs.m4 \
+	#	|| die
+	#cp -fp confdb/aclocal_libs.m4 \
+	#	src/pm/hydra/mpl/confdb/aclocal_libs.m4 \
+	#	|| die
+	#cd src/pm/hydra/mpl; eautoreconf; cd -
+	#cd src/pm/hydra; eautoreconf; cd -
+	#eautoreconf
+}
+
+multilib_src_configure() {
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.  Hence the separate
+	# local vars.
+
+	local c=
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+
+	# GCC 10 compatibility workaround
+	# bug #725842
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	export MPICHLIB_CFLAGS="${CFLAGS}"
+	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
+	export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
+	export MPICHLIB_FFLAGS="${FFLAGS}"
+	export MPICHLIB_FCFLAGS="${FCFLAGS}"
+	export MPICHLIB_LDFLAGS="${LDFLAGS}"
+
+	# Dropped w/ bug #725842 fix
+	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	# Forcing Bash as there's quite a few bashisms in the build system
+	#
+	# Note that --with-device=ch3 is preserving the old 3.3.x default
+	# - keeping it for compatibility for now.
+	CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf \
+		--enable-shared \
+		--with-hwloc-prefix="${EPREFIX}/usr" \
+		--with-hwloc-libdir="$(get_libdir)" \
+		--with-common-libdir="$(get_libdir)" \
+		--with-prefix-libdir="$(get_libdir)" \
+		--with-izem-libdir="$(get_libdir)" \
+		--with-fiprovider-libdir="$(get_libdir)" \
+		${c} \
+		--with-pm=hydra \
+		--with-device=ch3 \
+		--disable-fast \
+		--enable-versioning \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran fortran all)
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if  use fortran; then
+		if multilib_is_native_abi; then
+			mkdir "${T}"/fortran || die
+			mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+			mv "${ED}"/usr/include/*.mod "${T}"/fortran || die
+		else
+			rm "${ED}"/usr/include/mpif* "${ED}"/usr/include/*.mod || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	# Fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/* "${ED}"/usr/include || die
+	fi
+
+	einstalldocs
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/www* || die
+	fi
+}