From 162945d2a91899b637bbb9e163b406350de12906 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 30 Oct 2021 19:43:03 +0100
Subject: gentoo resync : 30.10.2021

---
 sys-cluster/mpich/Manifest              |   6 +-
 sys-cluster/mpich/mpich-3.0.4-r1.ebuild | 122 ------------------------
 sys-cluster/mpich/mpich-3.0.4-r2.ebuild | 122 ++++++++++++++++++++++++
 sys-cluster/mpich/mpich-3.3-r1.ebuild   | 163 --------------------------------
 sys-cluster/mpich/mpich-3.3-r2.ebuild   | 163 ++++++++++++++++++++++++++++++++
 sys-cluster/mpich/mpich-3.4.2-r1.ebuild | 162 +++++++++++++++++++++++++++++++
 sys-cluster/mpich/mpich-3.4.2.ebuild    | 162 -------------------------------
 7 files changed, 450 insertions(+), 450 deletions(-)
 delete mode 100644 sys-cluster/mpich/mpich-3.0.4-r1.ebuild
 create mode 100644 sys-cluster/mpich/mpich-3.0.4-r2.ebuild
 delete mode 100644 sys-cluster/mpich/mpich-3.3-r1.ebuild
 create mode 100644 sys-cluster/mpich/mpich-3.3-r2.ebuild
 create mode 100644 sys-cluster/mpich/mpich-3.4.2-r1.ebuild
 delete mode 100644 sys-cluster/mpich/mpich-3.4.2.ebuild

(limited to 'sys-cluster/mpich')

diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 1b34c54e289a..370979b9cb4b 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -2,7 +2,7 @@ AUX mpich-3.3-add-external-libdir-parameter.patch 8605 BLAKE2B 56a6c60362da3004c
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
 DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
 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
+EBUILD mpich-3.0.4-r2.ebuild 2846 BLAKE2B b29ce6d73d7c8604c9be6416884915269169c6162f617772a9c7da8757d2c782c3b1b81572c46b5ccc834eb79da9ce14efd67e9e06f5ef5e2f9dd28e8570e407 SHA512 cb71bbcc08264a508721793f79842812e142e649b28cc84949e4c60e6723dd2eb642e0310609c9de0c2fc67a3bf9e40d352835e7b79bb600f452b13405b3b9f0
+EBUILD mpich-3.3-r2.ebuild 4087 BLAKE2B bd06fa8dd38ee27428884d4d425598a79971337a4656034491e42028d5e69e38801e4076bba50a9925b94b1acc984e3a5c5bb0cbd81fe9582ffca1c03e22711c SHA512 a0b4af79a0b6b601b1ca4d522bba791d0d983e71ffe59c8c8f725e7d97a0d5e1ae169707fa7036719a2a668717100f41d432e3942fc1676557aa158ce8db6310
+EBUILD mpich-3.4.2-r1.ebuild 4220 BLAKE2B becfac877eae499d6a14e390947bfcd2382266cb0cd8cf5f1f47043a15a1ed5bdec44dbafdeeb3c79021599641d8cc0b512378a2a1ddd0fad8e5da0efe393163 SHA512 3e3b0488526c9c2f7fb5d9596f826b43701c21efce3dadeb2ceebae18ff220b803fd99dfa82594878c5ecaf9cb020a04d59ab17ea81be4247508b6a924185574
 MISC metadata.xml 395 BLAKE2B 25cbe25bce4d76de586fdfb898e1925f047edeea1b9658f09db3c17f8c80056fea93a4a8f6bcd7d91d701ef7e94d5509f215290f97fbdff500b1e50c12f4814b SHA512 9f38dd49af31cad2d458ed8bcf674caf32ef12cfd93ec9548f6598cb8b54794bf7d1ba46a431172ee2938c5e66c8a54b5b238b0d48883f20f7e5b3148317d2d8
diff --git a/sys-cluster/mpich/mpich-3.0.4-r1.ebuild b/sys-cluster/mpich/mpich-3.0.4-r1.ebuild
deleted file mode 100644
index 8d5657d59939..000000000000
--- a/sys-cluster/mpich/mpich-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 flag-o-matic
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
-	dev-libs/libaio
-	<sys-apps/hwloc-2
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/mpich2
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-}
-
-src_prepare() {
-	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
-	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
-		src/packaging/pkgconfig/mpich.pc.in \
-		src/env/*.in \
-		|| die
-}
-
-src_configure() {
-	local c="--enable-shared"
-
-	# 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.
-
-	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}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	# 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
-
-	# 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 ${c} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--disable-fast \
-		--enable-smpcoll \
-		--enable-versioning \
-		--with-hwloc-prefix=/usr \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc/${PF}
-	dodoc README{,.envvar} CHANGES RELEASE_NOTES
-	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 "${D}"usr/share/doc/${PF}/www*
-	fi
-}
diff --git a/sys-cluster/mpich/mpich-3.0.4-r2.ebuild b/sys-cluster/mpich/mpich-3.0.4-r2.ebuild
new file mode 100644
index 000000000000..8a215eacfc6b
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.0.4-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 flag-o-matic
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich2"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	<sys-apps/hwloc-2:=
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich2
+	!sys-cluster/openmpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+
+	# 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.
+
+	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}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	# 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
+
+	# 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 ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		--with-hwloc-prefix=/usr \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran f77) \
+		$(use_enable fortran fc)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc/${PF}
+	dodoc README{,.envvar} CHANGES RELEASE_NOTES
+	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 "${D}"usr/share/doc/${PF}/www*
+	fi
+}
diff --git a/sys-cluster/mpich/mpich-3.3-r1.ebuild b/sys-cluster/mpich/mpich-3.3-r1.ebuild
deleted file mode 100644
index f3cd4b9f84da..000000000000
--- a/sys-cluster/mpich/mpich-3.3-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit fortran-2 multilib-minimal multilib flag-o-matic autotools
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich2"
-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"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-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
-	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 \
-		--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
-}
diff --git a/sys-cluster/mpich/mpich-3.3-r2.ebuild b/sys-cluster/mpich/mpich-3.3-r2.ebuild
new file mode 100644
index 000000000000..e8ae27f50de2
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.3-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 multilib-minimal multilib flag-o-matic autotools
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich2"
+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"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+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
+	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 \
+		--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
+}
diff --git a/sys-cluster/mpich/mpich-3.4.2-r1.ebuild b/sys-cluster/mpich/mpich-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..403ac8cf2eeb
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.4.2-r1.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
+}
diff --git a/sys-cluster/mpich/mpich-3.4.2.ebuild b/sys-cluster/mpich/mpich-3.4.2.ebuild
deleted file mode 100644
index 21539e686ec2..000000000000
--- a/sys-cluster/mpich/mpich-3.4.2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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
-}
-- 
cgit v1.2.3