Fixing transcode 0.6.12-r2 being -amd64 due to no working pvm on amd64

4 files changed, 91 insertions, 7 deletions

diff --git a/sys-cluster/pvm/ChangeLog b/sys-cluster/pvm/ChangeLog
index 1d3dea662536..29085d3837f1 100644
--- a/sys-cluster/pvm/ChangeLog
+++ b/sys-cluster/pvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/pvm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.12 2004/07/01 21:49:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.13 2004/10/09 21:52:30 morfic Exp $
+
+  09 Oct 2004; Daniel Goller <morfic@gentoo.org>
+  +files/pvm-3.4.4-amd64.patch, pvm-3.4.4-r2.ebuild:
+  Fixing for amd64 to finally put transcode bug re: USE=pvm to rest
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> pvm-3.4.4-r1.ebuild,
   pvm-3.4.4-r2.ebuild:
diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index 31bc675ab100..8ca4d93dc259 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -1,7 +1,8 @@
-MD5 affa712367df82b5028f06bf20138166 ChangeLog 1234
-MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
+MD5 4d504fc52d366c8e2720ba101bac154c pvm-3.4.4-r2.ebuild 1877
 MD5 1143604bbda9e9288f4e4c583e497adb pvm-3.4.4-r1.ebuild 1142
-MD5 4c1509e4b7ce625590df5250e66e80a1 pvm-3.4.4-r2.ebuild 1149
+MD5 66c7d8928accf5d72e0fa51aaa8bfdf7 ChangeLog 1401
+MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
+MD5 726a6a69ba5fb9e140e8f7e1a85c9c9d files/pvm-3.4.4-gentoo.diff 608
+MD5 61db9ccafbe3d9f647e98823ba30fd55 files/pvm-3.4.4-amd64.patch 2188
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r1 57
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r2 57
-MD5 726a6a69ba5fb9e140e8f7e1a85c9c9d files/pvm-3.4.4-gentoo.diff 608
diff --git a/sys-cluster/pvm/files/pvm-3.4.4-amd64.patch b/sys-cluster/pvm/files/pvm-3.4.4-amd64.patch
new file mode 100644
index 000000000000..fa3d6b0f5493
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.4-amd64.patch
@@ -0,0 +1,62 @@
+diff -uNr pvm3/conf/LINUXAMD64.def ../../pvm-3.4.4-r1.old/work/pvm3/conf/LINUXAMD64.def
+--- pvm3/conf/LINUXAMD64.def	1969-12-31 16:00:00.000000000 -0800
++++ pvm3/conf/LINUXAMD64.def	2004-09-28 11:34:03.557014346 -0700
+@@ -0,0 +1,24 @@
++#
++# Notes on readline Usage:
++#
++#	If your Linux system has readline, then you may append the
++#	following flags to the defines below:
++#
++#		ARCHCFLAGS = . . .  -DHASREADLINE
++#		ARCHLIB = . . .  -lreadline
++#
++#	and recompile PVM.
++#
++#	On some Linux systems, readline requires ncurses, so you
++#	must also add "-lncurses" to the ARCHLIB define.
++#
++ARCHCFLAGS	=	-DSYSVSIGNAL -DNOWAIT3 -DRSHCOMMAND=\"/usr/bin/rsh\" \
++				-DNEEDENDIAN -DFDSETNOTSTRUCT -DHASERRORVARS \
++				-DCTIMEISTIMET -DSYSERRISCONST -DNOTMPNAM
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	LINUX
++MAKE		=	make
+diff -uNr pvm3/conf/LINUXAMD64.m4 ../../pvm-3.4.4-r1.old/work/pvm3/conf/LINUXAMD64.m4
+--- pvm3/conf/LINUXAMD64.m4	1969-12-31 16:00:00.000000000 -0800
++++ pvm3/conf/LINUXAMD64.m4	2004-09-28 11:34:14.110914614 -0700
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
+diff -uNr pvm3/lib/pvmgetarch ../../pvm-3.4.4-r1.old/work/pvm3/lib/pvmgetarch
+--- pvm3/lib/pvmgetarch	2001-09-27 14:24:04.000000000 -0700
++++ pvm3/lib/pvmgetarch	2004-09-28 11:32:18.944915087 -0700
+@@ -67,6 +67,7 @@
+ 	*,mips )                ARCH=MIPS ;;
+ 	*,CRAY-2 )              ARCH=CRAY2 ;;
+ 	Linux,i[3456]86 )       ARCH=LINUX ;;
++	Linux,x86_64 )          ARCH=LINUXAMD64 ;;
+ 	Linux,ia64 )            ARCH=LINUX64 ;;
+ 	Linux,alpha )           ARCH=LINUXALPHA ;;
+ 	Linux,arm* )            ARCH=LINUXARM ;;
diff --git a/sys-cluster/pvm/pvm-3.4.4-r2.ebuild b/sys-cluster/pvm/pvm-3.4.4-r2.ebuild
index 94c8dfb015af..1cbd8c6098ee 100644
--- a/sys-cluster/pvm/pvm-3.4.4-r2.ebuild
+++ b/sys-cluster/pvm/pvm-3.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.4-r2.ebuild,v 1.5 2004/09/03 19:44:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.4-r2.ebuild,v 1.6 2004/10/09 21:52:30 morfic Exp $
 
 inherit eutils
 
@@ -13,13 +13,30 @@ DEPEND=""
 RDEPEND="virtual/libc"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ppc"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64"
 S="${WORKDIR}/${MY_P%%.*}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-s390.patch || die
+	epatch ${FILESDIR}/${P}-x86_64-segfault.patch || die
+
+# setup def files for other archs
+	cp conf/LINUX.def conf/LINUXX86_64.def
+	cp conf/LINUX.m4 conf/LINUXX86_64.m4
+	cp conf/LINUX64.def conf/LINUXIA64.def
+	cp conf/LINUX64.m4 conf/LINUXIA64.m4
+	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 X86_64 PPC64; do
+		sed -i -e "s|ARCHDLIB	=|ARCHDLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX${I}.def
+		sed -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX${I}.def
+	done
 }
 
 src_compile() {