Update to latest version, after building up suitable suspense over the past six months it's been out.

(Portage version: 2.0.51-r15)

5 files changed, 153 insertions, 4 deletions

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index b06e7a06dc96..99e4463a392f 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/mpich
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.16 2004/09/28 08:49:06 blubb Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.17 2005/02/21 07:57:19 spyderous Exp $
+
+*mpich-1.2.6 (20 Feb 2005)
+
+  20 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/1.2.6-fix-romio-sandbox-breakage.patch, +mpich-1.2.6.ebuild:
+  Update to latest version, after building up suitable suspense over the past
+  six months it's been out.
 
   28 Sep 2004; Simon Stelling <blubb@gentoo.org> mpich-1.2.5.2.ebuild:
   added ~amd64
diff --git a/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch b/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch
new file mode 100644
index 000000000000..0b46f0feb4cb
--- /dev/null
+++ b/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch
@@ -0,0 +1,12 @@
+diff -urN mpich-1.2.6.orig/romio/configure.in mpich-1.2.6/romio/configure.in
+--- mpich-1.2.6.orig/romio/configure.in	2004-08-02 06:37:31.000000000 -0700
++++ mpich-1.2.6/romio/configure.in	2005-02-20 23:35:18.163959288 -0800
+@@ -1621,7 +1621,7 @@
+ # 
+ # Make sure we remove any configuration file incase there is out-of-date data.
+ # We remove the version in include in case this is a vpath build
+-rm -f adio/include/romioconf.h ${use_top_srcdir}/src/mpi/romio/adio/include/romioconf.h ${use_top_srcdir}/adio/include/romioconf.h
++rm -f adio/include/romioconf.h
+ #
+ # Create makefiles for all of the adio devices.  Only the ones that 
+ # are active will be called by the top level ROMIO make
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.6 b/sys-cluster/mpich/files/digest-mpich-1.2.6
new file mode 100644
index 000000000000..537b23d89d79
--- /dev/null
+++ b/sys-cluster/mpich/files/digest-mpich-1.2.6
@@ -0,0 +1 @@
+MD5 dbf6ea0b5717bbf88851e5bd36aed644 mpich-1.2.6.tar.gz 15248688
diff --git a/sys-cluster/mpich/mpich-1.2.5.2.ebuild b/sys-cluster/mpich/mpich-1.2.5.2.ebuild
index 26f3fafac7be..016ad754811c 100644
--- a/sys-cluster/mpich/mpich-1.2.5.2.ebuild
+++ b/sys-cluster/mpich/mpich-1.2.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.5.2.ebuild,v 1.9 2004/09/28 08:49:06 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.5.2.ebuild,v 1.10 2005/02/21 07:57:19 spyderous Exp $
 
 # Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
 # mpich listens on or any other custom options (#38207).
diff --git a/sys-cluster/mpich/mpich-1.2.6.ebuild b/sys-cluster/mpich/mpich-1.2.6.ebuild
new file mode 100644
index 000000000000..dc177b919fd9
--- /dev/null
+++ b/sys-cluster/mpich/mpich-1.2.6.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.6.ebuild,v 1.1 2005/02/21 07:57:19 spyderous Exp $
+
+inherit eutils
+
+# Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
+# mpich listens on or any other custom options (#38207).
+# The default USR1 conflicts with pthreads. Options include SIGUSR2 and SIGBUS.
+# For example: MPICH_CONFIGURE_OPTS="--with-device=ch_p4:-listener_sig=SIGBUS"
+
+DESCRIPTION="MPICH - A portable MPI implementation"
+HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc crypt"
+
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/libtool"
+RDEPEND="${DEPEND}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )
+	!sys-cluster/lam-mpi"
+
+pkg_setup() {
+	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
+		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	grep -FrlZ '$(P) ' . | xargs -0 sed -i -e 's/\$(P)//'
+
+	# Fix broken romio
+	epatch ${FILESDIR}/${PV}-fix-romio-sandbox-breakage.patch
+	cd ${S}/romio
+	rm configure
+	autoreconf --install --verbose
+}
+
+src_compile() {
+	local RSHCOMMAND
+
+	if use crypt; then
+		RSHCOMMAND="ssh -x"
+	else
+		RSHCOMMAND="rsh"
+	fi
+
+	export RSHCOMMAND
+
+	local myconf="${myconf} ${MPICH_CONFIGURE_OPTS}"
+
+	./configure \
+		${myconf} \
+		--mandir=/usr/share/man \
+		--prefix=/usr || die
+	make || die
+}
+
+src_install() {
+	dodir /usr/sbin
+
+	# mpich install process is really weird, need to do some hand work perhaps
+
+	# to skip installation of man pages, uncomment following line
+	# export MPIINSTALL_OPTS=-noman
+
+	./bin/mpiinstall -echo -prefix=${D}/usr || die
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}
+		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
+	fi
+	rm -rf ${D}/usr/doc/
+
+	dodir /etc/mpich
+	mv ${D}/usr/etc/* ${D}/etc/mpich/
+	rmdir ${D}/usr/etc/
+
+	dodir /usr/share/${PN}
+	mv ${D}/usr/examples ${D}/usr/share/${PN}/examples1
+	mv ${D}/usr/share/examples ${D}/usr/share/${PN}/examples2
+
+	# rm -rf ${D}/usr/local
+	rm -f ${D}/usr/man/mandesc
+
+	mv ${D}/usr/share/{machines*,jumpshot-3,Makefile.sample,upshot} ${D}/usr/share/${PN}
+
+	dodoc COPYRIGHT README
+	use doc && \
+		mv ${D}/usr/www ${D}/usr/share/doc/${PF}/html || \
+			rm -rf ${D}/usr/www
+
+	# Dont let users deinstall without portage
+	rm ${D}/usr/sbin/mpiuninstall
+
+	# We dont have a real DESTDIR, so we have to fix all the files
+	dosed /usr/bin/mpirun /usr/bin/mpiman /usr/sbin/tstmachines
+	dosed /usr/sbin/chkserv /usr/sbin/chp4_servs
+	dosed /usr/bin/mpicc /usr/bin/mpiCC /usr/bin/logviewer
+	dosed /usr/bin/mpireconfig /usr/bin/mpireconfig.dat
+	dosed /usr/bin/mpereconfig /usr/bin/mpereconfig.dat
+
+	dosed /usr/share/mpich/examples1/Makefile
+	dosed /usr/share/mpich/examples2/Makefile
+	dosed /usr/share/mpich/jumpshot-3/bin/jumpshot
+	dosed /usr/share/mpich/jumpshot-3/bin/slog_print
+	dosed /usr/share/mpich/Makefile.sample
+	dosed /usr/share/mpich/upshot/bin/upshot
+
+	# those are dangling symlinks
+	rm -f \
+		${D}/usr/share/mpich/examples1/mpirun \
+		${D}/usr/share/mpich/examples2/mpirun
+
+	mv ${D}/usr/man ${D}/usr/share/man
+	prepallman
+
+	#FIXME: Here, we should either clean the empty directories
+	# or use keepdir to make sure they stick around.
+}