Now compiles with local lapack as system lapack do not go along well (Thanks Michael Krause for the report). New autotools patch, lots of cleanup and working mpi. Also fixed LICENSE as RiceBSD.

Package-Manager: portage-2.1.3.9

2 files changed, 460 insertions, 168 deletions

diff --git a/sci-libs/arpack/files/arpack-autotools.patch b/sci-libs/arpack/files/arpack-autotools.patch
index d76eeec8f2dd..b8324afd8dc8 100644
--- a/sci-libs/arpack/files/arpack-autotools.patch
+++ b/sci-libs/arpack/files/arpack-autotools.patch
@@ -1,129 +1,138 @@
-diff -Nur ../ARPACK.orig/Makefile.am ./Makefile.am
---- ../ARPACK.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./Makefile.am	2007-03-22 15:18:07.579698500 +0000
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2007-09-26 19:35:49.186784649 +0100
+@@ -0,0 +1,45 @@
++AC_PREREQ(2.59)
++AC_INIT([arpack], [96], [arpack@caam.rice.edu])
++AM_INIT_AUTOMAKE([foreign])
++
++dnl Checks for standard programs.
++AC_PROG_F77
++AC_PROG_LIBTOOL
++
++dnl Check for BLAS libraries
++sinclude(acx_blas.m4)
++ACX_BLAS
++if test x"$BLAS_LIBS" = x; then
++   AC_MSG_ERROR([Cannot find blas libraries])
++fi
++
++dnl See if compiling parpack
++AC_MSG_CHECKING([for MPI mode])
++AC_ARG_ENABLE(mpi,
++	      AC_HELP_STRING([--enable-mpi],
++			     [build parallel version of arpack with mpi]),
++	      [enable_mpi=$enableval],
++	      [enable_mpi=no])
++sinclude(acx_mpi.m4)
++if test x"$enable_mpi" != x"no"; then
++  AC_LANG_PUSH([Fortran 77])
++  ACX_MPI([], AC_MSG_ERROR([could not compile an mpi test program]))
++  AC_LANG_POP([Fortran 77])
++fi
++
++if test x"$enable_mpi" = x"yes"; then
++   MPIDIR=PARPACK
++fi
++AC_SUBST(MPIDIR)
++
++AC_CONFIG_FILES([
++	Makefile
++	SRC/Makefile
++	UTIL/Makefile
++	LAPACK/Makefile
++	PARPACK/Makefile
++	PARPACK/SRC/Makefile
++	PARPACK/SRC/MPI/Makefile
++	PARPACK/UTIL/Makefile
++	PARPACK/UTIL/MPI/Makefile])
++AC_OUTPUT
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2007-09-26 12:54:25.487623476 +0100
 @@ -0,0 +1,7 @@
-+SUBDIRS = UTIL SRC @MPIDIR@
-+SUBLIBS = SRC/libarpacksrc.la UTIL/libarpackutil.la
++SUBDIRS = UTIL SRC LAPACK @MPIDIR@
++SUBLIBS = SRC/libarpacksrc.la UTIL/libarpackutil.la LAPACK/liblapack_arpack.la
 +lib_LTLIBRARIES = libarpack.la
 +libarpack_la_SOURCES =
 +libarpack_la_LDFLAGS = -version-info 0:0
 +libarpack_la_LIBADD = $(SUBLIBS)
 +EXTRA_DIST = README
-diff -Nur ../ARPACK.orig/PARPACK/Makefile.am ./PARPACK/Makefile.am
---- ../ARPACK.orig/PARPACK/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./PARPACK/Makefile.am	2007-03-22 15:17:54.390874250 +0000
-@@ -0,0 +1,6 @@
-+SUBDIRS = UTIL SRC
-+SUBLIBS = SRC/MPI/libparpacksrcmpi.la UTIL/MPI/libparpackutilmpi.la
-+lib_LTLIBRARIES = libparpack.la
-+libparpack_la_SOURCES = 
-+libarpack_la_LDFLAGS = -version-info 0:0
-+libparpack_la_LIBADD = $(SUBLIBS) @MPILIBS@
-diff -Nur ../ARPACK.orig/PARPACK/SRC/MPI/Makefile.am ./PARPACK/SRC/MPI/Makefile.am
---- ../ARPACK.orig/PARPACK/SRC/MPI/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./PARPACK/SRC/MPI/Makefile.am	2007-03-21 21:20:19.771953500 +0000
-@@ -0,0 +1,14 @@
-+noinst_LTLIBRARIES = libparpacksrcmpi.la
-+libparpacksrcmpi_la_SOURCES = \
-+	psgetv0.f  \
-+	psnaitr.f psnapps.f psnaup2.f psnaupd.f psneigh.f psngets.f \
-+	pssaitr.f pssapps.f pssaup2.f pssaupd.f psseigt.f pssgets.f \
-+	psneupd.f psseupd.f pslarnv.f pslamch.f psnorm2.f \
-+	pdgetv0.f \
-+	pdnaitr.f pdnapps.f pdnaup2.f pdnaupd.f pdneigh.f pdngets.f \
-+	pdsaitr.f pdsapps.f pdsaup2.f pdsaupd.f pdseigt.f pdsgets.f \
-+	pdneupd.f pdseupd.f pdlarnv.f pdlamch.f pdnorm2.f \
-+	pcnaitr.f pcnapps.f pcnaup2.f pcnaupd.f pcneigh.f \
-+	pcneupd.f pcngets.f pcgetv0.f pscnorm2.f pclarnv.f \
-+	pznaitr.f pznapps.f pznaup2.f pznaupd.f pzneigh.f \
-+	pzneupd.f pzngets.f pzgetv0.f pdznorm2.f pzlarnv.f
-diff -Nur ../ARPACK.orig/PARPACK/SRC/Makefile.am ./PARPACK/SRC/Makefile.am
---- ../ARPACK.orig/PARPACK/SRC/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./PARPACK/SRC/Makefile.am	2007-03-21 21:20:19.771953500 +0000
-@@ -0,0 +1 @@
-+SUBDIRS = MPI
-diff -Nur ../ARPACK.orig/PARPACK/UTIL/MPI/Makefile.am ./PARPACK/UTIL/MPI/Makefile.am
---- ../ARPACK.orig/PARPACK/UTIL/MPI/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./PARPACK/UTIL/MPI/Makefile.am	2007-03-21 21:20:19.771953500 +0000
-@@ -0,0 +1,5 @@
-+noinst_LTLIBRARIES = libparpackutilmpi.la
-+libparpackutilmpi_la_SOURCES = \
-+	pivout.f psvout.f  psmout.f pdvout.f \
-+	pdmout.f  pcvout.f  pcmout.f pzvout.f  pzmout.f
-+
-diff -Nur ../ARPACK.orig/PARPACK/UTIL/Makefile.am ./PARPACK/UTIL/Makefile.am
---- ../ARPACK.orig/PARPACK/UTIL/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./PARPACK/UTIL/Makefile.am	2007-03-21 21:20:19.771953500 +0000
-@@ -0,0 +1 @@
-+SUBDIRS = MPI
-\ No newline at end of file
-diff -Nur ../ARPACK.orig/SRC/Makefile.am ./SRC/Makefile.am
---- ../ARPACK.orig/SRC/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./SRC/Makefile.am	2007-03-21 21:20:19.771953500 +0000
-@@ -0,0 +1,14 @@
-+noinst_LTLIBRARIES = libarpacksrc.la
-+libarpacksrc_la_SOURCES = \
-+	sgetv0.f slaqrb.f sstqrb.f ssortc.f ssortr.f sstatn.f sstats.f \
-+	snaitr.f snapps.f snaup2.f snaupd.f snconv.f sneigh.f sngets.f \
-+	ssaitr.f ssapps.f ssaup2.f ssaupd.f ssconv.f sseigt.f ssgets.f \
-+	sneupd.f sseupd.f ssesrt.f \
-+	dgetv0.f dlaqrb.f dstqrb.f dsortc.f dsortr.f dstatn.f dstats.f \
-+	dnaitr.f dnapps.f dnaup2.f dnaupd.f dnconv.f dneigh.f dngets.f \
-+	dsaitr.f dsapps.f dsaup2.f dsaupd.f dsconv.f dseigt.f dsgets.f \
-+	dneupd.f dseupd.f dsesrt.f \
-+	cnaitr.f cnapps.f cnaup2.f cnaupd.f cneigh.f cneupd.f cngets.f \
-+        cgetv0.f csortc.f cstatn.f \
-+	znaitr.f znapps.f znaup2.f znaupd.f zneigh.f zneupd.f zngets.f \
-+        zgetv0.f zsortc.f zstatn.f
-diff -Nur ../ARPACK.orig/UTIL/Makefile.am ./UTIL/Makefile.am
---- ../ARPACK.orig/UTIL/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ./UTIL/Makefile.am	2007-03-21 21:20:19.775953750 +0000
-@@ -0,0 +1,5 @@
-+noinst_LTLIBRARIES = libarpackutil.la
-+libarpackutil_la_SOURCES = \
-+	icnteq.f icopy.f iset.f iswap.f ivout.f second.f \
-+	svout.f  smout.f dvout.f  dmout.f cvout.f  cmout.f \
-+	zvout.f  zmout.f
-diff -Nur ../ARPACK.orig/acx_mpi.m4 ./acx_mpi.m4
---- ../ARPACK.orig/acx_mpi.m4	1970-01-01 01:00:00.000000000 +0100
-+++ ./acx_mpi.m4	2007-03-21 21:20:19.775953750 +0000
-@@ -0,0 +1,107 @@
-+dnl @synopsis ACX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+dnl
-+dnl @summary figure out how to compile/link code with MPI
-+dnl
-+dnl This macro tries to find out how to compile programs that use MPI
-+dnl (Message Passing Interface), a standard API for parallel process
-+dnl communication (see http://www-unix.mcs.anl.gov/mpi/)
-+dnl
-+dnl On success, it sets the MPICC, MPICXX, or MPIF77 output variable to
-+dnl the name of the MPI compiler, depending upon the current language.
-+dnl (This may just be $CC/$CXX/$F77, but is more often something like
-+dnl mpicc/mpiCC/mpif77.) It also sets MPILIBS to any libraries that are
-+dnl needed for linking MPI (e.g. -lmpi, if a special
-+dnl MPICC/MPICXX/MPIF77 was not found).
-+dnl
-+dnl If you want to compile everything with MPI, you should set:
-+dnl
-+dnl     CC="$MPICC" #OR# CXX="$MPICXX" #OR# F77="$MPIF77"
-+dnl     LIBS="$MPILIBS $LIBS"
-+dnl
-+dnl NOTE: The above assumes that you will use $CC (or whatever) for
-+dnl linking as well as for compiling. (This is the default for automake
-+dnl and most Makefiles.)
-+dnl
-+dnl The user can force a particular library/compiler by setting the
-+dnl MPICC/MPICXX/MPIF77 and/or MPILIBS environment variables.
-+dnl
-+dnl ACTION-IF-FOUND is a list of shell commands to run if an MPI
-+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
-+dnl default action will define HAVE_MPI.
-+dnl
-+dnl @category InstalledPackages
-+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
-+dnl @version 2005-09-02
-+dnl @license GPLWithACException
+--- acx_mpi.m4 	1970-01-01 01:00:00.000000000 +0100
++++ acx_mpi.m4	2007-08-04 22:50:48.000000000 +0100
+@@ -0,0 +1,183 @@
++##### http://autoconf-archive.cryp.to/acx_mpi.html
++#
++# SYNOPSIS
++#
++#   ACX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro tries to find out how to compile programs that use MPI
++#   (Message Passing Interface), a standard API for parallel process
++#   communication (see http://www-unix.mcs.anl.gov/mpi/)
++#
++#   On success, it sets the MPICC, MPICXX, MPIF77, or MPIFC output
++#   variable to the name of the MPI compiler, depending upon the
++#   current language. (This may just be $CC/$CXX/$F77/$FC, but is more
++#   often something like mpicc/mpiCC/mpif77/mpif90.) It also sets
++#   MPILIBS to any libraries that are needed for linking MPI (e.g.
++#   -lmpi or -lfmpi, if a special MPICC/MPICXX/MPIF77/MPIFC was not
++#   found).
++#
++#   If you want to compile everything with MPI, you should set:
++#
++#       CC="MPICC" #OR# CXX="MPICXX" #OR# F77="MPIF77" #OR# FC="MPIFC"
++#       LIBS="$MPILIBS $LIBS"
++#
++#   NOTE: The above assumes that you will use $CC (or whatever) for
++#   linking as well as for compiling. (This is the default for automake
++#   and most Makefiles.)
++#
++#   The user can force a particular library/compiler by setting the
++#   MPICC/MPICXX/MPIF77/MPIFC and/or MPILIBS environment variables.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if an MPI
++#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
++#   run if it is not found. If ACTION-IF-FOUND is not specified, the
++#   default action will define HAVE_MPI.
++#
++# LAST MODIFICATION
++#
++#   2007-07-29
++#
++# COPYLEFT
++#
++#   Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2007 Julian C. Cummings <cummings@cacr.caltech.edu>
++#
++#   This program is free software: you can redistribute it and/or
++#   modify it under the terms of the GNU General Public License as
++#   published by the Free Software Foundation, either version 3 of the
++#   License, or (at your option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++#   General Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License
++#   along with this program. If not, see
++#   <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright
++#   owner gives unlimited permission to copy, distribute and modify the
++#   configure scripts that are the output of Autoconf when processing
++#   the Macro. You need not follow the terms of the GNU General Public
++#   License when using or distributing such scripts, even though
++#   portions of the text of the Macro appear in them. The GNU General
++#   Public License (GPL) does govern all other use of the material that
++#   constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the
++#   Autoconf Macro released by the Autoconf Macro Archive. When you
++#   make and distribute a modified version of the Autoconf Macro, you
++#   may extend this special exception to the GPL to apply to your
++#   modified version as well.
 +
 +AC_DEFUN([ACX_MPI], [
 +AC_PREREQ(2.50) dnl for AC_LANG_CASE
@@ -131,7 +140,7 @@ diff -Nur ../ARPACK.orig/acx_mpi.m4 ./acx_mpi.m4
 +AC_LANG_CASE([C], [
 +	AC_REQUIRE([AC_PROG_CC])
 +	AC_ARG_VAR(MPICC,[MPI C compiler command])
-+	AC_CHECK_PROGS(MPICC, mpicc hcc mpcc mpcc_r mpxlc cmpicc, $CC)
++	AC_CHECK_PROGS(MPICC, mpicc hcc mpxlc_r mpxlc mpcc cmpicc, $CC)
 +	acx_mpi_save_CC="$CC"
 +	CC="$MPICC"
 +	AC_SUBST(MPICC)
@@ -139,27 +148,54 @@ diff -Nur ../ARPACK.orig/acx_mpi.m4 ./acx_mpi.m4
 +[C++], [
 +	AC_REQUIRE([AC_PROG_CXX])
 +	AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
-+	AC_CHECK_PROGS(MPICXX, mpic++ mpiCC mpicxx mpCC hcp mpxlC mpxlC_r cmpic++, $CXX)
++	AC_CHECK_PROGS(MPICXX, mpic++ mpicxx mpiCC hcp mpxlC_r mpxlC mpCC cmpic++, $CXX)
 +	acx_mpi_save_CXX="$CXX"
 +	CXX="$MPICXX"
 +	AC_SUBST(MPICXX)
 +],
 +[Fortran 77], [
 +	AC_REQUIRE([AC_PROG_F77])
-+	AC_ARG_VAR(MPIF77,[MPI Fortran compiler command])
-+	AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c, $F77)
++	AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command])
++	AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc, $F77)
 +	acx_mpi_save_F77="$F77"
 +	F77="$MPIF77"
 +	AC_SUBST(MPIF77)
++],
++[Fortran], [
++	AC_REQUIRE([AC_PROG_FC])
++	AC_ARG_VAR(MPIFC,[MPI Fortran compiler command])
++	AC_CHECK_PROGS(MPIFC, mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC)
++	acx_mpi_save_FC="$FC"
++	FC="$MPIFC"
++	AC_SUBST(MPIFC)
 +])
 +
 +if test x = x"$MPILIBS"; then
 +	AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
 +		[C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
 +		[Fortran 77], [AC_MSG_CHECKING([for MPI_Init])
-+			AC_TRY_LINK([],[      call MPI_Init], [MPILIBS=" "
++			AC_LINK_IFELSE([AC_LANG_PROGRAM([],[      call MPI_Init])],[MPILIBS=" "
++				AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])],
++		[Fortran], [AC_MSG_CHECKING([for MPI_Init])
++			AC_LINK_IFELSE([AC_LANG_PROGRAM([],[      call MPI_Init])],[MPILIBS=" "
 +				AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])])
 +fi
++AC_LANG_CASE([Fortran 77], [
++	if test x = x"$MPILIBS"; then
++		AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"])
++	fi
++	if test x = x"$MPILIBS"; then
++		AC_CHECK_LIB(fmpich, MPI_Init, [MPILIBS="-lfmpich"])
++	fi
++],
++[Fortran], [
++	if test x = x"$MPILIBS"; then
++		AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"])
++	fi
++	if test x = x"$MPILIBS"; then
++		AC_CHECK_LIB(mpichf90, MPI_Init, [MPILIBS="-lmpichf90"])
++	fi
++])
 +if test x = x"$MPILIBS"; then
 +	AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"])
 +fi
@@ -178,11 +214,22 @@ diff -Nur ../ARPACK.orig/acx_mpi.m4 ./acx_mpi.m4
 +	AC_MSG_CHECKING([for mpi.h])
 +	AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
 +		AC_MSG_RESULT(no)])
++fi],
++[Fortran 77], [if test x != x"$MPILIBS"; then
++	AC_MSG_CHECKING([for mpif.h])
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[      include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS=""
++		AC_MSG_RESULT(no)])
++fi],
++[Fortran], [if test x != x"$MPILIBS"; then
++	AC_MSG_CHECKING([for mpif.h])
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[      include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS=""
++		AC_MSG_RESULT(no)])
 +fi])
 +
 +AC_LANG_CASE([C], [CC="$acx_mpi_save_CC"],
 +	[C++], [CXX="$acx_mpi_save_CXX"],
-+	[Fortran 77], [F77="$acx_mpi_save_F77"])
++	[Fortran 77], [F77="$acx_mpi_save_F77"],
++	[Fortran], [FC="$acx_mpi_save_FC"])
 +
 +AC_SUBST(MPILIBS)
 +
@@ -195,52 +242,297 @@ diff -Nur ../ARPACK.orig/acx_mpi.m4 ./acx_mpi.m4
 +        :
 +fi
 +])dnl ACX_MPI
-diff -Nur ../ARPACK.orig/configure.ac ./configure.ac
---- ../ARPACK.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ ./configure.ac	2007-03-22 11:17:43.207027250 +0000
-@@ -0,0 +1,45 @@
-+# -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
+--- acx_blas.m4 	1970-01-01 01:00:00.000000000 +0100
++++ acx_blas.m4	2007-08-04 22:50:48.000000000 +0100
+@@ -0,0 +1,191 @@
++##### http://autoconf-archive.cryp.to/acx_blas.html
++#
++# SYNOPSIS
++#
++#   ACX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro looks for a library that implements the BLAS
++#   linear-algebra interface (see http://www.netlib.org/blas/). On
++#   success, it sets the BLAS_LIBS output variable to hold the
++#   requisite library linkages.
++#
++#   To link with BLAS, you should link with:
++#
++#   	$BLAS_LIBS $LIBS $FLIBS
++#
++#   in that order. FLIBS is the output variable of the
++#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_BLAS), and
++#   is sometimes necessary in order to link with F77 libraries. Users
++#   will also need to use AC_F77_DUMMY_MAIN (see the autoconf manual),
++#   for the same reason.
++#
++#   Many libraries are searched for, from ATLAS to CXML to ESSL. The
++#   user may also use --with-blas=<lib> in order to use some specific
++#   BLAS library <lib>. In order to link successfully, however, be
++#   aware that you will probably need to use the same Fortran compiler
++#   (which can be set via the F77 env. var.) as was used to compile the
++#   BLAS library.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a BLAS
++#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
++#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
++#   default action will define HAVE_BLAS.
++#
++#   This macro requires autoconf 2.50 or later.
++#
++# LAST MODIFICATION
++#
++#   2007-07-29
++#
++# COPYLEFT
++#
++#   Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu>
++#
++#   This program is free software: you can redistribute it and/or
++#   modify it under the terms of the GNU General Public License as
++#   published by the Free Software Foundation, either version 3 of the
++#   License, or (at your option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++#   General Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License
++#   along with this program. If not, see
++#   <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright
++#   owner gives unlimited permission to copy, distribute and modify the
++#   configure scripts that are the output of Autoconf when processing
++#   the Macro. You need not follow the terms of the GNU General Public
++#   License when using or distributing such scripts, even though
++#   portions of the text of the Macro appear in them. The GNU General
++#   Public License (GPL) does govern all other use of the material that
++#   constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the
++#   Autoconf Macro released by the Autoconf Macro Archive. When you
++#   make and distribute a modified version of the Autoconf Macro, you
++#   may extend this special exception to the GPL to apply to your
++#   modified version as well.
 +
-+AC_PREREQ(2.59)
-+AC_INIT(arpack, 96, http://www.caam.rice.edu/software/ARPACK/)
-+AM_INIT_AUTOMAKE([foreign])
++AC_DEFUN([ACX_BLAS], [
++AC_PREREQ(2.50)
++AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
++acx_blas_ok=no
 +
-+# Checks for standard programs.
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
++AC_ARG_WITH(blas,
++	[AC_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
++case $with_blas in
++	yes | "") ;;
++	no) acx_blas_ok=disable ;;
++	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
++	*) BLAS_LIBS="-l$with_blas" ;;
++esac
 +
-+# parpack stuff
-+# Provide special option for the MPI version
-+AC_MSG_CHECKING([for MPI mode])
-+AC_ARG_ENABLE(mpi,
-+	[AC_HELP_STRING([--enable-mpi],
-+	[Enable MPI parallel processing (off by default)])],
-+		use_mpi="yes"
-+		AC_MSG_RESULT([yes]),
-+      		use_mpi="no"
-+		AC_MSG_RESULT([no]),
-+	use_mpi="no"
-+	AC_MSG_RESULT([no]))
++# Get fortran linker names of BLAS functions to check for.
++AC_F77_FUNC(sgemm)
++AC_F77_FUNC(dgemm)
 +
-+sinclude(acx_mpi.m4)
-+if test "$use_mpi" = "yes"; then
-+ACX_MPI([AC_DEFINE(HAVE_MPI,1,[use MPI library.])]
-+   	[FC="$MPIF77" && CC="$MPICC" ],
-+      	use_mpi="no")
-+MPIDIR="PARPACK"
++acx_blas_save_LIBS="$LIBS"
++LIBS="$LIBS $FLIBS"
++
++# First, check BLAS_LIBS environment variable
++if test $acx_blas_ok = no; then
++if test "x$BLAS_LIBS" != x; then
++	save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
++	AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
++	AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes], [BLAS_LIBS=""])
++	AC_MSG_RESULT($acx_blas_ok)
++	LIBS="$save_LIBS"
++fi
 +fi
 +
-+AC_SUBST(MPIDIR)
++# BLAS linked to by default?  (happens on some supercomputers)
++if test $acx_blas_ok = no; then
++	save_LIBS="$LIBS"; LIBS="$LIBS"
++	AC_CHECK_FUNC($sgemm, [acx_blas_ok=yes])
++	LIBS="$save_LIBS"
++fi
++
++# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(atlas, ATL_xerbla,
++		[AC_CHECK_LIB(f77blas, $sgemm,
++		[AC_CHECK_LIB(cblas, cblas_dgemm,
++			[acx_blas_ok=yes
++			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
++			[], [-lf77blas -latlas])],
++			[], [-latlas])])
++fi
++
++# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(blas, $sgemm,
++		[AC_CHECK_LIB(dgemm, $dgemm,
++		[AC_CHECK_LIB(sgemm, $sgemm,
++			[acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
++			[], [-lblas])],
++			[], [-lblas])])
++fi
++
++# BLAS in Alpha CXML library?
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(cxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-lcxml"])
++fi
++
++# BLAS in Alpha DXML library? (now called CXML, see above)
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(dxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-ldxml"])
++fi
++
++# BLAS in Sun Performance library?
++if test $acx_blas_ok = no; then
++	if test "x$GCC" != xyes; then # only works with Sun CC
++		AC_CHECK_LIB(sunmath, acosp,
++			[AC_CHECK_LIB(sunperf, $sgemm,
++        			[BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
++                                 acx_blas_ok=yes],[],[-lsunmath])])
++	fi
++fi
++
++# BLAS in SCSL library?  (SGI/Cray Scientific Library)
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(scs, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lscs"])
++fi
++
++# BLAS in SGIMATH library?
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(complib.sgimath, $sgemm,
++		     [acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
++fi
++
++# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(blas, $sgemm,
++		[AC_CHECK_LIB(essl, $sgemm,
++			[acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
++			[], [-lblas $FLIBS])])
++fi
++
++# Generic BLAS library?
++if test $acx_blas_ok = no; then
++	AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lblas"])
++fi
++
++AC_SUBST(BLAS_LIBS)
++
++LIBS="$acx_blas_save_LIBS"
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$acx_blas_ok" = xyes; then
++        ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
++        :
++else
++        acx_blas_ok=no
++        $2
++fi
++])dnl ACX_BLAS
+--- SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ SRC/Makefile.am	2007-09-26 11:15:34.850827457 +0100
+@@ -0,0 +1,14 @@
++noinst_LTLIBRARIES = libarpacksrc.la
++libarpacksrc_la_SOURCES = \
++	sgetv0.f slaqrb.f sstqrb.f ssortc.f ssortr.f sstatn.f sstats.f \
++	snaitr.f snapps.f snaup2.f snaupd.f snconv.f sneigh.f sngets.f \
++	ssaitr.f ssapps.f ssaup2.f ssaupd.f ssconv.f sseigt.f ssgets.f \
++	sneupd.f sseupd.f ssesrt.f \
++	dgetv0.f dlaqrb.f dstqrb.f dsortc.f dsortr.f dstatn.f dstats.f \
++	dnaitr.f dnapps.f dnaup2.f dnaupd.f dnconv.f dneigh.f dngets.f \
++	dsaitr.f dsapps.f dsaup2.f dsaupd.f dsconv.f dseigt.f dsgets.f \
++	dneupd.f dseupd.f dsesrt.f \
++	cnaitr.f cnapps.f cnaup2.f cnaupd.f cneigh.f cneupd.f cngets.f \
++        cgetv0.f csortc.f cstatn.f \
++	znaitr.f znapps.f znaup2.f znaupd.f zneigh.f zneupd.f zngets.f \
++        zgetv0.f zsortc.f zstatn.f
+--- LAPACK/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ LAPACK/Makefile.am	2007-09-26 12:54:25.479623020 +0100
+@@ -0,0 +1,27 @@
++noinst_LTLIBRARIES = liblapack_arpack.la
++liblapack_arpack_la_SOURCES = \
++	sgeqr2.f slabad.f slacon.f slacpy.f sladiv.f slae2.f slaev2.f\
++        slaexc.f slagtm.f slahqr.f slaln2.f slamch.f slange.f slanhs.f\
++        slanst.f slanv2.f slaptm.f slapy2.f slapy3.f slaran.f slarf.f\
++        slarfg.f slarfx.f slarnd.f slarnv.f slartg.f slaruv.f slascl.f\
++        slaset.f slasr.f  slasrt.f slassq.f slasy2.f sorm2r.f ssteqr.f\
++        strevc.f strexc.f strsen.f strsyl.f\
++	dgeqr2.f dlabad.f dlacon.f dlacpy.f dladiv.f dlae2.f dlaev2.f\
++        dlaexc.f dlagtm.f dlahqr.f dlaln2.f dlamch.f dlange.f dlanhs.f\
++        dlanst.f dlanv2.f dlaptm.f dlapy2.f dlapy3.f dlaran.f dlarf.f\
++        dlarfg.f dlarfx.f dlarnd.f dlarnv.f dlartg.f dlaruv.f dlascl.f\
++        dlaset.f dlasr.f  dlasrt.f dlassq.f dlasy2.f dorm2r.f dsteqr.f\
++        dtrevc.f dtrexc.f dtrsen.f dtrsyl.f\
++	ilaenv.f lsame.f lsamen.f xerbla.f xlaenv.f\
++	icmax1.f\
++	izmax1.f\
++	cgeqr2.f clacon.f clacpy.f cladiv.f clahqr.f clange.f clanhs.f\
++        clarf.f  clarfg.f clarnv.f clartg.f clascl.f claset.f classq.f\
++        clatrs.f cmach.f  crot.f   ctrevc.f ctrexc.f ctrsen.f ctrsyl.f\
++        cunm2r.f\
++        scsum1.f \
++	zgeqr2.f zlacon.f zlacpy.f zladiv.f zlahqr.f zlange.f zlanhs.f\
++        zlarf.f  zlarfg.f zlarnv.f zlartg.f zlascl.f zlaset.f zlassq.f\
++        zlatrs.f zmach.f  zrot.f   ztrevc.f ztrexc.f ztrsen.f ztrsyl.f\
++        zunm2r.f\
++        dzsum1.f
+--- UTIL/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ UTIL/Makefile.am	2007-09-26 11:15:34.850827457 +0100
+@@ -0,0 +1,5 @@
++noinst_LTLIBRARIES = libarpackutil.la
++libarpackutil_la_SOURCES = \
++	icnteq.f icopy.f iset.f iswap.f ivout.f second.f \
++	svout.f  smout.f dvout.f  dmout.f cvout.f  cmout.f \
++	zvout.f  zmout.f
+--- PARPACK/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ PARPACK/Makefile.am	2007-09-26 11:17:50.418553022 +0100
+@@ -0,0 +1,6 @@
++SUBDIRS = UTIL SRC
++SUBLIBS = SRC/MPI/libparpacksrcmpi.la UTIL/MPI/libparpackutilmpi.la
++lib_LTLIBRARIES = libparpack.la
++libparpack_la_SOURCES = 
++libparpack_la_LDFLAGS = -version-info 0:0
++libparpack_la_LIBADD = $(SUBLIBS) @MPILIBS@
+--- PARPACK/SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ PARPACK/SRC/Makefile.am	2007-09-26 18:34:31.611823276 +0100
+@@ -0,0 +1 @@
++SUBDIRS = MPI
+--- PARPACK/UTIL/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ PARPACK/UTIL/Makefile.am	2007-09-26 18:33:15.487485197 +0100
+@@ -0,0 +1,2 @@
++SUBDIRS = MPI
++
+--- PARPACK/SRC/MPI/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ PARPACK/SRC/MPI/Makefile.am	2007-09-26 19:42:38.902132996 +0100
+@@ -0,0 +1,15 @@
++F77= $(MPIF77)
++noinst_LTLIBRARIES = libparpacksrcmpi.la
++libparpacksrcmpi_la_SOURCES = \
++	psgetv0.f  \
++	psnaitr.f psnapps.f psnaup2.f psnaupd.f psneigh.f psngets.f \
++	pssaitr.f pssapps.f pssaup2.f pssaupd.f psseigt.f pssgets.f \
++	psneupd.f psseupd.f pslarnv.f pslamch.f psnorm2.f \
++	pdgetv0.f \
++	pdnaitr.f pdnapps.f pdnaup2.f pdnaupd.f pdneigh.f pdngets.f \
++	pdsaitr.f pdsapps.f pdsaup2.f pdsaupd.f pdseigt.f pdsgets.f \
++	pdneupd.f pdseupd.f pdlarnv.f pdlamch.f pdnorm2.f \
++	pcnaitr.f pcnapps.f pcnaup2.f pcnaupd.f pcneigh.f \
++	pcneupd.f pcngets.f pcgetv0.f pscnorm2.f pclarnv.f \
++	pznaitr.f pznapps.f pznaup2.f pznaupd.f pzneigh.f \
++	pzneupd.f pzngets.f pzgetv0.f pdznorm2.f pzlarnv.f
+--- PARPACK/UTIL/MPI/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ PARPACK/UTIL/MPI/Makefile.am	2007-09-26 19:42:57.543195289 +0100
+@@ -0,0 +1,6 @@
++F77 = $(MPIF77)
++noinst_LTLIBRARIES = libparpackutilmpi.la
++libparpackutilmpi_la_SOURCES = \
++	pivout.f psvout.f  psmout.f pdvout.f \
++	pdmout.f  pcvout.f  pcmout.f pzvout.f  pzmout.f
 +
-+AC_CONFIG_FILES([
-+	UTIL/Makefile
-+	SRC/Makefile
-+	PARPACK/SRC/MPI/Makefile
-+	PARPACK/SRC/Makefile
-+	PARPACK/UTIL/MPI/Makefile
-+	PARPACK/UTIL/Makefile
-+	PARPACK/Makefile
-+	Makefile
-+        ])
-+AC_OUTPUT
diff --git a/sci-libs/arpack/files/digest-arpack-96 b/sci-libs/arpack/files/digest-arpack-96-r1
index 847206ad803b..847206ad803b 100644
--- a/sci-libs/arpack/files/digest-arpack-96
+++ b/sci-libs/arpack/files/digest-arpack-96-r1