From b62ae26a9aefd5820175900c086d55c135977730 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gentoo.org>
Date: Thu, 11 Jul 2013 01:04:06 +0000
Subject: bump and cleanup

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9
---
 sys-cluster/openmpi/ChangeLog               |   8 +-
 sys-cluster/openmpi/Manifest                |  14 +--
 sys-cluster/openmpi/openmpi-1.4.4.ebuild    | 104 ------------------
 sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild | 164 ----------------------------
 sys-cluster/openmpi/openmpi-1.6.5.ebuild    | 164 ++++++++++++++++++++++++++++
 5 files changed, 177 insertions(+), 277 deletions(-)
 delete mode 100644 sys-cluster/openmpi/openmpi-1.4.4.ebuild
 delete mode 100644 sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
 create mode 100644 sys-cluster/openmpi/openmpi-1.6.5.ebuild

(limited to 'sys-cluster/openmpi')

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 37039cf88828..21c65be55d0d 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.121 2013/07/09 22:28:16 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.122 2013/07/11 01:03:55 jsbronder Exp $
+
+*openmpi-1.6.5 (11 Jul 2013)
+
+  11 Jul 2013; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.4.4.ebuild,
+  -openmpi-1.6.4-r1.ebuild, +openmpi-1.6.5.ebuild:
+  bump and cleanup
 
   09 Jul 2013; Justin Bronder <jsbronder@gentoo.org> openmpi-1.4.3.ebuild,
   openmpi-1.4.4.ebuild, openmpi-1.4.5.ebuild, openmpi-1.6.3.ebuild,
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 3e1b436821d5..687509aaf113 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -6,21 +6,19 @@ AUX openmpi-1.4.1-r22513.patch 2460 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d
 AUX openmpi-1.6-hostfile.patch 929 SHA256 4aca97b15207c633aaf70ee3aeadcb3b9034fa49780dafeacdb19cbdc765fe66 SHA512 2c229bbf938802570714224d479172da8f039eee82ac3906639d2cdd68aa0f0690a41f448d3dbb66ea2546f5a0e39043255dbe89c27ac4006f611dcaded0bf9f WHIRLPOOL c99ba9f3c69d7246d6c8aaebe0e4af85a30f02b906e5e8e2b75555a44180d68d89772d37df503c4b269cb9d31154d80087c8d31fa50f725e589a21b6b2fb438a
 AUX openmpi-r24328.patch 1707 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83 SHA512 e376f60f4c7bca610873ac5de5a9e72afab459262acf6f6ad61d4e8aa7a7d33370c52d2dcf2279a992de159b47d7d2fe29257306cf3e11a82234668205b876bf WHIRLPOOL 732347d68ba261f32c1010bcfeff2c490bc436d45a01119741fe68ee6ef366a2021e8d37dfb8ae2ffd681997111951eab4d57b00ff430e09d6c6f929e26816f9
 DIST openmpi-1.4.3.tar.bz2 6626909 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
-DIST openmpi-1.4.4.tar.bz2 6653048 SHA256 9ad125304a89232d5b04da251f463fdbd8dcd997450084ba4227e7f7a095c3ed
 DIST openmpi-1.4.5.tar.bz2 6643760 SHA256 a3857bc69b7d5258cf7fc1ed1581d9ac69110f5c17976b949cb7ec789aae462d SHA512 f89922345cde8978483e397e9016103626db3f1787f9afccaf0f60d59caa2a4409b47b01ac221d60e24e241f2afecb636ca89688bf326dc0ca5c817de96b3e99 WHIRLPOOL 2008bd952f9cc93ead6508267f5a45ee6d9ebf9136e35e25b798400d162173514da73349518bfada4777471c32d315e8556bbee8847a5268719d6b32fd0fd811
 DIST openmpi-1.6.3.tar.bz2 10199061 SHA256 0c30cfec0e420870630fdc101ffd82f7eccc90276bc4e182f8282a2448668798 SHA512 29d34c343bf4f21d5f16da70ac2d2db819834d50102c14efa46d1b8898efbbf92346a95227c548787eff4d73799f0042c5f5c3c1e0ec15c578987b6df17755e6 WHIRLPOOL de21379dc798658f4dd0eea2824d3dbe19a85b371b998355831d637f36759adcea2415881ecfc4f8509001fe2936944f637446a62df4cfd6e1a9e2681722ed25
-DIST openmpi-1.6.4.tar.bz2 10869229 SHA256 40cb113a27d76e1e915897661579f413564c032dc6e703073e6a03faba8093fa SHA512 714e8faff6efeb3ef7cd43073e3bc235e38dae0414f7803c7430d82c31c5b66ffb61f5cced888436b7e5924ac7c99fbd5c58463fc1a2080ccc132f08d7b3dd01 WHIRLPOOL 644b0d3bd975d2b2c445403185e507e3b320a53e548b9f44f7b1d1cd3f1cbd8c79f0febe75ff941af0226a9533fcb1a092fa5c17a8cb9e69aed77098033b5bc9
+DIST openmpi-1.6.5.tar.bz2 10943881 SHA256 fe37bab89b5ef234e0ac82dc798282c2ab08900bf564a1ec27239d3f1ad1fc85 SHA512 b0ede0264cd9263b8ba59ec51d17ad47b5f20d49d219ca05f7c396d608398d517b2023a46a2535fd6191160d709e4805c4de436dcfee56eda287383bd69f9652 WHIRLPOOL d0288677827c1deba17295ee1b69cd21da294ac314cc49404389b4c286384f9f2f229cae4c4fd62511e7f20abc510998642d6a2edfac3f16f83078f474f8e735
 EBUILD openmpi-1.4.3.ebuild 2690 SHA256 dd75dd17581c9f5555fa8589d11b6baa42beca6d16ae2c61b9771b32f21ba4ee SHA512 33d5c94d4d4af194cb34114e58753e38c321bd0996cddb2f361112cdd0da7535792b4a7846b796e0855f88938eae59aed431fb7d2f66083fca5267dbcfcd7bd8 WHIRLPOOL 78951f59ed8ea509ce97cf4e323451ecf25ac8595494d64ae433e566ac91b2eb61baf9d670261bd4c45825241d8bb08cb28ff9572f871e2d2cbb11e164ebcdd7
-EBUILD openmpi-1.4.4.ebuild 2698 SHA256 d56ac81578496791d1308cbbc1c43e7e2638fc31735fd6a95be485df7fb21f7d SHA512 fc2fbc7ddee2293e545b5dd8aa596c3d65b12cd9b476bc10e1e55ec5fbfe7ba1244aac6ce0f8d5d03cacf7281dae0338417c482163783c737907403c4fad2a7b WHIRLPOOL fc1aaa89320897e40e0f0a078e1380623118b60d172cd387d4ecc068c9eb38ec085d1fb436f35be41052de26971b1f3a61750541a4f42ba117d9b2c9f3f3cbd6
 EBUILD openmpi-1.4.5.ebuild 2698 SHA256 4326f9fe35dabb5ed4c15a35edb7389c3a35d12d99bf163ad02aea7c6ce4ce08 SHA512 e81ca3a6e76d448c8ed22dc1de36e11275b2860e0bb7698ca65b4f4fefdc82421b34b0bfb838b73fa273a27acc5a77d7e7c6a4b63257fda6695e213e10f0b2c0 WHIRLPOOL 09e5b23f727a22b6a2a6b3885d5f56a123b1f2c2572966438f52b1f5189b59f89c5d0533ebd9ce61e9d66fc6331477f780171f86ef9727c78bd279c7b5754950
 EBUILD openmpi-1.6.3.ebuild 5032 SHA256 07397172f6269eaa94df8effe686423e55d4cb1f2be52fe2cd7b0abc5d738748 SHA512 31826059cea06d97254a41b2efd55c8cdfc857eb36d1666439f02dd65b2478f62032d75558a628cf3f49a630a7bc3e92b13bd8699fd002d08e50c72cb266c3a4 WHIRLPOOL f0163215e5009a5e175e8e9d384763498422c87c2f47830f056e71c1178359b9ceeeb17bf12efc2244bedf8bb070f8b1a1ec4c686e76fb0f07fafe7f0921f079
-EBUILD openmpi-1.6.4-r1.ebuild 5218 SHA256 8f8f598fac29078429f39acd3e1d599b8c5d7c3f893285afecc523324f59f4b5 SHA512 684a1d53123a6fb1b4fc76c33a273d370914e8ddc301bd25e614fd2759288f2247751b4cea3b087a19ef91904e6b67eb1acbc424438ad9bcf362a2ec986e7d48 WHIRLPOOL 9c516edc9b88a25c0a0a485d79e68ef11f1d88e33648f5b632b5a419e8c4e83e8d065ebd778ccc8b0b6a5ad4fe2a34ad25ac02eb7e5aba42891b9c2baa5b410c
-MISC ChangeLog 18739 SHA256 13dfb96a1cb78b43f22b8fffcb39454dd8ec105c8e168db3fa1c5c4422e81230 SHA512 ab06bdf30f4f6fec4ac3e79c9280a9ddc0ed36663907dff54dc81e0ed50bf0df49f65f42ba45cd3b2e723e6ed1b709771267a8a88f3917687749a592ca10f065 WHIRLPOOL 110617252ba08b749e4d3d6d30dfdcd1b418c956bb2458430bef0d94c895dfe010e16a06258c22be09e800e279206941e87ac4875ee80e603877bfe858054ba2
+EBUILD openmpi-1.6.5.ebuild 5215 SHA256 19eb12b4aedd7c9a8eb3a015100d743c1687d0c3d7ac140e06c2c9f5ed2c29b8 SHA512 2bdfc777f0df9ec6347c7b1d6f1b8b8ae0ffc7775ad0e5b9b0ce12b856492f1695024f3e39518beaebb728350f7d67f58708d96de3fb808384d8283efc27267a WHIRLPOOL eda03f20c1cf682bc6fcdcd82325ade22c1e13d0d206b019b230d372bc732796cda26c76528636c865dabc7770e7a00bda36105bfcf8f1fb9e64ac5525405e5a
+MISC ChangeLog 18916 SHA256 84ddea4c81e801948d0d40c1b5d76ba92a53e23b7c571d0b1b30e6f49a7df00a SHA512 e59f725cb730124584794da0ead5ff27cbf802c25925d5d4e774fc359a9803b05d91b83e16bfb8989430056759d649cdaa3632e4f7706ec20f25aaadbd7b41a9 WHIRLPOOL b8d070cc3aa4a1c6f91464841a3ec0b17c5f08f26a71079771de1fbbc1acfafed0220d4a53f478907e36ca0cbc154825c1f4fc156df5ef04a5c0323fcc8f95df
 MISC metadata.xml 597 SHA256 d2f945feefe70edef93523edcfcfadb4347dd20ac74834573c586b2e1c129897 SHA512 f113fe8490de7d1f424caf024a81dd5cfda83ccd84399d9f93f84abdcdd6e51ce10406cbb3fa60ae1c64ef125b389c5c80bf5d03e4686a7fce9c8ae3897d6887 WHIRLPOOL 34f1acfaee950beb462fe7bc1a19b76dc3aea63623959aeb9f34037e31116c0add40cd9be447d0190e859039b1073e469f7fa552b25ff8eb7a583912af010561
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlHcjooACgkQ4MrvBE1wQ8n8mgCfcDunCpLqKjr+6bkmXD7kBiiI
-XIMAnjUum2ihS1B/eySoQALr2tputEOH
-=H4vT
+iEYEAREIAAYFAlHeBIEACgkQ4MrvBE1wQ8lJ+wCgqAYETFA57NWfkHhrtraW22RS
+DgEAn3VVXf1AGdshA+C1y+0mCcqhJ8HD
+=clTC
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.4.4.ebuild b/sys-cluster/openmpi/openmpi-1.4.4.ebuild
deleted file mode 100644
index 06fd47fdaedf..000000000000
--- a/sys-cluster/openmpi/openmpi-1.4.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.4.ebuild,v 1.5 2013/07/09 22:28:16 jsbronder Exp $
-
-EAPI=3
-
-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 ~x86-fbsd"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
-RDEPEND="
-	pbs? ( sys-cluster/torque )
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/mpiexec"
-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 || die "make install failed"
-	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 || die "emake check failed"
-}
diff --git a/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
deleted file mode 100644
index d5961b88f3ec..000000000000
--- a/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild,v 1.3 2013/07/09 22:28:16 jsbronder Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_dapl
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_open-mx
-	openmpi_fabrics_psm
-	openmpi_fabrics_sctp"
-
-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_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="+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_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-RDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
-	>=sys-apps/hwloc-1.3
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_dapl? ( sys-infiniband/dapl )
-	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_fabrics_sctp? ( net-misc/lksctp-tools )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)
-	"
-DEPEND="${RDEPEND}"
-# TODO:  Newer releases of Vampir use otf2 which would resolve the above blockers.
-
-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://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
-}
-
-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-thread-multiple
-			--enable-opal-multi-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_enable ipv6) \
-		$(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_ofed openib "${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_dynamic-sl openib-dynamic-sl) \
-		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(use_with openmpi_fabrics_sctp sctp) \
-		$(use_with openmpi_rm_pbs tm) \
-		$(use_with openmpi_rm_slurm slurm)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
-	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 || die "emake check failed"
-}
diff --git a/sys-cluster/openmpi/openmpi-1.6.5.ebuild b/sys-cluster/openmpi/openmpi-1.6.5.ebuild
new file mode 100644
index 000000000000..0bc0144fedb7
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.6.5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.5.ebuild,v 1.1 2013/07/11 01:03:55 jsbronder Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_dapl
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_open-mx
+	openmpi_fabrics_psm
+	openmpi_fabrics_sctp"
+
+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_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="+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_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
+
+RDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/mpiexec
+	>=sys-apps/hwloc-1.3
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	openmpi_fabrics_dapl? ( sys-infiniband/dapl )
+	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_fabrics_sctp? ( net-misc/lksctp-tools )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	"
+DEPEND="${RDEPEND}"
+# TODO:  Newer releases of Vampir use otf2 which would resolve the above blockers.
+
+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://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
+}
+
+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-thread-multiple
+			--enable-opal-multi-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_enable ipv6) \
+		$(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \
+		$(use_with openmpi_fabrics_ofed openib "${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_dynamic-sl openib-dynamic-sl) \
+		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
+		$(use_with openmpi_fabrics_sctp sctp) \
+		$(use_with openmpi_rm_pbs tm) \
+		$(use_with openmpi_rm_slurm slurm)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	# From USE=vt see #359917
+	rm "${ED}"/usr/share/libtool &> /dev/null
+	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 || die "emake check failed"
+}
-- 
cgit v1.2.3-65-gdbad