gentoo (leap year) resync : 29.02.2020

9 files changed, 9 insertions, 626 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 5947f507823a..e35dc78f44fe 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,33 +1,25 @@
 AUX hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch 1602 BLAKE2B d15d2321ef32b3b16a2084ae1f0c3b6d6a6d4f6f16aa703c3ff0d217bf8900df261e053d3ea7426e889344597bbda59ceacbda6ba4c0ddd046cac4fc3d972d58 SHA512 7732a53f6074432a10bbe7dcca6b64e45bebadb797c214fca9c93d2ec5fd179832f69374c38d2bba5932089fcae6a7045990a1c7bbb048c3b5ab1397e9596c74
 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.3.tar.bz2 6626909 BLAKE2B 76c87f748908dc91e79114f555f9dc6341729959076221ba92a4c542fb4af16ceac70e5b7567a918604dc1338a1b417c7d358b746a7d4b0c966b3ab8abbc2f28 SHA512 c33d5e019ba0b080aa34ecfa085182349da806e4bff26c1bf4dbdc8fb3f8f3c38899b9d96d671e1ae337b523ac9d634ae25c49d9af6eef2bc340c29dba75b1b8
 DIST openmpi-1.4.5.tar.bz2 6643760 BLAKE2B 6890e8ed6f75e77e0e02c88bce473a37195549bca06696881cf7c3f6e46db25abaa04d9517d7ff9a11ad64cc97cf8d1b8678d9797c49a1659656d8a5de5c56ae SHA512 f89922345cde8978483e397e9016103626db3f1787f9afccaf0f60d59caa2a4409b47b01ac221d60e24e241f2afecb636ca89688bf326dc0ca5c817de96b3e99
 DIST openmpi-1.6.5.tar.bz2 10943881 BLAKE2B 8022d8a146d7e99a01e734d9c9725882bb359a2419dc27afe6a2dc2e8bbc8bca03ec1311e10a12068dd38d0f9c442d1efe5af755192a2ad2af332a1459369953 SHA512 b0ede0264cd9263b8ba59ec51d17ad47b5f20d49d219ca05f7c396d608398d517b2023a46a2535fd6191160d709e4805c4de436dcfee56eda287383bd69f9652
 DIST openmpi-1.7.5.tar.bz2 13286694 BLAKE2B 15862d34f8b8db60e7896f57274555df849713492c6e7e590feb06ec9b3655ff0311a81c0a6c87cc16dc8fd95510a1d79b23467af843d37768f75005ff4edd8c SHA512 72de2788fa26615a2e7373b5f32e0a2b9e39d56094c45b49348ef19bbb0ea306734b7d3275d76471a18628b5244d882de4ed3595eb46f13683e1c8d2b277f065
-DIST openmpi-1.8.4.tar.bz2 13488749 BLAKE2B 25190d5b5853e5b18900ee5b00e5c3524aa7923258e4718ea562da6d7f0e316f777a54be9fa8e15d3ba6e82a00a506c8df15b51a554bfc6f1a6e34c7adda8561 SHA512 d4c8ce2bd3359cf2e85958b58ba18b52c9cef6676718eb3d948309b164b2f54544f8f8419ef6881c7a51ba268a876cd56e9b2d340a106a16fa25fb9fc3e4eff9
-DIST openmpi-1.8.7.tar.bz2 13228742 BLAKE2B d273d038726f0892467416388c4c52f4ed8b655868761306a812c44f93fbde41a157cccf06b8a5ae5d376dcb98a1afd1dc8820268ef22cb567be9c476c9f3f83 SHA512 953e007b00c9753bafc05d13e6f686c9aa47f76f55fcc4eda565174d410de059e07862b7e667d15df13afb80418661d9a8d5ee17fdcc211d3e044992cd9ceede
 DIST openmpi-1.8.8.tar.bz2 13231433 BLAKE2B d196fd0bb08cfb0c86a29ae39015eb15e1465554e322c1ae039b61cee3a027ea0ba8d7fecd02e310309caec416147611a233861e464db4449da3b449387b1dca SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660
 DIST openmpi-2.0.2.tar.bz2 8311215 BLAKE2B 8dd0d7b95c396e9a0f05760136bbf62defd3527b2ac4f9ec738239b91d8cf5ed0c3dc4ad5330f0ea2fafa3464164e3d514bc058dc9d019daa83382ae990f442c SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a
 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.1.tar.bz2 9838152 BLAKE2B 75657940e37c23fbe88032f116588960c6bcf34c4928d77b45e8fde6fb51e814f521adb6c5155cb588fff9d1b382c2470873d90979a68598ff13e1aa205fc811 SHA512 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731
 DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cfcdd7c6f8ab90bc9507fd7a473d70502574ee1e75c88acecb06c516a643ef7b9e804fb580be9fc860b7b1fb1cc5d SHA512 634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770
 EBUILD openmpi-1.10.7.ebuild 6263 BLAKE2B 3b62f526e26cca18bb42ddb1da43401f8250fa3ac948cbef7a7a10f7a8d475efbf0fd728896e5bc57837486c71e7802d1122a9929cac786406c677530c9370ac SHA512 2f6f7b6265536a34596a4b28610bcc753834c7f7d96fd87d2ba13b2c3e4ed80f5cd7905e01c496aac88be5394876ebda9e724fa0f637c81331e506105f2bc056
-EBUILD openmpi-1.4.3.ebuild 2437 BLAKE2B 3efab12eccefe66f6ee61c368fc20e323144b1ab61129c30bd3a0c0a2757dc9394ebf444b60f14b145a59fdcba0420a5b2daeb16e8de95a8e94e9d9f69bd4d93 SHA512 2cc33b0a3a60ac5e262a323927fe3a2c669110be4fa5aa9f0615584763300be72879e1f34fbac9922ad527c972f53166685299242dc9bd4e05bc0113376e050e
-EBUILD openmpi-1.4.5.ebuild 2445 BLAKE2B 43a7054359fd696b62e5402ad516d863d7fff69a4e99afb9412b5ed4d5b1f23a9a03d358d09ddd9a02740ebabd6181fa422cb7e291bf2d0b5103a78ea27cd341 SHA512 85930a30601f2ed2ea99fd42ed97b5310ab99fe0e2787a6dc3ff1262505f396b488577dab662a433e304f8d6b6b1c5e39d17113d45bf1f3477eaa9ebaaf52c1b
-EBUILD openmpi-1.6.5-r1.ebuild 5009 BLAKE2B 60fd2512b457e6b4fc8f226a08a6f1563962c80de5bf5f245e5476a2cb4538864b8fe4551f474bbcd31f47bf6002f6ff4b758f247eeeac25ce82676543d4e4fc SHA512 806d58dc0bade3b601f35992409ddb9c7eb275d346a2e7df52a6dd8c1d11d77574e82a3a1c13c99699f9cc1e06549acc71fa2b16d01915711d35a83e249fd9e6
-EBUILD openmpi-1.7.5-r1.ebuild 4759 BLAKE2B 45c90e4ad034085849e3653e9dcefb383d431d0d2846731612f97feb195571ce61b4f7175478d0764d9066db61b09fd6f71bb6c3cec82964ac4c6582e65266f1 SHA512 15cd32162895306696da23762c7053969890f6e52869c378a53ea7da5886e0487cbdb80e9f041237fea9520703a1cca299244bd8e5d40fd6cbaf5adff8a00c5e
-EBUILD openmpi-1.8.4-r4.ebuild 4803 BLAKE2B 7a76f303d011bfbc728c1493f84d16dba7b846c35db9f7b480e4d6dc6f9f24560926512c4cc41b78518e1751e2a2023852e878c5b32a6d36756c232683ee68ef SHA512 a207be21dab98a6722c67169ef9b9f106f78942f5d8e71bffc1e4ed5098428293d61021271b0eebe324c71a19f4bec7cfb515207d59b4734533fa024948fd0fd
-EBUILD openmpi-1.8.7-r1.ebuild 5314 BLAKE2B ab982909481cce9f14cdad5f434f3605b47ec584004355b27d7d1e792c0a152844782f15857b9558635270cf1da9eb37be11016f4caaab22e9da4be8c5241d10 SHA512 9bf214ca103100df609c09267376989ea531f427dcadfae26c5608fd2587cff0b0df62dacea17ce1eb44db375b4e5a4aa778544f3b197cd05b8b187329fbc10d
-EBUILD openmpi-1.8.8.ebuild 5320 BLAKE2B ca0be3563d2110673489348d25bab2e3e5713924cf6a5a4129f595c88c707b3090df4722c22367870225afaf41d64af6eeec58ccd35f5b508b126335a425ee22 SHA512 0781ea59c2c941b968f2ae39d660ca26f6991019520e07f5b4fe37140f236ec76f77d2e8bb84f290b7007f8da7630c9aac156b5073d2093773975a9f7abb2868
+EBUILD openmpi-1.4.5.ebuild 2438 BLAKE2B 2bc673e395029f0892afbbe61ffe81264673db90727f9bd50ac52f836aa813a5f6bad79bac3eab862fd664655b629fc8d00feea48292d2c4f5a603e6cd1972fb SHA512 7e3f32b2887f7b8c7f889ee39fdc32f6968dd67fd82618b382b1069462855b8191b90e7f01254589bbbe94af734bbf0e2369304b341261f4c28c3a20752b21b0
+EBUILD openmpi-1.6.5-r1.ebuild 5008 BLAKE2B 7adca9087c72cd4abd34049d43963a936d64aee6893ac3743d163c62af0e266fea62f2eebcc28b32eadf3ba8a64fe316ce0906f604f2c217f8dd4df0f92b4e4b SHA512 3f33f763da0d4438216cb6458bfae130047f52c40f4a55497a949130b69f6dccb3a84fa750f547920376712f6ef9f2968dee1f3bcb6b585f05ab2d863c0b6519
+EBUILD openmpi-1.7.5-r1.ebuild 4758 BLAKE2B e6c0bfd7a63f4c8ba8b74b6f05ec5341177ea91de39c0f2a95021825632675a09e023b1613f8f4c0e9ba4f9a6df610f18cb77f98beb3f6c1c12de38ac89348c1 SHA512 124de92b7cccd583dd978ef3317e88b19aa1cd04b4a89f89f4ff6f8b778073ac8888d0304bd23869d3f8a929d3c86eb9d0d2d49df4ac79d644e296e2d9175951
+EBUILD openmpi-1.8.8.ebuild 5319 BLAKE2B 3071a92067d41f3559e127ca98854de7bb360ab8b9606ce56fe694067abca83a895345700fff8308413eca8082c833f9ac24ddd078fc5f4dd93b44419151a4b2 SHA512 84b1722fbbc42200d82cf40e82ab09ad2dbbfc9548cf2fb1c3bcb1555f99296b00e2ccf5af38498e4b1de13c728ab3f9e8cee4ea0dc6686c9c3c2025e043fe86
 EBUILD openmpi-2.0.2.ebuild 5873 BLAKE2B 8b92228d6a4c1d3ae7d5914cee38aef6eac9f3ce198ed7cf620bdd699f1b54a67f537f6b8841bb6a97711b4af741c305c8dd4f5dfbb1a53a3ce286c73d1f394d SHA512 1ff2f6d2cda462d1416a3f49655ae0f97d34dbbdcd22b64555de8e593fc0888b8dd127ef5c32e08be8d88fdbb28b31bcc856dcb46a7813dac6b20ba851689994
 EBUILD openmpi-2.0.4.ebuild 5877 BLAKE2B 096d892a023c61dad1f8d628b5b2a9450b7eb43687e246c841bf2d68bedd8046f9ddb922e6b077511a05e56d4fedc68043c9b9954296fd6c17af006c8fc002cf SHA512 3dad7eca29d98fb2b564ea5d96adccc794ca056357cc596b57ac82bceaa7bf08031d45ff0779dfe835ffb5bf8bbc1973c69ed1298c5a046eb65875561873d5a8
 EBUILD openmpi-2.1.6.ebuild 5491 BLAKE2B 4820398c3d020f650c067ba56fe6c324d319acd0755ab87d98df0cc43abfd24f1481d991c75a545e12a4b856287ec6337a872bb00e5a528595acd0a247dc6f7e SHA512 2c15f7b7f9131b7b6a0c08e918d7c683ffd8108f71decdd8ca4e1e82c78b66dd31e2017c22ec60c72a5cd37f2ea3c2e6f65d1ca3d13b6855e19e5ebe57278586
 EBUILD openmpi-3.0.4.ebuild 5377 BLAKE2B a07ba3ef9c7b594c9de2ef29ff1d33177ec56568d10336147c9c4ffadd4d655f2648a1f097468bb7e638249f081bf80d27421db0e03435f33c20f9b649cb585e SHA512 b552ee84c2196f233cbd052f98bea70ea003b447ee3f5a5853841fcdae68843317afd7ba3fb8be93641c76f538fc77aecd2b81e8593fceed2e4ca4c56475045b
 EBUILD openmpi-3.1.4.ebuild 5377 BLAKE2B a07ba3ef9c7b594c9de2ef29ff1d33177ec56568d10336147c9c4ffadd4d655f2648a1f097468bb7e638249f081bf80d27421db0e03435f33c20f9b649cb585e SHA512 b552ee84c2196f233cbd052f98bea70ea003b447ee3f5a5853841fcdae68843317afd7ba3fb8be93641c76f538fc77aecd2b81e8593fceed2e4ca4c56475045b
-EBUILD openmpi-4.0.1-r1.ebuild 5319 BLAKE2B eff82c6e203d8875c8e8ce2a0e3add15f95302479d1a76bc947162ee72f6660b1545f40903f95c52adc5b63a006a2982f4be343b7a06cbfa73a772bfaf69151f SHA512 4f6096c9d123c0b49ff49de54b5540758fe3626c58fe537bfd0e815ce3b34a17d8ff71bd2363a119cc5ed57eec56edd6b9834c5dcdb65c6ce5e57152c6057bed
 EBUILD openmpi-4.0.2.ebuild 5319 BLAKE2B eff82c6e203d8875c8e8ce2a0e3add15f95302479d1a76bc947162ee72f6660b1545f40903f95c52adc5b63a006a2982f4be343b7a06cbfa73a772bfaf69151f SHA512 4f6096c9d123c0b49ff49de54b5540758fe3626c58fe537bfd0e815ce3b34a17d8ff71bd2363a119cc5ed57eec56edd6b9834c5dcdb65c6ce5e57152c6057bed
 MISC metadata.xml 928 BLAKE2B f6cacb50815977ad28b83ec24725021a140db9592152d2a9e238da051058287c01c73ac557392946f83949caee2f75a847ba5e82c4b6f816ab3f8288aa38b719 SHA512 a7ba5e4bfc8e6c1a74667f31c4d8df580699fa84766cbc597a66c1a0ed12ece60bf1f683fcbd30529b042588ae4460741b4eef407e232532a3eede1766326f1e
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
deleted file mode 100644
index 995428ba0bae..000000000000
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
-
-MY_P=${P/-mpi}
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://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() {
-	# 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 () {
-	emake DESTDIR="${D}" install
-	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.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 09f1a47cf5a1..06dc029d76c8 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 RESTRICT="mpi-threads? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
 RDEPEND="
 	pbs? ( sys-cluster/torque )
@@ -91,7 +91,7 @@ src_configure() {
 		$(use_enable ipv6)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc README AUTHORS NEWS VERSION
 }
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 2316cbacd408..2e0401287fb9 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -153,7 +153,7 @@ src_configure() {
 		$(use_with openmpi_rm_slurm slurm)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	# From USE=vt see #359917
 	rm "${ED}"/usr/share/libtool &> /dev/null
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index b89bbeea526c..dab0046aced8 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -145,7 +145,7 @@ src_configure() {
 		$(use_with openmpi_rm_slurm slurm)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	# From USE=vt see #359917
 	rm "${ED}"/usr/share/libtool &> /dev/null
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
deleted file mode 100644
index 6fb44825a36e..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-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="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 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 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_fabrics_psm? ( openmpi_fabrics_ofed )
-	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
-	)"
-
-RDEPEND="
-	!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-fabric/ofed )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm )
-	"
-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() {
-	# 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
-	epatch "${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
-		myconf+=(--enable-mpi-fortran=all)
-	else
-		myconf+=(--enable-mpi-fortran=no)
-	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_with openmpi_fabrics_psm psm "${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)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	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.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
deleted file mode 100644
index e50b89fd7f6a..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda eutils flag-o-matic fortran-2 java-pkg-opt-2 multilib toolchain-funcs versionator
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-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="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 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_fabrics_psm? ( openmpi_fabrics_ofed )
-	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-fabric/ofed )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm )"
-
-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() {
-	# 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_with openmpi_fabrics_psm psm "${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 () {
-	emake DESTDIR="${D}" install
-
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null
-
-	# 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-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 762622c3a983..824231448dff 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -149,7 +149,7 @@ src_configure() {
 		$(use_enable java mpi-java)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# From USE=vt see #359917
diff --git a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
deleted file mode 100644
index 325f9db22542..000000000000
--- a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 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
-	openmpi_fabrics_psm"
-
-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="http://www.open-mpi.org"
-SRC_URI="http://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 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_fabrics_psm? ( openmpi_fabrics_ofed )
-	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-fabric/ofed:* )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
-
-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-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(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_with openmpi_fabrics_psm psm "${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* \
-			|| 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
-}