cleanup

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

4 files changed, 9 insertions, 330 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index ca85c596d34d..4b6ff25318e7 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.128 2015/02/04 05:10:12 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.129 2015/02/04 05:12:16 jsbronder Exp $
+
+  04 Feb 2015; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.8.ebuild,
+  -openmpi-1.8.1.ebuild:
+  cleanup
 
 *openmpi-1.8.4 (04 Feb 2015)
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 2cb24475aca9..05d272c4e900 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -9,24 +9,20 @@ DIST openmpi-1.4.3.tar.bz2 6626909 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6
 DIST openmpi-1.4.5.tar.bz2 6643760 SHA256 a3857bc69b7d5258cf7fc1ed1581d9ac69110f5c17976b949cb7ec789aae462d SHA512 f89922345cde8978483e397e9016103626db3f1787f9afccaf0f60d59caa2a4409b47b01ac221d60e24e241f2afecb636ca89688bf326dc0ca5c817de96b3e99 WHIRLPOOL 2008bd952f9cc93ead6508267f5a45ee6d9ebf9136e35e25b798400d162173514da73349518bfada4777471c32d315e8556bbee8847a5268719d6b32fd0fd811
 DIST openmpi-1.6.5.tar.bz2 10943881 SHA256 fe37bab89b5ef234e0ac82dc798282c2ab08900bf564a1ec27239d3f1ad1fc85 SHA512 b0ede0264cd9263b8ba59ec51d17ad47b5f20d49d219ca05f7c396d608398d517b2023a46a2535fd6191160d709e4805c4de436dcfee56eda287383bd69f9652 WHIRLPOOL d0288677827c1deba17295ee1b69cd21da294ac314cc49404389b4c286384f9f2f229cae4c4fd62511e7f20abc510998642d6a2edfac3f16f83078f474f8e735
 DIST openmpi-1.7.5.tar.bz2 13286694 SHA256 cb3eef6880537d341d5d098511d390ec853716a6ec94007c03a0d1491b2ac8f2 SHA512 72de2788fa26615a2e7373b5f32e0a2b9e39d56094c45b49348ef19bbb0ea306734b7d3275d76471a18628b5244d882de4ed3595eb46f13683e1c8d2b277f065 WHIRLPOOL 107edd2eeca6e0ce9a9fb9ea1cd920cb1a87e8434390f2ed93279734c61bed63e9942bf2d33081e992d4d892f77a8643abbb58194aa76f7148d8716f1648aa82
-DIST openmpi-1.8.1.tar.bz2 13297716 SHA256 171427ebc007943265f33265ec32e15e786763952e2bfa2eac95e3e192c1e18f SHA512 f1b35ace5c62c89dccdab3f2ee774dae8eaf7d7bd9e41136bb5953f9c61207620917d1905be95350215c6dbc03b494ddd18732b6b7520893e51c5b1a8861fb99 WHIRLPOOL 4d429e7c23131f050aebad11f6eb9048b09979af58d1efbbdc5f6d1d349bd5164745fdbc2ec53f326d8ae99b9af2313e2bc2bf1fb675343e8e231b787ff0aa4d
 DIST openmpi-1.8.3.tar.bz2 13301056 SHA256 2ef02dab61febeb74714ff80d508c00b05defc635b391ed2c8dcc1791fbc88b3 SHA512 dbb8ae576d5272defdf5fd9cc09ddcd488d9076e2f4f6b1bc1a49e7ce6345784e1a637615705873feead7c86b20c3ec204cddda8fdbab58342e76f07752154dc WHIRLPOOL 98ef14928e1f620d89212ae53c2353fc96e801a3da96997bd09572e411e7debd30d49b846af459bfe92f7b79e3efadfe74ed4668a85d82ef0324cfaf4e07ed80
 DIST openmpi-1.8.4.tar.bz2 13488749 SHA256 23158d916e92c80e2924016b746a93913ba7fae9fff51bf68d5c2a0ae39a2f8a SHA512 d4c8ce2bd3359cf2e85958b58ba18b52c9cef6676718eb3d948309b164b2f54544f8f8419ef6881c7a51ba268a876cd56e9b2d340a106a16fa25fb9fc3e4eff9 WHIRLPOOL 793f64ad44c2e3451a269bcb53d747d15a01649978d80f13599596e1bdd6a6011b50fdd60222bbe3a4ebe567a4785b2660e3c1eb09bdba77420581a0062480a2
-DIST openmpi-1.8.tar.bz2 13291595 SHA256 35d5db86f49c0c64573b2eaf6d51c94ed8a06a9bb23dda475e602288f05e4ecf SHA512 8d9be16f00a0582e161851976af166aade70425c6e1b08b3f0168bf560273d9378a333a8111b3e6a5ff861592c744442c95e0b660818eaaaa1b0fcc54dbeb3fd WHIRLPOOL fbe208976ed657c0aff8c4fe8aed3968ff9e9571244f9d6c5ee7b119b80cb504bb7c1a116e03210da0d47ea0114e32ddae25ddd665b2fe4a2d76a75414fa6742
 EBUILD openmpi-1.4.3.ebuild 2687 SHA256 9365fb61ca5888953cc61602d0862489ca50c281395b06c106368c7e14ce0cf8 SHA512 2753f9ba436791cee692e856d4c7d92ac5445230af158b594f08995e61a43b90cbb09625a9374e720890b158d06fb13bc198fb9c0c72de93b7a05fe569a74cc1 WHIRLPOOL efba39e8ed2b252acfe2e573904e3f0490f65f7f2746f7c2eed6d50860321c70a7d55288d146a36536f78b8ecf0f647d9dbb3120b96c67ad5368a38ca130bccd
 EBUILD openmpi-1.4.5.ebuild 2698 SHA256 4326f9fe35dabb5ed4c15a35edb7389c3a35d12d99bf163ad02aea7c6ce4ce08 SHA512 e81ca3a6e76d448c8ed22dc1de36e11275b2860e0bb7698ca65b4f4fefdc82421b34b0bfb838b73fa273a27acc5a77d7e7c6a4b63257fda6695e213e10f0b2c0 WHIRLPOOL 09e5b23f727a22b6a2a6b3885d5f56a123b1f2c2572966438f52b1f5189b59f89c5d0533ebd9ce61e9d66fc6331477f780171f86ef9727c78bd279c7b5754950
 EBUILD openmpi-1.6.5.ebuild 5215 SHA256 19eb12b4aedd7c9a8eb3a015100d743c1687d0c3d7ac140e06c2c9f5ed2c29b8 SHA512 2bdfc777f0df9ec6347c7b1d6f1b8b8ae0ffc7775ad0e5b9b0ce12b856492f1695024f3e39518beaebb728350f7d67f58708d96de3fb808384d8283efc27267a WHIRLPOOL eda03f20c1cf682bc6fcdcd82325ade22c1e13d0d206b019b230d372bc732796cda26c76528636c865dabc7770e7a00bda36105bfcf8f1fb9e64ac5525405e5a
 EBUILD openmpi-1.7.5.ebuild 4944 SHA256 ac3a50bb72e67d10ce68d19e7d8e73218a218e1141a933daafc31e4dfcd49e72 SHA512 b0eef019d943d7e5d3a2664bbb2afb2676867dbc160553b3b624e8b4b8e318c291cfef32283f6926d2b901005581eb177889ee7470e9f9bf1a5bf353a1f41dd1 WHIRLPOOL 8540db81a925c0c5656d39bca4ce3027bd8ee50c2eb4b3733a938644afcb4717d8b8c9be6968215b62a14c78ef7fb27ea5e39949793aa97c644056117186a9e1
-EBUILD openmpi-1.8.1.ebuild 4979 SHA256 e5f4f7bb035fb7aabe741d20f31ab7a891b63d9ef17253b7a2d17b3269ad28f9 SHA512 0209445710dc41f0faaeaf17d65936b710b0cff159494f89e41722f372a38633a776a35200e69f05ddc5991ef41776a70a90c98abdb1dc4659005c18ff597901 WHIRLPOOL 185579b06a3a37fc3d9b9d7834ee32c91422d638de001826f18950236eda8f692758e93840619b5742e742d4f8db8aa81773e38827a5157de1005baac2b64b15
 EBUILD openmpi-1.8.3.ebuild 4979 SHA256 5b616cb2a56206b96f670d1b2b64b70f25f2bc378c4907bb62327e3944ab13b1 SHA512 6936ecbdaf0fd935f378e1031edff175ec74a71c860a84f85327ee66d6b733de647232db24b9d7355dfda53c50665f3a833a4a424df6301ae49687ce72ed8e7b WHIRLPOOL 3b44fc882eb26d79163e1eaef07ab9fd1fa8a06206a9e6625a4f4bac6c28c9aec795e22f7e34f5c72b48a9c4d800389f41d4997d9fe13f3b97e35106c2119fb1
 EBUILD openmpi-1.8.4.ebuild 4979 SHA256 b9e45c3090560081a913f42420919df29647b00215571b364296a97667c502cb SHA512 409f2a6419fc2000c8575d17893a4bc6b18c1b1c7c8984e222c3c1c602ac8c06a712b4f54892d468307cf7aa801696f66d4b558c9a1ab490b1726045792eb676 WHIRLPOOL c935ce298c4f5c84bc5391dbdf8811c579ed3db198f9bdb400ef5ec3c2c6339dfac463b86b92b1824e962296b6fc18090a7123be48f00de0ba30a2439ad410a7
-EBUILD openmpi-1.8.ebuild 4885 SHA256 915360d265038314a2f1556edaf0c5d518756b253397ccd5a2721c6abfaea346 SHA512 ff0d1442de508483cce90321145cf9c2dcf735a33d2498b965c15da0aa699ed0aecf054ef37d75e1a81533c8073f826dc27ed1478edec616f3074eb2f4ea1d4f WHIRLPOOL ba11299037b08230c75d48725c0a7ea7aa81c85bcc9d573c737b1b55fcbf1cf67f6a1052837c9083e18e6882f7e3818fb7edf5c61082729554daf06c5fb0456d
-MISC ChangeLog 20007 SHA256 814949787abd2596874f4aefac903a6d20614b56c5041f74e0b2b79c6f9f9a05 SHA512 61e73f67f4eac69cef965e5e46bcf172384fc293b4f2b45f07aef2f4b35fd18fc54635836c2b9546a546ca2a90c17e3e2535a8190be7acfc3d4cd29068841592 WHIRLPOOL a43e559563ac3502c97184cc5a8d38014d5b6d5ebcd590c58e77541a9e87f614d4ff8337253559fa28e2958d5cf6f21e2f2a654dc9bd5c7648112980d525f349
+MISC ChangeLog 20117 SHA256 64ee603e954e9cad8abafd248a1680bc160b1735d624b09ee7769dc6d968ebe2 SHA512 416652bf73ec306b68a1519def7848ba7e385e75d4a395887b6af6e60a6f35d7e71d34330a5d28caf28499ac9237cb16edb67ffd0ee807c8398de6543dcf158a WHIRLPOOL ad87ac2d6dbb97f6fe1339221cad20cbebf6d15c28ac00d1fd7260fbe2eb248e63a427649953d3759f9515e1e4c14a9f56f192adf225d85b4f26a0d0b17eb36b
 MISC metadata.xml 714 SHA256 fc650835101e7da842eca4c7d444f2c50746dc97610f9442ea567cb665d7bfa4 SHA512 406f1ac85885bf5068c9711afb3257fbd537d82e253a46ce70e7fef88652c4ca9ae408c694ecb4d9ddeaf688fc6859dd1c6caadb25b64aafad297e918ffa9298 WHIRLPOOL 53177e043da7f788f75d531c3b8d7aba4119585d5a8af051f50ed67f2be7d348379b420877dde8934dfac278db4665204e659acdf87bb5c1aff7fe2d96015907
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlTRqcEACgkQ4MrvBE1wQ8lm9wCfQBE4m6XHGILTr5S3ujn4suAN
-u5wAoIyGzH5GzE1yBNA+uydva/Ny5mZz
-=2rHF
+iEYEAREIAAYFAlTRqjEACgkQ4MrvBE1wQ8mxvgCdEJvPLYH+n6ghjQaahV1dbSlG
+YMEAoKQvsBesaPOpLtHipYiWUeNpn1HR
+=+RAp
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.8.1.ebuild b/sys-cluster/openmpi/openmpi-1.8.1.ebuild
deleted file mode 100644
index e3c8a0baf87a..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.1.ebuild,v 1.2 2014/10/16 14:59:06 jsbronder Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit 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_open-mx
-	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-fbsd ~x86-fbsd ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD 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_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/mpiexec
-	dev-libs/libevent
-	>=sys-apps/hwloc-1.7.2
-	sys-libs/zlib
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/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
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--with-hwloc="${EPREFIX}/usr"
-		)
-
-	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_open-mx mx "${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 || die
-}
-
-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.ebuild b/sys-cluster/openmpi/openmpi-1.8.ebuild
deleted file mode 100644
index ba6042b62bf7..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild,v 1.3 2014/10/16 14:59:06 jsbronder Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit 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_open-mx
-	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-fbsd ~x86-fbsd ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD 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_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/mpiexec
-	dev-libs/libevent
-	>=sys-apps/hwloc-1.7.2
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/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
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--with-hwloc="${EPREFIX}/usr"
-		)
-
-	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_open-mx mx "${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
-	dodoc README AUTHORS NEWS VERSION || die
-}
-
-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
-}