Remove fortran eclass use, switched to EAPI3

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 28 insertions, 16 deletions

diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index b049f90b302d..ebc7f23d77e5 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-physics/xfoil
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.13 2008/12/20 14:53:29 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.14 2010/07/16 21:56:01 bicatali Exp $
+
+  16 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> xfoil-6.97.ebuild:
+  Remove fortran eclass use, switched to EAPI3
 
   20 Dec 2008; nixnut <nixnut@gentoo.org> xfoil-6.97.ebuild:
   Stable on ppc wrt bug 250370
diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index b4bd31c905e4..9faa34413de8 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xfoil-6.96-gfortran.patch 993 RMD160 7baec31ed66d527120bed0047a2efba3a4083565 SHA1 7968cf64c3dba19e212b40bc771de0ba68b289a8 SHA256 807615a09ce1324da1bb04a30bfaa552aac2042c5dc6468ad3637c2335560a77
 AUX xfoil-6.97-overflow.patch 704 RMD160 8569992d73fb1a6b4dcd64d2769551a508490286 SHA1 b0feb036e88955e5997c176ef4822c202348b688 SHA256 e5241bba1c8249db3bec34960078fba123d56e00734a36bd24e231f9ce34ee64
 DIST dataflow.pdf 7654 RMD160 3e20242333cdab5f18b09603cd6d5df988629ea7 SHA1 cb0c3202dcc242e39c685567eb1505226cb6ffe1 SHA256 4596c77a3fa24cd334b35c34fcbd0b4f1d9055273c0862643e2d07b5e774aff5
 DIST xfoil6.97.tar.gz 3972497 RMD160 54c218c858c9e82838441e62939d4daa3ceabc29 SHA1 f91ee2ee24367ffb77b836684b999691f83cc1b4 SHA256 293e28e269bd88a62f8b6ba6bf684f16843f6776736e6b77aaa8b6bebc467a81
-EBUILD xfoil-6.97.ebuild 2053 RMD160 39f212e794430bd8408bc94f2bbf4f1a336a491d SHA1 290cff9a7f4eb3145b35d4dab7c0d960cc6d7894 SHA256 1baf863ce54f10205ad6134f1cae0f68738bbf8f5784aed481bc43a523d2dd52
-MISC ChangeLog 3132 RMD160 614652e3325201e3ea59603292ba0996fe657c47 SHA1 edb6533d256fd97f1a1ee6bda68d074457eebb16 SHA256 74f7e118f6b79cde4443c1dfffcb8d113b68367466920b55bf5ab496d398b9f4
+EBUILD xfoil-6.97.ebuild 2004 RMD160 9b6ee7556a4a6332debd54a62d5b5e49be48a975 SHA1 892e27632a23331b44e4c1be9c87e6c399c58a1a SHA256 c3ee930cee4b4d91f25e91ecc8cd87ca343e794fc51f1833481d01ea91314865
+MISC ChangeLog 3256 RMD160 73d1456b59ca90f0c99dc6dcccd33b59e35275bf SHA1 c5ac7bbe2706db51076e76a5ed11c656e19e4e7b SHA256 f1eb37607322afdae3b057398743ffc31dd074d501824dde5520798bdd8e21ed
 MISC metadata.xml 862 RMD160 e6be84075ef908c577d96b5a1ce12b77369b1dcf SHA1 702836e26377a6a8d18695ffadf9cdbb47a849c1 SHA256 9a2c764a3ce20df6baf4f48b155281d045a8e144a50627f4ab9007f13f0bd34a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxA1XoACgkQ1ycZbhPLE2BiSwCgmEr7haCSneeCtUzCi3coGbm2
+nYcAn1Axc+R8KERkg99pQ0six865Enan
+=cMSU
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/xfoil/xfoil-6.97.ebuild b/sci-physics/xfoil/xfoil-6.97.ebuild
index f298b00995f6..0370b7cf2af5 100644
--- a/sci-physics/xfoil/xfoil-6.97.ebuild
+++ b/sci-physics/xfoil/xfoil-6.97.ebuild
@@ -1,8 +1,9 @@
-# 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-physics/xfoil/xfoil-6.97.ebuild,v 1.5 2008/12/20 14:53:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.97.ebuild,v 1.6 2010/07/16 21:56:01 bicatali Exp $
 
-inherit eutils fortran
+EAPI=3
+inherit eutils
 
 DESCRIPTION="Design and analysis of subsonic isolated airfoils"
 HOMEPAGE="http://raphael.mit.edu/xfoil/"
@@ -14,14 +15,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc examples"
 
-DEPEND="x11-libs/libX11"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/Xfoil"
-FORTRAN="gfortran ifc g77"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e '/^FC/d' \
 		-e '/^CC/d' \
@@ -32,16 +31,16 @@ src_unpack() {
 		|| die "sed for flags and compilers failed"
 
 	# fix bug #147033
-	[[ ${FORTRANC} == gfortran ]] && \
+	[[ $(tc-getFC) == *gfortran ]] && \
 		epatch "${FILESDIR}"/${PN}-6.96-gfortran.patch
 	epatch "${FILESDIR}"/${P}-overflow.patch
 	sed -i \
-		-e 's:/var/local/codes/orrs/osmap.dat:/usr/share/xfoil/orrs/osmap.dat:' \
+		-e "s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
 		orrs/src/osmap.f || die "sed osmap.f failed"
 }
 
 src_compile() {
-	export FC="${FORTRANC}" F77="${FORTRANC}"
+	export FC="$(tc-getFC)" F77="$(tc-getF77)"
 	cd "${S}"/orrs/bin
 	emake FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS || die "failed to build orrs"
 	cd "${S}"/orrs
@@ -65,5 +64,5 @@ src_install() {
 	dodoc *.txt README || die "dodoc failed"
 	insinto /usr/share/doc/${PF}/
 	use examples && { doins -r runs || die "examples install failed"; }
-	use doc && { doins "${DISTDIR}"/dataflow.pdf || die "doc install failed"; }
+	use doc && dodoc "${DISTDIR}"/dataflow.pdf
 }