gentoo resync : 02.02.2022

14 files changed, 3 insertions, 1775 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index e57ca1662abf..48dfae6d353d 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,24 +1,3 @@
-AUX openmpi-ltdl.patch 2449 BLAKE2B 4ea973f09988a45485840cb70dd8f1c72f6b51d38d051f700fe04cd38ea79ca08c81cd8930504b38633fbb31a081cc9e5819c21e1170fa0461870467846a6c52 SHA512 4487ecbd2025d561f5ac46c70da5e407f6f201b7588f350d1211790dceb64ec2acdf3ca8f90e2ecbe8a6f7c3a6577e77fb7ae22be0ff3dd4adbded9035a7b6c9
-DIST openmpi-1.10.7.tar.bz2 13435131 BLAKE2B c1914e6842f59a4a21a27d015275eff00092e57784c4219f58424fbc69c6d9e58109aa1b2ff4e1e340ddc3b93f07d7271e728928772c66c271442e375c08315e SHA512 9c5470f9959ca37650a59e56fb8343c028422c709876ab9d25a411dd09a07cdde927c45d8f3db1ad524b1f2847fe799471d469fa1efee48f8018b2ff24427ecb
-DIST openmpi-1.4.5.tar.bz2 6643760 BLAKE2B 6890e8ed6f75e77e0e02c88bce473a37195549bca06696881cf7c3f6e46db25abaa04d9517d7ff9a11ad64cc97cf8d1b8678d9797c49a1659656d8a5de5c56ae SHA512 f89922345cde8978483e397e9016103626db3f1787f9afccaf0f60d59caa2a4409b47b01ac221d60e24e241f2afecb636ca89688bf326dc0ca5c817de96b3e99
-DIST openmpi-1.7.5.tar.bz2 13286694 BLAKE2B 15862d34f8b8db60e7896f57274555df849713492c6e7e590feb06ec9b3655ff0311a81c0a6c87cc16dc8fd95510a1d79b23467af843d37768f75005ff4edd8c SHA512 72de2788fa26615a2e7373b5f32e0a2b9e39d56094c45b49348ef19bbb0ea306734b7d3275d76471a18628b5244d882de4ed3595eb46f13683e1c8d2b277f065
-DIST openmpi-1.8.8.tar.bz2 13231433 BLAKE2B d196fd0bb08cfb0c86a29ae39015eb15e1465554e322c1ae039b61cee3a027ea0ba8d7fecd02e310309caec416147611a233861e464db4449da3b449387b1dca SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660
-DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
-DIST openmpi-2.1.6.tar.bz2 8324626 BLAKE2B 4aed4b397c0e0ead24ed5e9bbf45ee8f6719a7566d74405cccf119ddf535891ece91c04cbcad96be5a5d9805c620aa13a1b51c0edd67c049827357e7668008b9 SHA512 f552f47961e040476e7d2949cdd3e5a0b5ad74bea2b6532608117ec893473a160cd368251d1f439fd773f4846950857baf939e7b3586bac2a099495f7bc0e349
-DIST openmpi-3.0.4.tar.bz2 9308341 BLAKE2B 84536082f8415c9a0e41db01d96d64bffc463ca84de7730b25789dfee74e2205db5467739a42f13b0938d0934b45c948cd2be406290cdb4b196a5b51a5a3fc88 SHA512 c9db432e89d680e8857444395fee3544bebd4d1535f3e85a9435ca21f9848fad9f181e6be1ab8b93241b88723395535e3b3bdb2a5dd4128ed26df887b9a55810
-DIST openmpi-3.1.4.tar.bz2 9468371 BLAKE2B 70a93aa170086f43b2eb4f9b7c74673065bd309ae7a4c8f478a6db7523167fd1d25af19f87661149f6dd6033898ab47b86690a0421a01aa6f5a4d70478072e0e SHA512 5b4aafffc79fd85cb94a11a6e2fac563b142ac532191009eb35826c432ed3c391a6616e2ca92eacbf36137468eadb7c0f7ddc787034bc95c4214232ed5128338
-DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011
-DIST openmpi-4.0.7.tar.bz2 9809794 BLAKE2B c8ecafa3d50c54ebb9c8853010628240a696b342b04d17df66c4dbbc199a6b65bf7d92a8c34867e86e36a8664d1e26b7d0b0fa16f28cc9c8fed5223a4c06ef81 SHA512 27c49a1598c565e7ab63d2ca5b5277aad36f9f863854199e86af0387ec6edce9a99e9a8bc8dad565d01a6ab4c9f61067603c07b30a165317cced4997507727a4
 DIST openmpi-4.1.2.tar.bz2 10084596 BLAKE2B 2e6fc12b4564a302d2c364528d0f6bea8b23f9b1cd6059763b8d5de583d86aae2812c239b1d0bb40c83f3c7682c8e666ce1de3112e95de54848169cb5e2805e8 SHA512 1958f96434cddbe525b4511fcf8d0cf8bf1ff376e024466219bd3a2092900e318f45a4b1e1a8ef6b03e350f46a71777fc7db82a7df711f12bb9758150d209aad
-EBUILD openmpi-1.10.7.ebuild 6069 BLAKE2B ac5bff677d4612bc063487b24a64fbec3af4a16fe6fc9af3089fbeefe432a9ac044d94baa48b9809d9a5a5e36c3cf19a088debccad5d55b667f76ca4851cba4a SHA512 321ef39a4f68026f11982dff7aafd25952af25da8923f8bda38f2607ebba24cd9b904651a81a1248c16626e03e87ec98853711952541ea5ebeba0d6fc457b8f1
-EBUILD openmpi-1.4.5-r1.ebuild 2413 BLAKE2B e19baf3cecf5b23e1323faf8201d7c9c61f30cb4a3d1db78a6b7d1f801a6d0648c68fd47a8b3237e6534aa4096a392b7f0c57053528c64150f5728424e60e0d1 SHA512 fc1fff1385bc270d88d87b52e699e6d65c5b0e9c80ed1807417a7db5757848cd69c555a5221a0b0238b1bf4001174e458e71d851e657622aaf83c13391a311a1
-EBUILD openmpi-1.7.5-r2.ebuild 4531 BLAKE2B e4c08d0a7924dd491429422d0358bf5cf7da83a24ecb9896d00b881f690760c17f33f03705920bbad5e17b26a1526cf1fb07a5a199b30625a606682adcc6bf08 SHA512 0e45fc86cd762e9f19085bdb51fccd2b25a5fea43f8a3aeee9ebda97cf3ec670a7819f582ae9420a18bb5b720ef81f13d23a123ee9e3f15b2a2b0ed965a6bdd8
-EBUILD openmpi-1.8.8-r1.ebuild 5079 BLAKE2B aea29d30afbb7fe5f1497ada6540f1852e91846ee9f3b8135535d93d30d64fcd2dd3dfd230b233bde5d2dd1fe1a7174ce36e80935fa7cdd5af38c05d5cad2da8 SHA512 e07ed826f7a33afa5bb83878e347744f31f7c88621a8473547cfb28584f87678977eb4748fe4b26691f3a200b244935698fcf4f4494736da4f2670bb7f56464d
-EBUILD openmpi-2.0.4-r1.ebuild 5679 BLAKE2B 40091a2ed90dac24444cd8909f4b0f448470d22daefd2662e8df0bb64337f3d84f12b07b23051cef44ac52af7bab408a3efd7f0001d93468c7476e8df867bf00 SHA512 777ac2fe960caa39a9c72f7ed1d3c9b1d8612fc605cfb81c8764001162e4055124ddc1b0228d349b40f8c871ed529c8200e06d16ec481e769e3d2e49d857f329
-EBUILD openmpi-2.1.6-r1.ebuild 5284 BLAKE2B 9df531ecacb2db92d4ca99d997b770ca9d1d9ed1bb58052144614cd8ecea21ed484b807824c89796180f4fdbb3aa2d54e4cd1ab4a6dad3321908b66d33bb4abc SHA512 df13ebfade10a22b0e62d4e83f9b78cae1148dd82702c7af2fd75f05e66209b68d30a2a7c53d773d83b1081b804cce8d3258c1532477f464b49c057e37186ad4
-EBUILD openmpi-3.0.4-r1.ebuild 5170 BLAKE2B 24b94a833499f545443d8427a697c895a6dd3cdb06fb6c64a5e7756f10be3fe89ce827d46a57703e8f2ec5b0b1595585aa3997fcba1f0f5b550ef146f7680b59 SHA512 a87bf7c9e2c684abc6e87be360681186d450db08179bf7d3466514327a449b8a52d453cba5e3e7922da75db3f9d42274384af118be4cad37008c9ad09f9da4f8
-EBUILD openmpi-3.1.4-r1.ebuild 5170 BLAKE2B 24b94a833499f545443d8427a697c895a6dd3cdb06fb6c64a5e7756f10be3fe89ce827d46a57703e8f2ec5b0b1595585aa3997fcba1f0f5b550ef146f7680b59 SHA512 a87bf7c9e2c684abc6e87be360681186d450db08179bf7d3466514327a449b8a52d453cba5e3e7922da75db3f9d42274384af118be4cad37008c9ad09f9da4f8
-EBUILD openmpi-4.0.5-r3.ebuild 5229 BLAKE2B 10a8ec7da4348b9562ac9084453c8c0751b532a2337ee4cd4fb6032bb076d9c01d9060f3ca16953ca7529122739f3799392cfdb3cfa5b60a12f02f71655392bb SHA512 3d6be4be0a16c702927b3a8ffc66bbff19730502fea48b623d32f279c4eab9e3200213c86de210bd38218d2ba3d0849dbdc64a1f434c847a2cf8eddc422054ca
-EBUILD openmpi-4.0.7.ebuild 5237 BLAKE2B cb1abc276f058a3e456d87a6e2ea4858b4068b74ab1bda607a614e7526545e5e76619b6f9e010e969c8b2031f8153399c6f5fc323e3198cf47916e103fc78b14 SHA512 c80ffdfd2d2d4b28edfd4dfd0c2ff498b3e587f97213c5039f7798858be6952f1a00e4d4389b5d1d4451dc55396a4dfba43d5518933efddf9ff8ee49c70da6ef
-EBUILD openmpi-4.1.2.ebuild 5693 BLAKE2B f6117f81c5b7ca3d7feb05f541cf50ecc8b122d309033dda9b49fdb86c060e3ce2f822e2bdcc0d3534134e681055f28b836723918674f281febf2b9a5c96ddfd SHA512 6628c8a651cd1c16f8b51b419651820da1255d8ce512675643b84e009a7f00388b497992b4038f499a14a6c69de20206bca3bee3a34c08a9d2900cb7ab1a5b16
-MISC metadata.xml 961 BLAKE2B 83fe60a3b125736b98fb8fde2deef0231d8dab694f251a1ca929360a92558774707da4f8085dbfa3431c311aabacaf06cefb0c2969126c95cee4996485cad87f SHA512 970e915852eb254419c67ba00df53034761e31ef12c63b3672ffcd1006a00e6ede30ae09d5ccd8c52e2d5899301cdecf24a477a67c8df9ec319e129705e9cd9c
+EBUILD openmpi-4.1.2.ebuild 5687 BLAKE2B 045d962b08de136effe107c6a6442e51d0498bab171ab00a8c7f4220fb0ec9bfd8ade99925f9b0bc1c4f17dc2b0a94e7a32a3f947624d9322085b0ade865cc13 SHA512 7eea04e47b1ec702f4d22c52c0cae7b24544ba5c5703b871acc4e775ea1e1581e16d89c8f8965fcc9727d266b22096b41919aac94b6e243543809583d57fdd80
+MISC metadata.xml 591 BLAKE2B 28565407b0cad3375993104e44ecaafdfac92c5523e1bdef1c4f3aa01f1d13abe87e9b4c1828edee3d44ada49020f8e3a1b5838d6b7481ab1800ea283531fdbb SHA512 90e1f3cddf37d3c6f957a5142cdf109916aa1348b3df3b56a18bbaab1c1221e4fd553c9ff356373f2b63cdb828a50eb2a041d6ef4252fa7a3b262be0edf3c3c1
diff --git a/sys-cluster/openmpi/files/openmpi-ltdl.patch b/sys-cluster/openmpi/files/openmpi-ltdl.patch
deleted file mode 100644
index a288ea272473..000000000000
--- a/sys-cluster/openmpi/files/openmpi-ltdl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -up openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl openmpi-1.6.3/ompi/debuggers/dlopen_test.c
---- openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl	2012-04-03 08:30:25.000000000 -0600
-+++ openmpi-1.6.3/ompi/debuggers/dlopen_test.c	2012-11-02 14:50:12.613702426 -0600
-@@ -13,7 +13,17 @@
- #include <string.h>
- #include <stdlib.h>
- 
--#include "opal/libltdl/ltdl.h"
-+#if OPAL_WANT_LIBLTDL
-+  #ifndef __WINDOWS__
-+    #if OPAL_LIBLTDL_INTERNAL
-+      #include "opal/libltdl/ltdl.h"
-+    #else
-+      #include "ltdl.h"
-+    #endif
-+  #else
-+    #include "ltdl.h"
-+  #endif
-+#endif
- 
- static int do_test(void);
- 
-diff -up openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl openmpi-1.6.3/ompi/debuggers/Makefile.am
---- openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl	2012-04-03 08:30:25.000000000 -0600
-+++ openmpi-1.6.3/ompi/debuggers/Makefile.am	2012-11-02 15:04:53.636926260 -0600
-@@ -47,7 +47,7 @@ headers = \
- 
- dlopen_test_SOURCES = dlopen_test.c
- dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl
--dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la
-+dlopen_test_LDADD = $(LIBLTDL)
- 
- predefined_gap_test_SOURCES = predefined_gap_test.c
- predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
-diff -up openmpi-1.6.3/test/support/components.c.ltdl openmpi-1.6.3/test/support/components.c
---- openmpi-1.6.3/test/support/components.c.ltdl	2012-04-03 08:29:44.000000000 -0600
-+++ openmpi-1.6.3/test/support/components.c	2012-11-02 14:50:29.204705380 -0600
-@@ -24,7 +24,17 @@
- 
- #include "opal/constants.h"
- #include "opal/mca/mca.h"
--#include "opal/libltdl/ltdl.h"
-+#if OPAL_WANT_LIBLTDL
-+  #ifndef __WINDOWS__
-+    #if OPAL_LIBLTDL_INTERNAL
-+      #include "opal/libltdl/ltdl.h"
-+    #else
-+      #include "ltdl.h"
-+    #endif
-+  #else
-+    #include "ltdl.h"
-+  #endif
-+#endif
- 
- #include "components.h"
- 
-diff -up openmpi-1.6.3/test/support/components.h.ltdl openmpi-1.6.3/test/support/components.h
---- openmpi-1.6.3/test/support/components.h.ltdl	2012-04-03 08:29:44.000000000 -0600
-+++ openmpi-1.6.3/test/support/components.h	2012-11-02 14:50:22.409703519 -0600
-@@ -20,7 +20,17 @@
- #ifndef OMPI_SUPPORT_COMPONENTS_H
- #define OMPI_SUPPORT_COMPONENTS_H
- 
--#include "opal/libltdl/ltdl.h"
-+#if OPAL_WANT_LIBLTDL
-+  #ifndef __WINDOWS__
-+    #if OPAL_LIBLTDL_INTERNAL
-+      #include "opal/libltdl/ltdl.h"
-+    #else
-+      #include "ltdl.h"
-+    #endif
-+  #else
-+    #include "ltdl.h"
-+  #endif
-+#endif
- #include "opal/mca/mca.h"
- 
- BEGIN_C_DECLS
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 54502ebb0c41..973c7450cc63 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -8,14 +8,8 @@
 	<use>
 		<flag name="cma">Enable the CMA (Cross Memory Attach) MCA</flag>
 		<flag name="cuda">Add GPU direct support</flag>
-		<flag name="heterogeneous">Enable features required for heterogeneous
-		platform support</flag>
 		<flag name="libompitrace">Enable support for contributed package libompitrace</flag>
-		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
-		<flag name="numa">Enable numactl to allow binding processes to CPUs</flag>
-		<flag name="pbs">Add support for the Portable Batch System (PBS)</flag>
 		<flag name="peruse">Enable PERUSE interface</flag>
 		<flag name="romio">Build the ROMIO MPI-IO component</flag>
-		<flag name="vt">Enable bundled VampirTrace support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
deleted file mode 100644
index bd10c4fe0ad4..000000000000
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/pmix
-	>=dev-libs/libevent-2.0.21:=[${MULTILIB_USEDEP}]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	if use mpi-threads; then
-		ewarn
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		ewarn
-	fi
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf || die
-	fi
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(usex !vt --enable-contrib-no-build=vt "") \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# From USE=vt see #359917
-	rm -rf "${ED}"/usr/share/libtool &> /dev/null || die
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null || die
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-1.4.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.4.5-r1.ebuild
deleted file mode 100644
index fb848dabe383..000000000000
--- a/sys-cluster/openmpi/openmpi-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 flag-o-matic toolchain-funcs
-
-MY_P=${P/-mpi}
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v1.4/downloads/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-RESTRICT="mpi-threads? ( test )"
-
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
-RDEPEND="
-	pbs? ( sys-cluster/torque )
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/pmix"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	default
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--without-slurm)
-
-	if use mpi-threads; then
-		myconf+=(--enable-mpi-threads
-			--enable-progress-threads)
-	fi
-
-	if use fortran; then
-		if [[ $(tc-getFC) =~ g77 ]]; then
-			myconf+=(--disable-mpi-f90)
-		elif [[ $(tc-getFC) =~ if ]]; then
-			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf+=(--with-mpi-f90-size=medium)
-		fi
-	else
-		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_with pbs tm) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-	dodoc README AUTHORS NEWS VERSION
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild
deleted file mode 100644
index 8319c92e65d2..000000000000
--- a/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools cuda flag-o-matic fortran-2 toolchain-funcs
-
-MY_P=${P/-mpi}
-
-S="${WORKDIR}"/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx fortran heterogeneous ipv6 mpi-threads romio threads vt
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)"
-
-RDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/pmix
-	dev-libs/libevent:=
-	dev-libs/libltdl:0
-	<sys-apps/hwloc-2:=
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	default
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-
-	# https://github.com/open-mpi/ompi/issues/163
-	eapply "${FILESDIR}"/openmpi-ltdl.patch
-
-	AT_M4DIR=config eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--with-hwloc="${EPREFIX}/usr"
-		--with-libltdl=external
-		)
-
-	if use mpi-threads; then
-		myconf+=(--enable-mpi-threads
-			--enable-opal-multi-threads)
-	fi
-
-	if use fortran; then
-		if [[ $(tc-getFC) =~ g77 ]]; then
-			myconf+=(--disable-mpi-f90)
-		elif [[ $(tc-getFC) =~ if ]]; then
-			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf+=(--with-mpi-f90-size=medium)
-		fi
-	else
-		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(use_with openmpi_rm_pbs tm) \
-		$(use_with openmpi_rm_slurm slurm)
-}
-
-src_install() {
-	default
-
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool || die
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 || die
-	dodoc README AUTHORS NEWS VERSION
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-
-	# Do not override malloc during build.  Works around #462602
-	emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild
deleted file mode 100644
index ac6ed9df845f..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/pmix
-	dev-libs/libevent:=
-	dev-libs/libltdl:0
-	<sys-apps/hwloc-2:=[numa?]
-	sys-libs/zlib
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	default
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--with-hwloc="${EPREFIX}/usr"
-		--with-libltdl="${EPREFIX}/usr"
-		)
-
-	if use fortran; then
-		myconf+=(--enable-mpi-fortran=all)
-	else
-		myconf+=(--enable-mpi-fortran=no)
-	fi
-
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(use_enable mpi-threads mpi-thread-multiple) \
-		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(use_with openmpi_rm_pbs tm) \
-		$(use_with openmpi_rm_slurm slurm) \
-		$(use_enable java) \
-		$(use_enable java mpi-java)
-}
-
-src_install() {
-	default
-
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool || die
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 || die
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	dodoc README AUTHORS NEWS VERSION
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild b/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild
deleted file mode 100644
index 752a3ae1982f..000000000000
--- a/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/pmix
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf || die
-	fi
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-
-	# fix parallel build when f08 is enabled
-	mkdir -p ompi/mpi/fortran/use-mpi-f08/profile || die
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild b/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild
deleted file mode 100644
index a6e5a26fe493..000000000000
--- a/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/pmix
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf || die
-	fi
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			"${ED}"/usr/bin/oshfort \
-			"${ED}"/usr/bin/shmemfort \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild b/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild
deleted file mode 100644
index d17836c5e10d..000000000000
--- a/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran heterogeneous ipv6 java numa romio
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/pmix
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	echo 'oob_tcp_listen_mode = listen_thread' \
-		>> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			"${ED}"/usr/bin/oshfort \
-			"${ED}"/usr/bin/shmemfort \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild b/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild
deleted file mode 100644
index d17836c5e10d..000000000000
--- a/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran heterogeneous ipv6 java numa romio
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/pmix
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	echo 'oob_tcp_listen_mode = listen_thread' \
-		>> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			"${ED}"/usr/bin/oshfort \
-			"${ED}"/usr/bin/shmemfort \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
deleted file mode 100644
index ef9a1e2bea64..000000000000
--- a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	echo 'oob_tcp_listen_mode = listen_thread' \
-		>> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	local myconf=(
-		--enable-mpi-fortran=$(usex fortran all no)
-		--enable-orterun-prefix-by-default
-		--enable-pretty-print-stacktrace
-
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-
-		--with-hwloc="${EPREFIX}/usr"
-		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-libltdl="${EPREFIX}/usr"
-		--with-libevent="${EPREFIX}/usr"
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
-
-		$(use_enable cxx mpi-cxx)
-		--disable-heterogeneous
-		$(use_enable ipv6)
-		$(use_enable libompitrace)
-		$(use_enable peruse)
-		$(use_enable romio io-romio)
-
-		$(use_with cma)
-
-		$(multilib_native_use_enable java mpi-java)
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
-
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_rm_pbs tm)
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-4.0.7.ebuild b/sys-cluster/openmpi/openmpi-4.0.7.ebuild
deleted file mode 100644
index 543d4350d094..000000000000
--- a/sys-cluster/openmpi/openmpi-4.0.7.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	echo 'oob_tcp_listen_mode = listen_thread' \
-		>> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	local myconf=(
-		--enable-mpi-fortran=$(usex fortran all no)
-		--enable-orterun-prefix-by-default
-		--enable-pretty-print-stacktrace
-
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-
-		--with-hwloc="${EPREFIX}/usr"
-		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-libltdl="${EPREFIX}/usr"
-		--with-libevent="${EPREFIX}/usr"
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
-
-		$(use_enable cxx mpi-cxx)
-		--disable-heterogeneous
-		$(use_enable ipv6)
-		$(use_enable libompitrace)
-		$(use_enable peruse)
-		$(use_enable romio io-romio)
-
-		$(use_with cma)
-
-		$(multilib_native_use_enable java mpi-java)
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
-
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_rm_pbs tm)
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-4.1.2.ebuild b/sys-cluster/openmpi/openmpi-4.1.2.ebuild
index bcdeed294796..3378509a5976 100644
--- a/sys-cluster/openmpi/openmpi-4.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.1.2.ebuild
@@ -30,7 +30,7 @@ SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"