diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2008-10-22 19:00:28 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-10-22 19:00:28 +0000 |
| commit | 5d0edd0fdae77b8cf601fd52bbd37e20e100f5c6 (patch) | |
| tree | e6bd2d8804c2962457188037a81365eb60640ba6 /sci-libs/plplot | |
| parent | Version bump. Translation updates. (diff) | |
| download | gentoo-2-5d0edd0fdae77b8cf601fd52bbd37e20e100f5c6.tar.gz gentoo-2-5d0edd0fdae77b8cf601fd52bbd37e20e100f5c6.tar.bz2 gentoo-2-5d0edd0fdae77b8cf601fd52bbd37e20e100f5c6.zip | |
Removed gif flag (not used) and merged fortranrtran and fortran95 flag, since they use the same compiler
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'sci-libs/plplot')
| -rw-r--r-- | sci-libs/plplot/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/plplot/plplot-5.9.0.ebuild | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog index 34c153002c9c..c17fe2899eb7 100644 --- a/sci-libs/plplot/ChangeLog +++ b/sci-libs/plplot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/plplot # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.16 2008/10/21 11:49:25 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.17 2008/10/22 19:00:28 bicatali Exp $ + + 22 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> plplot-5.9.0.ebuild: + Removed gif flag (not used) and merged fortranrtran and fortran95 flag, + since they use the same compiler *plplot-5.9.0 (21 Oct 2008) diff --git a/sci-libs/plplot/plplot-5.9.0.ebuild b/sci-libs/plplot/plplot-5.9.0.ebuild index 5d0702ca1a0d..533800b33dc2 100644 --- a/sci-libs/plplot/plplot-5.9.0.ebuild +++ b/sci-libs/plplot/plplot-5.9.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.0.ebuild,v 1.1 2008/10/21 11:49:25 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.0.ebuild,v 1.2 2008/10/22 19:00:28 bicatali Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ada doc examples fortran fortran95 gd gnome java jpeg gif latex - octave pdf perl png python qhull svga tcl threads tk truetype wxwindows X" +IUSE="ada doc examples fortran gd gnome java jpeg latex octave pdf perl + png python qhull svga tcl threads tk truetype wxwindows X" RDEPEND="ada? ( virtual/gnat ) java? ( >=virtual/jre-1.5 ) @@ -53,9 +53,8 @@ DEPEND="${RDEPEND} qhull? ( media-libs/qhull )" pkg_setup() { - FORTRAN="gfortran ifc g77" - use fortran95 && FORTRAN="gfortran ifc" - if use fortran || use fortran95; then + if use fortran; then + FORTRAN="gfortran ifc g77" fortran_pkg_setup fi export FC=${FORTRANC} F77=${FORTRANC} @@ -116,7 +115,6 @@ src_configure() { $(cmake-utils_has truetype FREETYPE) $(cmake-utils_use_enable ada ada) $(cmake-utils_use_enable fortran f77) - $(cmake-utils_use_enable fortran95 f95) $(cmake-utils_use_enable java java) $(cmake-utils_use_enable gnome gnome2) $(cmake-utils_use_enable octave octave) @@ -131,6 +129,9 @@ src_configure() { $(cmake-utils_pld latex pstex) $(cmake-utils_pld svga linuxvga)" + use fortran && [[ ${FORTRANC} != g77 ]] && \ + mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable fortran f95)" + use truetype && mycmakeargs="${mycmakeargs} -DPL_FREETYPE_FONT_PATH:PATH=/usr/share/fonts/freefont-ttf" |