11 files changed, 78 insertions, 187 deletions
diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 585fe33d1bcc..443e672a7cf1 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/lam-mpi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.4 2003/11/14 15:43:04 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.5 2004/01/06 23:44:25 tester Exp $
+
+*lam-mpi-7.0.3 (07 Jan 2004)
+
+  07 Jan 2004; Olivier Crete <tester@gentoo.org> lam-mpi-7.0.3.ebuild:
+  Version bump as reported by JFMuggs on irc
 
   14 Nov 2003; Brad House <brad_mssw@gentoo.org> lam-mpi-7.0.2.ebuild:
   add ~amd64 flag
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index 40205c35f70f..77daa3a916f1 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -1,14 +1,8 @@
 MD5 218d80be782fd68f7f8001b2b6ace932 lam-mpi-6.5.9-r1.ebuild 1543
-MD5 597caadc19f934f87eb86cdcbc47d39e lam-mpi-7.0.3.ebuild 1430
-MD5 23f7878c277e5c9e75716f1e70032c9e ChangeLog 2514
+MD5 24f54487f4cda94bd10c7fb200ed976e lam-mpi-7.0.3.ebuild 1427
+MD5 258003ffdf3afa57faf3adca815ffb0e ChangeLog 2658
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
-MD5 597caadc19f934f87eb86cdcbc47d39e lam-mpi-7.0.2.ebuild 1430
-MD5 65ac945c484a031dfb7ef4e2cf30773c lam-mpi-6.5.6-r1.ebuild 1463
-MD5 224256393cce24b833b54f3717cde114 lam-mpi-6.5.9.ebuild 1374
-MD5 ae375ff2817e99645cc20f005e384526 lam-mpi-6.5.7.ebuild 1376
-MD5 b2a92a68d13d42103750c61268d9ef19 files/digest-lam-mpi-6.5.6-r1 63
-MD5 e897a667e2ca42d134950b2c85a4b4e3 files/digest-lam-mpi-6.5.9 63
+MD5 e01195aefff35e7a7362accba521b71a lam-mpi-7.0.2.ebuild 1425
 MD5 da17d8227315799bb5745b32fe45e398 files/digest-lam-mpi-7.0.2 63
 MD5 f99c2a4c1cbbfd97415b800afca5d343 files/digest-lam-mpi-7.0.3 63
 MD5 e897a667e2ca42d134950b2c85a4b4e3 files/digest-lam-mpi-6.5.9-r1 63
-MD5 742d2b0cd6347d7e8403628f0d56a5d1 files/digest-lam-mpi-6.5.7 63
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.6-r1 b/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.6-r1
deleted file mode 100644
index 4d564991aa7a..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97884838b7b0299f3a095d0b2a9f9ef1 lam-6.5.6.tar.bz2 1303693
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.7 b/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.7
deleted file mode 100644
index c886ff086a6d..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59c0cc8bc6ab1134ba435c2424cbe5e0 lam-6.5.7.tar.bz2 1349765
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.9 b/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.9
deleted file mode 100644
index 3f1c3b8d4156..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-6.5.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a4e98da5e1ba41e68c9422635b42364 lam-6.5.9.tar.bz2 1642559
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.0.3 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.0.3
new file mode 100644
index 000000000000..f33914878a3a
--- /dev/null
+++ b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.0.3
@@ -0,0 +1 @@
+MD5 c779eff458c37b595dbfd0b7eb364a79 lam-7.0.3.tar.bz2 5609106
diff --git a/sys-cluster/lam-mpi/lam-mpi-6.5.6-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-6.5.6-r1.ebuild
deleted file mode 100644
index e869e92f5a04..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-6.5.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-6.5.6-r1.ebuild,v 1.2 2003/09/06 22:05:25 msterret Exp $
-
-Name="lam"
-S=${WORKDIR}/${Name}-${PV}
-
-DESCRIPTION="the LAM MPI parallel computing environment"
-SRC_URI="http://www.lam-mpi.org/download/files/${Name}-${PV}.tar.bz2"
-HOMEPAGE="http://www.lam-mpi.org"
-
-DEPEND="virtual/glibc"
-# we need ssh if we want to use it instead of rsh
-RDEPEND="net-misc/openssh"
-
-SLOT="6"
-KEYWORDS="x86 sparc "
-LICENSE="as-is"
-
-PROVIDE="dev-libs/lam-mpi"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/romio/util/
-	mv romioinstall.in romioinstall.in-orig
-	sed -e "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in-orig >romioinstall.in
-
-}
-
-src_compile() {
-	./configure \
-		--infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr \
-		--host="${CHOST}" --with-cflags="${CFLAGS}" \
-		--sysconfdir=/etc/lam-mpi \
-		--with-cxxflags="${CXXFLAGS}" --with-rsh="ssh -x" || die
-
-	# sometimes emake doesn't finish since it gets ahead of itself :)
-
-	make || die
-
-}
-
-src_install () {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/lam-mpi install || die
-
-	#need to correct the produced absolute symlink
-	cd ${D}/usr/include
-	rm mpi++.h
-	ln -sf mpi2c++/mpi++.h mpi++.h
-
-	dodoc README HISTORY LICENSE RELEASE_NOTES VERSION
-}
-
diff --git a/sys-cluster/lam-mpi/lam-mpi-6.5.7.ebuild b/sys-cluster/lam-mpi/lam-mpi-6.5.7.ebuild
deleted file mode 100644
index a7cbf9b23394..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-6.5.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-6.5.7.ebuild,v 1.1 2003/07/08 05:31:28 george Exp $
-
-IUSE=""
-
-Name="lam"
-S=${WORKDIR}/${Name}-${PV}
-
-DESCRIPTION="the LAM MPI parallel computing environment"
-SRC_URI="http://www.lam-mpi.org/download/files/${Name}-${PV}.tar.bz2"
-HOMEPAGE="http://www.lam-mpi.org"
-
-DEPEND="virtual/glibc"
-# we need ssh if we want to use it instead of rsh
-RDEPEND="net-misc/openssh"
-
-SLOT="6"
-KEYWORDS="x86 ~sparc ~ppc"
-LICENSE="as-is"
-
-PROVIDE="dev-libs/lam-mpi"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/romio/util/
-	mv romioinstall.in romioinstall.in-orig
-	sed -e "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in-orig >romioinstall.in
-
-}
-
-src_compile() {
-	econf --with-cflags="${CFLAGS}" \
-		--sysconfdir=/etc/lam-mpi \
-		--with-cxxflags="${CXXFLAGS}" --with-rsh="ssh -x" || die
-
-	# sometimes emake doesn't finish since it gets ahead of itself :)
-
-	make || die
-
-}
-
-src_install () {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/lam-mpi install || die
-
-	#need to correct the produced absolute symlink
-	cd ${D}/usr/include
-	rm mpi++.h
-	ln -sf mpi2c++/mpi++.h mpi++.h
-
-	dodoc README HISTORY LICENSE RELEASE_NOTES VERSION
-}
-
diff --git a/sys-cluster/lam-mpi/lam-mpi-6.5.9.ebuild b/sys-cluster/lam-mpi/lam-mpi-6.5.9.ebuild
deleted file mode 100644
index e2e6137b6ce0..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-6.5.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-6.5.9.ebuild,v 1.1 2003/07/08 05:31:28 george Exp $
-
-IUSE=""
-
-Name="lam"
-S=${WORKDIR}/${Name}-${PV}
-
-DESCRIPTION="the LAM MPI parallel computing environment"
-SRC_URI="http://www.lam-mpi.org/download/files/${Name}-${PV}.tar.bz2"
-HOMEPAGE="http://www.lam-mpi.org"
-
-DEPEND="virtual/glibc"
-# we need ssh if we want to use it instead of rsh
-RDEPEND="net-misc/openssh"
-
-SLOT="6"
-KEYWORDS="x86 sparc ppc"
-LICENSE="as-is"
-
-PROVIDE="dev-libs/lam-mpi"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/romio/util/
-	mv romioinstall.in romioinstall.in-orig
-	sed -e "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in-orig >romioinstall.in
-
-}
-
-src_compile() {
-	econf --with-cflags="${CFLAGS}" \
-		--sysconfdir=/etc/lam-mpi \
-		--with-cxxflags="${CXXFLAGS}" --with-rsh="ssh -x" || die
-
-	# sometimes emake doesn't finish since it gets ahead of itself :)
-
-	make || die
-
-}
-
-src_install () {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/lam-mpi install || die
-
-	#need to correct the produced absolute symlink
-	cd ${D}/usr/include
-	rm mpi++.h
-	ln -sf mpi2c++/mpi++.h mpi++.h
-
-	dodoc README HISTORY LICENSE RELEASE_NOTES VERSION
-}
-
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.0.2.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.0.2.ebuild
index 56ef8c1468b5..4a1f734effee 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.0.2.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.0.2.ebuild,v 1.2 2003/11/14 15:43:04 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.0.2.ebuild,v 1.3 2004/01/06 23:44:25 tester Exp $
 
 IUSE="crypt"
 
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}
 	!crypt? ( net-misc/netkit-rsh )"
 
 SLOT="6"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 LICENSE="as-is"
 
 src_unpack() {
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.0.3.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.0.3.ebuild
new file mode 100644
index 000000000000..3d44ab1ae5fc
--- /dev/null
+++ b/sys-cluster/lam-mpi/lam-mpi-7.0.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.0.3.ebuild,v 1.1 2004/01/06 23:44:25 tester Exp $
+
+IUSE="crypt"
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="the LAM MPI parallel computing environment"
+SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.lam-mpi.org"
+
+DEPEND="virtual/glibc
+	!sys-cluster/mpich"
+# we need ssh if we want to use it instead of rsh
+RDEPEND="${DEPEND}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )"
+
+SLOT="6"
+KEYWORDS="~x86 ~amd64"
+LICENSE="as-is"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/romio/util/
+	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
+}
+
+src_compile() {
+
+	local myconf
+
+	if use crypt; then
+		myconf="--with-rsh=ssh"
+	else
+		myconf="--with-rsh=rsh"
+	fi
+
+	econf \
+		--sysconfdir=/etc/lam-mpi \
+		${myconf} || die
+
+	# sometimes emake doesn't finish since it gets ahead of itself :)
+
+	make || die
+}
+
+src_install () {
+
+	make DESTDIR="${D}" install || die
+
+	#need to correct the produced absolute symlink
+	cd ${D}/usr/include
+	rm mpi++.h
+	ln -sf mpi2c++/mpi++.h mpi++.h
+
+	# There are a bunch more tex docs we could make and install too,
+	# but they might be replicated in the pdf.
+	dodoc README HISTORY LICENSE VERSION
+	cd ${S}/doc
+	dodoc {user,install}.pdf
+}