diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2008-07-08 10:04:00 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-07-08 10:04:00 +0000 |
commit | b73e081b4fc725a950ef270742840b4d737b5841 (patch) | |
tree | 824481cc2dec0cc6dcad6c20253336a88494792f /sci-libs | |
parent | stable x86, bug 231061 (diff) | |
download | historical-b73e081b4fc725a950ef270742840b4d737b5841.tar.gz historical-b73e081b4fc725a950ef270742840b4d737b5841.tar.bz2 historical-b73e081b4fc725a950ef270742840b4d737b5841.zip |
Removed older versions, make tests not failures not die the src_test since almost all of the failures were only timings. This should be fixed next version bump, upstream contacted.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/umfpack/ChangeLog | 10 | ||||
-rw-r--r-- | sci-libs/umfpack/Manifest | 20 | ||||
-rw-r--r-- | sci-libs/umfpack/files/umfpack-5.0.3-autotools.patch | 324 | ||||
-rw-r--r-- | sci-libs/umfpack/files/umfpack-5.1.0-autotools.patch | 321 | ||||
-rw-r--r-- | sci-libs/umfpack/files/umfpack-5.2.0-autotools.patch | 7 | ||||
-rw-r--r-- | sci-libs/umfpack/umfpack-5.0.3.ebuild | 43 | ||||
-rw-r--r-- | sci-libs/umfpack/umfpack-5.1.0.ebuild | 42 |
7 files changed, 24 insertions, 743 deletions
diff --git a/sci-libs/umfpack/ChangeLog b/sci-libs/umfpack/ChangeLog index 92a09cc41747..96524f8375d5 100644 --- a/sci-libs/umfpack/ChangeLog +++ b/sci-libs/umfpack/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/umfpack # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.8 2008/04/15 15:49:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.9 2008/07/08 10:04:00 bicatali Exp $ + + 08 Jul 2008; SĂ©bastien Fabbro <bicatali@gentoo.org> + -files/umfpack-5.0.3-autotools.patch, + -files/umfpack-5.1.0-autotools.patch, files/umfpack-5.2.0-autotools.patch, + -umfpack-5.0.3.ebuild, -umfpack-5.1.0.ebuild: + Removed older versions, make tests not failures not die the src_test since + almost all of the failures were only timings. This should be fixed next + version bump, upstream contacted. 15 Apr 2008; Jeroen Roovers <jer@gentoo.org> umfpack-5.2.0.ebuild: Marked ~hppa (bug #215834). diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest index 103bd7b9d1a5..5e3274392492 100644 --- a/sci-libs/umfpack/Manifest +++ b/sci-libs/umfpack/Manifest @@ -1,11 +1,15 @@ -AUX umfpack-5.0.3-autotools.patch 11710 RMD160 3db05b75198c5a772f7c973275128f13344f49d4 SHA1 0537ed02293952c8b352043ca226d28303f646e0 SHA256 c4a84022594837395432dffc414e477cde68f48679f72eaedf61e699461b0079 -AUX umfpack-5.1.0-autotools.patch 11439 RMD160 2b957f551146a6733f6c061abed65311c1cb44e9 SHA1 20335474d5e6e0b73e71b1da59817aed21aa907f SHA256 3b39cc0c3d64578c1c5d494e16092a827e5ae11076e87d53a688127f0d9a2f90 -AUX umfpack-5.2.0-autotools.patch 18287 RMD160 73b5f9df34dd938f60fd0035954347e369c2f54f SHA1 a3b961834dc1a9c3344f260124eb2626c929b87a SHA256 18c4c95c69918262dd7e42fab1f9207da8bdfd6a0557fe589a6fa0d671b8f4ba -DIST UMFPACK-5.0.3.tar.gz 1266492 RMD160 c5b9915cf0d914c75ac5e6d91c588060d45a4d89 SHA1 a1fa0c60e68942adcdb3874cbd4d679e82a387d3 SHA256 ea9e49feeaab02c5980d7cf7751d5e3dd2ce397c29b281e6fa0aa7dc2db40a15 -DIST UMFPACK-5.1.0.tar.gz 1123142 RMD160 954a4c1eda292524de3d3cc8eff73c7840c7a03a SHA1 9d667cd73069002243549a62ae2e4409eaf50465 SHA256 872724b59fb00b9259b590850d11b9b5aaa20dba6a135271c2f61862ec0346fa +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX umfpack-5.2.0-autotools.patch 18317 RMD160 1a45245a299e831ea7d5bf5cd3c2fab166310bb6 SHA1 0656cc130ff6002520364edc88ca919a78277c63 SHA256 1fc1b6465d73582e61c0782b2d44f3b4e0f73ff22de9f65ffcdfc537c04d1452 DIST UMFPACK-5.2.0.tar.gz 1122066 RMD160 98cb8c6f3d62d0f78018f82714b063e9a4aaa4c0 SHA1 056df2b498c97a5e4ed0b396f55e4e4faf4ca346 SHA256 cdf1061c551625f7d572f6f887bad978b4e0e90c6e448a08013ba72c95691c1c -EBUILD umfpack-5.0.3.ebuild 1032 RMD160 b36d5ed9d9d5ad42c15674ce62deef883de5893b SHA1 c5875536be4bafafb7beb6928ee5728fc9898073 SHA256 f08820d630df9bc033c73652ccd43d186143872eeeb25af941d8df11cd0524f2 -EBUILD umfpack-5.1.0.ebuild 1014 RMD160 e67ab5244e6ddb056e2cde2f68b72079a346fede SHA1 3ef48430b3727e59f0c551ef211457ebfaa19709 SHA256 f1bdef1782706f789e5fa05afbe72c686b9ffef8f4cf34a77dcd6323db13ba58 EBUILD umfpack-5.2.0.ebuild 1109 RMD160 8eedd7c5002894ee39e025c45ee7a351e6e278fb SHA1 36fae2a2c53d28a6b31f882566e0a12c53f2cae4 SHA256 42041a86853cfb41bd4a177a9c9aa3abe6bd14befe798bbf1b084b9f75e976c7 -MISC ChangeLog 1452 RMD160 7698f5c57ddc8c82cbe73a8f23ccd29cc2975543 SHA1 957af57934f92a5e18a7b4cbd54888aa8293e86f SHA256 73f2797782d8c83b2d203aead6f1d78a40e93f39545958873d10553fbd77971f +MISC ChangeLog 1865 RMD160 bb8ab7d3e49bf38451ff5e394731ebccb447ac77 SHA1 572cc5a1c19226fea10282821d91b41a0466b37f SHA256 d82f154771fa7acb13aa62e754554689b70224a476af7e311914d441080bee66 MISC metadata.xml 459 RMD160 68be0781281582f5e418dd632e549f61c8302ef3 SHA1 be53152268274dd71ef87b819014761f95785d1c SHA256 21d8e999c800cfa92da3b00eb81697bb810b02ed2b693babf862877ea3cbc377 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkhzO5gACgkQ1ycZbhPLE2DoNwCdGf4odPd4xgMfRAfDcdATIT5T ++PoAn0PmnP9Wo2AREg/2mNv0tECbxNHV +=ql2+ +-----END PGP SIGNATURE----- diff --git a/sci-libs/umfpack/files/umfpack-5.0.3-autotools.patch b/sci-libs/umfpack/files/umfpack-5.0.3-autotools.patch deleted file mode 100644 index 0acefbac9f84..000000000000 --- a/sci-libs/umfpack/files/umfpack-5.0.3-autotools.patch +++ /dev/null @@ -1,324 +0,0 @@ -diff -Nur UMFPACK.orig/Demo/Makefile UMFPACK/Demo/Makefile ---- UMFPACK.orig/Demo/Makefile 2006-05-02 13:46:21.000000000 +0100 -+++ UMFPACK/Demo/Makefile 2007-02-18 20:03:33.000000000 +0000 -@@ -5,29 +5,14 @@ - # UMFPACK Version 4.4, Copyright (c) 2005 by Timothy A. Davis. - # All Rights Reserved. See ../Doc/License for License. - --default: libs umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo \ -+default: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo \ - umfpack_simple - --include ../../UFconfig/UFconfig.mk -+C = $(CC) $(CFLAGS) -I../Include -+INC = ../Include/umfpack.h -+UMFPACK= ../Source/.libs/libumfpack.a -+LIBS = -lblas -lamd -lm - --C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \ -- -I../../UFconfig -- --INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h -- --LIBS = $(BLAS) $(XERBLA) $(LIB) -- --../Lib/libumfpack.a: -- ( cd ../Source ; $(MAKE) ) -- --../../AMD/Lib/libamd.a: -- ( cd ../../AMD/Source ; $(MAKE) ) -- --UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a -- --libs: -- ( cd ../Source ; $(MAKE) ) -- ( cd ../../AMD/Source ; $(MAKE) ) - - #------------------------------------------------------------------------------- - # Create the demo programs, run them, and compare the output -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 2007-02-18 23:30:33.000000000 +0000 -@@ -0,0 +1,34 @@ -+include_HEADERS = \ -+ umfpack.h \ -+ umfpack_col_to_triplet.h \ -+ umfpack_defaults.h \ -+ umfpack_free_numeric.h \ -+ umfpack_free_symbolic.h \ -+ umfpack_get_determinant.h \ -+ umfpack_get_lunz.h \ -+ umfpack_get_numeric.h \ -+ umfpack_get_symbolic.h \ -+ umfpack_global.h \ -+ umfpack_load_numeric.h \ -+ umfpack_load_symbolic.h \ -+ umfpack_numeric.h \ -+ umfpack_qsymbolic.h \ -+ umfpack_report_control.h \ -+ umfpack_report_info.h \ -+ umfpack_report_matrix.h \ -+ umfpack_report_numeric.h \ -+ umfpack_report_perm.h \ -+ umfpack_report_status.h \ -+ umfpack_report_symbolic.h \ -+ umfpack_report_triplet.h \ -+ umfpack_report_vector.h \ -+ umfpack_save_numeric.h \ -+ umfpack_save_symbolic.h \ -+ umfpack_scale.h \ -+ umfpack_solve.h \ -+ umfpack_symbolic.h \ -+ umfpack_tictoc.h \ -+ umfpack_timer.h \ -+ umfpack_transpose.h \ -+ umfpack_triplet_to_col.h \ -+ 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 2007-02-17 18:55:57.000000000 +0000 -@@ -0,0 +1,2 @@ -+SUBDIRS = Source Include -+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 2007-02-18 19:56:22.000000000 +0000 -@@ -0,0 +1,220 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+lib_LTLIBRARIES = libumfpack.la -+ -+# non-user-callable umf_*.[ch] files: -+UMFCH = umf_assemble umf_blas3_update umf_build_tuples umf_create_element \ -+ umf_dump umf_extend_front umf_garbage_collection umf_get_memory \ -+ umf_init_front umf_kernel umf_kernel_init umf_kernel_wrapup \ -+ umf_local_search umf_lsolve umf_ltsolve umf_mem_alloc_element \ -+ umf_mem_alloc_head_block umf_mem_alloc_tail_block \ -+ umf_mem_free_tail_block umf_mem_init_memoryspace \ -+ umf_report_vector umf_row_search umf_scale_column \ -+ umf_set_stats umf_solve umf_symbolic_usage umf_transpose \ -+ umf_tuple_lengths umf_usolve umf_utsolve umf_valid_numeric \ -+ umf_valid_symbolic umf_grow_front umf_start_front umf_2by2 \ -+ umf_store_lu umf_scale -+ -+# non-user-callable umf_*.[ch] files, int/UF_long versions only (no real/complex): -+UMFINT = umf_analyze umf_apply_order umf_colamd umf_free umf_fsize \ -+ umf_is_permutation umf_malloc umf_realloc umf_report_perm \ -+ umf_singletons -+ -+# non-user-callable, created from umf_ltsolve.c, umf_utsolve.c, -+# umf_triplet.c, and umf_assemble.c , with int/UF_long and real/complex versions: -+UMF_CREATED = umf_lhsolve umf_uhsolve umf_triplet_map_nox \ -+ umf_triplet_nomap_x umf_triplet_nomap_nox umf_triplet_map_x \ -+ umf_assemble_fixq umf_store_lu_drop -+ -+# non-user-callable, int/UF_long and real/complex versions: -+UMF = $(UMF_CREATED) $(UMFCH) -+ -+# user-callable umfpack_*.[ch] files (int/UF_long and real/complex): -+UMFPACK = umfpack_col_to_triplet umfpack_defaults umfpack_free_numeric \ -+ umfpack_free_symbolic umfpack_get_numeric umfpack_get_lunz \ -+ umfpack_get_symbolic umfpack_get_determinant umfpack_numeric \ -+ umfpack_qsymbolic umfpack_report_control umfpack_report_info \ -+ umfpack_report_matrix umfpack_report_numeric umfpack_report_perm \ -+ umfpack_report_status umfpack_report_symbolic umfpack_report_triplet \ -+ umfpack_report_vector umfpack_solve umfpack_symbolic \ -+ umfpack_transpose umfpack_triplet_to_col umfpack_scale \ -+ umfpack_load_numeric umfpack_save_numeric \ -+ umfpack_load_symbolic umfpack_save_symbolic -+ -+# user-callable, created from umfpack_solve.c (umfpack_wsolve.h exists, though): -+# with int/UF_long and real/complex versions: -+UMFPACKW = umfpack_wsolve -+ -+USER = $(UMFPACKW) $(UMFPACK) -+ -+# user-callable, only one version for int/UF_long, real/complex, *.[ch] files: -+GENERIC = umfpack_timer umfpack_tictoc umfpack_global -+ -+ -+#------------------------------------------------------------------------------- -+# object files for each version -+#------------------------------------------------------------------------------- -+ -+DI = $(addsuffix .lo, $(subst umf_,umf_di_,$(UMF)) $(subst umfpack_,umfpack_di_,$(USER))) -+DL = $(addsuffix .lo, $(subst umf_,umf_dl_,$(UMF)) $(subst umfpack_,umfpack_dl_,$(USER))) -+ZI = $(addsuffix .lo, $(subst umf_,umf_zi_,$(UMF)) $(subst umfpack_,umfpack_zi_,$(USER))) -+ZL = $(addsuffix .lo, $(subst umf_,umf_zl_,$(UMF)) $(subst umfpack_,umfpack_zl_,$(USER))) -+II = $(addsuffix .lo, $(subst umf_,umf_i_,$(UMFINT))) -+LL = $(addsuffix .lo, $(subst umf_,umf_l_,$(UMFINT))) -+GN = $(addsuffix .lo, $(subst umfpack_,umfpack_gn_,$(GENERIC))) -+ -+#------------------------------------------------------------------------------- -+# compile each int and UF_long routine (with no real/complex version) -+#------------------------------------------------------------------------------- -+ -+umf_i_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+umf_l_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the DI version -+#------------------------------------------------------------------------------- -+ -+umf_di_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+umf_di_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DDINT -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_di_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_di_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -DDO_MAP -c $< -o $@ -+ -+umf_di_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -DDO_VALUES -c $< -o $@ -+ -+umf_di_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+umf_di_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DDINT -DFIXQ -c $< -o $@ -+ -+umf_di_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DDINT -DDROP -c $< -o $@ -+ -+umfpack_di_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DDINT -DWSOLVE -c $< -o $@ -+ -+umfpack_di_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the DL version -+#------------------------------------------------------------------------------- -+ -+umf_dl_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+umf_dl_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_dl_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_dl_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDO_MAP -c $< -o $@ -+ -+umf_dl_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDO_VALUES -c $< -o $@ -+ -+umf_dl_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+umf_dl_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DDLONG -DFIXQ -c $< -o $@ -+ -+umf_dl_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDROP -c $< -o $@ -+ -+umfpack_dl_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DDLONG -DWSOLVE -c $< -o $@ -+ -+umfpack_dl_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the ZI version -+#------------------------------------------------------------------------------- -+ -+umf_zi_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DZINT -c $< -o $@ -+ -+umf_zi_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DZINT -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_zi_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_zi_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -DDO_MAP -c $< -o $@ -+ -+umf_zi_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -DDO_VALUES -c $< -o $@ -+ -+umf_zi_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -c $< -o $@ -+ -+umf_zi_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DZINT -DFIXQ -c $< -o $@ -+ -+umf_zi_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DZINT -DDROP -c $< -o $@ -+ -+umfpack_zi_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DZINT -DWSOLVE -c $< -o $@ -+ -+umfpack_zi_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DZINT -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the ZL version -+#------------------------------------------------------------------------------- -+ -+umf_zl_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DZLONG -c $< -o $@ -+ -+umf_zl_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_zl_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_zl_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDO_MAP -c $< -o $@ -+ -+umf_zl_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDO_VALUES -c $< -o $@ -+ -+umf_zl_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -c $< -o $@ -+ -+umf_zl_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DZLONG -DFIXQ -c $< -o $@ -+ -+umf_zl_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDROP -c $< -o $@ -+ -+umfpack_zl_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DZLONG -DWSOLVE -c $< -o $@ -+ -+umfpack_zl_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DZLONG -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# Create the generic routines (GN) using a generic rule -+#------------------------------------------------------------------------------- -+ -+umfpack_gn_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -c $< -o $@ -+ -+ -+libumfpack_la_SOURCES = -+libumfpack_la_LIBADD = $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) -diff -Nur UMFPACK.orig/configure.ac UMFPACK/configure.ac ---- UMFPACK.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ UMFPACK/configure.ac 2007-02-18 23:30:46.000000000 +0000 -@@ -0,0 +1,14 @@ -+# -*- Autoconf -*- -+AC_PREREQ(2.59) -+AC_INIT(umfpack, 5.0.3, davis@cise.ufl.edu) -+AM_INIT_AUTOMAKE([foreign]) -+AC_PROG_INSTALL -+AC_PROG_F77 -+AC_PROG_LIBTOOL -+AC_CHECK_LIB(m, sqrt) -+AC_CHECK_LIB(blas, dgemv_) -+AC_CHECK_LIB(amd, amd_aat) -+AC_CONFIG_FILES([Source/Makefile -+ Include/Makefile -+ Makefile]) -+AC_OUTPUT diff --git a/sci-libs/umfpack/files/umfpack-5.1.0-autotools.patch b/sci-libs/umfpack/files/umfpack-5.1.0-autotools.patch deleted file mode 100644 index 7f49f4e586e4..000000000000 --- a/sci-libs/umfpack/files/umfpack-5.1.0-autotools.patch +++ /dev/null @@ -1,321 +0,0 @@ -diff -Nur ../UMFPACK.orig/configure.ac ./configure.ac ---- ../UMFPACK.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ ./configure.ac 2007-08-18 18:18:41.664550371 +0100 -@@ -0,0 +1,16 @@ -+# -*- Autoconf -*- -+AC_PREREQ(2.59) -+AC_INIT(umfpack, 5.1.0, davis@cise.ufl.edu) -+AC_CONFIG_SRCDIR([Source/umf_solve.c]) -+AC_CONFIG_HEADER([config.h]) -+AM_INIT_AUTOMAKE([foreign]) -+AC_PROG_INSTALL -+AC_PROG_F77 -+AC_PROG_LIBTOOL -+AC_CHECK_LIB(m, sqrt) -+AC_CHECK_LIB(blas, dgemv_) -+AC_CHECK_LIB(amd, amd_aat) -+AC_CONFIG_FILES([Source/Makefile -+ Include/Makefile -+ Makefile]) -+AC_OUTPUT -diff -Nur ../UMFPACK.orig/Demo/Makefile ./Demo/Makefile ---- ../UMFPACK.orig/Demo/Makefile 2007-05-05 20:56:55.000000000 +0100 -+++ ./Demo/Makefile 2007-08-18 19:05:37.999937028 +0100 -@@ -5,16 +5,13 @@ - # UMFPACK Version 4.4, Copyright (c) 2005 by Timothy A. Davis. - # All Rights Reserved. See ../Doc/License for License. - --default: libs run -+default: run - --include ../../UFconfig/UFconfig.mk -+C = $(CC) $(CFLAGS) -I../Include - --C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \ -- -I../../UFconfig -+INC = ../Include/umfpack.h - --INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h -- --LIBS = $(BLAS) $(XERBLA) $(LIB) -+LIBS = -lblas -lm -lamd - - ../Lib/libumfpack.a: - ( cd ../Lib ; $(MAKE) ) -@@ -22,7 +19,7 @@ - ../../AMD/Lib/libamd.a: - ( cd ../../AMD ; $(MAKE) library ) - --UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a -+UMFPACK = ../Source/.libs/libumfpack.a - - libs: - ( cd ../Lib ; $(MAKE) ) -diff -Nur ../UMFPACK.orig/Include/Makefile.am ./Include/Makefile.am ---- ../UMFPACK.orig/Include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ./Include/Makefile.am 2007-08-18 18:17:17.031524193 +0100 -@@ -0,0 +1,34 @@ -+include_HEADERS = \ -+ umfpack.h \ -+ umfpack_col_to_triplet.h \ -+ umfpack_defaults.h \ -+ umfpack_free_numeric.h \ -+ umfpack_free_symbolic.h \ -+ umfpack_get_determinant.h \ -+ umfpack_get_lunz.h \ -+ umfpack_get_numeric.h \ -+ umfpack_get_symbolic.h \ -+ umfpack_global.h \ -+ umfpack_load_numeric.h \ -+ umfpack_load_symbolic.h \ -+ umfpack_numeric.h \ -+ umfpack_qsymbolic.h \ -+ umfpack_report_control.h \ -+ umfpack_report_info.h \ -+ umfpack_report_matrix.h \ -+ umfpack_report_numeric.h \ -+ umfpack_report_perm.h \ -+ umfpack_report_status.h \ -+ umfpack_report_symbolic.h \ -+ umfpack_report_triplet.h \ -+ umfpack_report_vector.h \ -+ umfpack_save_numeric.h \ -+ umfpack_save_symbolic.h \ -+ umfpack_scale.h \ -+ umfpack_solve.h \ -+ umfpack_symbolic.h \ -+ umfpack_tictoc.h \ -+ umfpack_timer.h \ -+ umfpack_transpose.h \ -+ umfpack_triplet_to_col.h \ -+ umfpack_wsolve.h -diff -Nur ../UMFPACK.orig/Makefile.am ./Makefile.am ---- ../UMFPACK.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ./Makefile.am 2007-08-18 18:17:17.031524193 +0100 -@@ -0,0 +1,2 @@ -+SUBDIRS = Source Include -+EXTRA_DIST = README.txt -diff -Nur ../UMFPACK.orig/Source/Makefile.am ./Source/Makefile.am ---- ../UMFPACK.orig/Source/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ./Source/Makefile.am 2007-08-18 18:17:17.031524193 +0100 -@@ -0,0 +1,220 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+lib_LTLIBRARIES = libumfpack.la -+ -+# non-user-callable umf_*.[ch] files: -+UMFCH = umf_assemble umf_blas3_update umf_build_tuples umf_create_element \ -+ umf_dump umf_extend_front umf_garbage_collection umf_get_memory \ -+ umf_init_front umf_kernel umf_kernel_init umf_kernel_wrapup \ -+ umf_local_search umf_lsolve umf_ltsolve umf_mem_alloc_element \ -+ umf_mem_alloc_head_block umf_mem_alloc_tail_block \ -+ umf_mem_free_tail_block umf_mem_init_memoryspace \ -+ umf_report_vector umf_row_search umf_scale_column \ -+ umf_set_stats umf_solve umf_symbolic_usage umf_transpose \ -+ umf_tuple_lengths umf_usolve umf_utsolve umf_valid_numeric \ -+ umf_valid_symbolic umf_grow_front umf_start_front umf_2by2 \ -+ umf_store_lu umf_scale -+ -+# non-user-callable umf_*.[ch] files, int/UF_long versions only (no real/complex): -+UMFINT = umf_analyze umf_apply_order umf_colamd umf_free umf_fsize \ -+ umf_is_permutation umf_malloc umf_realloc umf_report_perm \ -+ umf_singletons -+ -+# non-user-callable, created from umf_ltsolve.c, umf_utsolve.c, -+# umf_triplet.c, and umf_assemble.c , with int/UF_long and real/complex versions: -+UMF_CREATED = umf_lhsolve umf_uhsolve umf_triplet_map_nox \ -+ umf_triplet_nomap_x umf_triplet_nomap_nox umf_triplet_map_x \ -+ umf_assemble_fixq umf_store_lu_drop -+ -+# non-user-callable, int/UF_long and real/complex versions: -+UMF = $(UMF_CREATED) $(UMFCH) -+ -+# user-callable umfpack_*.[ch] files (int/UF_long and real/complex): -+UMFPACK = umfpack_col_to_triplet umfpack_defaults umfpack_free_numeric \ -+ umfpack_free_symbolic umfpack_get_numeric umfpack_get_lunz \ -+ umfpack_get_symbolic umfpack_get_determinant umfpack_numeric \ -+ umfpack_qsymbolic umfpack_report_control umfpack_report_info \ -+ umfpack_report_matrix umfpack_report_numeric umfpack_report_perm \ -+ umfpack_report_status umfpack_report_symbolic umfpack_report_triplet \ -+ umfpack_report_vector umfpack_solve umfpack_symbolic \ -+ umfpack_transpose umfpack_triplet_to_col umfpack_scale \ -+ umfpack_load_numeric umfpack_save_numeric \ -+ umfpack_load_symbolic umfpack_save_symbolic -+ -+# user-callable, created from umfpack_solve.c (umfpack_wsolve.h exists, though): -+# with int/UF_long and real/complex versions: -+UMFPACKW = umfpack_wsolve -+ -+USER = $(UMFPACKW) $(UMFPACK) -+ -+# user-callable, only one version for int/UF_long, real/complex, *.[ch] files: -+GENERIC = umfpack_timer umfpack_tictoc umfpack_global -+ -+ -+#------------------------------------------------------------------------------- -+# object files for each version -+#------------------------------------------------------------------------------- -+ -+DI = $(addsuffix .lo, $(subst umf_,umf_di_,$(UMF)) $(subst umfpack_,umfpack_di_,$(USER))) -+DL = $(addsuffix .lo, $(subst umf_,umf_dl_,$(UMF)) $(subst umfpack_,umfpack_dl_,$(USER))) -+ZI = $(addsuffix .lo, $(subst umf_,umf_zi_,$(UMF)) $(subst umfpack_,umfpack_zi_,$(USER))) -+ZL = $(addsuffix .lo, $(subst umf_,umf_zl_,$(UMF)) $(subst umfpack_,umfpack_zl_,$(USER))) -+II = $(addsuffix .lo, $(subst umf_,umf_i_,$(UMFINT))) -+LL = $(addsuffix .lo, $(subst umf_,umf_l_,$(UMFINT))) -+GN = $(addsuffix .lo, $(subst umfpack_,umfpack_gn_,$(GENERIC))) -+ -+#------------------------------------------------------------------------------- -+# compile each int and UF_long routine (with no real/complex version) -+#------------------------------------------------------------------------------- -+ -+umf_i_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+umf_l_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the DI version -+#------------------------------------------------------------------------------- -+ -+umf_di_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+umf_di_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DDINT -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_di_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_di_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -DDO_MAP -c $< -o $@ -+ -+umf_di_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -DDO_VALUES -c $< -o $@ -+ -+umf_di_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+umf_di_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DDINT -DFIXQ -c $< -o $@ -+ -+umf_di_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DDINT -DDROP -c $< -o $@ -+ -+umfpack_di_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DDINT -DWSOLVE -c $< -o $@ -+ -+umfpack_di_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DDINT -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the DL version -+#------------------------------------------------------------------------------- -+ -+umf_dl_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+umf_dl_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_dl_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_dl_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDO_MAP -c $< -o $@ -+ -+umf_dl_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDO_VALUES -c $< -o $@ -+ -+umf_dl_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+umf_dl_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DDLONG -DFIXQ -c $< -o $@ -+ -+umf_dl_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DDLONG -DDROP -c $< -o $@ -+ -+umfpack_dl_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DDLONG -DWSOLVE -c $< -o $@ -+ -+umfpack_dl_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DDLONG -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the ZI version -+#------------------------------------------------------------------------------- -+ -+umf_zi_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DZINT -c $< -o $@ -+ -+umf_zi_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DZINT -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_zi_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_zi_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -DDO_MAP -c $< -o $@ -+ -+umf_zi_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -DDO_VALUES -c $< -o $@ -+ -+umf_zi_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZINT -c $< -o $@ -+ -+umf_zi_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DZINT -DFIXQ -c $< -o $@ -+ -+umf_zi_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DZINT -DDROP -c $< -o $@ -+ -+umfpack_zi_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DZINT -DWSOLVE -c $< -o $@ -+ -+umfpack_zi_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DZINT -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# compile each routine in the ZL version -+#------------------------------------------------------------------------------- -+ -+umf_zl_%.lo: umf_%.c $(INC) -+ $(LTCOMPILE) -DZLONG -c $< -o $@ -+ -+umf_zl_%hsolve.lo: umf_%tsolve.c $(INC) -+ $(LTCOMPILE) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@ -+ -+umf_zl_triplet_map_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@ -+ -+umf_zl_triplet_map_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDO_MAP -c $< -o $@ -+ -+umf_zl_triplet_nomap_x.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDO_VALUES -c $< -o $@ -+ -+umf_zl_triplet_nomap_nox.lo: umf_triplet.c $(INC) -+ $(LTCOMPILE) -DZLONG -c $< -o $@ -+ -+umf_zl_assemble_fixq.lo: umf_assemble.c $(INC) -+ $(LTCOMPILE) -DZLONG -DFIXQ -c $< -o $@ -+ -+umf_zl_store_lu_drop.lo: umf_store_lu.c $(INC) -+ $(LTCOMPILE) -DZLONG -DDROP -c $< -o $@ -+ -+umfpack_zl_wsolve.lo: umfpack_solve.c $(INC) -+ $(LTCOMPILE) -DZLONG -DWSOLVE -c $< -o $@ -+ -+umfpack_zl_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -DZLONG -c $< -o $@ -+ -+#------------------------------------------------------------------------------- -+# Create the generic routines (GN) using a generic rule -+#------------------------------------------------------------------------------- -+ -+umfpack_gn_%.lo: umfpack_%.c $(INC) -+ $(LTCOMPILE) -c $< -o $@ -+ -+ -+libumfpack_la_SOURCES = -+libumfpack_la_LIBADD = $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) diff --git a/sci-libs/umfpack/files/umfpack-5.2.0-autotools.patch b/sci-libs/umfpack/files/umfpack-5.2.0-autotools.patch index 1056a89b5604..ae8734311c20 100644 --- a/sci-libs/umfpack/files/umfpack-5.2.0-autotools.patch +++ b/sci-libs/umfpack/files/umfpack-5.2.0-autotools.patch @@ -484,7 +484,7 @@ + $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) --- Demo/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ Demo/Makefile.am 2008-01-29 18:38:19.000000000 +0000 -@@ -0,0 +1,45 @@ +@@ -0,0 +1,44 @@ +AM_CPPFLAGS = -I$(top_srcdir)/Include +LDADD = $(top_builddir)/Source/libumfpack.la + @@ -514,7 +514,7 @@ + fi; \ + total=$$(($$total + 1)); \ + for i in *demo; do \ -+ echo "--- Testing $i ---"; \ ++ echo "--- Testing $$i ---"; \ + ./$$i$(EXEEXT) > my_$$i.out; \ + diff $$i.out my_$$i.out; \ + if [ "x$$?" = "x0" ]; then \ @@ -527,6 +527,5 @@ + done; \ + if [ $$failed -gt 0 ]; then \ + echo "*** ERROR: $$failed/$$total tests failed!!!"; \ -+ echo ""; \ -+ exit 1; \ ++ echo "Please check the failures before reporting"; \ + fi diff --git a/sci-libs/umfpack/umfpack-5.0.3.ebuild b/sci-libs/umfpack/umfpack-5.0.3.ebuild deleted file mode 100644 index b3fe7e2df2e1..000000000000 --- a/sci-libs/umfpack/umfpack-5.0.3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.0.3.ebuild,v 1.2 2007/08/18 18:17:09 bicatali Exp $ - -inherit autotools eutils - -MY_PN=UMFPACK - -DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/umfpack" -SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" -DEPEND="virtual/blas - >=sci-libs/amd-2.0" -RESTRICT="test" -S="${WORKDIR}/${MY_PN}" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-autotools.patch - cd "${S}" - rm -f Makefile */*akefile - eautoreconf -} - -src_test() { - cd "${S}"/Demo - # test is still buggy but worth testing - make > test.log || die "test failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README.txt Doc/ChangeLog - if use doc; then - insinto /usr/share/doc/${PF} - doins Doc/*.pdf - fi -} diff --git a/sci-libs/umfpack/umfpack-5.1.0.ebuild b/sci-libs/umfpack/umfpack-5.1.0.ebuild deleted file mode 100644 index dc1d756a3dd0..000000000000 --- a/sci-libs/umfpack/umfpack-5.1.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.1.0.ebuild,v 1.2 2007/09/09 14:25:47 josejx Exp $ - -inherit autotools eutils - -MY_PN=UMFPACK - -DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/umfpack" -SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" -DEPEND="virtual/blas - >=sci-libs/amd-2.0" - -S="${WORKDIR}/${MY_PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-autotools.patch - eautoreconf -} - -src_test() { - cd "${S}"/Demo - # test is still a bit buggy - make || die "test failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README.txt Doc/ChangeLog || die "dodoc failed" - if use doc; then - insinto /usr/share/doc/${PF} - doins Doc/*.pdf || die "doins failed" - fi -} |