Changed the NCHOLMOD define in the autotools patch to fix bug #319841

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 18 insertions, 13 deletions

diff --git a/sci-libs/umfpack/ChangeLog b/sci-libs/umfpack/ChangeLog
index 6529a47890e4..ecb4d103a2fb 100644
--- a/sci-libs/umfpack/ChangeLog
+++ b/sci-libs/umfpack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/umfpack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.18 2010/05/14 21:46:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.19 2010/05/16 15:22:50 bicatali Exp $
+
+  16 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  files/umfpack-5.5.0-autotools.patch:
+  Changed the NCHOLMOD define in the autotools patch to fix bug #319841
 
 *umfpack-5.5.0 (14 May 2010)
 
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 62173e5f48b6..6df44e52f805 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 AUX umfpack-5.2.0-autotools.patch 18317 RMD160 1a45245a299e831ea7d5bf5cd3c2fab166310bb6 SHA1 0656cc130ff6002520364edc88ca919a78277c63 SHA256 1fc1b6465d73582e61c0782b2d44f3b4e0f73ff22de9f65ffcdfc537c04d1452
-AUX umfpack-5.5.0-autotools.patch 19485 RMD160 48fb2f555c92450a9e8181d7fd3bd3194fd8238f SHA1 209e1f3d831491e9918860801fb229297fb88576 SHA256 b0e4cd1689218a22c13d2df9a7aa89e9eec70094ab35b3affc3a1cf8ec12e04e
+AUX umfpack-5.5.0-autotools.patch 19491 RMD160 104b780be4f53dc4cd9996249f8c27b5146a40c7 SHA1 a0a06ab560ed1ebd9ab533620b22a4b888ebae38 SHA256 5a94ae2807ad1b6bf1a4279c2c3d87cffd8435ef2c7e5580f79ac250f82e8543
 DIST UMFPACK-5.2.0.tar.gz 1122066 RMD160 98cb8c6f3d62d0f78018f82714b063e9a4aaa4c0 SHA1 056df2b498c97a5e4ed0b396f55e4e4faf4ca346 SHA256 cdf1061c551625f7d572f6f887bad978b4e0e90c6e448a08013ba72c95691c1c
 DIST UMFPACK-5.4.0.tar.gz 1105287 RMD160 bceee72614d676b0496458869afd4c5a7c42e016 SHA1 b9f7d1329d537fe42c8f1cb4a48e93846c197cd2 SHA256 a93854547441d17621cc341c89c7368d238886659f6776c2b727792c0a04c24f
 DIST UMFPACK-5.5.0.tar.gz 1109053 RMD160 b32b8cbb7e0726dc43bddf9b2f3fc00ce5169871 SHA1 ddac11183b5953a68cce7db9dc5b769e97e7a61b SHA256 c14aff8f3b49e8772b372a7b311b008d144a6d42ab63520224a4379aa8fec85f
 EBUILD umfpack-5.2.0.ebuild 1104 RMD160 99e4ce9c5f0f7741112852ce50cbafa7b59d66e1 SHA1 575d31c3230d07ca278d5c546e48b74fd54cb364 SHA256 cac304fa72d728bbd90f71a4fc8ab7ee70f6650e8473680356d148efead032a0
 EBUILD umfpack-5.4.0.ebuild 1080 RMD160 7c53c85219a70053ce88717c6f26c085fc5ac8f5 SHA1 4075847ef9572fca3bf45b2191317197d9f295b5 SHA256 f55a3bc210210af5e8aec0de0f307525dde9522c8a48f2d0e9b4f0edcdf278e0
 EBUILD umfpack-5.5.0.ebuild 1187 RMD160 e583a8fc3adf227d9ecc4295e198ba884614a9cb SHA1 cd8d36ffa8df621076dc5c2b24581f2fc2f24512 SHA256 afb11de3f9743a5999be5f36b007592a9d81c7453ce28433077d9938b640d562
-MISC ChangeLog 3027 RMD160 c6b2e675de3c795c355d82d79e36034d36525328 SHA1 ecde42601aeafcdb06933bcaf68cb5fff800699b SHA256 8c0434d1863e117d1bb77cd5b9ccbbc4fa5586129064a6749068c995ba7d3021
+MISC ChangeLog 3194 RMD160 9f7ab8e8de4af2fe4d628436a17e0c84437142b3 SHA1 9665be1bca11f1d91d51147fd90d9ffc2aef270c SHA256 86e08a70a3d606e28bb77632059342a61402cc54de7515c1bcf5ac42b12f5935
 MISC metadata.xml 568 RMD160 cd2f888cdbc42ce5bc5b6177496aa0f2f876f99a SHA1 c9f1ab800f67a8d0041b391c4789a30b6fd108cf SHA256 3e0de3bbddf611f5e7d37f5393a51426811b72d88fd6c71c6774901570023526
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvtzmwACgkQ1ycZbhPLE2ALxwCghr6+rJKe7oYGQJ9OIhFCJvHx
-LEEAoJDwFCRbgOVq6iX757I+n775qK/I
-=FcVS
+iEYEARECAAYFAkvwF2UACgkQ1ycZbhPLE2Ch3wCePxXfDbz8ZDlR+2/ZGWcB55wy
+RrgAnjeMpcDAdjQo0mFCaQuy1HFYZA8t
+=3He8
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch b/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch
index 44db752f45c5..3da771940d66 100644
--- a/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch
+++ b/sci-libs/umfpack/files/umfpack-5.5.0-autotools.patch
@@ -1,6 +1,6 @@
 diff -Nur UMFPACK.orig/acx_blas.m4 UMFPACK/acx_blas.m4
 --- UMFPACK.orig/acx_blas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/acx_blas.m4	2010-05-14 20:54:52.000000000 +0100
++++ UMFPACK/acx_blas.m4	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,191 @@
 +##### http://autoconf-archive.cryp.to/acx_blas.html
 +#
@@ -195,8 +195,8 @@ diff -Nur UMFPACK.orig/acx_blas.m4 UMFPACK/acx_blas.m4
 +])dnl ACX_BLAS
 diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac
 --- UMFPACK.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/configure.ac	2010-05-14 20:55:11.000000000 +0100
-@@ -0,0 +1,44 @@
++++ UMFPACK/configure.ac	2010-05-16 16:37:29.000000000 +0100
+@@ -0,0 +1,45 @@
 +#                                               -*- Autoconf -*-
 +AC_PREREQ(2.59)
 +AC_INIT(umfpack, 5.5.0, davis@cise.ufl.edu)
@@ -231,6 +231,7 @@ diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac
 +    	AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
 +		[AC_MSG_ERROR([CHOLMOD needs metis. Cannot find libmetis])])
 +    fi
++else
 +    AC_DEFINE(NCHOLMOD)
 +fi
 +AM_CONDITIONAL([CHOLMOD], [test x$with_cholmod = xyes])
@@ -243,7 +244,7 @@ diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac
 +AC_OUTPUT
 diff -Nur UMFPACK.orig/Demo/Makefile.am UMFPACK/Demo/Makefile.am
 --- UMFPACK.orig/Demo/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Demo/Makefile.am	2010-05-14 20:54:52.000000000 +0100
++++ UMFPACK/Demo/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,44 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/Include
 +LDADD = $(top_builddir)/Source/libumfpack.la
@@ -291,7 +292,7 @@ diff -Nur UMFPACK.orig/Demo/Makefile.am UMFPACK/Demo/Makefile.am
 +	fi
 diff -Nur UMFPACK.orig/Include/Makefile.am UMFPACK/Include/Makefile.am
 --- UMFPACK.orig/Include/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Include/Makefile.am	2010-05-14 20:54:52.000000000 +0100
++++ UMFPACK/Include/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,34 @@
 +include_HEADERS = \
 +	umfpack.h \
@@ -329,13 +330,13 @@ diff -Nur UMFPACK.orig/Include/Makefile.am UMFPACK/Include/Makefile.am
 +	umfpack_wsolve.h
 diff -Nur UMFPACK.orig/Makefile.am UMFPACK/Makefile.am
 --- UMFPACK.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Makefile.am	2010-05-14 20:54:52.000000000 +0100
++++ UMFPACK/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,2 @@
 +SUBDIRS = Source Include Demo
 +EXTRA_DIST = README.txt
 diff -Nur UMFPACK.orig/Source/Makefile.am UMFPACK/Source/Makefile.am
 --- UMFPACK.orig/Source/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ UMFPACK/Source/Makefile.am	2010-05-14 20:54:52.000000000 +0100
++++ UMFPACK/Source/Makefile.am	2010-05-16 16:36:04.000000000 +0100
 @@ -0,0 +1,221 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/Include
 +lib_LTLIBRARIES = libumfpack.la