Bump. Attempt to fix miscellaneous issues, including weird, non-standard PVM_ARCH definitions (mentioned in #61017, among others). Nab some patches from Red Hat.

Package-Manager: portage-2.0.51-r15

8 files changed, 337 insertions, 2 deletions

diff --git a/sys-cluster/pvm/ChangeLog b/sys-cluster/pvm/ChangeLog
index 96fdba900579..2918795df8d3 100644
--- a/sys-cluster/pvm/ChangeLog
+++ b/sys-cluster/pvm/ChangeLog
@@ -1,6 +1,16 @@
 # 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.16 2005/02/20 09:53:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.17 2005/02/22 06:45:40 spyderous Exp $
+
+*pvm-3.4.5 (21 Feb 2005)
+
+  21 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/pvm-3.4.5-envvars.patch, +files/pvm-3.4.5-extra-arches.patch,
+  +files/pvm-3.4.5-strerror.patch, +files/pvm-3.4.5-x86_64-segfault.patch,
+  +pvm-3.4.5.ebuild:
+  Bump. Attempt to fix miscellaneous issues, including weird, non-standard
+  PVM_ARCH definitions (mentioned in #61017, among others). Nab some patches
+  from Red Hat.
 
   20 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; pvm-3.4.4-r3.ebuild:
   (#82614) We need to copy x86 config files over too. Thanks to gophix on
diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index f80b9061d9d8..1466b3d54c41 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -1,11 +1,17 @@
-MD5 0d8ed5c4653295ceefb200d385835a37 ChangeLog 1970
+MD5 e49433ff317839df617cea9b197c3b4d ChangeLog 2387
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 MD5 6670265f824ab06a23db5549f167f298 pvm-3.4.4-r1.ebuild 1143
 MD5 092f51f6e7c4e6c713b143f60f83e2d1 pvm-3.4.4-r2.ebuild 1911
+MD5 7116f984e962ccd15573c13913b2301d pvm-3.4.5.ebuild 1820
 MD5 1467c0af9fe5c3fc0f33ae58abbc2516 pvm-3.4.4-r3.ebuild 1992
+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 726a6a69ba5fb9e140e8f7e1a85c9c9d files/pvm-3.4.4-gentoo.diff 608
 MD5 cb7593c1f1921b55cd0eee8447204ba8 files/pvm-3.4.4-s390.patch 886
 MD5 1f52ad91cea65624c2bed0e33db5f7b4 files/pvm-3.4.4-x86_64-segfault.patch 2478
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r3 57
+MD5 52c60bea6e97bcc060451d7bf2c60bdd files/pvm-3.4.5-envvars.patch 732
+MD5 280129471c091d368fb315350d763d44 files/pvm-3.4.5-extra-arches.patch 547
+MD5 548feda663862f5bd034456e7dec662c files/pvm-3.4.5-strerror.patch 5403
+MD5 2b358bb1f53a8649c966f6099b8e67cc files/pvm-3.4.5-x86_64-segfault.patch 1233
diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.5 b/sys-cluster/pvm/files/digest-pvm-3.4.5
new file mode 100644
index 000000000000..6de3184f5d12
--- /dev/null
+++ b/sys-cluster/pvm/files/digest-pvm-3.4.5
@@ -0,0 +1 @@
+MD5 086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz 979201
diff --git a/sys-cluster/pvm/files/pvm-3.4.5-envvars.patch b/sys-cluster/pvm/files/pvm-3.4.5-envvars.patch
new file mode 100644
index 000000000000..dae45df1321a
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.5-envvars.patch
@@ -0,0 +1,33 @@
+diff -ur pvm3/src/pvmcruft.c pvm3-lhh/src/pvmcruft.c
+--- pvm3/src/pvmcruft.c	2001-09-27 17:25:10.000000000 -0400
++++ pvm3-lhh/src/pvmcruft.c	2004-03-31 11:03:08.361416845 -0500
+@@ -293,7 +293,7 @@
+  ***************/
+ 
+ #ifndef RSHCOMMAND
+-#define RSHCOMMAND  "/usr/ucb/rsh"
++#define RSHCOMMAND  "/usr/bin/rsh"
+ #endif
+ 
+ char *getenv();
+@@ -840,6 +840,7 @@
+ char *
+ pvmgetroot()
+ {
++	struct stat st_buf;
+ 	static char *rd = 0;
+ 
+ 	if (!rd) {
+@@ -874,6 +875,12 @@
+ #endif
+ 
+ 		if (!rd) {
++			rd = strdup("/usr/share/pvm3");
++			if (stat(rd, &st_buf) == 0)
++				return rd;
++			free(rd);
++			rd = NULL;
++
+ 			pvmlogerror("PVM_ROOT environment variable not set.\n");
+ 			pvmbailout(0);
+ 			exit(1);		/* the other meaning of bail out */
diff --git a/sys-cluster/pvm/files/pvm-3.4.5-extra-arches.patch b/sys-cluster/pvm/files/pvm-3.4.5-extra-arches.patch
new file mode 100644
index 000000000000..fea31d4ea062
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.5-extra-arches.patch
@@ -0,0 +1,12 @@
+diff -urN pvm3.orig/lib/pvmgetarch pvm3/lib/pvmgetarch
+--- pvm3.orig/lib/pvmgetarch	2004-02-03 12:12:05.000000000 -0800
++++ pvm3/lib/pvmgetarch	2005-02-21 22:34:48.484957880 -0800
+@@ -75,6 +75,8 @@
+ 	Linux,sparc* )          ARCH=LINUXSPARC ;;
+ 	Linux,hp_pa )           ARCH=LINUXHPPA ;;
+ 	Linux,ppc )             ARCH=LINUXPPC ;;
++	Linux,s390 )            ARCH=LINUXS390 ;;
++	Linux,s390x )           ARCH=LINUXS390X ;;
+ 	Linux,m68k )            ARCH=LINUXATARI ;;
+ 	BSD/OS,i[3456]86 )      ARCH=BSD386 ;;
+ 	FreeBSD,i[3456]86 )     ARCH=FREEBSD ;;
diff --git a/sys-cluster/pvm/files/pvm-3.4.5-strerror.patch b/sys-cluster/pvm/files/pvm-3.4.5-strerror.patch
new file mode 100644
index 000000000000..fd8cba21049c
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.5-strerror.patch
@@ -0,0 +1,159 @@
+--- pvm3/console/Makefile.aimk.strerror	1997-08-28 14:12:54.000000000 -0400
++++ pvm3/console/Makefile.aimk	2005-02-02 13:20:52.764031000 -0500
+@@ -22,6 +22,7 @@
+ LIBPREFIX	=	lib
+ PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
+ TRCLIBDEP	=	$(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).a
++CFLOPTS        +=       -DUSESTRERROR      
+ CFLAGS		=	$(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \
+ 				-I$(PVMSDIR) $(ARCHCFLAGS)
+ LIBS		=	$(LOPT) -L$(TRCLDIR) -L$(PVMLDIR) \
+--- pvm3/examples/Makefile.aimk.strerror	2004-01-14 13:43:37.000000000 -0500
++++ pvm3/examples/Makefile.aimk	2005-02-02 13:21:39.364384000 -0500
+@@ -24,7 +24,7 @@
+ BDIR		=	$(PVMDIR)/bin
+ XDIR		=	$(BDIR)/$(PVM_ARCH)
+ 
+-CFLOPTS		=	-g
++CFLOPTS		=	-g -DUSESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMDIR)/include $(ARCHCFLAGS)
+ 
+ ##### Need to select some architecture-specific libraries to link tasks
+--- pvm3/pvmgs/Makefile.aimk.strerror	2001-11-30 15:33:11.000000000 -0500
++++ pvm3/pvmgs/Makefile.aimk	2005-02-02 13:26:37.580869000 -0500
+@@ -32,6 +32,7 @@
+ # server requests, where XXX is the number of seconds for the timeout.
+ # (Note: this flag can also be added to the ARCHCFLAGS define in the
+ # PVM conf file, i.e.:  $PVM_ROOT/conf/$PVM_ARCH.def )
++CFLOPTS        +=       -DUSESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
+ 				$(ARCHCFLAGS)
+ 
+--- pvm3/src/lpvmgen.c.strerror	2004-02-17 13:01:29.000000000 -0500
++++ pvm3/src/lpvmgen.c	2005-02-02 13:31:13.922251000 -0500
+@@ -642,6 +642,8 @@
+ #ifndef USESTRERROR
+ extern char *sys_errlist[];
+ extern int sys_nerr;
++#else
++#include <string.h>
+ #endif
+ #endif
+ 
+@@ -878,7 +880,7 @@
+ 		em = pvmtxt;
+ 	} else */
+ #ifdef USESTRERROR
+-		em = strerror( errno );
++		em = (char*)strerror( errno );
+ #else
+ 		em = ((errno >= 0 && errno < sys_nerr)
+ 			? sys_errlist[errno] : "Unknown Error");
+--- pvm3/src/pvmlog.c.strerror	2004-05-26 11:56:36.000000000 -0400
++++ pvm3/src/pvmlog.c	2005-02-02 13:33:14.497555000 -0500
+@@ -233,6 +233,8 @@
+ #ifndef USESTRERROR
+ extern int sys_nerr;
+ extern char *sys_errlist[];
++#else
++#include <string.h>
+ #endif
+ #endif
+ 
+--- pvm3/tracer/Makefile.aimk.strerror	1998-10-01 17:13:24.000000000 -0400
++++ pvm3/tracer/Makefile.aimk	2005-02-02 13:34:38.069899000 -0500
+@@ -16,7 +16,7 @@
+ PVMVERSION	=
+ #PVMVERSION	=	-DUSE_PVM_33
+ 
+-CFLOPTS		=	-O
++CFLOPTS		=	-O -DUSESTRERROR
+ #CFLOPTS	=	-g
+ 
+ #CC			=	cc
+--- pvm3/gexamples/Makefile.aimk.strerror	2000-02-16 16:48:37.000000000 -0500
++++ pvm3/gexamples/Makefile.aimk	2005-02-02 13:22:09.154564000 -0500
+@@ -22,7 +22,7 @@
+ PVMIDIR	=	$(PVMDIR)/include
+ PVMLDIR	=	$(PVMDIR)/lib/$(PVM_ARCH)
+ PVMLIB	=	$(LOPT) -L$(PVMLDIR) -lgpvm3 -lpvm3 $(ARCHLIB)
+-CFLOPTS	=	-g
++CFLOPTS	=	-g -USESTRERROR
+ CFLAGS	=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS)
+ SDIR	=	$(PVMDIR)/gexamples
+ BDIR	=	$(PVMDIR)/bin
+--- pvm3/hoster/Makefile.aimk.strerror	1997-08-28 15:39:09.000000000 -0400
++++ pvm3/hoster/Makefile.aimk	2005-02-02 13:23:09.409249000 -0500
+@@ -20,7 +20,7 @@
+ BDIR		=	$(PVMDIR)/bin
+ XDIR		=	$(BDIR)/$(PVM_ARCH)
+ 
+-CFLOPTS		=	-O
++CFLOPTS		=	-O -DUSESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
+ 				$(ARCHCFLAGS)
+ LIBS		=	-L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
+--- pvm3/libfpvm/Makefile.aimk.strerror	1999-03-15 14:05:11.000000000 -0500
++++ pvm3/libfpvm/Makefile.aimk	2005-02-02 13:24:14.698895000 -0500
+@@ -9,6 +9,7 @@
+ SHELL			=	/bin/sh
+ PVMDIR			=	../..
+ SDIR			=	$(PVMDIR)/libfpvm
++CFLOPTS		       +=       -DUSESTRERROR
+ CFLAGS			=	$(CFLOPTS) -c -DIMA_$(PVM_ARCH) \
+ 					-I$(SDIR) -I$(PVMDIR)/include -I$(PVMDIR)/src \
+ 					$(CDEBUGFLAGS) $(ARCHCFLAGS)
+--- pvm3/rm/Makefile.aimk.strerror	1997-08-28 17:20:11.000000000 -0400
++++ pvm3/rm/Makefile.aimk	2005-02-02 13:27:20.596810000 -0500
+@@ -25,7 +25,7 @@
+ BDIR		=	$(PVMDIR)/bin
+ XDIR		=	$(BDIR)/$(PVM_ARCH)
+ 
+-CFLOPTS		=	-g
++CFLOPTS		=	-g -DUSESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
+ 				-DIMA_$(PVM_ARCH) $(ARCHCFLAGS) \
+ 			$(DEBUG_FLAGS)
+--- pvm3/shmd/Makefile.aimk.strerror	1999-03-11 15:19:33.000000000 -0500
++++ pvm3/shmd/Makefile.aimk	2005-02-02 13:28:10.182175000 -0500
+@@ -35,6 +35,7 @@
+ PVMLIB		=	pvm3
+ LIBPREFIX	=	lib
+ PVMLIBDEP	=	$(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
++CFLOPTS	       +=       -DUSESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
+ 				$(ARCHCFLAGS) -DSEM
+ LIBS		=	$(LOPT) -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
+--- pvm3/tasker/Makefile.aimk.strerror	1997-06-17 16:48:50.000000000 -0400
++++ pvm3/tasker/Makefile.aimk	2005-02-02 13:34:17.114875000 -0500
+@@ -18,7 +18,7 @@
+ BDIR		=	$(PVMDIR)/bin
+ XDIR		=	$(BDIR)/$(PVM_ARCH)
+ 
+-CFLOPTS		=	-g
++CFLOPTS		=	-g -DUSESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
+ 				-DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
+ LIBS		=	-L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
+--- pvm3/xep/Makefile.aimk.strerror	1997-08-29 10:17:48.000000000 -0400
++++ pvm3/xep/Makefile.aimk	2005-02-02 13:35:18.149780000 -0500
+@@ -20,7 +20,7 @@
+ XDIR		=	$(BDIR)/$(PVM_ARCH)
+ 
+ #CFLOPTS	=	-O
+-CFLOPTS		=	-g
++CFLOPTS		=	-g -USESTRERROR
+ CFLAGS		=	$(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
+ LIBS		=	-l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS)
+ XLIBS		=	-lXaw -lXmu -lXext -lXt -lX11
+--- pvm3/Makefile.aimk.strerror	2003-03-28 13:29:52.000000000 -0500
++++ pvm3/Makefile.aimk	2005-02-02 13:25:36.013498000 -0500
+@@ -24,7 +24,7 @@
+ #
+ 
+ #CC			=	cc
+-#CFLOPTS	=	-g
++#CFLOPTS	        =	-g   -DUSESTRERROR 
+ #F77		=	f77
+ #FFLOPTS	=	-g
+ #PVMDIR		=	../..
diff --git a/sys-cluster/pvm/files/pvm-3.4.5-x86_64-segfault.patch b/sys-cluster/pvm/files/pvm-3.4.5-x86_64-segfault.patch
new file mode 100644
index 000000000000..637d0f50c7e0
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.5-x86_64-segfault.patch
@@ -0,0 +1,48 @@
+--- pvm3/src/pvmd.c.x86_64_segfault	2004-09-08 15:35:36.000000000 -0400
++++ pvm3/src/pvmd.c	2005-02-02 14:09:39.727751000 -0500
+@@ -1711,6 +1711,7 @@
+ 
+ 	gettimeofday(&tnow, (struct timezone*)0);
+ 	if (pvmdebmask || myhostpart) {
++	        char *ctm;
+ 		PVM_TIMET time_temp;
+ 		pvmlogprintf("%s (%s) %s %s\n",
+ 				hosts->ht_hosts[hosts->ht_local]->hd_name,
+@@ -1719,7 +1720,9 @@
+ 				PVM_VER);
+ 		pvmlogprintf("ready ");
+ 		time_temp = (PVM_TIMET) tnow.tv_sec;
+-		pvmlogprintf(ctime(&time_temp));
++		ctm = ctime(&time_temp);
++		if( ctm != NULL )
++		    pvmlogprintf("%s\n", ctm);
+ 	}
+ 
+ 	/*
+--- pvm3/src/pvmlog.c.x86_64_segfault	2004-05-26 11:56:36.000000000 -0400
++++ pvm3/src/pvmlog.c	2005-02-02 14:11:37.539821000 -0500
+@@ -174,7 +174,11 @@
+  * Initial revision
+  *
+  */
+-
++#if defined (__STDC__) || defined(IMA_WIN32_WATCOM)
++#include <stdarg.h>
++#else
++#include <varargs.h>
++#endif
+ #include <stdio.h>
+ #include <pvm3.h>
+ #include <errno.h>
+@@ -188,11 +192,6 @@
+ #include <strings.h>
+ #define	CINDEX(s,c)	index(s,c)
+ #endif
+-#if defined (__STDC__) || defined(IMA_WIN32_WATCOM)
+-#include <stdarg.h>
+-#else
+-#include <varargs.h>
+-#endif
+ 
+ #ifndef PVMDLOGMAX
+ #define PVMDLOGMAX 1000000			/* (approx) max chars to log to file */
diff --git a/sys-cluster/pvm/pvm-3.4.5.ebuild b/sys-cluster/pvm/pvm-3.4.5.ebuild
new file mode 100644
index 000000000000..9d5c57127d85
--- /dev/null
+++ b/sys-cluster/pvm/pvm-3.4.5.ebuild
@@ -0,0 +1,66 @@
+# 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.1 2005/02/22 06:45:40 spyderous 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=""
+DEPEND=""
+RDEPEND="virtual/libc"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64 ~sparc"
+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
+		sed -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64 |" conf/LINUX${I}.def
+	done
+}
+
+src_compile() {
+	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!"
+}