diff options
40 files changed, 211 insertions, 227 deletions
diff --git a/sci-libs/amd/ChangeLog b/sci-libs/amd/ChangeLog index 4f6470049038..7201e5859371 100644 --- a/sci-libs/amd/ChangeLog +++ b/sci-libs/amd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/amd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.22 2010/12/02 19:01:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.23 2010/12/16 14:18:02 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> amd-2.2.0.ebuild, + amd-2.2.1.ebuild: + Removal of fortran.eclass, #348851 02 Dec 2010; Justin Lecher <jlec@gentoo.org> amd-2.2.0.ebuild: Fixing Changelog deletion diff --git a/sci-libs/amd/amd-2.2.0.ebuild b/sci-libs/amd/amd-2.2.0.ebuild index 918e5434c131..f0f9d7fc79bf 100644 --- a/sci-libs/amd/amd-2.2.0.ebuild +++ b/sci-libs/amd/amd-2.2.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.0.ebuild,v 1.18 2010/12/02 19:01:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.0.ebuild,v 1.19 2010/12/16 14:18:02 jlec Exp $ -inherit autotools eutils fortran +inherit autotools eutils toolchain-funcs MY_PN=AMD DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" @@ -19,13 +19,12 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PN}" -FORTRAN="gfortran g77 ifc" - src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-autotools.patch - epatch "${FILESDIR}"/${P}-tests.patch + epatch \ + "${FILESDIR}"/${P}-autotools.patch \ + "${FILESDIR}"/${P}-tests.patch eautoreconf } diff --git a/sci-libs/amd/amd-2.2.1.ebuild b/sci-libs/amd/amd-2.2.1.ebuild index 36a15148ba29..f949552045b8 100644 --- a/sci-libs/amd/amd-2.2.1.ebuild +++ b/sci-libs/amd/amd-2.2.1.ebuild @@ -1,12 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.3 2010/12/02 11:14:44 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.4 2010/12/16 14:18:02 jlec Exp $ EAPI="3" -inherit autotools eutils fortran - -FORTRAN="gfortran ifc" +inherit autotools eutils toolchain-funcs MY_PN=AMD diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog index dc010db4c85b..e339014506ef 100644 --- a/sci-libs/blas-atlas/ChangeLog +++ b/sci-libs/blas-atlas/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/blas-atlas # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.101 2010/04/28 07:28:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.102 2010/12/16 14:20:20 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> blas-atlas-3.8.0.ebuild, + blas-atlas-3.8.2.ebuild, blas-atlas-3.9.3.ebuild, blas-atlas-3.9.21.ebuild, + blas-atlas-3.9.21-r1.ebuild, blas-atlas-3.9.23.ebuild, + blas-atlas-3.9.23-r2.ebuild, blas-atlas-3.9.23-r4.ebuild: + Removal of fortran.eclass, #348851 *blas-atlas-3.9.23-r4 (28 Apr 2010) diff --git a/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild b/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild index cc35bc5b4db8..2fed37c0fdd5 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild,v 1.11 2008/08/28 09:48:46 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.0.ebuild,v 1.12 2010/12/16 14:20:20 jlec Exp $ -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib PATCH_V="3.7.39" @@ -34,8 +34,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -90,7 +88,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "$(tc-getCC)" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:--O2}" \ + -C if $(tc-getFC) -F if "${FFLAGS:--O2}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -142,8 +140,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild b/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild index db5824c6f6d5..88b611528647 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild,v 1.1 2008/06/07 16:42:26 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.2.ebuild,v 1.2 2010/12/16 14:20:20 jlec Exp $ -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib PATCH_V="3.7.39" @@ -34,8 +34,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -82,7 +80,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "$(tc-getCC)" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -134,8 +132,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild index bf5c88081a61..99c023c2cac2 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild,v 1.1 2010/02/06 17:08:34 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.21-r1.ebuild,v 1.2 2010/12/16 14:20:20 jlec Exp $ -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation" HOMEPAGE="http://math-atlas.sourceforge.net/" @@ -32,8 +32,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -95,7 +93,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -152,8 +150,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild index 8d4e0f345787..1e3c21fdd881 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild,v 1.4 2010/01/29 04:44:54 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.21.ebuild,v 1.5 2010/12/16 14:20:20 jlec Exp $ -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation" HOMEPAGE="http://math-atlas.sourceforge.net/" @@ -32,8 +32,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -95,7 +93,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -152,8 +150,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild index b5f0794cdea5..a3cfd6743467 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild,v 1.2 2010/04/20 18:26:51 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r2.ebuild,v 1.3 2010/12/16 14:20:20 jlec Exp $ EAPI="3" -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation" HOMEPAGE="http://math-atlas.sourceforge.net/" @@ -36,8 +36,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -109,7 +107,7 @@ src_configure() { --libdir="${ED}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${ED}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -166,8 +164,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild index dbadcbb8125d..ed78a5faad2a 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild,v 1.1 2010/04/28 07:28:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r4.ebuild,v 1.2 2010/12/16 14:20:20 jlec Exp $ EAPI="3" -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation" HOMEPAGE="http://math-atlas.sourceforge.net/" @@ -37,8 +37,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -110,7 +108,7 @@ src_configure() { --libdir="${ED}"/usr/$(get_libdir)/atlas \ --incdir="${ED}"/usr/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -166,8 +164,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild index 31938004ccaf..7a5cac6b16c0 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild,v 1.1 2010/02/19 02:35:21 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild,v 1.2 2010/12/16 14:20:20 jlec Exp $ -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation" HOMEPAGE="http://math-atlas.sourceforge.net/" @@ -33,8 +33,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -97,7 +95,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -154,8 +152,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild index 5c79196ef898..af5b2327c66d 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.6 2010/01/21 22:37:30 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.3.ebuild,v 1.7 2010/12/16 14:20:20 jlec Exp $ -inherit eutils toolchain-funcs fortran multilib +inherit eutils toolchain-funcs multilib PATCH_V="3.9.0" @@ -34,8 +34,6 @@ pkg_setup() { die "blas-atlas won't compile with icc" fi - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup echo ewarn "Please make sure to disable CPU throttling completely" ewarn "during the compile of blas-atlas. Otherwise, all atlas" @@ -94,7 +92,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -151,8 +149,8 @@ src_install () { # pkgconfig files local extlibs="-lm" local threadlibs - [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" - [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + [[ $(tc-getFC) == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ $(tc-getFC) == g77 ]] && extlibs="${extlibs} -lg2c" cp "${FILESDIR}"/blas.pc.in blas.pc cp "${FILESDIR}"/cblas.pc.in cblas.pc sed -i \ diff --git a/sci-libs/blas-goto/ChangeLog b/sci-libs/blas-goto/ChangeLog index c90438ee258a..4f6a82a4c0a8 100644 --- a/sci-libs/blas-goto/ChangeLog +++ b/sci-libs/blas-goto/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/blas-goto -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/ChangeLog,v 1.22 2009/08/18 14:22:19 bicatali Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/ChangeLog,v 1.23 2010/12/16 14:24:01 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> blas-goto-1.22-r1.ebuild, + blas-goto-1.26.ebuild: + Removal of fortran.eclass, #348851 18 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> blas-goto-1.22-r1.ebuild, -blas-goto-1.24.ebuild, blas-goto-1.26.ebuild: diff --git a/sci-libs/blas-goto/blas-goto-1.22-r1.ebuild b/sci-libs/blas-goto/blas-goto-1.22-r1.ebuild index e98748b1bc0a..b3abdd99a6e3 100644 --- a/sci-libs/blas-goto/blas-goto-1.22-r1.ebuild +++ b/sci-libs/blas-goto/blas-goto-1.22-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.22-r1.ebuild,v 1.7 2009/08/18 14:22:19 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.22-r1.ebuild,v 1.8 2010/12/16 14:24:01 jlec Exp $ -inherit eutils fortran flag-o-matic toolchain-funcs +inherit eutils flag-o-matic toolchain-funcs MY_PN="GotoBLAS" MY_P="${MY_PN}-${PV}" @@ -23,7 +23,6 @@ DEPEND="app-admin/eselect-blas >=sys-devel/binutils-2.17" S="${WORKDIR}/${MY_PN}" -FORTRAN="gfortran g77 ifc" ESELECT_PROF=goto @@ -43,12 +42,12 @@ src_unpack() { C_COMPILER=GNU # Set up FORTRAN 77 compiler - case ${FORTRANC} in + case $(tc-getFC) in g77) F_COMPILER=G77;; gfortran) F_COMPILER=GFORTRAN;; ifc|ifort) F_COMPILER=INTEL;; *) - die "Invalid Fortran compiler: ${FORTRANC}; valid are ${FORTRAN}." + die "Invalid Fortran compiler: $(tc-getFC); valid are ${FORTRAN}." esac # Set up compilers diff --git a/sci-libs/blas-goto/blas-goto-1.26.ebuild b/sci-libs/blas-goto/blas-goto-1.26.ebuild index 1a3863200262..ca5c801f55c3 100644 --- a/sci-libs/blas-goto/blas-goto-1.26.ebuild +++ b/sci-libs/blas-goto/blas-goto-1.26.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.26.ebuild,v 1.2 2009/08/18 14:22:19 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-goto/blas-goto-1.26.ebuild,v 1.3 2010/12/16 14:24:01 jlec Exp $ -inherit eutils fortran flag-o-matic toolchain-funcs +inherit eutils flag-o-matic toolchain-funcs MY_PN="GotoBLAS" MY_P="${MY_PN}-${PV}" @@ -23,7 +23,6 @@ DEPEND="app-admin/eselect-blas >=sys-devel/binutils-2.17" S="${WORKDIR}/${MY_PN}" -FORTRAN="gfortran g77 ifc" ESELECT_PROF=goto @@ -43,12 +42,12 @@ src_unpack() { C_COMPILER=GNU # Set up FORTRAN 77 compiler - case ${FORTRANC} in + case $(tc-getFC) in g77) F_COMPILER=G77;; gfortran) F_COMPILER=GFORTRAN;; ifc|ifort) F_COMPILER=INTEL;; *) - die "Invalid Fortran compiler: ${FORTRANC}; valid are ${FORTRAN}." + die "Invalid Fortran compiler: $(tc-getFC); valid are ${FORTRAN}." esac # Set up compilers diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog index de0fdc490935..6c291c7e4f0f 100644 --- a/sci-libs/blas-reference/ChangeLog +++ b/sci-libs/blas-reference/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/blas-reference # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.47 2010/11/14 12:35:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.48 2010/12/16 14:25:50 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> blas-reference-20070226.ebuild, + blas-reference-20070226-r1.ebuild, blas-reference-20070226-r2.ebuild: + Removal of fortran.eclass, #348851 *blas-reference-20070226-r2 (14 Nov 2010) diff --git a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild index dcf4ad934915..5d6f70616440 100644 --- a/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild +++ b/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild,v 1.2 2010/10/02 20:42:02 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r1.ebuild,v 1.3 2010/12/16 14:25:50 jlec Exp $ EAPI="3" -inherit eutils autotools fortran multilib flag-o-matic +inherit eutils autotools multilib flag-o-matic toolchain-funcs LAPACKPV="3.1.1" LAPACKPN="lapack-lite" @@ -25,9 +25,7 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}" pkg_setup() { - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup - if [[ ${FORTRANC} == if* ]]; then + if [[ $(tc-getFC) == if* ]]; then ewarn "Using Intel Fortran at your own risk" LDFLAGS="$(raw-ldflags)" fi diff --git a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild index 0132ceac464e..35f7dbe1b9b8 100644 --- a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild +++ b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild,v 1.1 2010/11/14 12:35:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild,v 1.2 2010/12/16 14:25:50 jlec Exp $ EAPI="3" -inherit eutils autotools fortran multilib flag-o-matic +inherit eutils autotools multilib flag-o-matic toolchain-funcs LAPACKPV="3.1.1" LAPACKPN="lapack-lite" @@ -25,9 +25,7 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}" pkg_setup() { - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup - if [[ ${FORTRANC} == if* ]]; then + if [[ $(tc-getFC) == if* ]]; then ewarn "Using Intel Fortran at your own risk" LDFLAGS="$(raw-ldflags)" fi diff --git a/sci-libs/blas-reference/blas-reference-20070226.ebuild b/sci-libs/blas-reference/blas-reference-20070226.ebuild index 658a2a63d87c..7143d4b358e7 100644 --- a/sci-libs/blas-reference/blas-reference-20070226.ebuild +++ b/sci-libs/blas-reference/blas-reference-20070226.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226.ebuild,v 1.18 2008/12/07 18:26:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226.ebuild,v 1.19 2010/12/16 14:25:50 jlec Exp $ -inherit eutils autotools fortran multilib flag-o-matic +inherit eutils autotools multilib flag-o-matic toolchain-funcs LAPACKPV="3.1.1" LAPACKPN="lapack-lite" @@ -23,9 +23,7 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}" pkg_setup() { - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup - if [[ ${FORTRANC} == if* ]]; then + if [[ $(tc-getFC) == if* ]]; then ewarn "Using Intel Fortran at your own risk" LDFLAGS="$(raw-ldflags)" fi diff --git a/sci-libs/cblas-reference/ChangeLog b/sci-libs/cblas-reference/ChangeLog index 4f77c77f2b87..46055c6e5002 100644 --- a/sci-libs/cblas-reference/ChangeLog +++ b/sci-libs/cblas-reference/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/cblas-reference # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.33 2010/03/07 19:14:51 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.34 2010/12/16 14:27:10 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> + cblas-reference-20030223-r4.ebuild, cblas-reference-20030223-r5.ebuild: + Removal of fortran.eclass, #348851 *cblas-reference-20030223-r5 (07 Mar 2010) diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild index a9280a366d0d..04269bf33334 100644 --- a/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild +++ b/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild,v 1.15 2008/12/07 18:41:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/cblas-reference-20030223-r4.ebuild,v 1.16 2010/12/16 14:27:10 jlec Exp $ -inherit autotools eutils fortran multilib +inherit autotools eutils multilib toolchain-funcs MyPN="${PN/-reference/}" @@ -20,7 +20,6 @@ RDEPEND="virtual/blas DEPEND="${RDEPEND} dev-util/pkgconfig" -FORTRAN="gfortran g77 ifc" ESELECT_PROF=reference S="${WORKDIR}/CBLAS" diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r5.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r5.ebuild index 87acdd47b407..342dae8bf3ba 100644 --- a/sci-libs/cblas-reference/cblas-reference-20030223-r5.ebuild +++ b/sci-libs/cblas-reference/cblas-reference-20030223-r5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/cblas-reference-20030223-r5.ebuild,v 1.1 2010/03/07 19:14:51 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/cblas-reference-20030223-r5.ebuild,v 1.2 2010/12/16 14:27:10 jlec Exp $ EAPI="3" -inherit autotools eutils fortran multilib +inherit autotools eutils multilib toolchain-funcs MyPN="${PN/-reference/}" @@ -22,7 +22,6 @@ RDEPEND="virtual/blas DEPEND="${RDEPEND} dev-util/pkgconfig" -FORTRAN="gfortran g77 ifc" ESELECT_PROF=reference S="${WORKDIR}/CBLAS" diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog index f8115953bfb7..5f0967c80416 100644 --- a/sci-libs/ccp4-libs/ChangeLog +++ b/sci-libs/ccp4-libs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/ccp4-libs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.15 2010/11/08 17:33:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.16 2010/12/16 14:28:58 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> ccp4-libs-6.1.3-r3.ebuild, + ccp4-libs-6.1.3-r4.ebuild: + Removal of fortran.eclass, #348851 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> ccp4-libs-6.1.3-r3.ebuild, ccp4-libs-6.1.3-r4.ebuild: diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild index 749948fca979..91fae02aee08 100644 --- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild +++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild @@ -1,12 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild,v 1.5 2010/11/08 17:33:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild,v 1.6 2010/12/16 14:28:58 jlec Exp $ EAPI="3" -inherit fortran eutils gnuconfig multilib toolchain-funcs - -FORTRAN="g77 gfortran ifc" +inherit eutils gnuconfig multilib toolchain-funcs SRC="ftp://ftp.ccp4.ac.uk/ccp4" @@ -124,7 +122,7 @@ src_configure() { # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd # linux_compaq_compilers linux_intel_compilers generic Darwin # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers - if [[ "${FORTRANC}" = "ifc" ]]; then + if [[ "$(tc-getFC)" = "ifort" ]]; then if use ia64; then GENTOO_OSNAME="ia64_linux_intel" else @@ -160,7 +158,7 @@ src_configure() { export COPTIM=${CFLAGS} export CXXOPTIM=${CXXFLAGS} # Default to -O2 if FFLAGS is unset - export FC=${FORTRANC} + export FC=$(tc-getFC) export FOPTIM=${FFLAGS:- -O2} # export CCP4_SCR="${T}" @@ -168,7 +166,7 @@ src_configure() { # $(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm -lstdc++ && \ export SHARE_LIB="\ $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \ - ${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" + $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" # Can't use econf, configure rejects unknown options like --prefix ./configure \ diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild index 26c4148fddb8..db977d740618 100644 --- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild +++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild @@ -1,12 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild,v 1.3 2010/11/08 17:33:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild,v 1.4 2010/12/16 14:28:58 jlec Exp $ EAPI="3" -inherit fortran eutils gnuconfig multilib toolchain-funcs - -FORTRAN="g77 gfortran ifc" +inherit eutils gnuconfig multilib toolchain-funcs SRC="ftp://ftp.ccp4.ac.uk/ccp4" @@ -127,7 +125,7 @@ src_configure() { # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd # linux_compaq_compilers linux_intel_compilers generic Darwin # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers - if [[ "${FORTRANC}" = "ifc" ]]; then + if [[ "$(tc-getFC)" = "ifort" ]]; then if use ia64; then GENTOO_OSNAME="ia64_linux_intel" else @@ -163,7 +161,7 @@ src_configure() { export COPTIM=${CFLAGS} export CXXOPTIM=${CXXFLAGS} # Default to -O2 if FFLAGS is unset - export FC=${FORTRANC} + export FC=$(tc-getFC) export FOPTIM=${FFLAGS:- -O2} # export CCP4_SCR="${T}" @@ -171,7 +169,7 @@ src_configure() { # $(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm -lstdc++ && \ export SHARE_LIB="\ $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \ - ${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" + $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm" # Can't use econf, configure rejects unknown options like --prefix ./configure \ diff --git a/sci-libs/cgcode/ChangeLog b/sci-libs/cgcode/ChangeLog index 7997898bb9c3..585fca17e2bd 100644 --- a/sci-libs/cgcode/ChangeLog +++ b/sci-libs/cgcode/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/cgcode # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/ChangeLog,v 1.2 2010/11/10 14:16:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/ChangeLog,v 1.3 2010/12/16 14:29:57 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> cgcode-1.0.ebuild: + Removal of fortran.eclass, #348851 10 Nov 2010; Justin Lecher <jlec@gentoo.org> cgcode-1.0.ebuild: Keyworded for ~-linux prefix diff --git a/sci-libs/cgcode/cgcode-1.0.ebuild b/sci-libs/cgcode/cgcode-1.0.ebuild index 6e39ed7ea937..df42a7418186 100644 --- a/sci-libs/cgcode/cgcode-1.0.ebuild +++ b/sci-libs/cgcode/cgcode-1.0.ebuild @@ -1,12 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/cgcode-1.0.ebuild,v 1.2 2010/11/10 14:16:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/cgcode-1.0.ebuild,v 1.3 2010/12/16 14:29:57 jlec Exp $ EAPI="3" -inherit eutils fortran - -FORTRNC="ifort gfortran" +inherit eutils toolchain-funcs DESCRIPTION="Conjugate gradient Codes for large sparse linear systems" HOMEPAGE="http://fetk.org/codes/cgcode/index.html" @@ -26,7 +24,7 @@ src_prepare() { epatch "${FILESDIR}"/${PV}-gentoo.patch cat >> make.inc <<- EOF - F77 = ${FORTRANC} + F77 = $(tc-getFC) FFLAGS = ${FFLAGS} BLASLIBS = $(pkg-config --libs blas) EOF diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog index 68b9cec976be..96b736f032aa 100644 --- a/sci-libs/lapack-atlas/ChangeLog +++ b/sci-libs/lapack-atlas/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/lapack-atlas # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.81 2010/04/20 18:41:05 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.82 2010/12/16 14:32:39 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> lapack-atlas-3.8.0.ebuild, + lapack-atlas-3.8.2.ebuild, lapack-atlas-3.9.3.ebuild, + lapack-atlas-3.9.21.ebuild, lapack-atlas-3.9.21-r1.ebuild, + lapack-atlas-3.9.23.ebuild, lapack-atlas-3.9.23-r2.ebuild, + lapack-atlas-3.9.23-r3.ebuild: + Removal of fortran.eclass, #348851 *lapack-atlas-3.9.23-r3 (20 Apr 2010) diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild index 36be70a183c7..7c0cc392e1d9 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild,v 1.15 2008/11/28 09:37:05 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.8.0.ebuild,v 1.16 2010/12/16 14:32:39 jlec Exp $ -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.7.39" @@ -33,8 +33,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -78,7 +76,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "$(tc-getCC)" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:--O2}" \ + -C if $(tc-getFC) -F if "${FFLAGS:--O2}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -89,7 +87,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -123,9 +121,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild index 5a9ed390f68b..884da664bc60 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild,v 1.2 2008/11/28 09:37:05 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.8.2.ebuild,v 1.3 2010/12/16 14:32:39 jlec Exp $ -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.7.39" @@ -33,8 +33,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -75,7 +73,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "$(tc-getCC)" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:--O2}" \ + -C if $(tc-getFC) -F if "${FFLAGS:--O2}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -86,7 +84,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -120,9 +118,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild index cc77ad0a5839..5ced8d9d6a23 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild,v 1.1 2010/02/06 17:09:49 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21-r1.ebuild,v 1.2 2010/12/16 14:32:39 jlec Exp $ -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.9.0" @@ -33,8 +33,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -88,7 +86,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -99,7 +97,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -133,9 +131,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild index d3b72db3d300..b5dc4e9bee3d 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild,v 1.3 2010/01/29 04:44:09 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild,v 1.4 2010/12/16 14:32:39 jlec Exp $ -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.9.0" @@ -33,8 +33,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -88,7 +86,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -99,7 +97,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -133,9 +131,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild index 6484a1a8d1b7..1bd958afaf59 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.2 2010/04/15 20:28:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r2.ebuild,v 1.3 2010/12/16 14:32:39 jlec Exp $ EAPI="3" -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.9.21" @@ -35,8 +35,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -104,14 +102,14 @@ src_configure() { --libdir="${ED}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${ED}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" cd "${S_LAPACK}" # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -144,9 +142,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild index b680b38a7fe0..bad6c696ff6d 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild,v 1.1 2010/04/20 18:41:05 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild,v 1.2 2010/12/16 14:32:39 jlec Exp $ EAPI="3" -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.9.21" @@ -35,8 +35,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -106,14 +104,14 @@ src_configure() { --libdir="${ED}"/usr/$(get_libdir)/atlas \ --incdir="${ED}"/usr/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" cd "${S_LAPACK}" # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} ${BLAS_LIBS}:" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} ${BLAS_LIBS}:" \ -e "s:../../blas\$(PLAT).a:${BLAS_LIBS}:" \ @@ -145,9 +143,9 @@ src_compile() { cp -sf "${BLD_DIR}"/gentoo/liblapack.a/.libs/*.o .libs/ local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \ "${BLAS_LIBS}" -latlas ${flibs} \ -o "${S_LAPACK}"/SRC/liblapack.la *.lo -rpath "${EPREFIX}/${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild index a4c92899b4df..ee73c333531b 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild,v 1.1 2010/02/19 02:36:43 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild,v 1.2 2010/12/16 14:32:39 jlec Exp $ -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.9.21" @@ -33,8 +33,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -88,7 +86,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -99,7 +97,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -133,9 +131,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) ${LDFLAGS} \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild index 6a2ca484a128..6dc35b508125 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild,v 1.4 2009/01/14 19:14:03 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.3.ebuild,v 1.5 2010/12/16 14:32:39 jlec Exp $ -inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator +inherit eutils flag-o-matic toolchain-funcs autotools versionator MY_PN="${PN/lapack-/}" PATCH_V="3.9.0" @@ -33,8 +33,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} doc? ( app-doc/lapack-docs )" -FORTRAN="g77 gfortran ifc" - S="${WORKDIR}/ATLAS" S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" BLD_DIR="${S}/gentoo-build" @@ -88,7 +86,7 @@ src_unpack() { --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ --incdir="${D}/${DESTTREE}"/include \ -C ac "${c_compiler}" -F ac "${CFLAGS}" \ - -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -C if $(tc-getFC) -F if "${FFLAGS:-'-O2'}" \ -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ -Si cputhrchk 0 ${archselect} \ || die "configure failed" @@ -99,7 +97,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ @@ -133,9 +131,9 @@ src_compile() { RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} local flibs - [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran - [[ ${FORTRANC} == g77 ]] && flibs=-lg2c - ../libtool --mode=link --tag=F77 ${FORTRANC} \ + [[ $(tc-getFC) == gfortran ]] && flibs=-lgfortran + [[ $(tc-getFC) == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 $(tc-getFC) \ $(pkg-config --libs blas cblas) -latlas ${flibs} \ -o liblapack.la *.lo -rpath "${RPATH}" \ || die "Failed to create liblapack.la" diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog index c18ef9a1bac7..950d6ecf9642 100644 --- a/sci-libs/lapack-reference/ChangeLog +++ b/sci-libs/lapack-reference/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/lapack-reference # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.52 2010/12/16 14:33:46 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> + lapack-reference-3.1.1-r1.ebuild, lapack-reference-3.2.1.ebuild, + lapack-reference-3.2.1-r1.ebuild: + Removal of fortran.eclass, #348851 02 Oct 2010; Fabian Groffen <grobian@gentoo.org> lapack-reference-3.2.1-r1.ebuild: diff --git a/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild index 18c630813f89..420eb80a8e5f 100644 --- a/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild +++ b/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild,v 1.20 2008/12/07 19:10:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild,v 1.21 2010/12/16 14:33:46 jlec Exp $ -inherit eutils autotools flag-o-matic fortran multilib +inherit eutils autotools flag-o-matic multilib toolchain-funcs MyPN="${PN/-reference/}" @@ -26,9 +26,7 @@ RDEPEND="virtual/blas S="${WORKDIR}/${MyPN}-lite-${PV}" pkg_setup() { - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup - if [[ ${FORTRANC} == if* ]]; then + if [[ $(tc-getFC) == if* ]]; then ewarn "Using Intel Fortran at your own risk" export LDFLAGS="$(raw-ldflags)" export NOOPT_FFLAGS=-O @@ -44,7 +42,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas):" \ diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild index e5bad2c031ab..3c25f2631094 100644 --- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild +++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild,v 1.2 2010/10/02 20:49:51 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild,v 1.3 2010/12/16 14:33:46 jlec Exp $ EAPI="3" -inherit eutils autotools flag-o-matic fortran multilib +inherit eutils autotools flag-o-matic multilib toolchain-funcs MyPN="${PN/-reference/}" PATCH_V="3.2.1" @@ -29,9 +29,7 @@ RDEPEND="virtual/blas S="${WORKDIR}/${MyPN}-${PV}" pkg_setup() { - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup - if [[ ${FORTRANC} == if* ]]; then + if [[ $(tc-getFC) == if* ]]; then ewarn "Using Intel Fortran at your own risk" export LDFLAGS="$(raw-ldflags)" export NOOPT_FFLAGS=-O @@ -45,7 +43,7 @@ src_prepare() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas):" \ diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild index 02249ea201ea..2047f06747e8 100644 --- a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild +++ b/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.2 2009/12/12 17:43:05 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.3 2010/12/16 14:33:46 jlec Exp $ -inherit eutils autotools flag-o-matic fortran multilib +inherit eutils autotools flag-o-matic multilib toolchain-funcs MyPN="${PN/-reference/}" PATCH_V="3.2.1" @@ -27,9 +27,7 @@ RDEPEND="virtual/blas S="${WORKDIR}/${MyPN}-${PV}" pkg_setup() { - FORTRAN="g77 gfortran ifc" - fortran_pkg_setup - if [[ ${FORTRANC} == if* ]]; then + if [[ $(tc-getFC) == if* ]]; then ewarn "Using Intel Fortran at your own risk" export LDFLAGS="$(raw-ldflags)" export NOOPT_FFLAGS=-O @@ -45,7 +43,7 @@ src_unpack() { eautoreconf # set up the testing routines - sed -e "s:g77:${FORTRANC}:" \ + sed -e "s:g77:$(tc-getFC):" \ -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas):" \ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas):" \ -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas):" \ |