summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2014-01-15 05:38:46 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2014-01-15 05:38:46 +0000
commit2972a808c04941ced33cb773e26ea471d0a1d06f (patch)
treecfa4319d501ddfe998f2a707edd3536809f5597b /sci-libs
parentVersion bump. Cleanup old. (diff)
downloadhistorical-2972a808c04941ced33cb773e26ea471d0a1d06f.tar.gz
historical-2972a808c04941ced33cb773e26ea471d0a1d06f.tar.bz2
historical-2972a808c04941ced33cb773e26ea471d0a1d06f.zip
Version bump
Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/lis/ChangeLog11
-rw-r--r--sci-libs/lis/Manifest18
-rw-r--r--sci-libs/lis/files/lis-1.4.23-autotools.patch (renamed from sci-libs/lis/files/lis-1.2.120-autotools.patch)174
-rw-r--r--sci-libs/lis/lis-1.4.23.ebuild (renamed from sci-libs/lis/lis-1.3.32.ebuild)8
4 files changed, 133 insertions, 78 deletions
diff --git a/sci-libs/lis/ChangeLog b/sci-libs/lis/ChangeLog
index 03195ff538ca..7b871956e2dd 100644
--- a/sci-libs/lis/ChangeLog
+++ b/sci-libs/lis/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-libs/lis
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.10 2013/07/22 20:40:53 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.11 2014/01/15 05:38:39 bicatali Exp $
+
+*lis-1.4.23 (15 Jan 2014)
+
+ 15 Jan 2014; SĂ©bastien Fabbro <bicatali@gentoo.org>
+ +files/lis-1.4.23-autotools.patch, +lis-1.4.23.ebuild,
+ -files/lis-1.2.120-autotools.patch, -lis-1.3.32.ebuild:
+ Version bump
*lis-1.4.11 (22 Jul 2013)
diff --git a/sci-libs/lis/Manifest b/sci-libs/lis/Manifest
index 8f51932bb2c1..869ad3c88848 100644
--- a/sci-libs/lis/Manifest
+++ b/sci-libs/lis/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX lis-1.2.120-autotools.patch 11328 SHA256 2be932ba01d7e614cdf59d888eb8a20082a280f647e7a2986e598a5c7d666b2d SHA512 f460b9fcbcd53721dcbb5b37f3875e0612a0855ba84b0ffc507144e390e1560d5fc7fc02f4a84d9d4a5282e67d32e8195fbfeb03711ff3720fadcd139b20f828 WHIRLPOOL a3181c33a86e6b67e529205b3b70ae9478a2683538924ad50cbaf7e8bc82f6ca347741b0061e7504a1943059d2e08c5eb7eaa4bfc24f195306e4a48275809e18
AUX lis-1.4.11-autotools.patch 13935 SHA256 4b7baebab2e05f78b110f2469159223a9eea90a59cbf7ea5575ffd56b8c48c72 SHA512 560a71d486149d3f83036340e6f6df3f8312453b3061288c103ec71c5256f2a30199012c2d319210080080090fc8e4a3a3913b27d99d8d642b2c1523dc9a118f WHIRLPOOL 81d3f14e95efa63e9d93b008f5dc7e58447a9ee890d58201fca1d1366311357d46aa436f7151b76cf82f6336b5669ba804def7bab221925c072ccd7444eea09b
-DIST lis-1.3.32.tar.gz 3002442 SHA256 296b26c8fba660af161bbb1cec3cccdfa39b3451dafe87b37e57f946b4fde2b2 SHA512 e13083f2f994765844e95b69b47ffb4722e571867aaa8b4b3d07b59d1990cfad6cdcc0ce07587f7dd111eac56ff3d5ffdc63c4a51953ccc8c0a6b1e676d4410c WHIRLPOOL 143b8aea535ce933aa480bd363f889971be70d227d9129bb7656d08633a5a5a00c25e2b1614341193cbc5437883534d088fbf9e427cfe3f79d7cfff8716e353c
+AUX lis-1.4.23-autotools.patch 13614 SHA256 4e802cbccd13a3406913bc280302ae7deb304a632991c31661d38ecf8d035a5f SHA512 e169fa7751807c626f99adbaacf324f8fa9cb94b0ca1623c91f8237d25390a42221620c85cbe21ec941b66d5059e5d33de888a5437db317fe4dbc904e12567a9 WHIRLPOOL 19497b23618f00628fffebc3d246266fd4727226c337faa125bfda8936199639b29ab235b9ae3363612dd03749577b945b033f31908328c84933c2314c4884f0
DIST lis-1.4.11.tar.gz 2978494 SHA256 08fd7452e184b72d58c7b99985d840e9c75df1f40fa525c7a260b7d37e9bf7dd SHA512 784f6cce01197588e3c835132016d04f39c871baf4e1111ddc06116a490bae3cdbbb133a781bdf52125d3452ba448d9b0dd3420899a34b9c46f5fad2198dd0d4 WHIRLPOOL 79b66354cb81199c9bb76b1d81bb2a38a29f413d37351a507b06c95260c16a2bfca876d271a98dc4c067954ae99e1e68ea07a3011c26e68a50292ee18497b54f
-EBUILD lis-1.3.32.ebuild 1231 SHA256 db38f694de2a48c7d30443042d3debd9535f50488bd29d30e66d6155831664f4 SHA512 566fdf7071835bd05be183090de4010029ee2e0ac2e438e7feb4e06590b80c6251df66af6c0ab38b20cb2bd88aa634956b169ae06072fedb616888a560c215ff WHIRLPOOL bcba7b84a7d56827452b42b62b42f6d7051cb7b3dc9923896dcba033e455f4d325ecaedf10e49bd84a9074c64b330a18346a64ad704168ff15ee213e082c9605
+DIST lis-1.4.23.tar.gz 2977200 SHA256 f915b4e3de1fbddc655e39b2e561f1aca5456b2a0e0cdb30b2c434d4c3c4f965 SHA512 8d720e2b69aaa2a3bef96679ae2c96d640787271a38037fa79ac88c571452a1e2f8f28bcbb78633f3d885d25143fb097bbef007433461fb2e0e511e671d9d481 WHIRLPOOL 5f82c645829ee13b6c164cca5a0f739543420c9eb9c40389d7cb37560713cb2d9afdd0ebccb9a57a8a667130df300fd40015036c06e681d90dfefbaab48f5e6e
EBUILD lis-1.4.11.ebuild 1253 SHA256 e83d54e0767d8f47068a007b3cb44b53cd4c860bc0eedc0589d143f438265d10 SHA512 e6aaae89bfc606cd513c314e24bb6f63e4e692009cf9cbd14be77e14fa2ff8cdaad3810d5fbf393479ec21e0e3b57678843f2a99d5e9827bc3c1306caa361761 WHIRLPOOL 495345fd0c02583a6dc27a5f3d1e234c73e6725ef4b0982739dff85c637fc60aba2e7a06eb33573e7d3d2f8c8cdb3e1287d71987ebc06536529d2ec83d607584
-MISC ChangeLog 1841 SHA256 76f89b9d58234b7f9cced6af6bfd3051e236f45c8601b9408ffc52ba7448bcbd SHA512 29e409292bebc9cbf1dc35adfcb3b3f874d05f64b5ac93cbbbf0916e1f68c391cf5d149d706961419a51b77cae7a4b5879a64d6a43894afe4e26c91e32ece7f5 WHIRLPOOL 2e20f7f8c28e702a7e8546a3055a556129bc12f6d53efaf9356add19aae553148ba020a79c2642e25d4db87a85cc6f780d133ce3f555f97d45222d06134e55d8
+EBUILD lis-1.4.23.ebuild 1261 SHA256 1f2cb897fbdd69b271377cc7f12992515af19b0ff7c3eb25694df8596b97ca5e SHA512 fcbcce204d95783b65e31091ff3236220fa82d4837749c25afae26fa7555a3e7f3fb4ecbbfd08f043a6729fe211e689705397e65e67c83cdf936d59ed1256108 WHIRLPOOL 0de460f62c2aa140fb11af1489fb9a166b954070c22163de88dcf86e85163aa2c1a599c3d0e388680369566f62e90c33ecb3b88cea2ea8f574d6fcdc5b05ae94
+MISC ChangeLog 2054 SHA256 5ebfe56dca0a3299062537c291ad99ac180aefbea08a191babd0929def928e75 SHA512 635547e38dde80030fdd05fab92c24da4abb7452d9be2da8a7d05830b0142616184b7a0c7e7f66b279fd252472112fb14469895012fac1842ef9c725b1d656cb WHIRLPOOL 688b9801ec6adafebe1ea3795fc132c3a63ccc39d638f566c3dac73f474a88913dbbca5c8dbf97a38b0618f5dfe94f95ccaacadeef65b349ff4bb00a77e9bad0
MISC metadata.xml 680 SHA256 b74d10b78b48e6dd3dfd9530a833e6f9c6efa967e63b6ca83ba3eaad9d256990 SHA512 49c9c7fb584f56e917e64257127422efb49bba5899852f581aaa2abe345a84e8d976e5cf4b610e8af8d2c1bd20d2ac9ccfdafcb8db4ffb5fa19df535708f6685 WHIRLPOOL 01431b5e19774d6d2d2c86a649ca0fc8658bd83706c9a0813b24901515a295995e33be594abe284ea8aaa7b3bbba2de4453a9a283e012363f6b6799d033dabed
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlHtmNkACgkQ1ycZbhPLE2Ag4QCgskUBjQZ3b5RYm+IcEQ/nL609
-THMAnAlMw1zy/ESHScyaI1/blUIHIHsk
-=m/Te
------END PGP SIGNATURE-----
diff --git a/sci-libs/lis/files/lis-1.2.120-autotools.patch b/sci-libs/lis/files/lis-1.4.23-autotools.patch
index 5f44d27aeb82..e0da6a6dac55 100644
--- a/sci-libs/lis/files/lis-1.2.120-autotools.patch
+++ b/sci-libs/lis/files/lis-1.4.23-autotools.patch
@@ -1,6 +1,30 @@
-diff -Nur lis-1.2.120.orig/src/esolver/Makefile.am lis-1.2.120/src/esolver/Makefile.am
---- lis-1.2.120.orig/src/esolver/Makefile.am 2012-11-11 18:31:26.617593585 -0800
-+++ lis-1.2.120/src/esolver/Makefile.am 2012-11-11 18:31:46.912690912 -0800
+diff -Nur lis-1.4.23.orig/configure.in lis-1.4.23/configure.in
+--- lis-1.4.23.orig/configure.in 2014-01-14 21:30:01.358264593 -0800
++++ lis-1.4.23/configure.in 2014-01-14 21:31:19.917763200 -0800
+@@ -527,6 +527,8 @@
+ AC_LANG_PUSH(Fortran 77)
+ fflags_save="$FFLAGS"
+ AC_PROG_F77([ifort ifc efc xlf95_r xlf90_r xlf_r xlf95 xlf90 xlf ftn frt pgf95 pgf90 pathf95 pathf90 epcf90 f95 fort lf95 gfortran f90 g77])
++ AC_F77_LIBRARY_LDFLAGS
++ AC_F77_DUMMY_MAIN
+ FFLAGS="$fflags_save"
+ if test "$TARGET" = ""; then
+ if test "$enable_mpi" = "yes"; then
+diff -Nur lis-1.4.23.orig/src/Makefile.am lis-1.4.23/src/Makefile.am
+--- lis-1.4.23.orig/src/Makefile.am 2014-01-14 21:30:01.374264719 -0800
++++ lis-1.4.23/src/Makefile.am 2014-01-14 21:30:25.932420643 -0800
+@@ -22,7 +22,7 @@
+ liblis@LIBSUFFIX@_la_LIBADD += fortran/amg/libsaamg.la
+ else
+ if ENABLE_FORTRAN
+- liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la
++ liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la $(FLIBS)
+ endif
+ endif
+ liblis@LIBSUFFIX@_la_SOURCES =
+diff -Nur lis-1.4.23.orig/src/esolver/Makefile.am lis-1.4.23/src/esolver/Makefile.am
+--- lis-1.4.23.orig/src/esolver/Makefile.am 2014-01-14 21:30:01.374264719 -0800
++++ lis-1.4.23/src/esolver/Makefile.am 2014-01-14 21:30:25.931420647 -0800
@@ -8,16 +8,5 @@
lis_esolver_si.c \
lis_esolver_rqi.c
@@ -19,9 +43,27 @@ diff -Nur lis-1.2.120.orig/src/esolver/Makefile.am lis-1.2.120/src/esolver/Makef
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/fortran/amg/Makefile.am lis-1.2.120/src/fortran/amg/Makefile.am
---- lis-1.2.120.orig/src/fortran/amg/Makefile.am 2012-11-11 18:31:26.616593603 -0800
-+++ lis-1.2.120/src/fortran/amg/Makefile.am 2012-11-11 18:31:46.912690912 -0800
+diff -Nur lis-1.4.23.orig/src/fortran/Makefile.am lis-1.4.23/src/fortran/Makefile.am
+--- lis-1.4.23.orig/src/fortran/Makefile.am 2014-01-14 21:30:01.373264712 -0800
++++ lis-1.4.23/src/fortran/Makefile.am 2014-01-14 21:30:25.932420643 -0800
+@@ -9,14 +9,3 @@
+
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ CLEANFILES = *.il
+-
+-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
+-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_FFLAGS) $(FFLAGS)
+-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+diff -Nur lis-1.4.23.orig/src/fortran/amg/Makefile.am lis-1.4.23/src/fortran/amg/Makefile.am
+--- lis-1.4.23.orig/src/fortran/amg/Makefile.am 2014-01-14 21:30:01.372264705 -0800
++++ lis-1.4.23/src/fortran/amg/Makefile.am 2014-01-14 21:30:25.931420647 -0800
@@ -25,25 +25,6 @@
CLEANFILES = *.mod
@@ -48,35 +90,17 @@ diff -Nur lis-1.2.120.orig/src/fortran/amg/Makefile.am lis-1.2.120/src/fortran/a
.NOTPARALLEL:
.NO_PARALLEL:
-diff -Nur lis-1.2.120.orig/src/fortran/Makefile.am lis-1.2.120/src/fortran/Makefile.am
---- lis-1.2.120.orig/src/fortran/Makefile.am 2012-11-11 18:31:26.616593603 -0800
-+++ lis-1.2.120/src/fortran/Makefile.am 2012-11-11 18:31:46.912690912 -0800
-@@ -9,14 +9,3 @@
-
- AM_CPPFLAGS = -I$(top_srcdir)/include
- CLEANFILES = *.il
--
--PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
--LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_FFLAGS) $(FFLAGS)
--COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/matrix/Makefile.am lis-1.2.120/src/matrix/Makefile.am
---- lis-1.2.120.orig/src/matrix/Makefile.am 2012-11-11 18:31:26.617593585 -0800
-+++ lis-1.2.120/src/matrix/Makefile.am 2012-11-11 18:31:46.912690912 -0800
-@@ -18,16 +18,6 @@
+diff -Nur lis-1.4.23.orig/src/matrix/Makefile.am lis-1.4.23/src/matrix/Makefile.am
+--- lis-1.4.23.orig/src/matrix/Makefile.am 2014-01-14 21:30:01.374264719 -0800
++++ lis-1.4.23/src/matrix/Makefile.am 2014-01-14 21:30:25.932420643 -0800
+@@ -18,16 +18,5 @@
lis_matrix_rco.c \
lis_matrix_vbr.c
-AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS)
CLEANFILES = *.il
-
+-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
@@ -87,9 +111,9 @@ diff -Nur lis-1.2.120.orig/src/matrix/Makefile.am lis-1.2.120/src/matrix/Makefil
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/matvec/Makefile.am lis-1.2.120/src/matvec/Makefile.am
---- lis-1.2.120.orig/src/matvec/Makefile.am 2012-11-11 18:31:26.615593621 -0800
-+++ lis-1.2.120/src/matvec/Makefile.am 2012-11-11 18:31:46.913690864 -0800
+diff -Nur lis-1.4.23.orig/src/matvec/Makefile.am lis-1.4.23/src/matvec/Makefile.am
+--- lis-1.4.23.orig/src/matvec/Makefile.am 2014-01-14 21:30:01.372264705 -0800
++++ lis-1.4.23/src/matvec/Makefile.am 2014-01-14 21:30:25.932420643 -0800
@@ -13,16 +13,5 @@
lis_matvec_vbr.c
@@ -108,9 +132,9 @@ diff -Nur lis-1.2.120.orig/src/matvec/Makefile.am lis-1.2.120/src/matvec/Makefil
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/precision/Makefile.am lis-1.2.120/src/precision/Makefile.am
---- lis-1.2.120.orig/src/precision/Makefile.am 2012-11-11 18:31:26.615593621 -0800
-+++ lis-1.2.120/src/precision/Makefile.am 2012-11-11 18:31:46.913690864 -0800
+diff -Nur lis-1.4.23.orig/src/precision/Makefile.am lis-1.4.23/src/precision/Makefile.am
+--- lis-1.4.23.orig/src/precision/Makefile.am 2014-01-14 21:30:01.372264705 -0800
++++ lis-1.4.23/src/precision/Makefile.am 2014-01-14 21:30:25.932420643 -0800
@@ -4,16 +4,5 @@
lis_precision_matvec.c
@@ -129,9 +153,9 @@ diff -Nur lis-1.2.120.orig/src/precision/Makefile.am lis-1.2.120/src/precision/M
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/precon/Makefile.am lis-1.2.120/src/precon/Makefile.am
---- lis-1.2.120.orig/src/precon/Makefile.am 2012-11-11 18:31:26.615593621 -0800
-+++ lis-1.2.120/src/precon/Makefile.am 2012-11-11 18:31:46.913690864 -0800
+diff -Nur lis-1.4.23.orig/src/precon/Makefile.am lis-1.4.23/src/precon/Makefile.am
+--- lis-1.4.23.orig/src/precon/Makefile.am 2014-01-14 21:30:01.371264698 -0800
++++ lis-1.4.23/src/precon/Makefile.am 2014-01-14 21:30:25.932420643 -0800
@@ -12,16 +12,5 @@
lis_precon_ssor.c
@@ -150,9 +174,9 @@ diff -Nur lis-1.2.120.orig/src/precon/Makefile.am lis-1.2.120/src/precon/Makefil
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/solver/Makefile.am lis-1.2.120/src/solver/Makefile.am
---- lis-1.2.120.orig/src/solver/Makefile.am 2012-11-11 18:31:26.617593585 -0800
-+++ lis-1.2.120/src/solver/Makefile.am 2012-11-11 18:31:46.913690864 -0800
+diff -Nur lis-1.4.23.orig/src/solver/Makefile.am lis-1.4.23/src/solver/Makefile.am
+--- lis-1.4.23.orig/src/solver/Makefile.am 2014-01-14 21:30:01.373264712 -0800
++++ lis-1.4.23/src/solver/Makefile.am 2014-01-14 21:30:25.932420643 -0800
@@ -17,16 +17,5 @@
lis_solver_sor.c
@@ -171,9 +195,9 @@ diff -Nur lis-1.2.120.orig/src/solver/Makefile.am lis-1.2.120/src/solver/Makefil
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/system/Makefile.am lis-1.2.120/src/system/Makefile.am
---- lis-1.2.120.orig/src/system/Makefile.am 2012-11-11 18:31:26.614593644 -0800
-+++ lis-1.2.120/src/system/Makefile.am 2012-11-11 18:31:46.913690864 -0800
+diff -Nur lis-1.4.23.orig/src/system/Makefile.am lis-1.4.23/src/system/Makefile.am
+--- lis-1.4.23.orig/src/system/Makefile.am 2014-01-14 21:30:01.371264698 -0800
++++ lis-1.4.23/src/system/Makefile.am 2014-01-14 21:30:25.932420643 -0800
@@ -13,16 +13,5 @@
mt19937ar.c
@@ -192,9 +216,9 @@ diff -Nur lis-1.2.120.orig/src/system/Makefile.am lis-1.2.120/src/system/Makefil
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/src/vector/Makefile.am lis-1.2.120/src/vector/Makefile.am
---- lis-1.2.120.orig/src/vector/Makefile.am 2012-11-11 18:31:26.616593603 -0800
-+++ lis-1.2.120/src/vector/Makefile.am 2012-11-11 18:31:46.913690864 -0800
+diff -Nur lis-1.4.23.orig/src/vector/Makefile.am lis-1.4.23/src/vector/Makefile.am
+--- lis-1.4.23.orig/src/vector/Makefile.am 2014-01-14 21:30:01.373264712 -0800
++++ lis-1.4.23/src/vector/Makefile.am 2014-01-14 21:30:25.932420643 -0800
@@ -4,16 +4,5 @@
lis_vector_opv.c
@@ -213,34 +237,66 @@ diff -Nur lis-1.2.120.orig/src/vector/Makefile.am lis-1.2.120/src/vector/Makefil
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-diff -Nur lis-1.2.120.orig/test/Makefile.am lis-1.2.120/test/Makefile.am
---- lis-1.2.120.orig/test/Makefile.am 2012-11-11 18:31:26.608593818 -0800
-+++ lis-1.2.120/test/Makefile.am 2012-11-11 18:36:56.241151118 -0800
-@@ -5,15 +5,15 @@
+diff -Nur lis-1.4.23.orig/test/Makefile.am lis-1.4.23/test/Makefile.am
+--- lis-1.4.23.orig/test/Makefile.am 2014-01-14 21:30:01.360264625 -0800
++++ lis-1.4.23/test/Makefile.am 2014-01-14 21:34:47.093078248 -0800
+@@ -5,15 +5,16 @@
- EXTRA_DIST = defs test.sh testmat.mtx matfiles.txt
+ EXTRA_DIST = defs test.sh testmat.mtx testmat2.mtx
-testdir = ${prefix}/share/examples/lis
-+testdir = ${prefix}/share/lis/examples
++testdir = $(libdir)/lis/examples
- test_DATA = testmat.mtx matfiles.txt
+ test_DATA = testmat.mtx testmat2.mtx
test_SCRIPTS = defs test.sh
--test_PROGRAMS = test1 test2 test3 test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
-+check_PROGRAMS = test1 test2 test3 test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
+-test_PROGRAMS = test1 test2 test2b test3 test3b test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
++check_PROGRAMS = test1 test2 test2b test3 test3b test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
if ENABLE_FORTRAN
- test_PROGRAMS += test1f test4f etest1f etest4f
+ check_PROGRAMS += test1f test4f etest1f etest4f
++ LDADD += $(FLIBS)
endif
test1_SOURCES = test1.c
-@@ -40,7 +40,7 @@
+@@ -44,38 +45,11 @@
etest4f_SOURCES = etest4f.F
endif
--bin_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
-+noinst_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
+-bin_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
++noinst_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
lsolve_SOURCES = test1.c
esolve_SOURCES = etest5.c
+
+-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
+-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_FFLAGS) $(FFLAGS)
+-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-
+-if ENABLE_SAAMG
+- LINK = $(LIBTOOL) --mode=link $(FC) \
+- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
+- F77LINK = $(LIBTOOL) --mode=link $(FC) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
+-else
+-if ENABLE_FORTRAN
+- LINK = $(LIBTOOL) --mode=link $(FC) \
+- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
+- F77LINK = $(LIBTOOL) --mode=link $(F77) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
+-else
+- LINK = $(LIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS)
+-endif
+-endif
+-
+ CLEANFILES = *.il
+
+
diff --git a/sci-libs/lis/lis-1.3.32.ebuild b/sci-libs/lis/lis-1.4.23.ebuild
index e7dde670093b..49d442ac9c83 100644
--- a/sci-libs/lis/lis-1.3.32.ebuild
+++ b/sci-libs/lis/lis-1.4.23.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.3.32.ebuild,v 1.1 2013/03/05 21:01:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.4.23.ebuild,v 1.1 2014/01/15 05:38:39 bicatali Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
inherit autotools-utils fortran-2
DESCRIPTION="Library of Iterative Solvers for Linear Systems"
@@ -19,7 +21,7 @@ IUSE="doc fma fortran mpi openmp quad saamg sse2 static-libs"
RDEPEND="mpi? ( virtual/mpi )"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-1.2.120-autotools.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.4.23-autotools.patch )
pkg_setup() {
if use openmp; then