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

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 28 insertions, 22 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/Manifest b/sci-physics/xfoil/Manifest
index 8060d727e0a4..1f01b543a26a 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -5,13 +5,14 @@ AUX xfoil-6.96-gfortran.patch 993 SHA256 807615a09ce1324da1bb04a30bfaa552aac2042
 AUX xfoil-6.97-overflow.patch 704 SHA256 e5241bba1c8249db3bec34960078fba123d56e00734a36bd24e231f9ce34ee64 SHA512 2c13ef4dc21e6e81ce734296124bfbaa83e25d8ca283866f4436c86644b5a970992a3f0679cff89fff29c1722ecca13537cecca6b42b09d5191d74bf7eadbbcb WHIRLPOOL 0086a7ddf6187ec4a2048a4e9e92ff677a597f5f6811544dfbdf09b11b0a0ca9dd4e455ae3f719a11bccd1713e7c188828eabfc9c8ef4912cb3cfe8fcc2cfafd
 DIST dataflow.pdf 7654 SHA256 4596c77a3fa24cd334b35c34fcbd0b4f1d9055273c0862643e2d07b5e774aff5
 DIST xfoil6.97.tar.gz 3972497 SHA256 293e28e269bd88a62f8b6ba6bf684f16843f6776736e6b77aaa8b6bebc467a81 SHA512 02c0a123fb99fa20de1e3577ca7c6ce00d494058f2ef3ec82e3fdea48901f4346180aea3436e001c5b90401007ccdd5b7e9daa6a96794f0d6b5781a5b36e36e7 WHIRLPOOL 3de5e6c56a906a71b2be1fcf39ea031454c9192b4a649a23aaa889566fea2e92b37239fa6ed90c4b050bdb5759943d0265881f316ecd5b48a06fe4217af36ef7
-EBUILD xfoil-6.97.ebuild 1847 SHA256 4c4ed337aea82a4f1ec516061a328b22b7b2b428a526cc06900087f462e70814 SHA512 fee0edc741c28c17fa514e0ca6e523420eac11feca7654393c8a9eddc97a7c7a8e20a2ef9adeed5bc69fda0c747772b46f73e59e7e26367a37272f97941a3aee WHIRLPOOL ee88bccfc7cd5106b6f29a3aff2a60a02c5bee2ccfcae38edc1f7a8ddbe10869e6e5a48ca80ad42c5d89ed78b71774a948c367208a85c5971a150672cf2f0f46
-MISC ChangeLog 3582 SHA256 eb161d8d1266a9e7b6d61eb8c2c915d4af0e258bbcd3a158da7e15036f1df13b SHA512 70272b4fecef8eb2ba6fe4c2b24072c04d70180e32a59b1c9c2e76b32b2b6e4d2dbd972012ddd7eb9021ab3a15c02dedf0bce944587e99d90a6e8ac7b695d416 WHIRLPOOL 4c1d05387f9eb0f39bf36d58e9f9cdaec8f13059f98ac88b0d6b3ea18b664fda8e6d81e474a1f5d6b0bfe1ad1d2a8fc12285daf26bee3cb6502dbcf2a808479b
-MISC metadata.xml 866 SHA256 ced1c3fd7ee75c088d368095951dd062a96281ed54b1edcee1573c8f8fea9361 SHA512 1021723774e4327176f735482130d76967e4b9ae011b94e39e5ff62c306b0beb05a16f30f67940c9c58b3a3566cd0c49a0286fefdf931ed55a126942d134e73f WHIRLPOOL 40020dbcb2e2a9f974e72f4f0d59fc21be812684a3ec5818e67c2c34fc8c558d0ab0a629eab3034d941d607a4521708e4fa72e136272886665589790ad0998b9
+EBUILD xfoil-6.97.ebuild 1787 SHA256 5afcc1484c52348604b2a5530d1bc8d6e8ed47d2f4cbb1fa05b2ed0415a9b90b SHA512 79b40aed69e5d740bd16132984a1f11336333a3fddfb59dd48d231fad60c3327a89c2166d9c615b4e35e2f5e66c63774569c3528bc2a3a160f2b6948bcd981a9 WHIRLPOOL 4c713002ee5cf383732a8edfc9e7dddc8a8447cac9ea0aabd58d3d45775edf02137cb64d3ad7c4f10b6d04c479f52e1b04a137fe7ed14e38fa8cc4a70bc03cff
+MISC ChangeLog 3764 SHA256 dd6f4885236409f0c33989b483444cdde05c93d57785fc16478211d4c90ce1b9 SHA512 970115eff91fdbc7c7b1953156b53468f7334694441a379d79fc4abd52aa88570fd18683561fdbdabaa3a08cc3bd2ab3fc8219774437e0accaa4522dd1643bee WHIRLPOOL 5ddab93da3802fb49140474d87319f4d5af0b340110e9d4ccdcc70fab0bae03e2c5a2c603f06ce6b6c3aed6edede66c76693cea3797bf06ea4ac8b827a664b8e
+MISC metadata.xml 870 SHA256 f2f79d086fc9169cc2f4bb4a540511c740c9c56651b2bf78457c3eb392fd1bf6 SHA512 6a50a1aae1548d724fe23e8866ad4be4f129cb143a6a37d66e2026c9ac5b0e55a4e8e9a7ffe9c02350f89c483b20a58d2a2543b53a2639b1eb1e3253ea8ee40a WHIRLPOOL d2258df4bafe2abcbfb9ec593ab8e48f7f223e927609e04ab670ed838e4f1f150ae9b19be6cad765bd8e6584fe0cde4182ef20bfdcfce1043205b7c29a457e96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAh+swACgkQ1ycZbhPLE2CUQACeN2kOlU/D696zK+AR6iVbV5t4
-xv8AoI4catDTDAKYqQkBOARPoKEUoTVQ
-=dhGa
+iEYEAREIAAYFAlB9rHkACgkQgAnW8HDreRaP6QCfUXhoSrSEqrbeJYgc5d5EATiG
+P5UAn1xvSWS5oh6w6OWXDn7L2NVygNcS
+=iSI5
 -----END PGP SIGNATURE-----
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