5 files changed, 91 insertions, 10 deletions
diff --git a/sys-cluster/pvm/ChangeLog b/sys-cluster/pvm/ChangeLog
index 44b4529801a1..ded2e3cb3eb0 100644
--- a/sys-cluster/pvm/ChangeLog
+++ b/sys-cluster/pvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/pvm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.21 2005/06/15 21:20:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.22 2005/07/05 23:59:18 robbat2 Exp $
+
+*pvm-3.4.5-r1 (05 Jul 2005)
+
+  05 Jul 2005; Robin H. Johnson <robbat2@gentoo.org> pvm-3.4.5.ebuild,
+  +pvm-3.4.5-r1.ebuild:
+  The ssh changes really should have been in a new revision, that wasnt stable
+  already, so revert them and create that new revision. Also change the
+  useflag for having ssh to be crypt instead of ssh.
 
   15 Jun 2005; Robin H. Johnson <robbat2@gentoo.org> pvm-3.4.5.ebuild:
   Add support for ssh instead of rsh.
diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index 4953d7eeb83e..2a4c8427691a 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -1,8 +1,9 @@
 MD5 d7e69b72f7a4deb9510975699f5da83f pvm-3.4.4-r3.ebuild 1990
-MD5 619e258c64fda89ca1f2f76c0e675696 pvm-3.4.5.ebuild 2056
+MD5 45c59368de332d2cdaefe39d70741b4f pvm-3.4.5.ebuild 1895
 MD5 092f51f6e7c4e6c713b143f60f83e2d1 pvm-3.4.4-r2.ebuild 1911
+MD5 e6c0cdea2c30efd02862a46d7d07cb01 pvm-3.4.5-r1.ebuild 2085
 MD5 6670265f824ab06a23db5549f167f298 pvm-3.4.4-r1.ebuild 1143
-MD5 ec1ab345921ba0af5c38db592ecf53d9 ChangeLog 2902
+MD5 53850501b12f15aa709cc4cdc619d17a ChangeLog 3231
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 MD5 726a6a69ba5fb9e140e8f7e1a85c9c9d files/pvm-3.4.4-gentoo.diff 608
 MD5 280129471c091d368fb315350d763d44 files/pvm-3.4.5-extra-arches.patch 547
@@ -15,3 +16,4 @@ MD5 a63de680fc0c3be96123243794b48096 files/digest-pvm-3.4.5 57
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r1 57
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r2 57
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r3 57
+MD5 a63de680fc0c3be96123243794b48096 files/digest-pvm-3.4.5-r1 57
diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.5-r1 b/sys-cluster/pvm/files/digest-pvm-3.4.5-r1
new file mode 100644
index 000000000000..6de3184f5d12
--- /dev/null
+++ b/sys-cluster/pvm/files/digest-pvm-3.4.5-r1
@@ -0,0 +1 @@
+MD5 086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz 979201
diff --git a/sys-cluster/pvm/pvm-3.4.5-r1.ebuild b/sys-cluster/pvm/pvm-3.4.5-r1.ebuild
new file mode 100644
index 000000000000..e7794483830d
--- /dev/null
+++ b/sys-cluster/pvm/pvm-3.4.5-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5-r1.ebuild,v 1.1 2005/07/05 23:59:18 robbat2 Exp $
+
+inherit eutils
+
+MY_P="${P/-}"
+DESCRIPTION="PVM: Parallel Virtual Machine"
+HOMEPAGE="http://www.epm.ornl.gov/pvm/pvm_home.html"
+SRC_URI="ftp://ftp.netlib.org/pvm3/${MY_P}.tgz "
+IUSE="crypt"
+DEPEND=""
+RDEPEND="virtual/libc"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+S="${WORKDIR}/${MY_P%%.*}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Patches from Red Hat
+	epatch ${FILESDIR}/${P}-envvars.patch || die
+	epatch ${FILESDIR}/${P}-strerror.patch || die
+	epatch ${FILESDIR}/${P}-extra-arches.patch || die
+	epatch ${FILESDIR}/${P}-x86_64-segfault.patch || die
+
+# setup def files for other archs
+	cp conf/LINUX64.def conf/LINUXPPC64.def
+	cp conf/LINUX64.m4 conf/LINUXPPC64.m4
+
+# s390 should go in this list if there is ever interest
+# Patch the 64bit def files to look in lib64 dirs as well for libraries.
+	for I in 64 PPC64; do
+		sed -i -e "s|ARCHDLIB	=|ARCHDLIB	= -L/usr/lib64 -L/usr/X11R6/lib64 |" conf/LINUX${I}.def || die "Failed to fix 64-bit"
+		sed -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64 |" conf/LINUX${I}.def || die "Failed to fix 64-bit"
+	done
+
+	if use crypt; then
+		for i in ${S}/conf/LINUX*def; do
+			sed -i.orig -e '/^ARCHCFLAGS/s~/usr/bin/rsh~/usr/bin/ssh~' "${i}" ||
+			die "Failed to set ssh instead of rsh"
+		done
+	fi
+
+}
+
+src_compile() {
+	unset PVM_ARCH
+
+	export PVM_ROOT="${S}"
+	emake || die
+}
+
+src_install() {
+	dodir /usr/share/man
+	rm man/man1 -fr
+	mv man/man3 ${D}/usr/share/man/
+	prepallman
+
+	dodoc Readme
+
+	#installs the rest of pvm
+	dodir /usr/share/pvm3
+	cp -r * ${D}/usr/share/pvm3
+
+	#environment variables:
+	echo PVM_ROOT=/usr/share/pvm3 > ${T}/98pvm
+	echo PVM_ARCH=$(${D}/usr/share/pvm3/lib/pvmgetarch) >> ${T}/98pvm
+	doenvd ${T}/98pvm
+}
+
+pkg_postinst() {
+	ewarn "Environment variables have changed. Do not forget to run etc-update,"
+	ewarn "reboot or perform . /etc/profile before using pvm!"
+}
diff --git a/sys-cluster/pvm/pvm-3.4.5.ebuild b/sys-cluster/pvm/pvm-3.4.5.ebuild
index 32116364f0f3..18c07d975e3f 100644
--- a/sys-cluster/pvm/pvm-3.4.5.ebuild
+++ b/sys-cluster/pvm/pvm-3.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5.ebuild,v 1.4 2005/06/15 21:20:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5.ebuild,v 1.5 2005/07/05 23:59:18 robbat2 Exp $
 
 inherit eutils
 
@@ -36,12 +36,6 @@ src_unpack() {
 		sed -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64 |" conf/LINUX${I}.def || die "Failed to fix 64-bit"
 	done
 
-	if use ssh; then
-		for i in ${S}/conf/LINUX*def; do
-			sed -i.orig -e '/^ARCHCFLAGS/s~/usr/bin/rsh~/usr/bin/ssh~' "${i}" || die "Failed to set ssh"
-		done
-	fi
-
 }
 
 src_compile() {