sci-physics/xfoil: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

(Portage version: 2.2.0_alpha138/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 21 insertions, 16 deletions

diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index 097e40c95ee5..2454b61ea8c6 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/xfoil
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.17 2012/08/08 05:36:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.18 2012/10/16 18:50:32 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> xfoil-6.97.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   08 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
   xfoil-6.97.ebuild:
diff --git a/sci-physics/xfoil/metadata.xml b/sci-physics/xfoil/metadata.xml
index 7a6116831268..c6130c99cea3 100644
--- a/sci-physics/xfoil/metadata.xml
+++ b/sci-physics/xfoil/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<herd>sci-physics</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
   XFOIL is an interactive program for the design and analysis of subsonic isolated airfoils.
   It consists of a collection of menu-driven routines which perform various useful functions such as:
     * Viscous (or inviscid) analysis of an existing airfoil
diff --git a/sci-physics/xfoil/xfoil-6.97.ebuild b/sci-physics/xfoil/xfoil-6.97.ebuild
index 4f250a3939a7..72b533885a1a 100644
--- a/sci-physics/xfoil/xfoil-6.97.ebuild
+++ b/sci-physics/xfoil/xfoil-6.97.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2012 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.9 2012/08/08 05:36:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.97.ebuild,v 1.10 2012/10/16 18:50:32 jlec Exp $
 
 EAPI=4
+
 inherit eutils fortran-2
 
 DESCRIPTION="Design and analysis of subsonic isolated airfoils"
 HOMEPAGE="http://raphael.mit.edu/xfoil/"
-SRC_URI="http://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tar.gz
+SRC_URI="
+	http://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tar.gz
 	doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
 
 LICENSE="GPL-2"
@@ -15,34 +17,33 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="
-	virtual/fortran
-x11-libs/libX11"
+RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/Xfoil"
 
 src_prepare() {
-	sed -i \
+	sed \
 		-e '/^FC/d' \
 		-e '/^CC/d' \
 		-e '/^FFLAGS/d' \
 		-e '/^CFLAGS/d' \
 		-e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
-		{bin,plotlib,orrs/bin}/Makefile plotlib/config.make \
+		-i {bin,plotlib,orrs/bin}/Makefile plotlib/config.make \
 		|| die "sed for flags and compilers failed"
 
 	# fix bug #147033
 	[[ $(tc-getFC) == *gfortran ]] && \
 		epatch "${FILESDIR}"/${PN}-6.96-gfortran.patch
+
 	epatch "${FILESDIR}"/${P}-overflow.patch
-	sed -i \
+
+	sed \
 		-e "s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
-		orrs/src/osmap.f || die "sed osmap.f failed"
+		-i orrs/src/osmap.f || die "sed osmap.f failed"
 }
 
 src_compile() {
-	export FC="$(tc-getFC)" F77="$(tc-getF77)"
 	cd "${S}"/orrs/bin
 	emake FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS
 	cd "${S}"/orrs