summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-06-23 09:28:30 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-06-23 09:28:30 +0000
commit2f71c1d0622331e93339ff27f4e349c98a19d5a8 (patch)
tree2795d995aa8df5b432279b7787abea5ed4a84e4c /sci-libs/pgplot
parentFix typo. (diff)
downloadgentoo-2-2f71c1d0622331e93339ff27f4e349c98a19d5a8.tar.gz
gentoo-2-2f71c1d0622331e93339ff27f4e349c98a19d5a8.tar.bz2
gentoo-2-2f71c1d0622331e93339ff27f4e349c98a19d5a8.zip
Enabling gif, wd and ppd drivers to be compiled when gfortran >= 4.3, some minor qa fixes
(Portage version: 2.1.4.4)
Diffstat (limited to 'sci-libs/pgplot')
-rw-r--r--sci-libs/pgplot/ChangeLog9
-rw-r--r--sci-libs/pgplot/pgplot-5.2.2-r2.ebuild16
2 files changed, 16 insertions, 9 deletions
diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 39edd5f6a6e4..9dba6e352e73 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/pgplot
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.10 2007/10/11 17:50:41 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.11 2008/06/23 09:28:30 bicatali Exp $
+
+ 23 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ pgplot-5.2.2-r2.ebuild:
+ Enabling gif, wd and ppd drivers to be compiled when gfortran >= 4.3, some
+ minor qa fixes
11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> -pgplot-5.2.2.ebuild,
-pgplot-5.2.2-r1.ebuild, pgplot-5.2.2-r2.ebuild:
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
index 16f140206284..ae1647800561 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild,v 1.3 2007/10/11 17:50:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild,v 1.4 2008/06/23 09:28:30 bicatali Exp $
inherit eutils toolchain-funcs fortran
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
motif? ( virtual/motif )
tk? ( dev-lang/tk )"
DEPEND="${RDEPEND}
- doc? ( virtual/tetex )"
+ doc? ( virtual/latex-base )"
S="${WORKDIR}/${PN}"
@@ -33,14 +33,16 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-compile-setup.patch
epatch "${FILESDIR}"/${PN}-pgdisp.patch
- # gfortran does not compile gif, pp and wd drivers (last check: gfortran-4.2)
- if [[ "${FORTRANC}" == gfortran ]]; then
+ # gfortran < 4.3 does not compile gif, pp and wd drivers
+ if [[ "${FORTRANC}" == gfortran ]] &&
+ [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
ewarn
ewarn "Warning!"
- ewarn "gfortran selected: does not yet compile all drivers"
+ ewarn "gfortran < 4.3 selected: does not compile all drivers"
ewarn "disabling gif, wd, and ppd drivers"
- ewarn "if you want more drivers, use g77 or ifort"
+ ewarn "if you want more drivers, use gfortran >= 4.3, g77 or ifort"
ewarn
+ epause 4
sed -i \
-e 's/GIDRIV/! GIDRIV/g' \
-e 's/PPDRIV/! GIDRIV/g' \