Corrected ebuild. Submitted by Marc St-Pierre <marc@cyberlogic.ca>

4 files changed, 115 insertions, 3 deletions

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index 3b72db662020..5f085dd657a4 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/mpich
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.4 2003/03/29 07:38:45 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.5 2003/06/03 12:01:58 tantive Exp $
+
+*mpich-1.2.5-r1 (03 Jun 2003)
+  
+  03 Jun 2003; Michael Imhof <tantive@gentoo.org>:
+  Corrected ebuild. Submitted by Marc St-Pierre <marc@cyberlogic.ca>
 
 *mpich-1.2.5 (28 Mar 2003)
 
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 2ffdbb317ffb..4f192429d508 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,7 +1,7 @@
-MD5 e274ebd10b9a6de81bac18a934a3afd7 mpich-1.2.5-r1.ebuild 2662
+MD5 361707ebd24d2e4bfb70211e05d117df mpich-1.2.5-r1.ebuild 2666
 MD5 ee74f2466fa818355b93044f49bb0e6a mpich-1.2.5.ebuild 1795
 MD5 4b38b09f2fe9d73faaf116d1571d5032 mpich-1.2.4.ebuild 1034
-MD5 d84a124973f55d2864d1120bc01f3f25 ChangeLog 665
+MD5 573d5ce0a20dcd59384b43e7f57ce8db ChangeLog 666
 MD5 ebdab2cb4d8e0c12320ba3625033b2e8 files/digest-mpich-1.2.4 65
 MD5 08007da1bd4dcd9f6e1c4b3c08d0bb1b files/digest-mpich-1.2.5 65
 MD5 08007da1bd4dcd9f6e1c4b3c08d0bb1b files/digest-mpich-1.2.5-r1 65
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.5-r1 b/sys-cluster/mpich/files/digest-mpich-1.2.5-r1
new file mode 100644
index 000000000000..da880c59243f
--- /dev/null
+++ b/sys-cluster/mpich/files/digest-mpich-1.2.5-r1
@@ -0,0 +1 @@
+MD5 e10f2fde92b6c3264eeb00fdefbb09f1 mpich-1.2.5.tar.gz 12573526
diff --git a/sys-cluster/mpich/mpich-1.2.5-r1.ebuild b/sys-cluster/mpich/mpich-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..5307361ca9e8
--- /dev/null
+++ b/sys-cluster/mpich/mpich-1.2.5-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.5-r1.ebuild,v 1.1 2003/06/03 12:01:58 tantive Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="MPICH - A portable MPI implementation"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/mpich-${PV}.tar.gz"
+HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich"
+IUSE="doc crypt"
+
+DEPEND="virtual/glibc
+	!dev-libs/lam-mpi"
+RDEPEND="${DEPEND}
+	crypt? ( net-misc/openssh ) : ( net-misc/netkit-rsh )"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
+
+src_compile() {
+	#looks like P is one of used vars, need to wrap around build...
+	local PSave RSHCOMMAND
+	PSave=${P}
+	unset P
+
+	if use crypt; then
+		RSHCOMMAND="ssh -x"
+	else
+		RSHCOMMAND="rsh"
+	fi
+
+	export RSHCOMMAND
+	
+	./configure \
+		--mandir=/usr/share/man \
+		--prefix=/usr || die
+	make || die
+	P=${PSave}
+}
+
+src_install() {
+	dodir /usr/sbin
+	dodir /usr/local/bin
+
+	#mangle P here as well..
+	local PSave
+	PSave=${P}
+	unset P
+
+	#mpic install process is really weird, need to do some hand work perheaps
+
+	#to skip installation of man pages, uncomment following line
+	#export MPIINSTALL_OPTS=-noman
+
+	./bin/mpiinstall -echo -prefix=${D}/usr || die
+
+	P=${PSave}
+
+	if use doc; then 
+		dodir /usr/share/doc/${PF}
+		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
+		rmdir ${D}/usr/doc/
+	else
+		rm -rf ${D}/usr/doc/
+	fi
+
+	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
+	use doc || 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 ${D}/usr/share/mpich/examples1/mpirun
+	rm ${D}/usr/share/mpich/examples2/mpirun
+
+}
+