diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2013-06-25 00:22:54 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2013-06-25 00:22:54 +0000 |
commit | 3aa2083fb3c7f65198a011cb0056fbc445ceedfc (patch) | |
tree | 3d4e5139f3c232a64603115c31319b11694fed3b /sci-libs | |
parent | Switch to EAPI5 and new tar ball (diff) | |
download | historical-3aa2083fb3c7f65198a011cb0056fbc445ceedfc.tar.gz historical-3aa2083fb3c7f65198a011cb0056fbc445ceedfc.tar.bz2 historical-3aa2083fb3c7f65198a011cb0056fbc445ceedfc.zip |
Version bump, switch to EAPI5 and new tar ball
Package-Manager: portage-2.2.01.22013-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/umfpack/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/umfpack/Manifest | 19 | ||||
-rw-r--r-- | sci-libs/umfpack/files/5.5.1-autotools.patch | 557 | ||||
-rw-r--r-- | sci-libs/umfpack/metadata.xml | 12 | ||||
-rw-r--r-- | sci-libs/umfpack/umfpack-5.5.2.ebuild | 45 | ||||
-rw-r--r-- | sci-libs/umfpack/umfpack-5.6.2.ebuild | 34 |
6 files changed, 56 insertions, 619 deletions
diff --git a/sci-libs/umfpack/ChangeLog b/sci-libs/umfpack/ChangeLog index 8f32cde9c81a..f76a8f1a44f8 100644 --- a/sci-libs/umfpack/ChangeLog +++ b/sci-libs/umfpack/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/umfpack # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.43 2013/02/21 21:20:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/ChangeLog,v 1.44 2013/06/25 00:22:42 bicatali Exp $ + +*umfpack-5.6.2 (25 Jun 2013) + + 25 Jun 2013; SĂ©bastien Fabbro <bicatali@gentoo.org> +umfpack-5.6.2.ebuild, + -files/5.5.1-autotools.patch, -umfpack-5.5.2.ebuild, metadata.xml: + Version bump, switch to EAPI5 and new tar ball 21 Feb 2013; Justin Lecher <jlec@gentoo.org> umfpack-5.2.0.ebuild, umfpack-5.5.2.ebuild, umfpack-5.6.1-r1.ebuild, metadata.xml: diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest index 26773d91030b..e15b39d7ad9d 100644 --- a/sci-libs/umfpack/Manifest +++ b/sci-libs/umfpack/Manifest @@ -1,20 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX 5.5.1-autotools.patch 19071 SHA256 3d45dfdb89d6eb7b2eed1dabda7a16f406491916735f9237e41758f11e869cc8 SHA512 57336b3735956a9b1465bc93fe79f65f473be86262c5eb13c9d13985b88fb67a79528b4786c13966824635e106de1723805f7fcca4f0d6929c8eaaecacc47d47 WHIRLPOOL 074c316dfeacc3e488aef10669b8afad87c40a127301ecb80dd94d7684b7e20b768f033c156a971f08945b74c5304fbe1a29411fb8c69c3d267e5248c8b4ed91 AUX umfpack-5.2.0-autotools.patch 18317 SHA256 1fc1b6465d73582e61c0782b2d44f3b4e0f73ff22de9f65ffcdfc537c04d1452 SHA512 1b6f53c7d4d53a0cdca754c69d56002c5c1461b2cf48c72b673f5de801b52dec9f14e5ec6fd523ff2601ee326d532e78dea045fc280cea7c92d473eb6c9b0b28 WHIRLPOOL d9a692611d907b20a42a024b6cb692d20f46b98956b5674538ba4c38e57fec2956daaed5cef76c9fedf67bd33a2c0b6181b5f110b5bc508e169cc8613396392f DIST UMFPACK-5.2.0.tar.gz 1122066 SHA256 cdf1061c551625f7d572f6f887bad978b4e0e90c6e448a08013ba72c95691c1c SHA512 cd9186ae4feb5c935883ec149c7cdccce980d383bcec33a40d96bd3bc7e0a10ea9d80e678eb689f5eb495acdd320bbee97593a06d1211f05a0ec4a188045939d WHIRLPOOL 9a790a8f5170f0b42bbc75e75c8a2ff851c697276be4865f8edb6e33842df7d78bece6f115eed599c3b64fd489d68a51d4899c98ded683d4ed8edbb3151dfd70 -DIST UMFPACK-5.5.2.tar.gz 1302074 SHA256 4a6fec454671ea5619bfaaa913ad6e37e37ca3361ba717eba2740d5df4d06a3f SHA512 9ee3c6e9db894793bfc9425f3da39e7052d4783c27db5b2cb5b8d7b0d8d29da44f056153d9493b0d7c9abb35c483366657595f52ad0ae53fee146248be0648a8 WHIRLPOOL 479d8d0e04c70b656d1c286c68cc558469e6b5e9255593d94d6c87700fddf5e7cbea99123dff7ae14e9c4030a6be0c5b6d616bfb624622b18c428222d03fe144 DIST umfpack-5.6.1.tar.gz 985202 SHA256 d1fe2849504132013c7f46e81dd218a2e1ef625e8e04e99a1382687744214d60 SHA512 9824b2b9652d908083b329e10e7d479f0bc9cced8c702e0655a4393723595ce188f9e848975d09bf67a6af07dbc318fd407d2e793a722fd8f94b823f0ab93eba WHIRLPOOL 9baee091da7224f3e7f53675aa75a4a83407257103a45ed1a029cc17cf5002367fe0e25d509d3b51f206feb91604120dea51493673a2ddbca1684441a75f5e6f +DIST umfpack-5.6.2.tar.bz2 780204 SHA256 bac722dd5e715c3312ebe7927c05df2e19bc2a29d7e4ab57d0a98330d03164ed SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc WHIRLPOOL fe5069dbbd4b21a3569ae8d81d55feb789b06f7afb4c39be67101fca65e601ac49a4ed455c7e85d7a5504d2f50ff18ec67c3bc02dd3d9635dea4200ffcaad4f5 EBUILD umfpack-5.2.0.ebuild 1115 SHA256 1d3e17557197f3874b73eb8f02df2f19c0d528d4d1c65a7c2b3e8760d278a1d3 SHA512 6a3083a4b6ced1f0b98752ec4d3a4d0a8f700578aafedba028229f8aaade53234953eff4b9d3a469fab0b23066b541dec4c290411b0f3b63b17a380752a74b30 WHIRLPOOL aebe2fbee8d426f3afcff714776f18aedfae6ab0f8f9ffbfa9ae2ca6ea3f9dc4a2f733d87cce000b3f1fec816fbd711fcf0c919c2ee8cece29e1fba6bf0f14c5 -EBUILD umfpack-5.5.2.ebuild 1142 SHA256 276eaa8448ce72a40489a6a20bf3568d98a254ebb369becab8b743f967731037 SHA512 f03f8d1f76bf5ca5c76e44d8844e148017e2408ca5a6044dd9b1d05634f665948035ba3b6f91f637ef05006c24a4fd9d3e3664a47eaa4a2ec5342defbc4f9154 WHIRLPOOL 99c96add5a2adf1eddc60f99d13456804f628d66505aa34fcc4c267404eff9f99464d41308afea37ab60401998d08b77b538f5f4846334b411f4a53d346af98b EBUILD umfpack-5.6.1-r1.ebuild 965 SHA256 4eae2503590624a9c751a4d71c4e3e6260692b5df8ec335c9db36974b12a6edd SHA512 fe3df3b7d3e574e7d004bb3088269cd94c63c191eb4a82e886a9fb04c08af79aa34d919ebfe993f37640f03fab5f92b66dc69e3ae9c97ca771612f774395a422 WHIRLPOOL 472c61a566b9e45e58fd01001e35935c2682d8f600eac3e6809d94894b95f39925c58f7aad8898bcdb9e9b125f31543ee8942cb3ef77ed2c24e6270ef03782df -MISC ChangeLog 6496 SHA256 fdb7d24f09a7efaaa0edf44f67747b3c6dcd186afed42b44a397aa4dd1faee87 SHA512 cb1ad61c92bd65f3883f028dfd3ae883277793070e7deea179a22bd666dd3e0e79fa80c754e166e3375694e8d6a93f6ce8641fe23f3c6ea51f278555c6c195b1 WHIRLPOOL 65ad43ff7051802d71bd88c577ffa76ee382d6fe69ddd0abe5e7d493195e60a187236668fd8e215b9e172f2762f3af8b2570b6b89784234e4f1118ecf57e2fc4 -MISC metadata.xml 666 SHA256 d54abdeec0bd9b43f0cbb294b45399060327609514ca87603d51d13afd7a49f5 SHA512 239b1cf7d0fa5b9a3ca9862e6cd52763bdc7f1949377fa6ffb294bb4088fe98535de3211aa5f595e5c19e7fc75af7d76e989c2073adfe98c019029a9b58fe488 WHIRLPOOL 376e177823eed51365153117d808bfd896e75b9759719ca22e461500fd3ba7f97f9a8ea539211c7a328e7c44d7c37eae17c7bff42b06797ddaf3ac7e4c8ea13c +EBUILD umfpack-5.6.2.ebuild 967 SHA256 9b8c8e8ad8ce3beeb1fcb013150b384e4e1a769be3e6707afcdc3db7f75c8e35 SHA512 64fd052eafa932d08e65eb267eee379498311c6c74adbbbff9270c9ba33329ac293a362d8c72bb7cfa2c65be125c7d2fc6c014c537c565d27d5b72f94e41a4d8 WHIRLPOOL bc43ff716530e98775115c328c512335e08fddbdc3fa11e388ac525ddfbd7fa5ab78ca84bfd792940a17a88518c2b077bcccd177fe1122a568a9becb45345803 +MISC ChangeLog 6727 SHA256 683817f58e37fc9db1e48e654e6bee43bb36d3584daf2c2332fbc03cc133b0ef SHA512 2898ec04d5fed5e627e1513031366acd1fe51f15b9af0c31b99ac63d32dd1cd037073a880df9a3d31530e163f281d1f3739aa8dfe89cd3fa135f37d67771d098 WHIRLPOOL 2c1572156a590d42439992723a4d211895a969aca031549f91073238f8543d8ad588d60c4f1a7beca9ab0d08eeb2275a2ee972491bdb32b1fbcf18e822f95219 +MISC metadata.xml 654 SHA256 c612e735d5a8c286d9c31de063996572e2e0095be58417edf47fb3464224cb0b SHA512 78ae48aa86cdc3a91a8bc23bf8e79cb67f3d932923ab3ce5a3014b608a486d9a699190db13e25ac4a92862ef2b568fe50e05343cdb2080f9b1178eb2c068ddad WHIRLPOOL 85cca03b79a95bae7c8e990bea94a958f54ec4a4135b8ded067512756882f197413f5e7a34f22eabe5d3520b59ee9c98388dc79919803f1b8c5834248582d0b5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREKAAYFAlEmj8cACgkQgAnW8HDreRY1aQCfdrbbuZqmFjAiiqNZSno6p4dO -SdQAn1Y0v+VT1zW4TmOk9oMYbVb5Nnmu -=YG1H +iEYEAREIAAYFAlHI4tQACgkQ1ycZbhPLE2ATkQCglxUbIe263iycAdoO0uBShZ9Q +rnYAn3d0Ffk/rHogGdEWtmLQqpHQI16N +=l8Vp -----END PGP SIGNATURE----- diff --git a/sci-libs/umfpack/files/5.5.1-autotools.patch b/sci-libs/umfpack/files/5.5.1-autotools.patch deleted file mode 100644 index 645ea56f27fd..000000000000 --- a/sci-libs/umfpack/files/5.5.1-autotools.patch +++ /dev/null @@ -1,557 +0,0 @@ ---- acx_blas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ acx_blas.m4 2010-05-16 16:36:04.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_DEFUN([ACX_BLAS], [ -+AC_PREREQ(2.50) -+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS]) -+acx_blas_ok=no -+ -+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 -+ -+# Get fortran linker names of BLAS functions to check for. -+AC_F77_FUNC(sgemm) -+AC_F77_FUNC(dgemm) -+ -+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 -+ -+# 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 ---- configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ configure.ac 2010-05-16 16:37:29.000000000 +0100 -@@ -0,0 +1,47 @@ -+# -*- Autoconf -*- -+AC_PREREQ(2.59) -+AC_INIT(umfpack, 5.5.1, davis@cise.ufl.edu) -+AC_CONFIG_SRCDIR([Source/umf_solve.c]) -+AM_INIT_AUTOMAKE([foreign]) -+AC_PROG_INSTALL -+AC_PROG_F77 -+AC_PROG_LIBTOOL -+AC_CHECK_LIB(m, sqrt) -+sinclude(acx_blas.m4) -+ACX_BLAS -+if test x"$BLAS_LIBS" = x; then -+ AC_MSG_ERROR([Cannot find blas libraries]) -+fi -+AC_CHECK_LIB(amd, amd_aat) -+ -+AC_ARG_WITH(cholmod, -+ [AC_HELP_STRING([--with-cholmod], -+ [Use CHOLMOD for ordering methods])], -+ [with_cholmod=$withval], -+ [with_cholmod="yes"]) -+if test x$with_cholmod = xyes; then -+ AC_CHECK_HEADERS(cholmod.h) -+ AC_CHECK_LIB(cholmod, cholmod_solve, [], \ -+ [AC_MSG_ERROR([Cannot find libcholmod])]) -+ -+ PKG_PROG_PKG_CONFIG -+ if test -n "$PKG_CONFIG"; then -+ PKG_CHECK_MODULES([metis], [metis]) -+ else -+ AC_CHECK_HEADERS(metis.h) -+ AC_CHECK_LIB(metis, METIS_NodeND, [metis_LIBS=-lmetis], \ -+ [AC_MSG_ERROR([CHOLMOD needs metis. Cannot find libmetis])]) -+ fi -+ LIBS="${LIBS} ${metis_LIBS}" -+ CPPFLAGS="${CPPFLAGS} ${metis_CFLAGS}" -+else -+ AC_DEFINE(NCHOLMOD) -+fi -+AM_CONDITIONAL([CHOLMOD], [test x$with_cholmod = xyes]) -+ -+ -+AC_CONFIG_FILES([Source/Makefile -+ Include/Makefile -+ Demo/Makefile -+ Makefile]) -+AC_OUTPUT ---- Demo/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ 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 -+ -+check_PROGRAMS = umfpack_simple \ -+ umfpack_di_demo \ -+ umfpack_dl_demo \ -+ umfpack_zi_demo \ -+ umfpack_zl_demo -+ -+umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed -+ - sed -f umfpack_$*_demo.sed < umfpack_xx_demo.c > umfpack_$*_demo.c -+ -+umfpack_simple_SOURCES = umfpack_simple.c -+umfpack_di_demo_SOURCES = umfpack_di_demo.c -+umfpack_dl_demo_SOURCES = umfpack_dl_demo.c -+umfpack_zi_demo_SOURCES = umfpack_zi_demo.c -+umfpack_zl_demo_SOURCES = umfpack_zl_demo.c -+ -+check-local: $(check_PROGRAMS) -+ @total=0; failed=0; \ -+ ./umfpack_simple; \ -+ if [ "x$$?" = "x0" ]; then \ -+ echo "Test umfpack_simple PASSED."; \ -+ else \ -+ echo "Test umfpack_simple FAILED!!!"; \ -+ failed=$$(($$failed + 1)); \ -+ fi; \ -+ total=$$(($$total + 1)); \ -+ for i in *demo; do \ -+ echo "--- Testing $$i ---"; \ -+ ./$$i$(EXEEXT) > my_$$i.out; \ -+ diff $$i.out my_$$i.out; \ -+ if [ "x$$?" = "x0" ]; then \ -+ echo "Test \`$$i' PASSED."; \ -+ else \ -+ echo "Test \`$$i' FAILED!!!"; \ -+ failed=$$(($$failed + 1)); \ -+ fi; \ -+ total=$$(($$total + 1)); \ -+ done; \ -+ if [ $$failed -gt 0 ]; then \ -+ echo "*** ERROR: $$failed/$$total tests failed!!!"; \ -+ echo "Please check the failures before reporting"; \ -+ fi ---- Include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Include/Makefile.am 2010-05-16 16:36:04.000000000 +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 ---- Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Makefile.am 2010-05-16 16:36:04.000000000 +0100 -@@ -0,0 +1,2 @@ -+SUBDIRS = Source Include Demo -+EXTRA_DIST = README.txt ---- Source/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ 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 -+ -+# 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_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_cholmod 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 = $(BLAS_LIBS) -lm \ -+ $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) diff --git a/sci-libs/umfpack/metadata.xml b/sci-libs/umfpack/metadata.xml index 314c6c20a456..29f71ca077a0 100644 --- a/sci-libs/umfpack/metadata.xml +++ b/sci-libs/umfpack/metadata.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci</herd> - <longdescription lang="en"> +<herd>sci</herd> +<longdescription lang="en"> UMFPACK is a set of routines for solving unsymmetric sparse linear systems, Ax=b, using the Unsymmetric MultiFrontal method. Includes a C-callable interface, and a Fortran-callable interface. MATLAB routines are not included in the Gentoo package. </longdescription> - <use> - <flag name="cholmod">Use <pkg>sci-libs/cholmod</pkg> for matrix +<use> + <flag name="cholmod">Use <pkg>sci-libs/cholmod</pkg> for matrix ordering</flag> - <flag name="metis">Use METIS via (<pkg>sci-libs/cholmod</pkg>) + <flag name="metis">Use METIS via (<pkg>sci-libs/cholmod</pkg>) for matrix partitioning</flag> - </use> +</use> </pkgmetadata> diff --git a/sci-libs/umfpack/umfpack-5.5.2.ebuild b/sci-libs/umfpack/umfpack-5.5.2.ebuild deleted file mode 100644 index 0a27dd29521f..000000000000 --- a/sci-libs/umfpack/umfpack-5.5.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.5.2.ebuild,v 1.7 2013/02/21 21:20:21 jlec Exp $ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils fortran-2 toolchain-funcs - -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="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="doc metis static-libs" - -RDEPEND=" - virtual/blas - sci-libs/amd - metis? ( sci-libs/cholmod[metis] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/5.5.1-autotools.patch ) -DOCS=( README.txt Doc/ChangeLog ) - -S="${WORKDIR}/${MY_PN}" - -src_configure() { - myeconfargs+=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - $(use_with metis cholmod) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - use doc && dodoc Doc/*.pdf -} diff --git a/sci-libs/umfpack/umfpack-5.6.2.ebuild b/sci-libs/umfpack/umfpack-5.6.2.ebuild new file mode 100644 index 000000000000..70c7c9e3ac33 --- /dev/null +++ b/sci-libs/umfpack/umfpack-5.6.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.6.2.ebuild,v 1.1 2013/06/25 00:22:42 bicatali Exp $ + +EAPI=5 + +inherit autotools-utils toolchain-funcs + +DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" +HOMEPAGE="http://www.cise.ufl.edu/research/sparse/umfpack" +SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc +cholmod static-libs" + +RDEPEND=" + >=sci-libs/amd-1.3 + sci-libs/suitesparseconfig + virtual/blas + cholmod? ( >=sci-libs/cholmod-2 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( virtual/latex-base )" + +src_configure() { + local myeconfargs+=( + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + $(use_with doc) + $(use_with cholmod) + ) + autotools-utils_src_configure +} |