summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-03-15 05:45:42 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-03-15 05:45:42 +0000
commit9d9af2b7a12fd617b23ea91f820f2a7859063500 (patch)
tree4236fa11e6563dd816753e7a2332bb339616527e /sci-libs/pgplot
parentNow install headers, thanks Joshua Rich for the patch, bug #309225 (diff)
downloadgentoo-2-9d9af2b7a12fd617b23ea91f820f2a7859063500.tar.gz
gentoo-2-9d9af2b7a12fd617b23ea91f820f2a7859063500.tar.bz2
gentoo-2-9d9af2b7a12fd617b23ea91f820f2a7859063500.zip
Removed fortran eclass and switched to EAPI2
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/pgplot')
-rw-r--r--sci-libs/pgplot/ChangeLog8
-rw-r--r--sci-libs/pgplot/pgplot-5.2.2-r3.ebuild20
2 files changed, 14 insertions, 14 deletions
diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 7a65a4570762..5b20490231b0 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/pgplot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.17 2009/02/23 17:30:38 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.18 2010/03/15 05:45:42 bicatali Exp $
+
+ 15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ pgplot-5.2.2-r3.ebuild:
+ Removed fortran eclass and switched to EAPI2
23 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
pgplot-5.2.2-r3.ebuild:
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
index 7457250f81f5..5a1fcd1b74a6 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
@@ -1,8 +1,9 @@
-# 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/pgplot/pgplot-5.2.2-r3.ebuild,v 1.4 2009/02/23 17:30:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.5 2010/03/15 05:45:42 bicatali Exp $
-inherit eutils toolchain-funcs fortran
+EAPI=2
+inherit eutils toolchain-funcs
MY_P="${PN}${PV//.}"
DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
@@ -22,19 +23,14 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}"
-FORTRAN="g77 gfortran ifc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}"/${PN}-drivers.patch
epatch "${FILESDIR}"/${PN}-makemake.patch
epatch "${FILESDIR}"/${PN}-compile-setup.patch
epatch "${FILESDIR}"/${PN}-headers.patch
# gfortran < 4.3 does not compile gif, pp and wd drivers
- if [[ "${FORTRANC}" == gfortran ]] &&
+ if [[ "$(tc-getFC)" == gfortran ]] &&
[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
ewarn
ewarn "Warning!"
@@ -60,11 +56,11 @@ src_unpack() {
cp sys_linux/g77_gcc.conf local.conf
sed -i \
- -e "s:FCOMPL=.*:FCOMPL=\"${FORTRANC}\":g" \
+ -e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \
-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
local.conf || die "sed flags failed"
- if [[ "${FORTRANC}" = if* ]]; then
+ if [[ "$(tc-getFC)" = if* ]]; then
sed -i \
-e 's/-Wall//g' \
-e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \