4 files changed, 137 insertions, 12 deletions
diff --git a/sys-cluster/pvm-povray/ChangeLog b/sys-cluster/pvm-povray/ChangeLog
index 655d80ab6eea..f55508922c44 100644
--- a/sys-cluster/pvm-povray/ChangeLog
+++ b/sys-cluster/pvm-povray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pvm-povray
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm-povray/ChangeLog,v 1.6 2004/10/01 23:55:42 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm-povray/ChangeLog,v 1.7 2004/11/09 23:03:05 squash Exp $
+
+*pvm-povray-3.1g-r1 (09 Nov 2004)
+
+  09 Nov 2004; Josh Grebe <squash@gentoo.org> +pvm-povray-3.1g-r1.ebuild:
+  Bug 64972 - pvm-povray broken on all arches, added pvm-povray-3.1g-r1.ebuild
+  to fix
 
   02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> pvm-povray-3.1g.ebuild:
   hooray for epatch!
diff --git a/sys-cluster/pvm-povray/Manifest b/sys-cluster/pvm-povray/Manifest
index a5074253b7e3..75de5442d138 100644
--- a/sys-cluster/pvm-povray/Manifest
+++ b/sys-cluster/pvm-povray/Manifest
@@ -1,13 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 29e1f3ee49981a970c0623d8ab080ed6 pvm-povray-3.1g.ebuild 3409
 MD5 07a8107f25932b7fd635673dd5ab7557 ChangeLog 866
+MD5 29e1f3ee49981a970c0623d8ab080ed6 pvm-povray-3.1g.ebuild 3409
+MD5 994f6f0387a8095c8ebfe351ac971240 pvm-povray-3.1g-r1.ebuild 3468
 MD5 f850b9680949db45729bea2724ddaaec files/digest-pvm-povray-3.1g 182
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBXe6QI7fK2cqeyXkRAtesAKDXY06gIjgijMnMvnwUsZZ64Ye0AQCg7LD/
-NS2BTNK6/h+FsGJpyBz4Lw8=
-=c+S3
------END PGP SIGNATURE-----
+MD5 f850b9680949db45729bea2724ddaaec files/digest-pvm-povray-3.1g-r1 182
diff --git a/sys-cluster/pvm-povray/files/digest-pvm-povray-3.1g-r1 b/sys-cluster/pvm-povray/files/digest-pvm-povray-3.1g-r1
new file mode 100644
index 000000000000..6a04957bc923
--- /dev/null
+++ b/sys-cluster/pvm-povray/files/digest-pvm-povray-3.1g-r1
@@ -0,0 +1,3 @@
+MD5 6da91fb1d3d48cd44f46b831760d233f povuni_s_3.1.tgz 946513
+MD5 dff3b8f3bc2a6dd131a9d008d0f46295 povuni_d_3.1.tgz 913748
+MD5 79fed3e1c3278a4754a5bf705a3d5a73 pvmpov-3.1g2.tgz 41114
diff --git a/sys-cluster/pvm-povray/pvm-povray-3.1g-r1.ebuild b/sys-cluster/pvm-povray/pvm-povray-3.1g-r1.ebuild
new file mode 100644
index 000000000000..284b15af4937
--- /dev/null
+++ b/sys-cluster/pvm-povray/pvm-povray-3.1g-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm-povray/pvm-povray-3.1g-r1.ebuild,v 1.1 2004/11/09 23:03:05 squash Exp $
+
+inherit eutils
+
+S=${WORKDIR}/povray31
+DESCRIPTION="The Persistence Of Vision Ray Tracer - PVM version"
+SRC_URI="http://www.ibiblio.org/gentoo/distfiles/povuni_s_3.1.tgz
+	http://www.ibiblio.org/gentoo/distfiles/povuni_d_3.1.tgz
+	mirror://sourceforge/pvmpov/pvmpov-3.1g2.tgz"
+HOMEPAGE="http://pvmpov.sourceforge.net/"
+
+SLOT="0"
+LICENSE="povlegal-3.1g"
+KEYWORDS="~x86 sparc"
+IUSE="X svga"
+
+RDEPEND="sys-cluster/pvm"
+
+DEPEND="media-libs/libpng
+	sys-libs/zlib
+	svga? ( media-libs/svgalib )
+	X? ( virtual/x11 )"
+
+src_unpack() {
+	unpack pvmpov-3.1g2.tgz
+	unpack povuni_s_3.1.tgz
+	unpack povuni_d_3.1.tgz
+
+	# Copy pvm-pov sources from the pvm-pov tarball
+	cp -R ${WORKDIR}/pvmpov3_1g_2/povray31/source ${S}
+
+	# The PVM Patch
+	epatch ${WORKDIR}/pvmpov3_1g_2/pvmpov.patch || die "epatch failed."
+
+	cd ${S}/source/pvm
+
+	cp Makefile.aimk Makefile.aimk.orig
+	sed -e 's/\/local//g' Makefile.aimk.orig > Makefile.aimk
+
+	# Use system libpng
+	echo "s:^PNGDIR.*:#PNGDIR = /usr/include:" >> Makefile.aimk.sed
+	echo "s:^LIBPNGINC.*:#LIBPNGINC =:" >> Makefile.aimk.sed
+	echo "s:^LIBPNGLIB.*:LIBPNGLIB = -lpng:" >> Makefile.aimk.sed
+
+	# Use system zlib
+	echo "s:^ZLIBDIR.*:#ZLIBDIR =:" >> Makefile.aimk.sed
+	echo "s:^ZLIBINC.*:#ZLIBINC =:" >> Makefile.aimk.sed
+	echo "s:^ZLIBLIB.*:ZLIBLIB = -lz:" >> Makefile.aimk.sed
+
+	# POVPATH (install path)
+	echo 's:^POVPATH.*:POVPATH = $(DESTDIR)/usr:' >> Makefile.aimk.sed
+
+	# Symlinks during install need to get into destdir
+	echo 's:$(PVM_ROOT)/bin/$(PVM_ARCH):$(DESTDIR)$(PVM_ROOT)/bin/$(PVM_ARCH):g' >> Makefile.aimk.sed
+	echo 's:ln -s $(POVPATH)/bin/$(UTARGET):ln -s /usr/bin/$(UTARGET):g' >> Makefile.aimk.sed
+	echo 's:ln -s $(POVPATH)/bin/$(XTARGET):ln -s /usr/bin/$(XTARGET):g' >> Makefile.aimk.sed
+	echo 's:ln -s $(POVPATH)/bin/$(STARGET):ln -s /usr/bin/$(STARGET):g' >> Makefile.aimk.sed
+
+	cp Makefile.aimk Makefile.aimk.orig
+	sed -f Makefile.aimk.sed Makefile.aimk.orig > Makefile.aimk
+}
+
+src_compile() {
+	einfo 'Checking for $PVM_ROOT...'
+
+	if [ -z "${PVM_ROOT}" ]
+	then
+		eerror 'Please set your $PVM_ROOT correctly, it is now empty.'
+		eerror 'The $PVM_ROOT variable should point to your PVM '
+		eerror "installation's root"
+		eerror 'Example $PVM_ROOT : /usr/pvm3/ or /opt/pvm3/'
+		die
+	fi
+
+	if [ ! -x ${PVM_ROOT}/lib/aimk ]
+	then
+		eerror "Can not execute ${PVM_ROOT}/lib/aimk."
+		eerror 'Make sure your $PVM_ROOT is set correctly'
+		eerror 'Example $PVM_ROOT : /usr/pvm3/ or /opt/pvm3/'
+		die
+	fi
+
+	export PATH="${PATH}:${PVM_ROOT}/lib/"
+	einfo '$PVM_ROOT is OK.'
+
+	einfo 'Building pvmpov'
+
+	cd source/pvm
+	aimk ${MAKEOPTS} newunix || die
+
+	if use X ; then
+		einfo 'Building x-pvmpov'
+		aimk ${MAKEOPTS} newxwin || die
+	fi
+
+	if use svga ; then
+		einfo 'Building s-pvmpov'
+		aimk ${MAKEOPTS} newsvga || die
+	fi
+}
+
+src_install() {
+
+	cd source/pvm
+	dodir usr/bin
+	dodir usr/lib
+	doman ${S}/source/unix/povray.1
+	if [ ! -x ${PVM_ROOT}/lib/pvmgetarch ]
+	then
+		eerror "Can not execute ${PVM_ROOT}/lib/pvmgetarch."
+		eerror 'Make sure your $PVM_ROOT is set correctly'
+		eerror 'Example $PVM_ROOT : /usr/pvm3/ or /opt/pvm3/'
+		die
+	fi
+
+	PVMARCH=`${PVM_ROOT}/lib/pvmgetarch`
+	export PATH="${PATH}:${PVM_ROOT}/lib/"
+
+	dodir ${PVM_ROOT}/bin/${PVMARCH}
+	dodir usr/share/man/man1
+	aimk DESTDIR=${D} install || die
+}