gentoo resync : 05.12.2021

4 files changed, 372 insertions, 2 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 387306799aea..2e87daccf6a6 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -12,7 +12,9 @@ DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724
 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
 DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011
 DIST openmpi-4.0.6.tar.bz2 9805015 BLAKE2B 2a476fc22a953bd8afb56153ca73e86e27a60ea1490bc1f2ac2a800d352876504e474d8cf8fc768e447ea9840413d7ae9eb7d852c14b0d751b90b86a6133b194 SHA512 4900a957756399464a74e7f685d5d0bf2b4672e274dc02f7de3e5ac07d9e890713d20ef424e0810368ace2315a2d3dea727bfeca980eb2d7cc99f12979dde22d
+DIST openmpi-4.0.7.tar.bz2 9809794 BLAKE2B c8ecafa3d50c54ebb9c8853010628240a696b342b04d17df66c4dbbc199a6b65bf7d92a8c34867e86e36a8664d1e26b7d0b0fa16f28cc9c8fed5223a4c06ef81 SHA512 27c49a1598c565e7ab63d2ca5b5277aad36f9f863854199e86af0387ec6edce9a99e9a8bc8dad565d01a6ab4c9f61067603c07b30a165317cced4997507727a4
 DIST openmpi-4.1.1.tar.bz2 10052770 BLAKE2B 2f853ca44703197469e5ccd42ecd81de72d39f265e0da9d847e6b2f7a7646241b76346c71969bf6a3d4605c28f02de6b587fd0330c753ad7dec8503af0784b69 SHA512 0d85ba45a40c0879f266e5286615e2cf94eb3570f0a705194525821d5c85d460cefc3a2da8207e6e84c479d3d0da656e2342cc2d6f88c4b4577ca22bbeacc89d
+DIST openmpi-4.1.2.tar.bz2 10084596 BLAKE2B 2e6fc12b4564a302d2c364528d0f6bea8b23f9b1cd6059763b8d5de583d86aae2812c239b1d0bb40c83f3c7682c8e666ce1de3112e95de54848169cb5e2805e8 SHA512 1958f96434cddbe525b4511fcf8d0cf8bf1ff376e024466219bd3a2092900e318f45a4b1e1a8ef6b03e350f46a71777fc7db82a7df711f12bb9758150d209aad
 EBUILD openmpi-1.10.7.ebuild 6259 BLAKE2B 2d1121714a453904b55d0773b1b66328ae738970b516122503d9a7237851fc4a1af2d020966c981887c5ad575749cba83ff080f10191490d75dfe6eba8e65d49 SHA512 b9d936fd911d07f2c0c9dc94137bbce7be58322bffcf1d35cf3b260aed66f4052d378e29b659c0949f2c1920f667d3d134a5d766a0af17a4eee6075101738ebd
 EBUILD openmpi-1.4.5-r1.ebuild 2413 BLAKE2B e19baf3cecf5b23e1323faf8201d7c9c61f30cb4a3d1db78a6b7d1f801a6d0648c68fd47a8b3237e6534aa4096a392b7f0c57053528c64150f5728424e60e0d1 SHA512 fc1fff1385bc270d88d87b52e699e6d65c5b0e9c80ed1807417a7db5757848cd69c555a5221a0b0238b1bf4001174e458e71d851e657622aaf83c13391a311a1
 EBUILD openmpi-1.7.5-r2.ebuild 4699 BLAKE2B 78e51295e74e29456e37f319af559c0b591d3eeb372165eb860964d2dc288aa90bb0de98061227f92360b1365ca160dd8ea32b98a60aee2799b460c12db61585 SHA512 964d4d9844bed55525a34cfd989bb158a5f8f87ef02739f8c0ee79e714359a0646bbeb2b3015856f09d9898ec50509d8d79296cb94f779ad4cfd39b76dd75edf
@@ -25,7 +27,9 @@ EBUILD openmpi-4.0.2-r1.ebuild 5323 BLAKE2B 77ba576ec0494dcb9354152f2d943a1dea24
 EBUILD openmpi-4.0.3-r1.ebuild 5323 BLAKE2B 77ba576ec0494dcb9354152f2d943a1dea241343fc297e60f4a07997d09d90cd94e09c7f09799313f5725d9f4c05e44d5470a2f20885d0ef35b17bc6690b348a SHA512 3724903c5d70076ff9626bf0f422405395dd2e31b9591b12a599cc748b57168dc42622181257fdbb0baf08774cd5e21897bd5aec5504f6a75bb3f07e1209d4da
 EBUILD openmpi-4.0.4-r1.ebuild 5323 BLAKE2B 77ba576ec0494dcb9354152f2d943a1dea241343fc297e60f4a07997d09d90cd94e09c7f09799313f5725d9f4c05e44d5470a2f20885d0ef35b17bc6690b348a SHA512 3724903c5d70076ff9626bf0f422405395dd2e31b9591b12a599cc748b57168dc42622181257fdbb0baf08774cd5e21897bd5aec5504f6a75bb3f07e1209d4da
 EBUILD openmpi-4.0.5-r2.ebuild 5381 BLAKE2B 563c2cc627514ea7230194ef3e301e7bcf1f32f7f82337c77909c4f0858d986e48e591a2b33f54b79c7231c75cd2c0741786e455a69447b407526dbee9697f24 SHA512 fe538a342237eea851165c5c2976e3d72bcfebad200be4d001e8582480c9eb6f0000dc18e61cbd02426c2294ab09bc1e248f48bc6a809208ffc8eab8c84ec5d3
-EBUILD openmpi-4.0.5-r3.ebuild 5495 BLAKE2B 6bc1dd2a8a22fb91d9440affa0e9ed6957a2f85e9b318726b0d60cf4e9af26aee3a3b456f5bf02891c5e4b131aa8b1abc11bb500e5dbed84b9f4da1c7319308d SHA512 88cd50baa7a1e2a82a17616470aeeaef973c35d7c3f4a2418984eddd7f4034e4c12e371316ce00e4b0581f3e53d392244411bb3f77a8c5dd8211e42ebfe4a39d
+EBUILD openmpi-4.0.5-r3.ebuild 5493 BLAKE2B 5238d480ee0112658a52bcfa09e884a9b26c32b3c0ee1cf58b9a087238ce776218fe0e84074beafee87cccbd8f94d8e36f228b1cdce8b431b9611e5f5068b90e SHA512 f20c971e620c982bbad1c98a09e0839b3194ef04103d34d6346af8e02c2e76e656dde4e0cb2cbf6c3f31742ca761a4c4c0609eeb68229530862706b592badb95
 EBUILD openmpi-4.0.6-r1.ebuild 5501 BLAKE2B 2fea55fdd5cad7b3761a1b0f5f22094bee988796a615e18002c0ac1d6045d0c87ce73d7f96f5d9cb6b01c091f2b946e7f58ba53689eb3b88a5068ae5ceebdb4d SHA512 1d7472a9c74f3d11560a54721e5e91d8a66fb7813ebf2002adcd8f479cca328e88a706ccaadc67433df4e981baabff9984e1877eff671e9dfa146f8cbb1359c1
+EBUILD openmpi-4.0.7.ebuild 5501 BLAKE2B 2fea55fdd5cad7b3761a1b0f5f22094bee988796a615e18002c0ac1d6045d0c87ce73d7f96f5d9cb6b01c091f2b946e7f58ba53689eb3b88a5068ae5ceebdb4d SHA512 1d7472a9c74f3d11560a54721e5e91d8a66fb7813ebf2002adcd8f479cca328e88a706ccaadc67433df4e981baabff9984e1877eff671e9dfa146f8cbb1359c1
 EBUILD openmpi-4.1.1-r1.ebuild 5813 BLAKE2B c6e0c20cb05932f24f5f5aadabee0f6487d946ca1fa2896537d7b562f451af8de212e4530fdac7b31a7511b21565ee424e6a163491c744d9bae6781f059c39bc SHA512 647b04be36ba199de2202b5cce0e9555411e642e1eea7134ca1487c0a3e9159e619360f51b4793f375a6500601b3b7ff6105035903e7fc123b4036a9e0bc913d
+EBUILD openmpi-4.1.2.ebuild 5813 BLAKE2B c6e0c20cb05932f24f5f5aadabee0f6487d946ca1fa2896537d7b562f451af8de212e4530fdac7b31a7511b21565ee424e6a163491c744d9bae6781f059c39bc SHA512 647b04be36ba199de2202b5cce0e9555411e642e1eea7134ca1487c0a3e9159e619360f51b4793f375a6500601b3b7ff6105035903e7fc123b4036a9e0bc913d
 MISC metadata.xml 961 BLAKE2B 83fe60a3b125736b98fb8fde2deef0231d8dab694f251a1ca929360a92558774707da4f8085dbfa3431c311aabacaf06cefb0c2969126c95cee4996485cad87f SHA512 970e915852eb254419c67ba00df53034761e31ef12c63b3672ffcd1006a00e6ede30ae09d5ccd8c52e2d5899301cdecf24a477a67c8df9ec319e129705e9cd9c
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
index f7ced4a1d4a6..6609fda95cfc 100644
--- a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
@@ -30,7 +30,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
diff --git a/sys-cluster/openmpi/openmpi-4.0.7.ebuild b/sys-cluster/openmpi/openmpi-4.0.7.ebuild
new file mode 100644
index 000000000000..93df7d8495cc
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.7.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2021 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="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 heterogeneous 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_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-cluster/rdma-core 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-cluster/rdma-core sys-fabric/librdmacm:* ) )"
+
+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)
+		$(use_enable 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_fabrics_psm psm "${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
new file mode 100644
index 000000000000..6652c805f75a
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.1.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda fortran-2 java-pkg-opt-2 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="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 heterogeneous 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_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-cluster/rdma-core 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-cluster/rdma-core sys-fabric/librdmacm:* ) )"
+
+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
+
+	echo "void main() { return 0; }" > test/util/opal_path_nfs.c || die
+
+	# 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)
+		$(use_enable 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_fabrics_psm psm "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_rm_pbs tm)
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+	)
+
+	CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_test() {
+	# -j1: doesn't work with the default src_test as the dry run (-n) fails.
+	# Explicit listing of test/* subdirs modulo util because of nfs test fails
+	# due to sandbox and couldn't find a sane way to skip it.
+	emake -j1 -C test asm class datatype dss event monitoring mpool spc support threads
+}
+
+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
+}