Version bump. Closing bug #231171

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64

4 files changed, 120 insertions, 3 deletions

diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index dfc69bf52471..585208f0eabd 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/xfoil
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.7 2007/09/27 08:12:16 bicatali Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.8 2008/08/22 15:55:40 bicatali Exp $
+
+*xfoil-6.97 (22 Aug 2008)
+
+  22 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/xfoil-6.97-overflow.patch, +xfoil-6.97.ebuild:
+  Version bump. Closing bug #231171
 
   27 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
   -xfoil-6.94-r1.ebuild, xfoil-6.96.ebuild:
diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index c8a65a04a032..3f527837c931 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,6 +1,19 @@
+-----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 705 RMD160 552023a2b19dbe8d1ac87bea29dc53bef6747e96 SHA1 95433ba6a87d1f635b1a79017fff7e4152ae7043 SHA256 209fdabfad00c16af226be211f39c356b86770a42ed85a8a76a51550b43b5e91
 DIST dataflow.pdf 7654 RMD160 3e20242333cdab5f18b09603cd6d5df988629ea7 SHA1 cb0c3202dcc242e39c685567eb1505226cb6ffe1 SHA256 4596c77a3fa24cd334b35c34fcbd0b4f1d9055273c0862643e2d07b5e774aff5
 DIST xfoil6.96.tar.gz 2542747 RMD160 27a2878ecccfcd713e0d6331c83cbe3fffa6cc12 SHA1 314cedc50cff919411583abb430309ffa84652c8 SHA256 9961dfe028eaa7247b64c7e8bb92d3befc673d80c3a288a30bf9e8e1c5dc385e
+DIST xfoil6.97.tar.gz 3972497 RMD160 54c218c858c9e82838441e62939d4daa3ceabc29 SHA1 f91ee2ee24367ffb77b836684b999691f83cc1b4 SHA256 293e28e269bd88a62f8b6ba6bf684f16843f6776736e6b77aaa8b6bebc467a81
 EBUILD xfoil-6.96.ebuild 2318 RMD160 b28e8738f184be5ee903d301b730611471886845 SHA1 5581abe4d3a709f5dfc5528b3f4a49ee74bd54d5 SHA256 ab655b090eabe2df8e984c65ab8cb0bfb46816b397a42ea37cdbb2a872886feb
-MISC ChangeLog 2357 RMD160 f2d4c277ecd0409065fcdde81952d36f282f710a SHA1 a3b311b5420904d0c54b164a546dc997c447c516 SHA256 1142b27706f71dc5346245eb8d2151450bea5119bae648496360eae9f3aff68e
+EBUILD xfoil-6.97.ebuild 2107 RMD160 ce5ec91cd660645b9e47a1ed78f587431fc78936 SHA1 823a1e276736ee5c4128872bc0b6977bae5ce858 SHA256 444705d6ae9d2ba02c9e72387e7a654a71d0ba36d41b7d6b017304cf56f9e73f
+MISC ChangeLog 2532 RMD160 117a326c05805f90509004533a7d1eafa73407fa SHA1 1383b5c65e0a6f78b4e9f85d83ee28b0fbbb7774 SHA256 51c1b2a617a6da8cad57fbc2670e3c0506539a30b7dfdf5e967a2e31ac9b1ecc
 MISC metadata.xml 862 RMD160 e6be84075ef908c577d96b5a1ce12b77369b1dcf SHA1 702836e26377a6a8d18695ffadf9cdbb47a849c1 SHA256 9a2c764a3ce20df6baf4f48b155281d045a8e144a50627f4ab9007f13f0bd34a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiu4YgACgkQ1ycZbhPLE2BpdQCgpk83l/HkG4CelrpNr1eM3zdP
+FgEAnRnFMxZbwA9NBF1cT4RH1Nxm+kBW
+=ssRG
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
new file mode 100644
index 000000000000..d86b52a4aaa1
--- /dev/null
+++ b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
@@ -0,0 +1,22 @@
+--- src/pplot.f.orig	2008-08-21 20:21:08.000000000 +0100
++++ src/pplot.f	2008-08-21 20:21:42.000000000 +0100
+@@ -36,7 +36,7 @@
+       PROGRAM PPLOT
+       INCLUDE 'PPLOT.INC'
+ C
+-      LOGICAL ERROR, LGETFN
++      LOGICAL ERROR, LGETFN, LERR
+       REAL RINP(10)
+       REAL CPOLO(NAX,IPTOT,NPX), VPOLO(NAX,2,NPX)
+ C
+--- src/xoper.f.orig	2008-08-22 15:55:27.000000000 +0100
++++ src/xoper.f	2008-08-22 15:53:36.000000000 +0100
+@@ -114,7 +114,7 @@
+ C---- don't try to read integers, since might get integer overflow
+       DO I=1, NINPUT
+         IF(ABS(RINPUT(I)) .GT. 2.1E9) THEN
+-         IINPUT(I) = 2**31
++         IINPUT(I) = 1.99**31
+         ELSE
+          IINPUT(I) = INT(RINPUT(I))
+         ENDIF
diff --git a/sci-physics/xfoil/xfoil-6.97.ebuild b/sci-physics/xfoil/xfoil-6.97.ebuild
new file mode 100644
index 000000000000..d04d3f7e769c
--- /dev/null
+++ b/sci-physics/xfoil/xfoil-6.97.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 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.1 2008/08/22 15:55:41 bicatali Exp $
+
+inherit eutils fortran
+
+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
+	doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="doc examples"
+
+DEPEND="x11-libs/libX11"
+
+S="${WORKDIR}/Xfoil"
+FORTRAN="gfortran ifc g77"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e 's/-O3//g' \
+		plotlib/config.make || die "sed plotlib/config.make failed"
+	cat >> plotlib/config.make <<-EOF
+		FC = ${FORTRANC}
+		CFLAGS += ${CFLAGS}
+		FFLAGS += ${FFLAGS:--O2}
+	EOF
+
+	sed -i \
+		-e '/^FC/d' \
+		-e '/^FFLAGS/d' \
+		-e '/^CC/d' \
+		-e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
+		bin/Makefile orrs/bin/Makefile \
+		|| die "sed for flags and compilers failed"
+
+	# fix bug #147033
+	[[ ${FORTRANC} == 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:' \
+		orrs/src/osmap.f || die "sed osmap.f failed"
+}
+
+src_compile() {
+	cd "${S}"/orrs/bin
+	emake FLG="${FFLAGS}" FTNLIB="" OS || die "failed to build orrs"
+	cd "${S}"/orrs
+	bin/osgen osmaps_ns.lst
+	cd "${S}"/plotlib
+	emake || die "failed to build plotlib"
+	cd "${S}"/bin
+	for i in xfoil pplot pxplot; do
+		emake \
+			PLTOBJ="../plotlib/libPlt.a" \
+			CFLAGS="${CFLAGS} -DUNDERSCORE" \
+			${i} || die "failed to build ${i}"
+	done
+}
+
+src_install() {
+	dobin bin/pplot bin/pxplot bin/xfoil || die "dobin failed"
+	insinto /usr/share/xfoil/orrs
+	doins orrs/osm*.dat || die "orrs data install failed"
+	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"; }
+}