[sys-cluster/openmpi] Version bump. Also introduce new USE EXPAND for openmpi

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 187 insertions, 10 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index f4ccd1333443..b4a07f367808 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.102 2012/03/31 17:56:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.103 2012/04/18 20:35:24 alexxy Exp $
+
+*openmpi-1.5.5 (18 Apr 2012)
+
+  18 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.5.5.ebuild,
+  openmpi-1.5.4-r3.ebuild:
+  [sys-cluster/openmpi] Version bump. Also introduce new USE EXPAND for openmpi
 
   31 Mar 2012; Raúl Porcel <armin76@gentoo.org> openmpi-1.4.3.ebuild:
   alpha/ia64/sparc/x86 stable wrt #402095
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 343e0ed19597..0055f7df31ed 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
 AUX openmpi-r24328.patch 1707 RMD160 4db5f60d692268e1e42ebbc5379cec245b14daa5 SHA1 25a3ac77307b4681e3f917e61ff88daa58dab508 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83
@@ -7,16 +7,28 @@ DIST openmpi-1.4.2.tar.bz2 6630550 RMD160 2c9fbcc8f77e7fa28e2bd062875d484548cc0b
 DIST openmpi-1.4.3.tar.bz2 6626909 RMD160 087532de57244c03941421162caa9e5537b4eba1 SHA1 9d24b6969d73605904855eb32d40d6b07e231932 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
 DIST openmpi-1.4.4.tar.bz2 6653048 RMD160 b568e41b657082517c41dbfcf93934af3b93c321 SHA1 cedc4d6c18d52c4f76b223ee562ef2c93dca690d SHA256 9ad125304a89232d5b04da251f463fdbd8dcd997450084ba4227e7f7a095c3ed
 DIST openmpi-1.5.4.tar.bz2 7629620 RMD160 6e172309b102cf6382b4b516d07e0133466485b3 SHA1 81f7736a83b2134ba20c2e5c380b4d267cfd9d9c SHA256 81126a95a51b8af4bb0ad28790f852c30d22d989713ec30ad22e9e0a79587ef6
+DIST openmpi-1.5.5.tar.bz2 10055601 RMD160 6e7648ec0fa553c16b40f886b397d11863039eb2 SHA1 206e555f6d376443f2342f721d944e67dd1a04ef SHA256 660e6e49315185f88a87b6eae3d292b81774eab7b29a9b058b10eb35d892ff23
 EBUILD openmpi-1.4.2.ebuild 2755 RMD160 5be40f5b45218df0650df27b24d33a5ec1e60164 SHA1 a58f360b08cec0343d27e9d7de239f8dcb3a5f8d SHA256 b9c496e2acf4b01687ed4224b440f81536245295a18779396cbceebe3334d7ca
 EBUILD openmpi-1.4.3.ebuild 2740 RMD160 a6837841e2dadafbc810b87623fc274256c18b32 SHA1 9898fe4bf5dee6162f80c9c23df59725e5480aa5 SHA256 cbacc1de0b48d9d53d7268d273da286e652e42845754b350d7d0fbd04a5b609a
 EBUILD openmpi-1.4.4.ebuild 2737 RMD160 c63e98d77ab23859f1f5af12c3fec0100aa2f205 SHA1 d90d89fa04917aac3a266734468e87514f5169c4 SHA256 341cec42f196b62edbee8168e7f165c6a4bddbc020cebecf2207e02401b919f3
-EBUILD openmpi-1.5.4-r3.ebuild 3767 RMD160 188a35607f001a8b6d362e63add25851268be7d5 SHA1 07bef61a6b69cdad9ff0f4f01d8aa557df018927 SHA256 2e390c670cd327160a4b048c3e6d44e8234deb85ed0a3dc13d4b59d69e6cbb16
-MISC ChangeLog 15239 RMD160 bfd155e67d0538586efc9bed46ef9ed9bfcafe22 SHA1 0c612d84025a6e3c1df5627c6572a5f29377aa59 SHA256 200eb3a4a7e2b028fed934c4d9952a49d84ea7cbad39801cfe2a7642ebb3b2da
+EBUILD openmpi-1.5.4-r3.ebuild 3762 RMD160 6b79e99f00949a9bcb952bb984b686409b8a2e99 SHA1 848532e8116c949488349468c045b41545e03acb SHA256 116c57b587d040e76ddfb7ef4fbe3bf3dbb9674e61ec0aff6621a358de8c849d
+EBUILD openmpi-1.5.5.ebuild 5006 RMD160 b922a3e9cdb5afc2c3eea22432cbb7ab02a465c1 SHA1 f82b7bfea6d5e04468d1430bfea91d613970e88b SHA256 ddf0bb04b3bba6a61e9f6c808fc3c53cd1779d60edf446c1cf02ec79b8f4bb43
+MISC ChangeLog 15450 RMD160 92f1856a4dfae25116786af5ea03e9c10b523f9e SHA1 ea33921114df08f290a7a9a77cf88ecbe35b05d9 SHA256 2f01337cf42be138ea6348b2d6414c82cbd56208b03f2d0a839b43c48ae4fddf
 MISC metadata.xml 975 RMD160 f018d88bafb6fff084b8fca9587e7c530c08f738 SHA1 9843ccb5ca4ab77ef4d469b0435bc6d34d684121 SHA256 6013730050494223daac882d90da64f6f72ed76ac850a53cabd95e7d57dda8ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk93RTkACgkQuQc30/atMkAh1gCeLNZDNppzQnvpv1ZskVT0Rcrf
-YgMAoMEnWDIy0Uh3GXerZuIoVymY5MV8
-=Cpco
+iQIcBAEBCAAGBQJPjyWMAAoJEOf+E+/4L5LmF18P+wVxNHfIe7CNO8WqVtpQ4w2u
+hGKy7Ig97+5oyNtE5LvmMzq5xHLJiJN21qUlJ1wF6vwjfoXWDKLGejVbgfX+tjIM
+41y/k1FgIZX81mQOAIIV9ZjjeAWmK12KKJbIoCyStMH9B07nePQiJPeyq7TA86gp
+XfShL+vLjKk4xsv5jVC1altu5wue799gD5jFP/Md1kBxcM2Oxb08esb7SWeccRBS
+sMTW+z6kaL50Q/lHs0qxRNwJyHuqX8cKfgV+RJ5+53MVgrcJA4Xu045SA9By9cib
+X46EdjIUAO7EOQAoA90Lss1XkI9F1XL8wO3qf9qCDJRxIFV1a4wdux1hhSPgGfWN
+NxQUIsIw6CMtRxcFPvjJg2NyQIRg4q5DkbqwNPdgbXHVRnm2Bnaeqji2mjgtJEXT
+MWqkYwHZSEyJ669on37vr36XX307Ntm5cRFXGTpeAErZEHpIBMWevuolp1Rw+wxP
+NqbBOKEvP+z+Wl95cHgn/fBiBll5eGf5Wd0Pgd0E+dHNfE6qwq8G9Wjhy0B/w/0x
+SbOA26ektcCBsr2ZDw4ICTiDot5E0iVcyXmXdTGzyylWxC2jZ50KTXqLJ4UkPL5a
+u2uH6P2bZgcIRIlR/NWZrXGB1FGMrpXeT92LHPaCcX1H+jfGpP7zdYEmOjEXrkjr
+3dpb38/4XVhampmQWKDz
+=Qmev
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
index 3c0df1af4dc3..bdf4af79b38c 100644
--- a/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild,v 1.1 2012/02/03 21:55:52 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild,v 1.2 2012/04/18 20:35:24 alexxy Exp $
 
 EAPI=4
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
@@ -24,7 +24,7 @@ REQUIRED_USE="slurm? ( !pbs )
 RDEPEND="
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 	fortran? ( virtual/fortran )
-	infiniband? ( sys-infiniband/openib )
+	infiniband? ( sys-infiniband/ofed )
 	knem? ( sys-cluster/knem )
 	numa? ( sys-process/numactl )
 	open-mx? ( sys-cluster/open-mx )
diff --git a/sys-cluster/openmpi/openmpi-1.5.5.ebuild b/sys-cluster/openmpi/openmpi-1.5.5.ebuild
new file mode 100644
index 000000000000..b89e85044d3f
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.5.5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.5.ebuild,v 1.1 2012/04/18 20:35:24 alexxy Exp $
+
+EAPI=4
+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 ~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/lam-mpi
+	!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 )
+	fortran? ( virtual/fortran )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use fortran && 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
+
+	epatch "${FILESDIR}"/openmpi-r24328.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 numa libnuma "${EPREFIX}"/usr) \
+		$(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"
+}