Version bump. Slight cleanup also, mostly in deps and for USE=doc.

4 files changed, 115 insertions, 4 deletions

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index 5f085dd657a4..e5fac060ff8d 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.5 2003/06/03 12:01:58 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/ChangeLog,v 1.6 2003/11/10 09:26:20 spyderous Exp $
+
+*mpich-1.2.5.2 (10 Nov 2003)
+
+  10 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; mpich-1.2.5.2.ebuild:
+  Version bump. Slight cleanup also, mostly in deps and for USE=doc.
 
 *mpich-1.2.5-r1 (03 Jun 2003)
   
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 757c6f9ca4ec..b17d1dfd3146 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,8 +1,10 @@
-MD5 573d5ce0a20dcd59384b43e7f57ce8db ChangeLog 666
+MD5 17d5ba764001acda0dcefc5c912a2a4d ChangeLog 845
+MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 e1e41860b3f6e785a1dfe989fd96b7be mpich-1.2.4.ebuild 1022
-MD5 ee74f2466fa818355b93044f49bb0e6a mpich-1.2.5.ebuild 1795
 MD5 a96171fd03b9fbf0a5c6873bee8d9c82 mpich-1.2.5-r1.ebuild 2663
-MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
+MD5 ee74f2466fa818355b93044f49bb0e6a mpich-1.2.5.ebuild 1795
+MD5 99f7c9bcd9c0466511ca33a74ed76626 mpich-1.2.5.2.ebuild 2619
 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
+MD5 11a56e15994b5f4fe1ae37ebde20fa50 files/digest-mpich-1.2.5.2 67
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.5.2 b/sys-cluster/mpich/files/digest-mpich-1.2.5.2
new file mode 100644
index 000000000000..9a7caffa87bf
--- /dev/null
+++ b/sys-cluster/mpich/files/digest-mpich-1.2.5.2
@@ -0,0 +1 @@
+MD5 9a7524c220eeb3f080069308bab9f487 mpich-1.2.5.2.tar.gz 12383519
diff --git a/sys-cluster/mpich/mpich-1.2.5.2.ebuild b/sys-cluster/mpich/mpich-1.2.5.2.ebuild
new file mode 100644
index 000000000000..10937346078c
--- /dev/null
+++ b/sys-cluster/mpich/mpich-1.2.5.2.ebuild
@@ -0,0 +1,103 @@
+# 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.2.ebuild,v 1.1 2003/11/10 09:26:20 spyderous Exp $
+
+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"
+IUSE="doc crypt"
+DEPEND=""
+RDEPEND="${DEPEND}
+	crypt? ( net-misc/openssh ) : ( net-misc/netkit-rsh )
+	!dev-libs/lam-mpi
+	virtual/glibc"
+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
+
+	#mangle P here as well..
+	local PSave
+	PSave=${P}
+	unset P
+
+	# 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
+
+	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 || \
+			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
+}
+