diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-12-16 13:54:59 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-12-16 13:54:59 +0000 |
| commit | c4ad17625ee73a7cc3cec71ae7469fa11268c518 (patch) | |
| tree | a3f667effb1eae440a4d848d4dcdd0c66fe73a80 /sci-chemistry | |
| parent | Removal of fortran.eclass, #348851 (diff) | |
| download | gentoo-2-c4ad17625ee73a7cc3cec71ae7469fa11268c518.tar.gz gentoo-2-c4ad17625ee73a7cc3cec71ae7469fa11268c518.tar.bz2 gentoo-2-c4ad17625ee73a7cc3cec71ae7469fa11268c518.zip | |
Removal of fortran.eclass, #348851
(Portage version: 2.2.0_alpha8/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/raster3d/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/raster3d-2.7c.ebuild | 6 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/raster3d-2.9.2.ebuild | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog index 3aa1ef3d742b..237d0967fec1 100644 --- a/sci-chemistry/raster3d/ChangeLog +++ b/sci-chemistry/raster3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/raster3d # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.20 2010/11/08 17:21:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.21 2010/12/16 13:54:59 jlec Exp $ + + 16 Dec 2010; Justin Lecher <jlec@gentoo.org> raster3d-2.7c.ebuild, + raster3d-2.9.2.ebuild: + Removal of fortran.eclass, #348851 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> raster3d-2.7c.ebuild, -raster3d-2.7d.ebuild, -files/raster3d-2.7d-gcc4-gentoo.patch, diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild index e4de11f9207b..98a0ef03aa90 100644 --- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild +++ b/sci-chemistry/raster3d/raster3d-2.7c.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-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.9 2010/11/08 17:21:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.10 2010/12/16 13:54:59 jlec Exp $ -inherit toolchain-funcs fortran +inherit toolchain-funcs NAME="Raster3D" @@ -34,7 +34,7 @@ src_compile() { # fix Makefile to honor user's CFLAGS/FFLAGS sed -e "s:gcc:$(tc-getCC):" \ - -e "s:g77:${FORTRANC}:" \ + -e "s:g77:$(tc-getFC):" \ -e "s:-g -m486 -w:${CFLAGS}:" \ -e "s:-g -O -w -malign-double:${FFLAGS} -w:" \ -i Makefile || die "Failed to patch makefile" diff --git a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild b/sci-chemistry/raster3d/raster3d-2.9.2.ebuild index 21b9e4bee7f0..a14f6f8c8876 100644 --- a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild +++ b/sci-chemistry/raster3d/raster3d-2.9.2.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-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.2 2010/11/08 17:21:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.3 2010/12/16 13:54:59 jlec Exp $ EAPI="3" -inherit fortran flag-o-matic multilib toolchain-funcs versionator +inherit flag-o-matic multilib toolchain-funcs versionator MY_PN="Raster3D" MY_PV=$(replace_version_separator 2 -) @@ -36,7 +36,7 @@ src_compile() { -i Makefile.template || \ die "Failed to patch makefile.template" - if [[ ${FORTRANC} == gfortran ]]; then + if [[ $(tc-getFC) == gfortran ]]; then append-cflags -Dgfortran fi @@ -48,7 +48,7 @@ src_compile() { LDFLAGS="${LDFLAGS}" \ FFLAGS="${FFLAGS}" \ CC="$(tc-getCC)"\ - FC="${FORTRANC}" \ + FC="$(tc-getFC)" \ INCDIRS="-I${EPREFIX}"/usr/include \ LIBDIRS="-L${EPREFIX}"/usr/$(get_libdir) \ ${target} || die |