summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-03-05 21:01:29 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-03-05 21:01:29 +0000
commit8c5d721e9d38e17dc251c4450b220248ce1a0b8c (patch)
tree20866d3b96888917eec02e7cc786db9e3c1ae768 /sci-libs
parentBump to 2.6.32.74.10, thanks to slepnoga (diff)
downloadgentoo-2-8c5d721e9d38e17dc251c4450b220248ce1a0b8c.tar.gz
gentoo-2-8c5d721e9d38e17dc251c4450b220248ce1a0b8c.tar.bz2
gentoo-2-8c5d721e9d38e17dc251c4450b220248ce1a0b8c.zip
Version bump
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/lis/ChangeLog8
-rw-r--r--sci-libs/lis/files/lis-1.2.62-autotools.patch215
-rw-r--r--sci-libs/lis/lis-1.2.120.ebuild49
-rw-r--r--sci-libs/lis/lis-1.3.32.ebuild (renamed from sci-libs/lis/lis-1.3.30.ebuild)2
4 files changed, 8 insertions, 266 deletions
diff --git a/sci-libs/lis/ChangeLog b/sci-libs/lis/ChangeLog
index 67dff5e6ea3e..8916e74e0164 100644
--- a/sci-libs/lis/ChangeLog
+++ b/sci-libs/lis/ChangeLog
@@ -1,6 +1,12 @@
# 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.8 2013/03/02 22:33:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.9 2013/03/05 21:01:29 bicatali Exp $
+
+*lis-1.3.32 (05 Mar 2013)
+
+ 05 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> +lis-1.3.32.ebuild,
+ -files/lis-1.2.62-autotools.patch, -lis-1.2.120.ebuild, -lis-1.3.30.ebuild:
+ Version bump
*lis-1.3.30 (02 Mar 2013)
diff --git a/sci-libs/lis/files/lis-1.2.62-autotools.patch b/sci-libs/lis/files/lis-1.2.62-autotools.patch
deleted file mode 100644
index 44a71e49f8d8..000000000000
--- a/sci-libs/lis/files/lis-1.2.62-autotools.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff -Nur lis-1.2.62.orig/src/esolver/Makefile.am lis-1.2.62/src/esolver/Makefile.am
---- lis-1.2.62.orig/src/esolver/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/esolver/Makefile.am 2012-01-21 16:40:35.000000000 +0000
-@@ -8,16 +8,5 @@
- lis_esolver_si.c \
- lis_esolver_rqi.c
-
--AM_CFLAGS = -I$(top_srcdir)/include
-+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.62.orig/src/fortran/amg/Makefile.am lis-1.2.62/src/fortran/amg/Makefile.am
---- lis-1.2.62.orig/src/fortran/amg/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/fortran/amg/Makefile.am 2012-01-21 17:03:17.000000000 +0000
-@@ -25,25 +25,6 @@
-
- CLEANFILES = *.mod
- AM_CPPFLAGS = -I$(top_srcdir)/include
--FCCOMPILE = $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
--LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
--FCLD = $(FC)
--FCLINK = $(LIBTOOL) --mode=link $(FCLD) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--PPFCCOMPILE = $(FC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)
--LTPPFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_FCFLAGS) $(FCFLAGS)
--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)
-
- .NOTPARALLEL:
- .NO_PARALLEL:
-diff -Nur lis-1.2.62.orig/src/fortran/Makefile.am lis-1.2.62/src/fortran/Makefile.am
---- lis-1.2.62.orig/src/fortran/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/fortran/Makefile.am 2012-01-21 16:41:13.000000000 +0000
-@@ -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.62.orig/src/matrix/Makefile.am lis-1.2.62/src/matrix/Makefile.am
---- lis-1.2.62.orig/src/matrix/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/matrix/Makefile.am 2012-01-21 16:38:44.000000000 +0000
-@@ -18,16 +18,6 @@
- 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) \
-- $(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.62.orig/src/matvec/Makefile.am lis-1.2.62/src/matvec/Makefile.am
---- lis-1.2.62.orig/src/matvec/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/matvec/Makefile.am 2012-01-21 16:39:27.000000000 +0000
-@@ -13,16 +13,5 @@
- lis_matvec_vbr.c
-
-
--AM_CFLAGS = -I$(top_srcdir)/include
-+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.62.orig/src/precision/Makefile.am lis-1.2.62/src/precision/Makefile.am
---- lis-1.2.62.orig/src/precision/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/precision/Makefile.am 2012-01-21 16:39:50.000000000 +0000
-@@ -4,16 +4,5 @@
- lis_precision_matvec.c
-
-
--AM_CFLAGS = -I$(top_srcdir)/include $(MPFLAG)
-+AM_CPPFLAGS = -I$(top_srcdir)/include $(MPFLAG)
- 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.62.orig/src/precon/Makefile.am lis-1.2.62/src/precon/Makefile.am
---- lis-1.2.62.orig/src/precon/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/precon/Makefile.am 2012-01-21 16:40:11.000000000 +0000
-@@ -12,16 +12,5 @@
- lis_precon_ssor.c
-
-
--AM_CFLAGS = -I$(top_srcdir)/include
-+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.62.orig/src/solver/Makefile.am lis-1.2.62/src/solver/Makefile.am
---- lis-1.2.62.orig/src/solver/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/solver/Makefile.am 2012-01-21 16:40:55.000000000 +0000
-@@ -17,16 +17,5 @@
- lis_solver_sor.c
-
-
--AM_CFLAGS = -I$(top_srcdir)/include
-+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.62.orig/src/system/Makefile.am lis-1.2.62/src/system/Makefile.am
---- lis-1.2.62.orig/src/system/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/system/Makefile.am 2012-01-21 16:41:32.000000000 +0000
-@@ -13,16 +13,5 @@
- mt19937ar.c
-
-
--AM_CFLAGS = -I$(top_srcdir)/include
-+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.62.orig/src/vector/Makefile.am lis-1.2.62/src/vector/Makefile.am
---- lis-1.2.62.orig/src/vector/Makefile.am 2012-01-21 16:36:43.000000000 +0000
-+++ lis-1.2.62/src/vector/Makefile.am 2012-01-21 16:39:10.000000000 +0000
-@@ -4,16 +4,5 @@
- lis_vector_opv.c
-
-
--AM_CFLAGS = -I$(top_srcdir)/include
-+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 --git a/sci-libs/lis/lis-1.2.120.ebuild b/sci-libs/lis/lis-1.2.120.ebuild
deleted file mode 100644
index ae12106691b8..000000000000
--- a/sci-libs/lis/lis-1.2.120.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.2.120.ebuild,v 1.1 2012/11/12 02:44:13 bicatali Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils fortran-2
-
-DESCRIPTION="Library of Iterative Solvers for Linear Systems"
-HOMEPAGE="http://www.ssisc.org/lis/index.en.html"
-SRC_URI="http://www.ssisc.org/lis/dl/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fma fortran mpi openmp quad saamg sse2 static-libs"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
-
-pkg_setup() {
- if use openmp; then
- [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp && \
- die "You have openmp enabled but your current gcc does not support it"
- export FORTRAN_NEED_OPENMP=1
- fi
- use fortran && fortran-2_pkg_setup
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable fortran)
- $(use_enable openmp omp)
- $(use_enable quad)
- $(use_enable fma)
- $(use_enable sse2)
- $(use_enable saamg)
- $(use_enable mpi)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/lis/lis-1.3.30.ebuild b/sci-libs/lis/lis-1.3.32.ebuild
index 144d2086387f..e7dde670093b 100644
--- a/sci-libs/lis/lis-1.3.30.ebuild
+++ b/sci-libs/lis/lis-1.3.32.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.3.30.ebuild,v 1.1 2013/03/02 22:33:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.3.32.ebuild,v 1.1 2013/03/05 21:01:29 bicatali Exp $
EAPI=5