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

["David Seifert" <soap@gentoo.org>]

commit:     0901cd7e3583035b2ec33cde89b4bdcd4c0bdb40
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Sat Nov 12 15:44:25 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 21:48:30 2016 +0000
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 <soap <AT> 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.000000000 +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.000000000 +0100
-+++ src/pplot.f	2008-08-21 20:21:42.000000000 +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.000000000 +0100
-+++ src/xoper.f	2008-08-22 15:53:36.000000000 +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 00000000..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
+}