Fix repoman warnings (quoting and dodoc LICENSE). Rekeyword 7.1.2 as ~sparc due to dep on sys-cluster/torque. Add patch for as-needed runtime errors to 7.1.4 (Bug #199835)

(Portage version: 2.1.4.4)

5 files changed, 128 insertions, 20 deletions

diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 08f6ac58ad48..ea8905204cba 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/lam-mpi
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.65 2008/01/31 07:07:18 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.66 2008/03/11 14:34:41 jsbronder Exp $
+
+  11 Mar 2008; Justin Bronder <jsbronder@gentoo.org>
+  +files/7.1.4-as-needed.patch, lam-mpi-7.0.4.ebuild, lam-mpi-7.1.2.ebuild,
+  lam-mpi-7.1.4.ebuild:
+  Fix repoman warnings (quoting and dodoc LICENSE). Rekeyword 7.1.2 as ~sparc
+  due to dep on sys-cluster/torque. Add patch for as-needed runtime errors to
+  7.1.4 (Bug #199835)
 
   31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   -lam-mpi-7.0.6.ebuild:
diff --git a/sys-cluster/lam-mpi/files/7.1.4-as-needed.patch b/sys-cluster/lam-mpi/files/7.1.4-as-needed.patch
new file mode 100644
index 000000000000..36a9659256f6
--- /dev/null
+++ b/sys-cluster/lam-mpi/files/7.1.4-as-needed.patch
@@ -0,0 +1,100 @@
+diff -urN lam-7.1.4/configure.in lam-7.1.4-patched/configure.in
+--- lam-7.1.4/configure.in	2006-06-24 16:42:47.000000000 -0400
++++ lam-7.1.4-patched/configure.in	2008-03-11 00:03:26.000000000 -0400
+@@ -2482,6 +2482,7 @@
+ 
+     share/libmpi/Makefile
+     share/liblam/Makefile
++    share/liblamf77mpi/Makefile
+ 
+     share/dynamic-ssi/Makefile
+     share/dynamic-ssi/boot/Makefile
+diff -urN lam-7.1.4/share/liblamf77mpi/Makefile.am lam-7.1.4-patched/share/liblamf77mpi/Makefile.am
+--- lam-7.1.4/share/liblamf77mpi/Makefile.am	1969-12-31 19:00:00.000000000 -0500
++++ lam-7.1.4-patched/share/liblamf77mpi/Makefile.am	2008-03-11 00:37:26.000000000 -0400
+@@ -0,0 +1,32 @@
++# -*- makefile -*-
++#
++# Copyright (c) 2001-2003 The Trustees of Indiana University.  
++#                         All rights reserved.
++# Copyright (c) 1998-2001 University of Notre Dame. 
++#                         All rights reserved.
++# Copyright (c) 1994-1998 The Ohio State University.  
++#                         All rights reserved.
++# 
++# This file is part of the LAM/MPI software package.  For license
++# information, see the LICENSE file in the top level directory of the
++# LAM/MPI source distribution.
++#
++# $Id: 7.1.4-as-needed.patch,v 1.1 2008/03/11 14:34:42 jsbronder Exp $
++#
++
++include $(top_srcdir)/config/Makefile.options
++
++if WANT_FORTRAN
++fortran_lib		= liblamf77mpi.la
++else
++fortran_lib		=
++endif
++
++lib_LTLIBRARIES		= $(fortran_lib)
++
++liblamf77mpi_la_SOURCES	=
++liblamf77mpi_la_LIBADD	= \
++			$(top_builddir)/share/libmpi/libmpi.la \
++			$(top_builddir)/share/liblam/liblam.la \
++			$(top_builddir)/share/mpi/f77/liblamf77mpi.la
++liblamf77mpi_la_LDFLAGS	= $(EXTRA_LDFLAGS)
+diff -urN lam-7.1.4/share/libmpi/Makefile.am lam-7.1.4-patched/share/libmpi/Makefile.am
+--- lam-7.1.4/share/libmpi/Makefile.am	2006-06-24 16:42:43.000000000 -0400
++++ lam-7.1.4-patched/share/libmpi/Makefile.am	2008-03-11 00:12:32.000000000 -0400
+@@ -42,5 +42,6 @@
+ 			$(top_builddir)/share/mpi/libmpiextra.la \
+ 			$(top_builddir)/share/ssi/libssi_mpi.la \
+ 			$(top_builddir)/share/memory/libmemory.la \
++			$(top_builddir)/share/liblam/liblam.la \
+ 			$(impi_lib) $(pmpi_lib)
+ libmpi_la_LDFLAGS	= $(EXTRA_LDFLAGS)
+diff -urN lam-7.1.4/share/Makefile.am lam-7.1.4-patched/share/Makefile.am
+--- lam-7.1.4/share/Makefile.am	2006-06-24 16:42:43.000000000 -0400
++++ lam-7.1.4-patched/share/Makefile.am	2008-03-10 23:32:04.000000000 -0400
+@@ -24,4 +24,4 @@
+ SUBDIRS			= include args boot etc freq kreq impi memory mpi \
+ 			  $(LIBLTDL_SUBDIR) nreq pmpi rreq ssi \
+ 			  threads $(TOTALVIEW_DLL_DIR) trillium tstdio \
+-			  liblam libmpi dynamic-ssi
++			  liblam libmpi liblamf77mpi dynamic-ssi
+diff -urN lam-7.1.4/share/mpi/f77/Makefile.am lam-7.1.4-patched/share/mpi/f77/Makefile.am
+--- lam-7.1.4/share/mpi/f77/Makefile.am	2006-06-24 16:42:35.000000000 -0400
++++ lam-7.1.4-patched/share/mpi/f77/Makefile.am	2008-03-10 23:41:30.000000000 -0400
+@@ -16,6 +16,8 @@
+ 
+ include $(top_srcdir)/config/Makefile.options
+ 
++noinst_LTLIBRARIES = liblamf77mpi.la
++
+ # This kinda sucks.  The "ar" command in IRIX 6.5 has a upper limit
+ # on the total number of characters in its arguments.  If we include
+ # all these fortran files in making libmpi.a, with all the
+@@ -34,12 +36,6 @@
+ # no extra subdirectories, so it doesn't run into the same character
+ # limit with ar.  Ugh.
+ 
+-if WANT_FORTRAN
+-fortran_lib		= liblamf77mpi.la
+-else
+-fortran_lib		=
+-endif
+-
+ 
+ # Files with stubs of MPI functions that LAM has not yet implemented.
+ # These are here because the default action is to *not* compile them
+@@ -61,8 +57,6 @@
+ mpi_stub_sources	=
+ endif
+ 
+-
+-lib_LTLIBRARIES		= $(fortran_lib)
+ liblamf77mpi_la_SOURCES	= \
+ 			  $(mpi_stub_sources) \
+ 			  abort_f.c \
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.0.4.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.0.4.ebuild
index 2a8272aed69a..cbbdde1e6274 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.0.4.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.0.4.ebuild,v 1.11 2006/12/06 23:39:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.0.4.ebuild,v 1.12 2008/03/11 14:34:41 jsbronder Exp $
 
 IUSE="crypt"
 
@@ -27,7 +27,7 @@ LICENSE="as-is"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}/romio/util/
+	cd "${S}"/romio/util/
 	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
 }
 
@@ -55,13 +55,13 @@ src_install () {
 	make DESTDIR="${D}" install || die
 
 	#need to correct the produced absolute symlink
-	cd ${D}/usr/include
+	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 README HISTORY VERSION
+	cd "${S}"/doc
 	dodoc {user,install}.pdf
 }
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild
index 3f624e56e577..76eaa9499802 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild,v 1.16 2007/07/02 15:32:13 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild,v 1.17 2008/03/11 14:34:41 jsbronder Exp $
 
 inherit autotools eutils fortran flag-o-matic multilib portability
 
@@ -25,16 +25,16 @@ RDEPEND="${DEPEND}
 	!crypt? ( net-misc/netkit-rsh )"
 
 SLOT="6"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86"
 LICENSE="as-is"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}/romio/util/
+	cd "${S}"/romio/util/
 	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
 
-	for i in ${S}/share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do
+	for i in "${S}"/share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do
 	  sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'/usr/share/doc/${PF}'@' ${i}
 	done
 
@@ -84,15 +84,15 @@ src_install () {
 	# There are a bunch more tex docs we could make and install too,
 	# but they might be replicated in the pdf.
 	# They are replicated in the pdfs! Thus remove this comment?
-	dodoc README HISTORY LICENSE VERSION
-	cd ${S}/doc
+	dodoc README HISTORY VERSION
+	cd "${S}"/doc
 	dodoc {user,install}.pdf
 
 	# install examples
-	cd ${S}/examples
-	mkdir -p ${D}/usr/share/${P}/examples
-	find -name README -or -iregex '.*\.[chf][c]?$' >${T}/testlist
+	cd "${S}"/examples
+	mkdir -p "${D}"/usr/share/${P}/examples
+	find -name README -or -iregex '.*\.[chf][c]?$' > "${T}"/testlist
 	while read p; do
-		treecopy $p ${D}/usr/share/${P}/examples ;
-	done < ${T}/testlist
+		treecopy $p "${D}"/usr/share/${P}/examples ;
+	done < "${T}"/testlist
 }
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild
index 3ec584c5e20c..35deebf9dfb5 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild,v 1.1 2008/01/17 03:15:55 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild,v 1.2 2008/03/11 14:34:41 jsbronder Exp $
 
 inherit autotools eutils fortran flag-o-matic multilib portability
 
@@ -38,6 +38,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
 	epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
+	epatch "${FILESDIR}"/7.1.4-as-needed.patch
 	eautoreconf
 }