version bump and upstream package rename from mpich2

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

3 files changed, 144 insertions, 2 deletions

diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 1fb9a01dfc28..fcea87ba8a15 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mpich-3.0.4.tar.gz 10921075 SHA256 cf638c85660300af48b6f776e5ecd35b5378d5905ec5d34c3da7a27da0acf0b3 SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0 WHIRLPOOL 52c811d1adcba26424bb3f05b7b97faff16ab3762782474fcde5f49e9ca77155fb91d80967120d9277eed2adb116443afe444671eb6315a610587d55ac4ec9ed
-EBUILD mpich-3.0.4.ebuild 2543 SHA256 af14c34c3aedc6a015dab5eaac00b5220b8fd0d0ad6b3aefc360abfc69ecf4a3 SHA512 58691cde28843dd15d7a6dc940d33245755a56567df09430fb50d17ffb3c07eebf76c59520dbfeaca65c6e0c5e6e57b1ec600b129dde83f5699887a17de4ad48 WHIRLPOOL 2e7a36297fd040598903c005c362df3620df6c7d536128684c3fbc193703baeda43dc8b8c10f5449f8de150070363b4c0ecd2858a159512097e1eb88f3e17920
-MISC ChangeLog 293 SHA256 099c6983976d8bc749b02dd10fb26b0f7fdcbc19328768ba429d4af921c0e773 SHA512 cca3378823c4ade9acfea9fe8de63a89463e66cd34ce91f7133a979c0784f0044d6e4979880dbaf5c4ec23ed6f94261165a6921a99bfea5acb43a2ee8b93859a WHIRLPOOL 8c1326f9fe851105be2df78fc48f2adb07c840f9d276e1b3cb13f89388718b44a854d8ae65bb329b9849c4fca750baed91ed20ee407151828e1ce46f04f7445d
+EBUILD mpich-3.0.4.ebuild 2644 SHA256 50e1252e7b310c9f5cd6644e3f54cb446d97aa291eeaf74ea13489de73c4769e SHA512 d7941b4f3b3f449d252b0f850cfdbd5a24a8c9eb382aa979e1186d0205e50082e393c97d87c3275686e292970d2e4fb1dcb63cf9c991aebc0ead75f8fb0fc058 WHIRLPOOL 161916f9dcee87e0925a61e467247e626c1f05f546d7a97a87438c1c875948fc3041ba5c33cf9db0c7ede143edef097195968351254fe2c86d390eb7abae4afd
+MISC ChangeLog 386 SHA256 f9b3518b29a343af72054274b33455256ee6689612e6fa42be1becac85c873bc SHA512 d4be09f9524d6d16044a78c9e37f38f7682753e9a316826aa5c8ab1880c75a197e796a75853b389a4eb9f41bbf92e1870735cc3a07d32c8c7e7064eb0485e200 WHIRLPOOL 6e22673b1c4c6c81adfe45fd1364dbf0eb2ee8c2a50a7c0534b5d59034b574528def0329bf8c2a39df38995b241390f85baca7d9603e4d5f830c1de4243bf011
 MISC metadata.xml 534 SHA256 9c6e52d38dc9621ae72de1b02ed6d59ee0b7397d968bfcedf582fd7d1d16ef5a SHA512 f3696869af563685acafb9753cf120e6d02de8d5719bbcba747f648565d952d25a0071ee9da70ed6d16f47bc964d8f0379257cd9e2700118bd9dee194fd4651d WHIRLPOOL 7bc49c4e233426726e01b2e79c1409e91dc77812873867806bad04d6164e8d77f50c9b40030aeb095b6707e8c1fe9fa8ca079860bbc8b8df22c019ee8b92488e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlHckXIACgkQ4MrvBE1wQ8lcDwCfYGIcVCyr1SRDnc/bk5xPj3vS
+8V0AnjPJOEQcVcY+M50vaR0GaBPbtlwL
+=PeP2
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
new file mode 100644
index 000000000000..1738cc60e6e8
--- /dev/null
+++ b/sys-cluster/mpich/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cluster</herd>
+	<maintainer>
+		<email>jsbronder@gentoo.org</email>
+		<name>Justin Bronder</name>
+	</maintainer>
+	<maintainer>
+		<email>balaji@mcs.anl.gov</email>
+		<name>Pavan Balaji</name>
+		<description>Upstream Contact</description>
+	</maintainer>
+	<use>
+		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
+		<flag name="romio">Build the ROMIO MPI-IO component</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4.ebuild
new file mode 100644
index 000000000000..5c93eddba59d
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.0.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-3.0.4.ebuild,v 1.1 2013/07/09 22:37:55 jsbronder Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	sys-apps/hwloc
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich2
+	!sys-cluster/openmpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+
+	# 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.
+
+	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
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	export MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	econf ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		--with-hwloc-prefix=/usr \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran f77) \
+		$(use_enable fortran fc)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc/${PF}
+	dodoc README{,.envvar} CHANGES RELEASE_NOTES
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"usr/share/doc/${PF}/www*
+	fi
+}