gentoo resync : 01.12.2017

3 files changed, 177 insertions, 4 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index c97060e8feb4..17365fa86da4 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -9,8 +9,9 @@ DIST openmpi-1.8.4.tar.bz2 13488749 SHA256 23158d916e92c80e2924016b746a93913ba7f
 DIST openmpi-1.8.7.tar.bz2 13228742 SHA256 da629e9bd820a379cfafe15f842ee9b628d7451856085ccc23ee75ab3e1b48c7 SHA512 953e007b00c9753bafc05d13e6f686c9aa47f76f55fcc4eda565174d410de059e07862b7e667d15df13afb80418661d9a8d5ee17fdcc211d3e044992cd9ceede WHIRLPOOL 374edbca97262217dfe405414deff2f6a3cacc06daec56e3356ea76f27804ef3caa3f37050dc8a81f257b83c1ced49fd5f66647c2cba4892fbe4ec9746a6f84e
 DIST openmpi-1.8.8.tar.bz2 13231433 SHA256 a28382d1e6a36f4073412dc00836ff2524e42b674da9caf6ca7377baad790b94 SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660 WHIRLPOOL e36186452978ba7a368c83b84b8b089f6995450fa866b7b8300d32eec7e64a816abf5f301dc716bf25b3b45b987489952ffc4b7057f4407677f2a2df5ee67cdd
 DIST openmpi-2.0.2.tar.bz2 8311215 SHA256 cae396e643f9f91f0a795f8d8694adf7bacfb16f967c22fb39e9e28d477730d3 SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a WHIRLPOOL 9403135fbf1682597c211b1ca0d1e300bd6f49294e9a70bf21f030c48a54f85d2d7ce8de8693dccaf81e2b46fbfd9a43a817bf598dc1f96e122b3f6ea6ffc3c6
-DIST openmpi-2.0.3.tar.bz2 8285131 SHA256 b52c0204c0e5954c9c57d383bb22b4181c09934f97783292927394d29f2a808a SHA512 158f90e3fac41540036d0c9cbcbf6abfe3f420c9f295d50a28f00e98181367769167dc3a59bb47ea34bdcd5a1c5a43bd2e77dad5b0c8b08d91f65340ff2b8547 WHIRLPOOL 07740f47814279f239aab0ef52f97fdd2c4a3ed5eb643ec5e9cf8b09d2096cbb8039f60d02153002c1035fc3514f7029b525b1fceb50bdbe05ec307c06fb7501
-DIST openmpi-2.1.2.tar.bz2 8278459 SHA256 3cc5804984c5329bdf88effc44f2971ed244a29b256e0011b8deda02178dd635 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457 WHIRLPOOL 9dbae8a3b0a35a761a8436bc30a4af36ea3492914f726a0334b39efe3e053e430d85723745ad33ca56d82f2884722532d408b809c25ea478b54c27f52fa99276
+DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
+DIST openmpi-2.1.2.tar.bz2 8278459 BLAKE2B 83f6617322baad4fb13d399fa6a491d1d8dec1a5862974552a5f0cb033ab2a27eb0a44055e2670e3fbe79dbac68ed0130bdfec057cad48e474b814ccd56e59e6 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457
+DIST openmpi-3.0.0.tar.bz2 9267606 BLAKE2B 9ee569a9c5f5918bb3d389a2945a2e7a5d98464afbd111eb2426a4e8296a23cf6d5b558554ce8126b13f910bd59acbb77e93ac297f3cf222c4bc764836b39ee6 SHA512 7e37eacf959a803d6d89dff4291b64a1f3d83bc7941b778a2fb13d12be0f205cb904e4a807d79676ad1e31fd99ffb15f255c8a227e830673455abb144f14616a
 EBUILD openmpi-1.10.7.ebuild 6355 BLAKE2B 3217a0e603cc8a1a2c9f2e9abf4d55e06e8cd8236ce257713c497a259734d62f634358fe6b4529884d740f7095bfa555fd2e9d4639f2b4d96409a57e594d13bc SHA512 1da5f322ebc8e7d0e4858bf005083370d1431559fa445eb0f0b80cdc9cf75d0493ab8db452784f87d052b38f434031b20c01f5eacd780eb720d69b9677b9e140
 EBUILD openmpi-1.4.3.ebuild 2571 BLAKE2B 82d9af83842020d3ec526b3abfdf413ce6408d563e50c761615a25f29a046cfa2b8aa9976954a266df35030a111f6dcb4482687ebc66d0ee4688c1fbb0151c38 SHA512 cbd64eaa022ca3861166ceb5a12b0d113d88c9cf4381c5f4eb9e1ca9c0b0006c2457e7639a2cabdd8118518f313bded89d80eb0b2ccd9a91dbb29018a3dd9efd
 EBUILD openmpi-1.4.5.ebuild 2580 BLAKE2B ec72a459e6ed9f8264e74700d541a303d52f1b1dced0f3b512041b415bfcee86e64e3661644107aee8c4cfe4528afdf84e79a23e91a3557e2837846feb6991df SHA512 a8b3f8628aa6f8379b959d2c3ea7ad4e8d9edf7c1e5a41e54e42959f831b53355a3dd0590a72e389f3864dcecafbc62f4b4cee03fe475455900e881598a290a1
@@ -20,6 +21,7 @@ EBUILD openmpi-1.8.4-r4.ebuild 5032 BLAKE2B 4139eae8a8c37ddb8f3199c9d2f4603b106e
 EBUILD openmpi-1.8.7-r1.ebuild 5544 BLAKE2B 9cd368c551d8d47477f524676d6aa1cd981b32a58041f624fbe2cf39c03290e829c4e404e6340334f559fe2065e507bf91f65aae59e3bfc57c07d4331216b962 SHA512 2b3de9e53b8cb911a5ab1a1181f734fb115f77b2ceeadaaf04eaaf776eb476150633d307431c7294a602ab48a6fb9c7172fbf057c1ec0d2155c8a5eb72953ef0
 EBUILD openmpi-1.8.8.ebuild 5550 BLAKE2B 06f87cf78851ae31b86f77ab1e8ef7c71ebb919e39e73df95b81e8aaffc38b1b1afb20c1972cf6328b51fe8d734baf274ef95b8450ebb2e7948b3b98b8a86e56 SHA512 51a5e3282133dbcc1d54e21f5f3957804c32df6d799d968dba43263cb7aba089fe9f7338b09c0e285b2d007758d446a8e64a02b2609a211b03bf984ec0fe3192
 EBUILD openmpi-2.0.2.ebuild 5865 BLAKE2B 6a89c033e8d1e0d77390f6b8d662137d46b4f4c5c326b4092a86746a3168003ad73bb3fd780ccd8b714ff4a90b03f68810adb8c5daf303039a0b7c59757e3682 SHA512 52b5c8c601d20988b06fb96d88b4afa4d81c759ab5526ced4f5844e7fd7b94003dfeca2ab50c9344352d448a0dfc88a09effd518dfc91cebabb311427ebd35af
-EBUILD openmpi-2.0.3.ebuild 5869 BLAKE2B c6830795431c193caff8cd06124699c81b446a1c2214134243e44b895a3c97d65a5f372d6d3404c69c2d5965600488b753437bba49715da79973b008ae275115 SHA512 3806f6cb1b58c7065f8762c3991a2b4cac3d66c86402f7107bb9c683c53415f0091145a69640ddd0209eba8c0eaa1b831a4ae38143643d92d5656e25abc9419d
+EBUILD openmpi-2.0.4.ebuild 5863 BLAKE2B de4495c7064fecd4b83f4ff03058ef1debb452461ca1f65b4d5117636719cfb3d8d8bca8cfc266f30efab816f690b4330a8cc126b491790ae702cc147013fec3 SHA512 bec1430b29d0bf95c349c61a2eee288a228bef721bc2a2587354679918610cd852fe032a48e16869ba8abfd9b15c9e0908f24b859b8ec89a67525ceab88d6a2e
 EBUILD openmpi-2.1.2.ebuild 5580 BLAKE2B 2ea31b522aab0aad425d75c9819bf52f17943df64f754656f6e1d8fe82621f97956537c3513332f1c1e163b00e0eaae79a8f22670d0e62f9916421dceeea43e0 SHA512 86bdd21e669732ee8bb13fb9b6461d75b7680dc5ee1ca90985562e479ab4df06f3bde2d7c4e765e3fbf893eb967f81d6092648eb16071e365ba008ab1dd0a2e5
+EBUILD openmpi-3.0.0.ebuild 5466 BLAKE2B bcd2bd17ad1083973abf4deabe650ea15ab96b9b016b4f3206f9f840bbeca00aafb3bce003be1f019d9319114c4e939017942676cccee0f3a21917bb35afb4c6 SHA512 25b3c1a816319b8113cc3e7b39dc7d425e10f820d8d5dbeee3dc3b28779da39cd59e9a9f1f9ac3fedc8329a33f4dc74b38cb9325677c034fbbc0ec32ef1b3ee9
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-2.0.3.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index a711f2778004..e1517dff800c 100644
--- a/sys-cluster/openmpi/openmpi-2.0.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -54,7 +54,7 @@ CDEPEND="
 	!sys-cluster/mpiexec
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	<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 )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0.ebuild
new file mode 100644
index 000000000000..b50c4f2ad163
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-3.0.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator 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$(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-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="cma cuda cxx elibc_FreeBSD 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_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 )"
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	!sys-cluster/mpiexec
+	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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-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_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* \
+			"${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
+}