diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2012-11-12 02:44:13 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-11-12 02:44:13 +0000 |
commit | 01180bc4af31da8f00f3235da4d2bf533b930ecd (patch) | |
tree | 097b00eafb947765e3ab44f14e8949986da0ee94 /sci-libs/lis | |
parent | Version bump (diff) | |
download | gentoo-2-01180bc4af31da8f00f3235da4d2bf533b930ecd.tar.gz gentoo-2-01180bc4af31da8f00f3235da4d2bf533b930ecd.tar.bz2 gentoo-2-01180bc4af31da8f00f3235da4d2bf533b930ecd.zip |
Version bump
(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs/lis')
-rw-r--r-- | sci-libs/lis/ChangeLog | 9 | ||||
-rw-r--r-- | sci-libs/lis/files/lis-1.2.120-autotools.patch | 246 | ||||
-rw-r--r-- | sci-libs/lis/lis-1.2.120.ebuild (renamed from sci-libs/lis/lis-1.2.90.ebuild) | 10 | ||||
-rw-r--r-- | sci-libs/lis/lis-1.2.62.ebuild | 51 |
4 files changed, 258 insertions, 58 deletions
diff --git a/sci-libs/lis/ChangeLog b/sci-libs/lis/ChangeLog index 3903e3570ac4..b1f8e1b5d869 100644 --- a/sci-libs/lis/ChangeLog +++ b/sci-libs/lis/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/lis # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.6 2012/10/18 20:08:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.7 2012/11/12 02:44:13 bicatali Exp $ + +*lis-1.2.120 (12 Nov 2012) + + 12 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> + +files/lis-1.2.120-autotools.patch, +lis-1.2.120.ebuild, -lis-1.2.62.ebuild, + -lis-1.2.90.ebuild: + Version bump 18 Oct 2012; Justin Lecher <jlec@gentoo.org> lis-1.2.62.ebuild, lis-1.2.90.ebuild, lis-1.2.91.ebuild: diff --git a/sci-libs/lis/files/lis-1.2.120-autotools.patch b/sci-libs/lis/files/lis-1.2.120-autotools.patch new file mode 100644 index 000000000000..5f44d27aeb82 --- /dev/null +++ b/sci-libs/lis/files/lis-1.2.120-autotools.patch @@ -0,0 +1,246 @@ +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 +@@ -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.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 +@@ -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.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 @@ + 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.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 +@@ -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.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 +@@ -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.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 +@@ -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.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 +@@ -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.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 +@@ -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.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 +@@ -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 -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 @@ + + EXTRA_DIST = defs test.sh testmat.mtx matfiles.txt + +-testdir = ${prefix}/share/examples/lis ++testdir = ${prefix}/share/lis/examples + + test_DATA = testmat.mtx matfiles.txt + + 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 + if ENABLE_FORTRAN +- test_PROGRAMS += test1f test4f etest1f etest4f ++ check_PROGRAMS += test1f test4f etest1f etest4f + endif + + test1_SOURCES = test1.c +@@ -40,7 +40,7 @@ + etest4f_SOURCES = etest4f.F + endif + +-bin_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5 ++noinst_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5 + + lsolve_SOURCES = test1.c + esolve_SOURCES = etest5.c diff --git a/sci-libs/lis/lis-1.2.90.ebuild b/sci-libs/lis/lis-1.2.120.ebuild index 31f94deba226..ae12106691b8 100644 --- a/sci-libs/lis/lis-1.2.90.ebuild +++ b/sci-libs/lis/lis-1.2.120.ebuild @@ -1,12 +1,10 @@ # 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.90.ebuild,v 1.4 2012/10/18 20:08:33 jlec Exp $ +# $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 -FORTRAN_NEEDED=fortran - inherit autotools-utils fortran-2 DESCRIPTION="Library of Iterative Solvers for Linear Systems" @@ -21,7 +19,7 @@ IUSE="doc fma fortran mpi openmp quad saamg sse2 static-libs" RDEPEND="mpi? ( virtual/mpi )" DEPEND="${RDEPEND}" -PATCHES=( ${FILESDIR}/${PN}-1.2.62-autotools.patch ) +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) pkg_setup() { if use openmp; then @@ -29,11 +27,11 @@ pkg_setup() { die "You have openmp enabled but your current gcc does not support it" export FORTRAN_NEED_OPENMP=1 fi - fortran-2_pkg_setup + use fortran && fortran-2_pkg_setup } src_configure() { - myeconfargs+=( + local myeconfargs=( $(use_enable fortran) $(use_enable openmp omp) $(use_enable quad) diff --git a/sci-libs/lis/lis-1.2.62.ebuild b/sci-libs/lis/lis-1.2.62.ebuild deleted file mode 100644 index 7d10609250bb..000000000000 --- a/sci-libs/lis/lis-1.2.62.ebuild +++ /dev/null @@ -1,51 +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.62.ebuild,v 1.4 2012/10/18 20:08:33 jlec Exp $ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes -FORTRAN_NEEDED=fortran - -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" -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 - fortran-2_pkg_setup -} - -src_configure() { - 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 -} |