[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/

2024-04-10 Thread Guilherme Amadio 
commit: 8029cc3cdcc002d98e46cced54851893ffa3f19c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Mar 30 20:27:54 2024 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Thu Apr 11 06:04:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8029cc3c

sci-physics/xfoil: EAPI8 bump, fix bug #820623, #725718

Closes: https://bugs.gentoo.org/820623
Closes: https://bugs.gentoo.org/725718
Closes: https://github.com/gentoo/gentoo/pull/36004

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Guilherme Amadio  gentoo.org>

 .../{xfoil-6.99.ebuild => xfoil-6.99-r1.ebuild}| 24 ++
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild 
b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
similarity index 78%
rename from sci-physics/xfoil/xfoil-6.99.ebuild
rename to sci-physics/xfoil/xfoil-6.99-r1.ebuild
index 36047f4e3d56..23bffe5c71d6 100644
--- a/sci-physics/xfoil/xfoil-6.99.ebuild
+++ b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Design and analysis of subsonic isolated airfoils"
-HOMEPAGE="http://raphael.mit.edu/xfoil/";
+HOMEPAGE="https://web.mit.edu/drela/Public/web/xfoil/";
 SRC_URI="
-   http://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tgz
-   doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
+   https://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tgz
+   doc? ( https://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
+S="${WORKDIR}/${PN^}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
@@ -21,8 +22,6 @@ DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
 
-S="${WORKDIR}/${PN^}"
-
 src_prepare() {
# fix bug #147033
[[ $(tc-getFC) == *gfortran ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-6.96-gfortran.patch )
@@ -52,7 +51,11 @@ src_compile() {
pushd orrs >/dev/null || die
bin/osgen osmaps_ns.lst || die
popd >/dev/null || die
-   emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE"
+   emake -C plotlib \
+   CFLAGS="${CFLAGS} -DUNDERSCORE" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR) r" \
+   RANLIB="$(tc-getRANLIB)"
 
local i
for i in blu pplot pxplot xfoil; do
@@ -60,6 +63,9 @@ src_compile() {
PLTOBJ="../plotlib/libPlt_gSP.a" \
CFLAGS="${CFLAGS} -DUNDERSCORE" \
FTNLIB="${LDFLAGS}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR) r" \
+   RANLIB="$(tc-getRANLIB)" \
$i
done
 }

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/, sci-physics/xfoil/files/

2024-04-10 Thread Guilherme Amadio 
commit: 2a5e31933be5976e472cddcf73f65ecf4cb4b308
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Thu Apr 11 06:06:20 2024 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Thu Apr 11 06:06:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5e3193

sci-physics/xfoil: fix bug 771615

Closes: https://bugs.gentoo.org/771615

Signed-off-by: Guilherme Amadio  gentoo.org>

 sci-physics/xfoil/files/xfoil-6.99-ldflags.patch | 12 
 sci-physics/xfoil/xfoil-6.99-r1.ebuild   |  5 -
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sci-physics/xfoil/files/xfoil-6.99-ldflags.patch 
b/sci-physics/xfoil/files/xfoil-6.99-ldflags.patch
new file mode 100644
index ..4667a891d8a7
--- /dev/null
+++ b/sci-physics/xfoil/files/xfoil-6.99-ldflags.patch
@@ -0,0 +1,12 @@
+Fix bug #771615
+
+--- a/bin/Makefile 2024-04-11 08:00:24.832420892 +0200
 b/bin/Makefile 2024-04-11 07:59:56.052410291 +0200
+@@ -152,7 +152,7 @@
+   $(INSTALLCMD) pplot $(BINDIR)
+
+ blu: blu.o profil.o
+-  $(FC) -o blu blu.o profil.o
++  $(FC) -o blu blu.o profil.o $(FTNLIB)
+   $(INSTALLCMD) blu $(BINDIR)
+

diff --git a/sci-physics/xfoil/xfoil-6.99-r1.ebuild 
b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
index 23bffe5c71d6..9628062e61ee 100644
--- a/sci-physics/xfoil/xfoil-6.99-r1.ebuild
+++ b/sci-physics/xfoil/xfoil-6.99-r1.ebuild
@@ -20,7 +20,10 @@ IUSE="doc examples"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-overflow.patch
+   "${FILESDIR}"/${P}-ldflags.patch
+)
 
 src_prepare() {
# fix bug #147033

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/

2021-02-19 Thread Sam James 
commit: 56b74153c2b5838bac693d99e1805f32a8bac9e5
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 13:09:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 13:09:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b74153

sci-physics/xfoil: workaround gcc 10 (fortran) failure

Closes: https://bugs.gentoo.org/722194
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-physics/xfoil/xfoil-6.99.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild 
b/sci-physics/xfoil/xfoil-6.99.ebuild
index 8826b940814..36047f4e3d5 100644
--- a/sci-physics/xfoil/xfoil-6.99.ebuild
+++ b/sci-physics/xfoil/xfoil-6.99.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fortran-2 toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Design and analysis of subsonic isolated airfoils"
 HOMEPAGE="http://raphael.mit.edu/xfoil/";
@@ -28,6 +28,10 @@ src_prepare() {
[[ $(tc-getFC) == *gfortran ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-6.96-gfortran.patch )
default
 
+   # GCC 10 workaround
+   # bug #722194
+   append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
sed \
-e '/^FC/d' \
-e '/^CC/d' \

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/files/, sci-physics/xfoil/

2021-01-20 Thread David Seifert 
commit: 121646ae68841dc1d981dc4c041820b99ae2c48f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Jan 20 10:16:14 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan 20 10:16:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121646ae

sci-physics/xfoil: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-physics/xfoil/Manifest|  1 -
 sci-physics/xfoil/files/xfoil-6.97-overflow.patch | 22 ---
 sci-physics/xfoil/xfoil-6.97-r1.ebuild| 74 ---
 3 files changed, 97 deletions(-)

diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index f8c066ff8e4..b4810f7f096 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,3 +1,2 @@
 DIST dataflow.pdf 7654 BLAKE2B 
67871007f6d2d72fe89c0f3bfcd7027d08ad8d064a0426c2947c5e41d6a31049973dd8b586ca0dd482def6745023c337157a77dbf35b541a5f3a8295f0162b03
 SHA512 
1bb5be8e70fca1fa90f28d214140e96a8795c7d82a37f4fe4d68606fa3eb28252913b8fb13eb3e97a3cf05c3001c88dbfcdb8a2f20d4baed5e730770a2d602b1
-DIST xfoil6.97.tar.gz 3972497 BLAKE2B 
25c50621bb76cec5463f05ca975b97b52688408cc8111e464fc89fd6bf1ab3f66b43798d89aa68c4a2ef4ffb049801e5930b45b520c0afeabfb8d89efd486536
 SHA512 
02c0a123fb99fa20de1e3577ca7c6ce00d494058f2ef3ec82e3fdea48901f4346180aea3436e001c5b90401007ccdd5b7e9daa6a96794f0d6b5781a5b36e36e7
 DIST xfoil6.99.tgz 4515991 BLAKE2B 
a96dc534a0ceff116970a22b9e267705065076f1561052334c4706d7d6d2d750ad75954fb9af843ef50ca5e8ab8cfd4c8e5d873f9f36b6337fe3381604cb2d37
 SHA512 
6f5bed520826dba2efd1b191b1f90dd810b53d9041cbbaddde09207ba9042f99dd0c9e9aa8b8cdf48767bf2695e328ac8fbd297e1510e53ac10b0f1eea35cfef

diff --git a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch 
b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
deleted file mode 100644
index 6f71440f050..000
--- a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/src/pplot.f
-+++ b/src/pplot.f
-@@ -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
 a/src/xoper.f
-+++ b/src/xoper.f
-@@ -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) = HUGE(0)
- ELSE
-  IINPUT(I) = INT(RINPUT(I))
- ENDIF

diff --git a/sci-physics/xfoil/xfoil-6.97-r1.ebuild 
b/sci-physics/xfoil/xfoil-6.97-r1.ebuild
deleted file mode 100644
index 80e95dc414c..000
--- a/sci-physics/xfoil/xfoil-6.97-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fortran-2 toolchain-funcs
-
-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="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
-
-S="${WORKDIR}/${PN^}"
-
-src_prepare() {
-   # fix bug #147033
-   [[ $(tc-getFC) == *gfortran ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-6.96-gfortran.patch )
-   default
-
-   sed \
-   -e '/^FC/d' \
-   -e '/^CC/d' \
-   -e '/^FFLAGS/d' \
-   -e '/^CFLAGS/d' \
-   -e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
-   -i {bin,plotlib,orrs/bin}/Makefile plotlib/config.make \
-   || die "sed for flags and compilers failed"
-
-   sed \
-   -e 
"s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
-   -i orrs/src/osmap.f || die "sed osmap.f failed"
-}
-
-src_compile() {
-   emake -C orrs/bin FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS
-   pushd orrs >/dev/null || die
-   bin/osgen osmaps_ns.lst
-   popd >/dev/null || die
-   emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE"
-
-   local i
-   for i in xfoil pplot pxplot; do
-   emake -C bin \
-   PLTOBJ="../plotlib/libPlt.a" \
-   CFLAGS="${CFLAGS} -DUNDERSCORE" \
-   FTNLIB="${LDFLAGS}" \
-   $i
-   done
-}
-
-src_install() {
-   dobin bin/{pplot,pxplot,xfoil}
-   insinto /usr/share/xfoil/orrs
-   doins orrs/osm*.dat
-
-   local DOCS=( *.txt README )
-   use doc && DOCS+=( "${DISTDIR}"/dataflow.pdf )
-   einstalldocs
-   if use examples; then
-   dodoc -r runs
-   docompress -x /usr/s

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/

2020-02-13 Thread David Seifert 
commit: d7dc87cddcbce8cfc93f34ac8176b123e9a50aa5
Author: David Seifert  gentoo  org>
AuthorDate: Thu Feb 13 21:38:50 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Feb 13 21:38:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7dc87cd

sci-physics/xfoil: [QA] inherit toolchain-funcs.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sci-physics/xfoil/xfoil-6.97-r1.ebuild | 4 ++--
 sci-physics/xfoil/xfoil-6.99.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/xfoil/xfoil-6.97-r1.ebuild 
b/sci-physics/xfoil/xfoil-6.97-r1.ebuild
index 4582882797f..80e95dc414c 100644
--- a/sci-physics/xfoil/xfoil-6.97-r1.ebuild
+++ b/sci-physics/xfoil/xfoil-6.97-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fortran-2
+inherit fortran-2 toolchain-funcs
 
 DESCRIPTION="Design and analysis of subsonic isolated airfoils"
 HOMEPAGE="http://raphael.mit.edu/xfoil/";

diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild 
b/sci-physics/xfoil/xfoil-6.99.ebuild
index ab0b383ef99..8826b940814 100644
--- a/sci-physics/xfoil/xfoil-6.99.ebuild
+++ b/sci-physics/xfoil/xfoil-6.99.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fortran-2
+inherit fortran-2 toolchain-funcs
 
 DESCRIPTION="Design and analysis of subsonic isolated airfoils"
 HOMEPAGE="http://raphael.mit.edu/xfoil/";

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/

2017-11-25 Thread David Seifert 
commit: 269f664086ee02eeb8843d43323b02dda05c8d6d
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 25 16:53:20 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 25 17:41:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=269f6640

sci-physics/xfoil: [QA] Consistent whitespace in metadata.xml

 sci-physics/xfoil/metadata.xml | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sci-physics/xfoil/metadata.xml b/sci-physics/xfoil/metadata.xml
index d754bd62132..4999b0416e2 100644
--- a/sci-physics/xfoil/metadata.xml
+++ b/sci-physics/xfoil/metadata.xml
@@ -9,13 +9,13 @@
Gentoo Physics Project


-  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
-* Airfoil design and redesign by interactive modification of surface speed 
distributions
-* Airfoil redesign by interactive modification of geometric parameters
-* Blending of airfoils
-* Writing and reading of airfoil coordinates and polar save files
-* Plotting of geometry, pressure distributions, and multiple polars
-
+   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
+   * Airfoil design and redesign by interactive modification of 
surface speed distributions
+   * Airfoil redesign by interactive modification of geometric 
parameters
+   * Blending of airfoils
+   * Writing and reading of airfoil coordinates and polar save 
files
+   * Plotting of geometry, pressure distributions, and multiple 
polars
+

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/

2017-03-05 Thread Andrew Savchenko 
commit: 0219e43ce9dac83b175116bef843cf480a70c143
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Mar  5 21:28:10 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Mar  5 21:28:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0219e43c

sci-physics/xfoil: remove damn Id

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/xfoil/xfoil-6.99.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild 
b/sci-physics/xfoil/xfoil-6.99.ebuild
index f50b8bace44..ab0b383ef99 100644
--- a/sci-physics/xfoil/xfoil-6.99.ebuild
+++ b/sci-physics/xfoil/xfoil-6.99.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/, sci-physics/xfoil/files/

2017-03-05 Thread Andrew Savchenko 
commit: 3d656adb54ef2b718e3b14d720ff78ebae5af7d5
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Mar  5 21:23:43 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Mar  5 21:23:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d656adb

sci-physics/xfoil: version bump

Bug: 556688

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/xfoil/Manifest|  1 +
 sci-physics/xfoil/files/xfoil-6.99-overflow.patch | 11 
 sci-physics/xfoil/xfoil-6.99.ebuild   | 76 +++
 3 files changed, 88 insertions(+)

diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index 75de844ff4e..8d653871e2a 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,2 +1,3 @@
 DIST dataflow.pdf 7654 SHA256 
4596c77a3fa24cd334b35c34fcbd0b4f1d9055273c0862643e2d07b5e774aff5 SHA512 
1bb5be8e70fca1fa90f28d214140e96a8795c7d82a37f4fe4d68606fa3eb28252913b8fb13eb3e97a3cf05c3001c88dbfcdb8a2f20d4baed5e730770a2d602b1
 WHIRLPOOL 
8e13137933ae0e8edc2890ccdd0537444d5fa9530e76caefb3701173c7720d2cb68d9073b70e7948a11ed6668dcd64b3685c750f5cef889c31d1506d3788a530
 DIST xfoil6.97.tar.gz 3972497 SHA256 
293e28e269bd88a62f8b6ba6bf684f16843f6776736e6b77aaa8b6bebc467a81 SHA512 
02c0a123fb99fa20de1e3577ca7c6ce00d494058f2ef3ec82e3fdea48901f4346180aea3436e001c5b90401007ccdd5b7e9daa6a96794f0d6b5781a5b36e36e7
 WHIRLPOOL 
3de5e6c56a906a71b2be1fcf39ea031454c9192b4a649a23aaa889566fea2e92b37239fa6ed90c4b050bdb5759943d0265881f316ecd5b48a06fe4217af36ef7
+DIST xfoil6.99.tgz 4515991 SHA256 
5c0250643f52ce0e75d7338ae2504ce7907f2d49a30f921826717b8ac12ebe40 SHA512 
6f5bed520826dba2efd1b191b1f90dd810b53d9041cbbaddde09207ba9042f99dd0c9e9aa8b8cdf48767bf2695e328ac8fbd297e1510e53ac10b0f1eea35cfef
 WHIRLPOOL 
88ca7c92fb1335f416577dc7df67e22581a32b56affb234f440b9523122429ad7ad37455e3270461909b0eb3d181013daa3db0e869086e218e2eaf5bf5f4e3ce

diff --git a/sci-physics/xfoil/files/xfoil-6.99-overflow.patch 
b/sci-physics/xfoil/files/xfoil-6.99-overflow.patch
new file mode 100644
index 000..d35528caa08
--- /dev/null
+++ b/sci-physics/xfoil/files/xfoil-6.99-overflow.patch
@@ -0,0 +1,11 @@
+--- Xfoil/src/xoper.f.orig 2013-12-08 22:21:22.0 +0400
 Xfoil/src/xoper.f  2017-03-05 23:02:33.214895357 +0300
+@@ -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**30
++ IINPUT(I) = HUGE(0)
+ ELSE
+  IINPUT(I) = INT(RINPUT(I))
+ ENDIF

diff --git a/sci-physics/xfoil/xfoil-6.99.ebuild 
b/sci-physics/xfoil/xfoil-6.99.ebuild
new file mode 100644
index 000..f50b8bace44
--- /dev/null
+++ b/sci-physics/xfoil/xfoil-6.99.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit 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}.tgz
+   doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
+
+S="${WORKDIR}/${PN^}"
+
+src_prepare() {
+   # fix bug #147033
+   [[ $(tc-getFC) == *gfortran ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-6.96-gfortran.patch )
+   default
+
+   sed \
+   -e '/^FC/d' \
+   -e '/^CC/d' \
+   -e '/^FFLAGS/d' \
+   -e '/^CFLAGS/d' \
+   -e '/INSTALLCMD/d' \
+   -e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
+   -i {bin,plotlib,orrs/bin}/Makefile plotlib/config.make \
+   || die "sed for flags and compilers failed"
+
+   sed \
+   -e 
"s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
+   -i orrs/src/osmap.f || die "sed osmap.f failed"
+}
+
+src_compile() {
+   emake -C orrs/bin FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS
+   pushd orrs >/dev/null || die
+   bin/osgen osmaps_ns.lst || die
+   popd >/dev/null || die
+   emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE"
+
+   local i
+   for i in blu pplot pxplot xfoil; do
+   emake -C bin \
+   PLTOBJ="../plotlib/libPlt_gSP.a" \
+   CFLAGS="${CFLAGS} -DUNDERSCORE" \
+   FTNLIB="${LDFLAGS}" \
+   $i
+   done
+}
+
+src_install() {
+   dobin bin/{blu,pplot,pxplot,xfoil}
+   insinto /usr/share/xfoil/orrs
+   doins orrs/osm*.dat
+
+   local DOCS=( *.txt README )
+   use doc && DOCS+=( "${DISTDIR}"/dataflow.pdf

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/, sci-physics/xfoil/files/

2016-11-13 Thread David Seifert 
commit: 0901cd7e3583035b2ec33cde89b4bdcd4c0bdb40
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Sat Nov 12 15:44:25 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 13 21:48:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0901cd7e

sci-physics/xfoil: EAPI bump 4 -> 6

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2826

Signed-off-by: David Seifert  gentoo.org>

 sci-physics/xfoil/files/xfoil-6.96-gfortran.patch |  4 +-
 sci-physics/xfoil/files/xfoil-6.97-overflow.patch |  8 +--
 sci-physics/xfoil/xfoil-6.97-r1.ebuild| 75 +++
 3 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch 
b/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch
index 67fc19c..b63db05 100644
--- a/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch
+++ b/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch
@@ -1,5 +1,5 @@
 plotlib/ps_subs.f.orig 2004-08-21 19:02:44.0 +0100
-+++ plotlib/ps_subs.f  2007-05-03 19:14:28.901490750 +0100
+--- a/plotlib/ps_subs.f
 b/plotlib/ps_subs.f
 @@ -559,7 +559,7 @@
  c   in the iout array (3,1,3,1,3,1,3,1)
  c Note: the bit mask is shifted to always start counting on a '1' bit.

diff --git a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch 
b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
index 73656f9..6f71440 100644
--- a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
+++ b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch
@@ -1,5 +1,5 @@
 src/pplot.f.orig   2008-08-21 20:21:08.0 +0100
-+++ src/pplot.f2008-08-21 20:21:42.0 +0100
+--- a/src/pplot.f
 b/src/pplot.f
 @@ -36,7 +36,7 @@
PROGRAM PPLOT
INCLUDE 'PPLOT.INC'
@@ -9,8 +9,8 @@
REAL RINP(10)
REAL CPOLO(NAX,IPTOT,NPX), VPOLO(NAX,2,NPX)
  C
 src/xoper.f.orig   2008-08-22 15:55:27.0 +0100
-+++ src/xoper.f2008-08-22 15:53:36.0 +0100
+--- a/src/xoper.f
 b/src/xoper.f
 @@ -114,7 +114,7 @@
  C don't try to read integers, since might get integer overflow
DO I=1, NINPUT

diff --git a/sci-physics/xfoil/xfoil-6.97-r1.ebuild 
b/sci-physics/xfoil/xfoil-6.97-r1.ebuild
new file mode 100644
index ..d835141
--- /dev/null
+++ b/sci-physics/xfoil/xfoil-6.97-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit 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
+   doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
+
+S="${WORKDIR}/${PN^}"
+
+src_prepare() {
+   # fix bug #147033
+   [[ $(tc-getFC) == *gfortran ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-6.96-gfortran.patch )
+   default
+
+   sed \
+   -e '/^FC/d' \
+   -e '/^CC/d' \
+   -e '/^FFLAGS/d' \
+   -e '/^CFLAGS/d' \
+   -e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
+   -i {bin,plotlib,orrs/bin}/Makefile plotlib/config.make \
+   || die "sed for flags and compilers failed"
+
+   sed \
+   -e 
"s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
+   -i orrs/src/osmap.f || die "sed osmap.f failed"
+}
+
+src_compile() {
+   emake -C orrs/bin FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS
+   pushd orrs >/dev/null || die
+   bin/osgen osmaps_ns.lst
+   popd >/dev/null || die
+   emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE"
+
+   local i
+   for i in xfoil pplot pxplot; do
+   emake -C bin \
+   PLTOBJ="../plotlib/libPlt.a" \
+   CFLAGS="${CFLAGS} -DUNDERSCORE" \
+   FTNLIB="${LDFLAGS}" \
+   $i
+   done
+}
+
+src_install() {
+   dobin bin/{pplot,pxplot,xfoil}
+   insinto /usr/share/xfoil/orrs
+   doins orrs/osm*.dat
+
+   local DOCS=( *.txt README )
+   use doc && DOCS+=( "${DISTDIR}"/dataflow.pdf )
+   einstalldocs
+   if use examples; then
+   dodoc -r runs
+   docompress -x /usr/share/doc/${PF}/runs
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/xfoil/

2016-11-13 Thread David Seifert 
commit: a2b13e11f194a23e55919ebf3c2d7b3b54d0a74e
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Sat Nov 12 15:45:05 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 13 21:48:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b13e11

sci-physics/xfoil: Removing EAPI version 6.97

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2826

Signed-off-by: David Seifert  gentoo.org>

 sci-physics/xfoil/xfoil-6.97.ebuild | 71 -
 1 file changed, 71 deletions(-)

diff --git a/sci-physics/xfoil/xfoil-6.97.ebuild 
b/sci-physics/xfoil/xfoil-6.97.ebuild
deleted file mode 100644
index d1679ff..
--- a/sci-physics/xfoil/xfoil-6.97.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-   doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/Xfoil"
-
-src_prepare() {
-   sed \
-   -e '/^FC/d' \
-   -e '/^CC/d' \
-   -e '/^FFLAGS/d' \
-   -e '/^CFLAGS/d' \
-   -e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
-   -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 \
-   -e 
"s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \
-   -i orrs/src/osmap.f || die "sed osmap.f failed"
-}
-
-src_compile() {
-   cd "${S}"/orrs/bin
-   emake FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS
-   cd "${S}"/orrs
-   bin/osgen osmaps_ns.lst
-   cd "${S}"/plotlib
-   emake CFLAGS="${CFLAGS} -DUNDERSCORE"
-   cd "${S}"/bin
-   for i in xfoil pplot pxplot; do
-   emake \
-   PLTOBJ="../plotlib/libPlt.a" \
-   CFLAGS="${CFLAGS} -DUNDERSCORE" \
-   FTNLIB="${LDFLAGS}" \
-   ${i}
-   done
-}
-
-src_install() {
-   dobin bin/pplot bin/pxplot bin/xfoil
-   insinto /usr/share/xfoil/orrs
-   doins orrs/osm*.dat
-   dodoc *.txt README
-   insinto /usr/share/doc/${PF}/
-   use examples && doins -r runs
-   use doc && dodoc "${DISTDIR}"/dataflow.pdf
-}