Version bump (#362655). Use system hwloc. Use hydra instead of mpd for pm (#145367). Disable more tests as recommended by upstream.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 163 insertions, 7 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index a39675ed9b59..2c6f5c1be0cd 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.67 2010/12/16 15:54:28 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.68 2011/05/04 03:29:40 jsbronder Exp $
+
+*mpich2-1.4_rc2 (04 May 2011)
+
+  04 May 2011; Justin Bronder <jsbronder@gentoo.org> +mpich2-1.4_rc2.ebuild:
+  Version bump (#362655). Use system hwloc. Use hydra instead of mpd for pm
+  (#145367). Disable more tests as recommended by upstream.
 
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r1.ebuild:
   Removal of fortran.eclass, #348851
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 0c967cd4fc44..ba3fe060edae 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -14,13 +14,15 @@ AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7
 AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
 AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
+DIST mpich2-1.4rc2.tar.gz 19764158 RMD160 2d5cbac33cd728ba0fb6b74d2fcd7f166f1bfc1e SHA1 53afd67e0527e0c1459330d70d7077a1da52fe0f SHA256 820fc929bd349a9b4e6ce4a2fa5e3b88b3abf6941a147f6921e3ab44f4a6015a
 EBUILD mpich2-1.2.1_p1-r1.ebuild 4834 RMD160 48aa931dc4119dd2ec66a5a2fbd8fb00dc0b0064 SHA1 5a843ec94fb6aff8e736fbefab5ba50fc8a6cd81 SHA256 2f6fcd6c42532da373e46175ccb7c65028755f43d660da4c2fc0e257c1ca1e9c
-MISC ChangeLog 13288 RMD160 78d449551f4b5e2c8e2772e48cf9bdee60513599 SHA1 a3d087df2a20eebccb1de4a27a2475f3ee12617e SHA256 ae9b6130eb2f9a0474140a527f862f7121b5d78283366998910b32c1af572ccf
+EBUILD mpich2-1.4_rc2.ebuild 4109 RMD160 002cbabc399ef9b374bade0450ba1016ff8c20b6 SHA1 c769b333dc3888bf108cc7fc810cd925d4490a8e SHA256 2d95cd97b354bb6483cbee55ddeec08f5e057988341787563cf38d312dbe7cfc
+MISC ChangeLog 13538 RMD160 8de7d49a692e37db2e7783e57a123d4d831a20b3 SHA1 a0c3b224c548ea9a178c023672182c798c4aaa1b SHA256 3d9f86404f443287a2347717f943165d966a3fccbc262c0b0811dc9c76e9abaa
 MISC metadata.xml 420 RMD160 930e2ff21815f000e213b80bb98074dd7594bafb SHA1 7ef0b850e21959933db71dfa8c57ff9349e37762 SHA256 c6dfa7e480cb95bb9b6bcb3fdbb89836795f8872ff9b098de85ec6e9ec0a1c34
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0OWQsACgkQgAnW8HDreRZmDQCgx7e6pn4nLgkj83hnuG7I2C6u
-10QAoJGVMGteKgms3oGY8SWfpIzujoho
-=r5Nw
+iEYEARECAAYFAk3AyC8ACgkQ4MrvBE1wQ8mA0wCfbfS3tfFkl9WcsIPvxR5cfc69
+PgwAnibPfoP9eZYGSrHvrFhrI8/sy608
+=KtJG
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
new file mode 100644
index 000000000000..28c4c5ac057d
--- /dev/null
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild,v 1.1 2011/05/04 03:29:40 jsbronder Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV/_/}
+DESCRIPTION="MPICH2 - A portable MPI implementation"
+HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
+SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+cxx debug doc fortran threads romio mpi-threads"
+
+COMMON_DEPEND="dev-libs/libaio
+	>=sys-apps/hwloc-1.1.1
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/openmpi
+	!sys-cluster/lam-mpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Cannot use bin/mpiexec as hydra is built by autotools and is
+	# a shell wrapped executable.
+	sed -i \
+		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
+		$(find ./test/ -name 'Makefile.in') || die
+
+	# #293665
+	# We could use MPICH2LIB_XFLAGS here and unset the cooresponding ones
+	# in the environment, however that's messy and doesn't for for LDFLAGS.
+	sed -i \
+		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
+		src/env/*.conf.in || die
+}
+
+src_configure() {
+	local c="--enable-shared --enable-sharedlibs=gcc"
+	local romio_conf
+
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.
+
+	use debug && c="${c} --enable-g=all --enable-debuginfo"
+
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	# enable f90 support for appropriate compilers
+	case "$(tc-getFC)" in
+	    gfortran|if*)
+			c="${c} --enable-f77 --enable-fc";;
+	    g77)
+			c="${c} --enable-f77 --disable-fc";;
+	esac
+
+	c="${c} --sysconfdir=/etc/${PN}"
+	econf ${c} ${romio_conf} \
+		--docdir=/usr/share/doc/${PF} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--with-hwloc-prefix=/usr \
+		--disable-fast \
+		--enable-smpcoll \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		|| die
+}
+
+src_compile() {
+	# Oh, the irony.
+	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
+	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
+	emake -j1 || die
+}
+
+src_test() {
+	if ! use romio; then
+		# These tests in errhan/ rely on MPI::File ...which is in romio
+		echo "" > test/mpi/errors/cxx/errhan/testlist
+	fi
+
+	# See #362655 and comments in the testlist files.
+	# large_message:  only on machines with > 8gb of ram
+	# bcastlength:  This is an extension to MPI that's not necessary
+	# non_zero_root: performance test
+	# Also note that I/O tests may fail on non-local filesystems.
+	sed -i '/^[# ]*large_message/d' test/mpi/pt2pt/testlist || die
+	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
+	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
+
+	if use debug; then
+		# http://bugs.gentoo.org/show_bug.cgi?id=362655#c8
+		sed -i '/^[# ]*scancel/d' test/mpi/pt2pt/testlist || die
+		sed -i '/^[# ]*pscancel/d' test/mpi/pt2pt/testlist || die
+		sed -i '/^[# ]*cancelrecv/d' test/mpi/pt2pt/testlist || die
+	fi
+
+	emake -j1 \
+		CC="${S}"/bin/mpicc \
+		CXX="${S}"/bin/mpicxx \
+		F77="${S}"/bin/mpif77 \
+		FC="${S}"/bin/mpif90 \
+		testing
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodir /usr/share/doc/${PF}
+	dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
+	newdoc src/pm/mpd/README README.hydra|| die
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio || die
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"/usr/share/doc/${PF}/www*
+	fi
+}