Version bump. Revamped ebuild, added map generation, examples use flags.

  Added patch to compile with gfortran, fixing bug #147033, thanks to
  Bob Johnson <ke6fis@arrl.net>. Added longdescription in metadata.xml.

Package-Manager: portage-2.1.2.7

6 files changed, 151 insertions, 19 deletions

diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index 5729e99045fb..d7a85418d644 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2007/02/22 01:14:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.5 2007/05/23 13:17:35 bicatali Exp $
+
+*xfoil-6.96 (23 May 2007)
+
+  23 May 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/xfoil-6.96-gfortran.patch, metadata.xml, +xfoil-6.96.ebuild:
+  Version bump. Revamped ebuild, added map generation, examples use flags. 
+  Added patch to compile with gfortran, fixing bug #147033, thanks to 
+  Bob Johnson <ke6fis@arrl.net>. Added longdescription in metadata.xml.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest
index cc4158fefff2..c780c64b149e 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,6 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xfoil-6.96-gfortran.patch 993 RMD160 7baec31ed66d527120bed0047a2efba3a4083565 SHA1 7968cf64c3dba19e212b40bc771de0ba68b289a8 SHA256 807615a09ce1324da1bb04a30bfaa552aac2042c5dc6468ad3637c2335560a77
+MD5 b66e0eab1473537c7813111fe856b693 files/xfoil-6.96-gfortran.patch 993
+RMD160 7baec31ed66d527120bed0047a2efba3a4083565 files/xfoil-6.96-gfortran.patch 993
+SHA256 807615a09ce1324da1bb04a30bfaa552aac2042c5dc6468ad3637c2335560a77 files/xfoil-6.96-gfortran.patch 993
+DIST dataflow.pdf 7654 RMD160 3e20242333cdab5f18b09603cd6d5df988629ea7 SHA1 cb0c3202dcc242e39c685567eb1505226cb6ffe1 SHA256 4596c77a3fa24cd334b35c34fcbd0b4f1d9055273c0862643e2d07b5e774aff5
+DIST xfoil6.96.tar.gz 2542747 RMD160 27a2878ecccfcd713e0d6331c83cbe3fffa6cc12 SHA1 314cedc50cff919411583abb430309ffa84652c8 SHA256 9961dfe028eaa7247b64c7e8bb92d3befc673d80c3a288a30bf9e8e1c5dc385e
 DIST xfoil694.tar.gz 435936 RMD160 5ff82817444e149f3b062c1049e72faf82f5d696 SHA1 baf7c0dff9fd7818686c1142486e20109a7f643c SHA256 9120b4bd1378abec7d09709855ea5b3edcfdd7108dc85082b6cfff982bf347f8
 DIST xfoil_doc.pdf 311472 RMD160 644ea80bf13b96699aeb6945d79384f5728bad00 SHA1 084b6a3161d7c5d15c4038c55fa70a2e4ab41257 SHA256 aa796cc709e4dedacf4c918500bea77d00fce15e3e4ca1a026199a884dfa6fa6
 DIST xfoil_doc.ps 304400 RMD160 e382e278f367cedd623f74d7edbfa09a6beb8fd7 SHA1 176b28e73580ac78ad09104c2866985327422e5a SHA256 43c291ef532be4e849b357e62ff29dfbbbbf398a0ac019fd1cc2484afb070675
@@ -8,21 +11,21 @@ EBUILD xfoil-6.94-r1.ebuild 1721 RMD160 e1ccef019bf7f97f7c4bdf2d307b41c0a813286f
 MD5 af3bd7301a5488dbde1e56c4a20a35e5 xfoil-6.94-r1.ebuild 1721
 RMD160 e1ccef019bf7f97f7c4bdf2d307b41c0a813286f xfoil-6.94-r1.ebuild 1721
 SHA256 fd0322b875c4c788b2ef07c233bf795865ce3e592712a3b7c00e67173d541744 xfoil-6.94-r1.ebuild 1721
-MISC ChangeLog 1699 RMD160 ba0d3d6bf9fa9de0bb5c43b09ba9f0c29c92824e SHA1 422029e2b1f2d04ba5b2ea75ee2498d1ac594168 SHA256 0672a8384e8d5adb8a5d5c5052e11230c896e9b259c5a16229572ffa5dd1a3e0
-MD5 9c78f7fc6397591cf172e92c24673333 ChangeLog 1699
-RMD160 ba0d3d6bf9fa9de0bb5c43b09ba9f0c29c92824e ChangeLog 1699
-SHA256 0672a8384e8d5adb8a5d5c5052e11230c896e9b259c5a16229572ffa5dd1a3e0 ChangeLog 1699
-MISC metadata.xml 227 RMD160 44b3ee0cb1ff25fbeab176369dd7912dc1bb8ab3 SHA1 2f25868a8593042c190e859f6f9a26ff74add2fb SHA256 2bcd8d8387f46fcec33ee77579c4cd40eec99bdc8f265257a7ad2866719c6edf
-MD5 056ed9eed780c8fc16f62f16ef2c9b50 metadata.xml 227
-RMD160 44b3ee0cb1ff25fbeab176369dd7912dc1bb8ab3 metadata.xml 227
-SHA256 2bcd8d8387f46fcec33ee77579c4cd40eec99bdc8f265257a7ad2866719c6edf metadata.xml 227
+EBUILD xfoil-6.96.ebuild 2185 RMD160 0bb435634018a7a4588d255e7a1b8e1d5fc050ed SHA1 81af73f741d8ad59ec2b025c2356244a4e7c5045 SHA256 8118f7b3b4bd9d03c7972cbcf80622faa8fc9734429197dedfa5644c16b21db9
+MD5 bfac625053c7b1339a701b7f61a9a7c3 xfoil-6.96.ebuild 2185
+RMD160 0bb435634018a7a4588d255e7a1b8e1d5fc050ed xfoil-6.96.ebuild 2185
+SHA256 8118f7b3b4bd9d03c7972cbcf80622faa8fc9734429197dedfa5644c16b21db9 xfoil-6.96.ebuild 2185
+MISC ChangeLog 2074 RMD160 7220e711ce7223d15a04d46dd84fb84ed3a84977 SHA1 8d01f22c1e656fd51e6c39f8c7e2b8381f3d84b0 SHA256 7c4dbf982a277a25dbc81cea31e5539abfe464a9ca2dfe85dcb82019faa9ef69
+MD5 107ebd32e724cd831d972b289bf19547 ChangeLog 2074
+RMD160 7220e711ce7223d15a04d46dd84fb84ed3a84977 ChangeLog 2074
+SHA256 7c4dbf982a277a25dbc81cea31e5539abfe464a9ca2dfe85dcb82019faa9ef69 ChangeLog 2074
+MISC metadata.xml 862 RMD160 e6be84075ef908c577d96b5a1ce12b77369b1dcf SHA1 702836e26377a6a8d18695ffadf9cdbb47a849c1 SHA256 9a2c764a3ce20df6baf4f48b155281d045a8e144a50627f4ab9007f13f0bd34a
+MD5 9681af8f67a68fc824aca65a6a3e82f5 metadata.xml 862
+RMD160 e6be84075ef908c577d96b5a1ce12b77369b1dcf metadata.xml 862
+SHA256 9a2c764a3ce20df6baf4f48b155281d045a8e144a50627f4ab9007f13f0bd34a metadata.xml 862
 MD5 01aa5d97527b5bcede17f1125dd39fd7 files/digest-xfoil-6.94-r1 663
 RMD160 8281807f1ab4ba4558bc8274fbbf36b6f8b94edb files/digest-xfoil-6.94-r1 663
 SHA256 dba2eabfbb3dc9ccc64c930a97bdb8df203bc793fb9fe30a2ae780c4f83fc606 files/digest-xfoil-6.94-r1 663
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3O4lz974XjDVpbkRAsdgAJ4ucgRsijVl4OjuaAFdN+og2tAMXQCcCkk9
-d++TqMXPGZUYQ9PRV/bVQZs=
-=Kn/q
------END PGP SIGNATURE-----
+MD5 7da0140dee7298ae57e369b3e09754cc files/digest-xfoil-6.96 443
+RMD160 c95e29604d7d7e37317ce795bacb08043ce22913 files/digest-xfoil-6.96 443
+SHA256 435d37de8b3deb87999c062ec5957857d90eec68ec5480753de616e00d2da7b3 files/digest-xfoil-6.96 443
diff --git a/sci-physics/xfoil/files/digest-xfoil-6.96 b/sci-physics/xfoil/files/digest-xfoil-6.96
new file mode 100644
index 000000000000..e27871094997
--- /dev/null
+++ b/sci-physics/xfoil/files/digest-xfoil-6.96
@@ -0,0 +1,6 @@
+MD5 3bcf27382a90b82470b582c254698599 dataflow.pdf 7654
+RMD160 3e20242333cdab5f18b09603cd6d5df988629ea7 dataflow.pdf 7654
+SHA256 4596c77a3fa24cd334b35c34fcbd0b4f1d9055273c0862643e2d07b5e774aff5 dataflow.pdf 7654
+MD5 6ea00f7a3a0d338e97ab48ef5dd3d011 xfoil6.96.tar.gz 2542747
+RMD160 27a2878ecccfcd713e0d6331c83cbe3fffa6cc12 xfoil6.96.tar.gz 2542747
+SHA256 9961dfe028eaa7247b64c7e8bb92d3befc673d80c3a288a30bf9e8e1c5dc385e xfoil6.96.tar.gz 2542747
diff --git a/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch b/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch
new file mode 100644
index 000000000000..67fc19c645f9
--- /dev/null
+++ b/sci-physics/xfoil/files/xfoil-6.96-gfortran.patch
@@ -0,0 +1,29 @@
+--- 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
+@@ -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.
+ c
+-c---  Uses the library routines and() and rshift() for bit manipulation 
++c---  Uses the library routines and() and ishft() for bit manipulation 
+ c     which are present in most fortran libraries as extensions to f77.
+ c
+       dimension iout(*)
+@@ -570,7 +570,7 @@
+         ibitold = and(1,imask)
+         if(ibitold.NE.0) go to 5
+           nshft = n
+-          imask = rshift(imask,1)
++          imask = ishft(imask,-1)
+       end do
+ c
+  5    nout  = 0
+@@ -594,7 +594,7 @@
+ c
+         ibitold = ibit
+         nbits = nbits + 1
+-        imask = rshift(imask,1)
++        imask = ishft(imask,-1)
+       end do
+ c--- Add final bit(s) to end of 16 bits checked
+ c--- Now append any zero bits shifted out originally
diff --git a/sci-physics/xfoil/metadata.xml b/sci-physics/xfoil/metadata.xml
index 31c4fcb35306..c2e54a0de070 100644
--- a/sci-physics/xfoil/metadata.xml
+++ b/sci-physics/xfoil/metadata.xml
@@ -5,4 +5,14 @@
 <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
+    * 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
+</longdescription>
 </pkgmetadata>
diff --git a/sci-physics/xfoil/xfoil-6.96.ebuild b/sci-physics/xfoil/xfoil-6.96.ebuild
new file mode 100644
index 000000000000..034ad862437f
--- /dev/null
+++ b/sci-physics/xfoil/xfoil-6.96.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2007/05/23 13:17:35 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 virtual/x11 )"
+
+RESTRICT="test"
+
+S=${WORKDIR}/Xfoil
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[ -z "${FFLAGS}" ] && FFLAGS="${CFLAGS}"
+
+	# As defined in toolchain-funcs.eclass
+	echo "CC = $(tc-getCC)" >> plotlib/config.make
+
+	# As defined in fortran.eclass
+	echo "FC = ${FORTRANC}" >> plotlib/config.make
+
+	echo "CFLAGS += ${CFLAGS}" >> plotlib/config.make
+	echo "FFLAGS += ${FFLAGS}" >> 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 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
+	dodoc *.txt README
+	insinto /usr/share/doc/${PF}/
+	use examples && doins -r runs
+	use doc && doins "${DISTDIR}"/dataflow.pdf
+}