New upstream tar ball, adjusting the autotools patch

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

4 files changed, 37 insertions, 29 deletions

diff --git a/sci-libs/superlu/ChangeLog b/sci-libs/superlu/ChangeLog
index 4a3ad38fa192..3d6d1707684f 100644
--- a/sci-libs/superlu/ChangeLog
+++ b/sci-libs/superlu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/superlu
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.4 2010/12/28 20:30:18 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/ChangeLog,v 1.5 2011/03/21 23:49:54 bicatali Exp $
+
+  21 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  files/superlu-4.1-autotools.patch:
+  New upstream tar ball, adjusting the autotools patch
 
 *superlu-4.1-r1 (28 Dec 2010)
 
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 29dda1244f85..c39c9978e38e 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 AUX 4.0-test.patch 1868 RMD160 861585be2d9cc3da505c0e8c0dd6e83e6e2708de SHA1 d9294695af21d725fdfbf2e48dc31c2aca6dd410 SHA256 263e24c1e502a28541b180b50ffaf98a49de7ee450386bf2660f6ab20e72c3d0
 AUX superlu-4.0-autotools.patch 11176 RMD160 060db9407e6c8d69bb2c4b0305580b72048358bf SHA1 53b05fa2ea3da4e2c7d0812a9c29dbdddee2cebc SHA256 10632706a011be2568a2bb32f80ada53301dac1601dddc0d0275d3671aee72f0
-AUX superlu-4.1-autotools.patch 19067 RMD160 f8435bb588eb8d340492ed99fb0de41e035c679d SHA1 6975cbc9c607d1e4a8ec25358429bf45da599541 SHA256 2a7bbb484302fe7d641c8a0cad51022add2dcbab7406b8d43b59e40f10179048
+AUX superlu-4.1-autotools.patch 19217 RMD160 94e7cceb3fae548810d3115096d95f686a4f8eb9 SHA1 fbdd4d415cff09e8d66723528178d7f6207f1e38 SHA256 cfdf7e039c7b0fcbf49b4f756678b2d3b120527345f7221347d0e02dc6705607
 AUX superlu-examples.patch 453 RMD160 471c1f75f6498c8165816722f2ec2d975110f343 SHA1 027f4376b1dc17131f6038b2eb9f9d245cbd14fe SHA256 56dcb30492c6b4b846a401ea302212b7b18f006c121f6d5a71dcdd59d9675a34
 DIST superlu_4.0.tar.gz 2163874 RMD160 79a1b3ac9c5aa02a0f16ab170dff5802c1cfb410 SHA1 f6caa9a7324d68e9bce7f315bad6062a1326710f SHA256 2f160235ef702da77782a21f201f320c71e5be492fdd53b22564f5195e3309e6
-DIST superlu_4.1.tar.gz 2542221 RMD160 fa713203d5c4a59c2e67bef74d496158b6a2f198 SHA1 f51b64562295b2d5eeb109d2c8b4539fb92a1dd7 SHA256 ef00cd65195c4d43fb1f7a2cd51ab418887d7f2e414fac168cfde2e211a2529a
+DIST superlu_4.1.tar.gz 2235055 RMD160 721b8ee7d44bfce5e2acda3718cda9694ab344a7 SHA1 7f71512316f4e421076ce7e257c8b939c348e5c2 SHA256 db79b732c6defc1b8f9a48d202bd52bd2a506eb355333e2073c4949c0f48fcf1
 EBUILD superlu-4.0-r2.ebuild 1776 RMD160 1ec5526afda78f8cdccb31880fdcb15e9d2c91f3 SHA1 42c79e5c0381150703604ea7f24f049728cbf7ee SHA256 2d48b0eb5626b8be135c305add5afbbbb51c4657beab08b0371db0bed07b2b05
-EBUILD superlu-4.1-r1.ebuild 1458 RMD160 0294c8d929191f0e98977a4991a6d98eb1394c14 SHA1 d3e88b61b786998f069f4a1f17ea20430db148f9 SHA256 3640aa5cbee742508f188cda877e3221ccc4c2856b05f32e322fc0fb0239dcce
-MISC ChangeLog 1202 RMD160 e4c1ee5430198229d299e9a717f31be96155681f SHA1 158efb626d20ac904d738e2a79b1f73104412d43 SHA256 1d66deab9d32326ce50eaea9641082159dbae97e8434007d011548d7920cbb6c
+EBUILD superlu-4.1-r1.ebuild 1458 RMD160 7558cce54e277524d3ac3618383cd6193b310e6b SHA1 0e1ec7156dcceaf700ea8c30c9c164768d4d699b SHA256 0744b51028d0f7f5eb1158528b6537d67a6099d78b507efa4474150f2dddafa3
+MISC ChangeLog 1350 RMD160 de98a006965a507224fa740981d8d59232cbc4a4 SHA1 6154d7bd47a6f01b96a65c8cc5fe65f838c3a152 SHA256 9855f90b9ca5bf94229e620f515f6d53f50b18656e6e8a601ee3368ea8d246e5
 MISC metadata.xml 1183 RMD160 90584eb7b02f392d8dcf1f7593d00532575fb2e7 SHA1 1f4720b37a9547af2f81d9eb9c72b0031ede1f6d SHA256 1086830fe855bba67b44bf4862464d8ecb88495e5242a7a06a97eb284dc5657c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0aSOMACgkQ1ycZbhPLE2AiegCfYpS/BNaLzmthVN1fDVp38Zdp
-yzQAniC/w6ol9NwkcHJue7rVpS8+ioZT
-=mqyL
+iEYEARECAAYFAk2H5C0ACgkQ1ycZbhPLE2D7FwCeJ1zLWuUne56QSpSoWegl4rtd
+R0IAnjwjEWeNe7793MZPvZ/4AKfETCSw
+=DAz2
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/superlu/files/superlu-4.1-autotools.patch b/sci-libs/superlu/files/superlu-4.1-autotools.patch
index e2510234ffe8..f96e9375fe14 100644
--- a/sci-libs/superlu/files/superlu-4.1-autotools.patch
+++ b/sci-libs/superlu/files/superlu-4.1-autotools.patch
@@ -1,6 +1,6 @@
 diff -Nur SuperLU_4.1.orig/ax_blas.m4 SuperLU_4.1/ax_blas.m4
 --- SuperLU_4.1.orig/ax_blas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/ax_blas.m4	2010-12-12 17:41:08.000000000 +0000
++++ SuperLU_4.1/ax_blas.m4	2011-03-21 23:42:42.000000000 +0000
 @@ -0,0 +1,201 @@
 +# ===========================================================================
 +#          http://www.gnu.org/software/autoconf-archive/ax_blas.html
@@ -205,7 +205,7 @@ diff -Nur SuperLU_4.1.orig/ax_blas.m4 SuperLU_4.1/ax_blas.m4
 +])dnl AX_BLAS
 diff -Nur SuperLU_4.1.orig/configure.ac SuperLU_4.1/configure.ac
 --- SuperLU_4.1.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/configure.ac	2010-12-12 17:41:31.000000000 +0000
++++ SuperLU_4.1/configure.ac	2011-03-21 23:42:42.000000000 +0000
 @@ -0,0 +1,16 @@
 +# -*- Autoconf -*-
 +AC_PREREQ(2.59)
@@ -224,8 +224,8 @@ diff -Nur SuperLU_4.1.orig/configure.ac SuperLU_4.1/configure.ac
 +AC_CONFIG_FILES([Makefile SRC/Makefile superlu.pc])
 +AC_OUTPUT
 diff -Nur SuperLU_4.1.orig/EXAMPLE/Makefile SuperLU_4.1/EXAMPLE/Makefile
---- SuperLU_4.1.orig/EXAMPLE/Makefile	2010-08-11 23:40:19.000000000 +0100
-+++ SuperLU_4.1/EXAMPLE/Makefile	2010-12-12 17:50:34.000000000 +0000
+--- SuperLU_4.1.orig/EXAMPLE/Makefile	2011-03-21 23:42:28.000000000 +0000
++++ SuperLU_4.1/EXAMPLE/Makefile	2011-03-21 23:42:42.000000000 +0000
 @@ -1,4 +1,3 @@
 -include ../make.inc
  
@@ -390,10 +390,11 @@ diff -Nur SuperLU_4.1.orig/EXAMPLE/Makefile SuperLU_4.1/EXAMPLE/Makefile
  clean:	
  	rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
 diff -Nur SuperLU_4.1.orig/FORTRAN/Makefile SuperLU_4.1/FORTRAN/Makefile
---- SuperLU_4.1.orig/FORTRAN/Makefile	2010-08-11 23:40:19.000000000 +0100
-+++ SuperLU_4.1/FORTRAN/Makefile	2010-12-12 17:50:23.000000000 +0000
-@@ -1,28 +1,27 @@
+--- SuperLU_4.1.orig/FORTRAN/Makefile	2011-03-21 23:42:29.000000000 +0000
++++ SuperLU_4.1/FORTRAN/Makefile	2011-03-21 23:45:29.000000000 +0000
+@@ -1,12 +1,12 @@
 -include ../make.inc
++#include ../make.inc
  
  #######################################################################
  #  This makefile creates the Fortran example interface to use the
@@ -402,35 +403,38 @@ diff -Nur SuperLU_4.1.orig/FORTRAN/Makefile SuperLU_4.1/FORTRAN/Makefile
  
 -HEADER   = ../SRC
 -LIBS	= $(SUPERLULIB) $(BLASLIB) -lm
-+HEADER  = $(shell pkg-config --cflags superlu)
++HEADER   = $(shell pkg-config --cflags superlu)
 +LIBS	= $(shell pkg-config --libs superlu)
  
+ # double real
  F77EXM	= f77_main.o hbcode1.o c_fortran_dgssv.o
+@@ -17,19 +17,19 @@
+ all:	f77exm zf77exm
  
- all:	f77exm
- 
--f77exm: $(F77EXM) $(SUPERLULIB)
+ f77exm: $(F77EXM) $(SUPERLULIB)
 -	$(FORTRAN) $(LOADOPTS) $(F77EXM) $(LIBS) -o $@
-+f77exm: $(F77EXM)
 +	$(FC) $(LDFLAGS) $(F77EXM) $(LIBS) -o $@
  
+ zf77exm: $(ZF77EXM) $(SUPERLULIB)
+ 	$(FORTRAN) $(LOADOPTS) $(ZF77EXM) $(LIBS) -o $@
+ 
  c_fortran_zgssv.o: c_fortran_zgssv.c
 -	$(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
 +	$(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
  
  .c.o:
 -	$(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
-+	$(CC) $(CFLAGS) $(CDEFS) -c $< $(VERBOSE)
++	$(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
  
  .f.o:
 -	$(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
 +	$(FC) $(FFLAGS) -c $< $(VERBOSE)
  
  clean:	
- 	rm -f *.o f77exm
+ 	rm -f *.o f77exm zf77exm
 diff -Nur SuperLU_4.1.orig/Makefile.am SuperLU_4.1/Makefile.am
 --- SuperLU_4.1.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/Makefile.am	2010-12-12 17:47:31.000000000 +0000
++++ SuperLU_4.1/Makefile.am	2011-03-21 23:42:42.000000000 +0000
 @@ -0,0 +1,4 @@
 +SUBDIRS = SRC
 +
@@ -438,7 +442,7 @@ diff -Nur SuperLU_4.1.orig/Makefile.am SuperLU_4.1/Makefile.am
 +pkgconfig_DATA = superlu.pc
 diff -Nur SuperLU_4.1.orig/SRC/Makefile.am SuperLU_4.1/SRC/Makefile.am
 --- SuperLU_4.1.orig/SRC/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/SRC/Makefile.am	2010-12-12 18:00:18.000000000 +0000
++++ SuperLU_4.1/SRC/Makefile.am	2011-03-21 23:42:42.000000000 +0000
 @@ -0,0 +1,116 @@
 +AM_CPPFLAGS = -DAdd_
 +
@@ -558,7 +562,7 @@ diff -Nur SuperLU_4.1.orig/SRC/Makefile.am SuperLU_4.1/SRC/Makefile.am
 +##################################
 diff -Nur SuperLU_4.1.orig/superlu.pc.in SuperLU_4.1/superlu.pc.in
 --- SuperLU_4.1.orig/superlu.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/superlu.pc.in	2010-12-12 17:44:43.000000000 +0000
++++ SuperLU_4.1/superlu.pc.in	2011-03-21 23:42:42.000000000 +0000
 @@ -0,0 +1,13 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
diff --git a/sci-libs/superlu/superlu-4.1-r1.ebuild b/sci-libs/superlu/superlu-4.1-r1.ebuild
index f9653b0a039c..b74f9800a48e 100644
--- a/sci-libs/superlu/superlu-4.1-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.1-r1.ebuild,v 1.1 2010/12/28 20:30:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.1-r1.ebuild,v 1.2 2011/03/21 23:49:54 bicatali Exp $
 
 EAPI="2"