Fixed patch for overflow, thanks to Joel Soete

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 11 insertions, 84 deletions

diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index d795262e0b11..98502878c57f 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2008/08/23 11:43:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.10 2008/11/24 15:47:11 bicatali Exp $
+
+  24 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/xfoil-6.97-overflow.patch, -xfoil-6.96.ebuild:
+  Fixed patch for overflow, thanks to Joel Soete
 
   23 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org> xfoil-6.97.ebuild:
   Fixed for propagation with fortran compilers and flags, bug #235501
diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index 6e775623f0a6..3e7f198b4a23 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -2,18 +2,16 @@
 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
+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.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
 EBUILD xfoil-6.97.ebuild 2039 RMD160 f62ad9c34caa1c005584488e94fb2969e55c2ee5 SHA1 7f161450304f948b4566767bb28d9c4538e5707f SHA256 6dd5c2681dbf219ed9592d4d8a94d3f1fcfdf2539ecbc7ad90685951ae9eb1a9
-MISC ChangeLog 2677 RMD160 8af1b1729fd0096a04b73f0ee1d2f3be09b58295 SHA1 6205926c5238d946b1ee95759e37867aacfd9220 SHA256 b14922660b50c0284b5f39b44973c675af44f90c750fc26d72d45a546f8c2a10
+MISC ChangeLog 2838 RMD160 035b3f22acf58427c18e2e02544670f51bde432e SHA1 05775da22c090f0bb39400733bbd2e4d6bcc5c3f SHA256 1bc7d0d2eb315c4456aa41e4d132d2d54edfdac7c1ad213b440d2c71097d2fc6
 MISC metadata.xml 862 RMD160 e6be84075ef908c577d96b5a1ce12b77369b1dcf SHA1 702836e26377a6a8d18695ffadf9cdbb47a849c1 SHA256 9a2c764a3ce20df6baf4f48b155281d045a8e144a50627f4ab9007f13f0bd34a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiv9/gACgkQ1ycZbhPLE2DpvQCfR3mbIWujq3plDzRHW4aOkJon
-3TAAoKwNdvwKwZgbTr+wexaEkK2hmJ33
-=sDDI
+iEYEARECAAYFAkkqzJQACgkQ1ycZbhPLE2DpagCgiSrlZ3oMF2IdSwivKVbu+4aA
+DB0An0S6uXmEdUElo4bJOq72c1+djVyi
+=nkyW
 -----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
index d86b52a4aaa1..73656f927a48 100644
--- a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
+++ b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
@@ -16,7 +16,7 @@
        DO I=1, NINPUT
          IF(ABS(RINPUT(I)) .GT. 2.1E9) THEN
 -         IINPUT(I) = 2**31
-+         IINPUT(I) = 1.99**31
++         IINPUT(I) = HUGE(0)
          ELSE
           IINPUT(I) = INT(RINPUT(I))
          ENDIF
diff --git a/sci-physics/xfoil/xfoil-6.96.ebuild b/sci-physics/xfoil/xfoil-6.96.ebuild
deleted file mode 100644
index 579a8f4aeaaa..000000000000
--- a/sci-physics/xfoil/xfoil-6.96.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.96.ebuild,v 1.3 2007/09/27 08:12:16 bicatali Exp $
-
-inherit toolchain-funcs 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"
-
-RESTRICT="test"
-
-S="${WORKDIR}/Xfoil"
-
-FORTRAN="gfortran ifc g77"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -e 's/-O3//g' -i plotlib/config.make || die "sed plotlib/config.make failed"
-	echo "CC = $(tc-getCC)" >> plotlib/config.make
-	echo "FC = ${FORTRANC}" >> plotlib/config.make
-	echo "CFLAGS += ${CFLAGS}" >> plotlib/config.make
-	echo "FFLAGS += ${FFLAGS:--O2}" >> plotlib/config.make
-
-	sed -i \
-		-e "s/^\(FC.*\)/FC = ${FORTRANC}/g" \
-		-e "s/^\(CC.*\)/CC = $(tc-getCC)/g" \
-		-e "s/^\(FFLAGS .*\)/FFLAGS = ${FFLAGS}/g" \
-		-e "s/^\(FFLOPT .*\)/FFLOPT = \$(FFLAGS)/g" \
-		-e "s/^\(FFLAGS2 .*\)/FFLAGS2 = \$(FFLAGS)/g" \
-		bin/Makefile orrs/bin/Makefile \
-		|| die "sed for flags and compilers failed"
-
-	# fix bug #147033
-	[[ ${FORTRANC} == gfortran ]] && epatch "${FILESDIR}"/${P}-gfortran.patch
-
-	# make everything double precision
-	sed -i \
-		-e 's:/var/local/codes/orrs/osmap.dat:/usr/share/xfoil/orrs/osmap.dat:' \
-		-e 's:REAL*4:REAL:g' \
-		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 DP="" || die "failed to build plotlib"
-	cd "${S}"/bin
-	for i in xfoil pplot pxplot; do
-		emake 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"; }
-}