gentoo Easter resync : 12.04.2020

7 files changed, 59 insertions, 65 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index e35dc78f44fe..6d7d841e55da 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -5,21 +5,21 @@ DIST openmpi-1.4.5.tar.bz2 6643760 BLAKE2B 6890e8ed6f75e77e0e02c88bce473a3719554
 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.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.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cfcdd7c6f8ab90bc9507fd7a473d70502574ee1e75c88acecb06c516a643ef7b9e804fb580be9fc860b7b1fb1cc5d SHA512 634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770
+DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f SHA512 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
 EBUILD openmpi-1.10.7.ebuild 6263 BLAKE2B 3b62f526e26cca18bb42ddb1da43401f8250fa3ac948cbef7a7a10f7a8d475efbf0fd728896e5bc57837486c71e7802d1122a9929cac786406c677530c9370ac SHA512 2f6f7b6265536a34596a4b28610bcc753834c7f7d96fd87d2ba13b2c3e4ed80f5cd7905e01c496aac88be5394876ebda9e724fa0f637c81331e506105f2bc056
-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-1.4.5.ebuild 2411 BLAKE2B de4ba9052e08bc5ee130db2db149f32dfa28f477418cee0eb5e643f70b311174cb6b14ade8aaca300e93628158c14a2272ec34c0ebda49c9308cbb925706ab3f SHA512 b7ac55a78155372f14b03cb4dcecd6cdea003d5928473df40c0827f542161af7216b111b3943eff0a5a389c1673eb499692b52b3226d7fee80561d1a658bcb33
+EBUILD openmpi-1.6.5-r1.ebuild 4942 BLAKE2B 94be71c8ff4e7979dcd5ff116478b6c8cbeea696191d5aeb1422336c4a0d310bef23f130886f6cb01bd1bb698cc442695e5c80f7bdcada89ae22d42307a88367 SHA512 13328c11924a784cd1305a75f46c22bfcc8978bb5f9e006c75bf3ed1acd78e7fd526e0a48a78ce31838165ff2ba0bad9b58f4b917a30f7b63668c71e9dc8c290
+EBUILD openmpi-1.7.5-r1.ebuild 4687 BLAKE2B cfde9458fbc1f5105a5862db7a6674adadd0ba00f69da6c82bed84dcedaa41640bde7a196b798f2671e4d20f6d1245bdf2cbf4a4ad2cc0fbc845df6cfb8060e4 SHA512 ceac97e01e6de8333248f7308fe1fb9fe1235f89a6af3c3c359ce72ea86158dd18abb027337d365242d3c575609ecf95ed8d37bd2a15ba3bdbff435b0566c767
+EBUILD openmpi-1.8.8.ebuild 5247 BLAKE2B cee3a37befdfd6cc322a9a9edf8ee5a766aa1ffb902eb6fd5ffa913cd9feb9a18285cb1dea05560a515181c552a70663e703cda83417d0cb73789f13dccb2e54 SHA512 193ed3c8c55e1440fc995e55fa8a0d229844beca89ac9f215f2c25fe8553f8bb8f4c90e38c2d80f3475af934feb0b9587fc467ca4e481d0d20b4a72b26abde49
+EBUILD openmpi-2.0.4.ebuild 5873 BLAKE2B 8b92228d6a4c1d3ae7d5914cee38aef6eac9f3ce198ed7cf620bdd699f1b54a67f537f6b8841bb6a97711b4af741c305c8dd4f5dfbb1a53a3ce286c73d1f394d SHA512 1ff2f6d2cda462d1416a3f49655ae0f97d34dbbdcd22b64555de8e593fc0888b8dd127ef5c32e08be8d88fdbb28b31bcc856dcb46a7813dac6b20ba851689994
 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.2.ebuild 5319 BLAKE2B eff82c6e203d8875c8e8ce2a0e3add15f95302479d1a76bc947162ee72f6660b1545f40903f95c52adc5b63a006a2982f4be343b7a06cbfa73a772bfaf69151f SHA512 4f6096c9d123c0b49ff49de54b5540758fe3626c58fe537bfd0e815ce3b34a17d8ff71bd2363a119cc5ed57eec56edd6b9834c5dcdb65c6ce5e57152c6057bed
+EBUILD openmpi-4.0.3.ebuild 5319 BLAKE2B eff82c6e203d8875c8e8ce2a0e3add15f95302479d1a76bc947162ee72f6660b1545f40903f95c52adc5b63a006a2982f4be343b7a06cbfa73a772bfaf69151f SHA512 4f6096c9d123c0b49ff49de54b5540758fe3626c58fe537bfd0e815ce3b34a17d8ff71bd2363a119cc5ed57eec56edd6b9834c5dcdb65c6ce5e57152c6057bed
 MISC metadata.xml 928 BLAKE2B f6cacb50815977ad28b83ec24725021a140db9592152d2a9e238da051058287c01c73ac557392946f83949caee2f75a847ba5e82c4b6f816ab3f8288aa38b719 SHA512 a7ba5e4bfc8e6c1a74667f31c4d8df580699fa84766cbc597a66c1a0ed12ece60bf1f683fcbd30529b042588ae4460741b4eef407e232532a3eede1766326f1e
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 06dc029d76c8..bc2a4450212b 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
 
 MY_P=${P/-mpi}
 
@@ -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 )
@@ -50,6 +50,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
 	# Necessary for scalibility, see
 	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
 	if use threads; then
@@ -92,7 +93,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	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 2e0401287fb9..3c25f065ce3a 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
+inherit autotools fortran-2 flag-o-matic toolchain-funcs
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -31,7 +31,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 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"
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -88,6 +88,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
 	# Necessary for scalibility, see
 	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
 	if use threads; then
@@ -97,10 +98,10 @@ src_prepare() {
 
 	# https://svn.open-mpi.org/trac/ompi/ticket/3649
 	# https://svn.open-mpi.org/trac/ompi/ticket/3648
-	epatch "${FILESDIR}"/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
+	eapply "${FILESDIR}"/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
 
 	# https://github.com/open-mpi/ompi/issues/163
-	epatch "${FILESDIR}"/openmpi-ltdl.patch
+	eapply "${FILESDIR}"/openmpi-ltdl.patch
 
 	AT_M4DIR="config opal/config orte/config ompi/config" eautoreconf
 }
@@ -154,9 +155,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
+	rm "${ED}"/usr/share/libtool || die
 	dodoc README AUTHORS NEWS VERSION
 }
 
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index dab0046aced8..507c969a7829 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+inherit autotools cuda flag-o-matic fortran-2 toolchain-funcs
 
 MY_P=${P/-mpi}
+
 S=${WORKDIR}/${MY_P}
 
 IUSE_OPENMPI_FABRICS="
@@ -28,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 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"
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -86,6 +87,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
 	# Necessary for scalibility, see
 	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
 	if use threads; then
@@ -94,7 +96,7 @@ src_prepare() {
 	fi
 
 	# https://github.com/open-mpi/ompi/issues/163
-	epatch "${FILESDIR}"/openmpi-ltdl.patch
+	eapply "${FILESDIR}"/openmpi-ltdl.patch
 
 	AT_M4DIR=config eautoreconf
 }
@@ -146,11 +148,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
+	rm "${ED}"/usr/share/libtool || die
 	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null
+	rm -rf "${ED}"/usr/include/event2 || die
 	dodoc README AUTHORS NEWS VERSION
 }
 
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 824231448dff..0390b3849341 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda eutils flag-o-matic fortran-2 java-pkg-opt-2 multilib toolchain-funcs versionator
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 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"
+SRC_URI="http://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"
@@ -94,6 +94,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
 	# Necessary for scalibility, see
 	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
 	if use threads; then
@@ -150,13 +151,13 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
+	rm "${ED}"/usr/share/libtool || die
 
 	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null
+	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
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 9f690b3e56ba..0cd832b79dc6 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -32,7 +32,7 @@ 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 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+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}"
 
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-4.0.3.ebuild
index 0cd832b79dc6..325f9db22542 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -21,42 +21,36 @@ IUSE_OPENMPI_RM="
 
 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"
+	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$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+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 mpi-threads numa romio threads
+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_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 )"
+	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/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
+	>=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 )
+	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:* )
@@ -91,10 +85,8 @@ 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 || die
-	fi
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
 }
 
 multilib_src_configure() {
@@ -110,32 +102,27 @@ multilib_src_configure() {
 		--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) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(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) \
 		$(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_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_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() {
@@ -149,29 +136,31 @@ multilib_src_install() {
 	# 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
+		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
+		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
+		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
+		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
 }