removed old version and cleaned up more recent one

(Portage version: 2.1.3.9)

4 files changed, 18 insertions, 90 deletions

diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index 4f79f03c43ac..dfc69bf52471 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2007/07/22 06:51:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.7 2007/09/27 08:12:16 bicatali Exp $
+
+  27 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -xfoil-6.94-r1.ebuild, xfoil-6.96.ebuild:
+  removed old version and cleaned up more recent one
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xfoil-6.94-r1.ebuild,
   xfoil-6.96.ebuild:
diff --git a/sci-physics/xfoil/files/digest-xfoil-6.94-r1 b/sci-physics/xfoil/files/digest-xfoil-6.94-r1
deleted file mode 100644
index d033a9ecdb43..000000000000
--- a/sci-physics/xfoil/files/digest-xfoil-6.94-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 79e1d6bdb445d0e3ba60338e56e3e420 xfoil694.tar.gz 435936
-RMD160 5ff82817444e149f3b062c1049e72faf82f5d696 xfoil694.tar.gz 435936
-SHA256 9120b4bd1378abec7d09709855ea5b3edcfdd7108dc85082b6cfff982bf347f8 xfoil694.tar.gz 435936
-MD5 ffdcc3ad6cf4466dd40c7753b0806177 xfoil_doc.pdf 311472
-RMD160 644ea80bf13b96699aeb6945d79384f5728bad00 xfoil_doc.pdf 311472
-SHA256 aa796cc709e4dedacf4c918500bea77d00fce15e3e4ca1a026199a884dfa6fa6 xfoil_doc.pdf 311472
-MD5 6a3cbfcc2dd6943317d6590a57dcd77f xfoil_doc.ps 304400
-RMD160 e382e278f367cedd623f74d7edbfa09a6beb8fd7 xfoil_doc.ps 304400
-SHA256 43c291ef532be4e849b357e62ff29dfbbbbf398a0ac019fd1cc2484afb070675 xfoil_doc.ps 304400
diff --git a/sci-physics/xfoil/xfoil-6.94-r1.ebuild b/sci-physics/xfoil/xfoil-6.94-r1.ebuild
deleted file mode 100644
index dffa2ea33317..000000000000
--- a/sci-physics/xfoil/xfoil-6.94-r1.ebuild
+++ /dev/null
@@ -1,66 +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.94-r1.ebuild,v 1.2 2007/07/22 06:51:22 dberkholz Exp $
-
-inherit toolchain-funcs fortran
-
-MY_PN="${PN}"
-MY_PV="${PV/./}"
-MY_P="${MY_PN}${MY_PV}"
-
-DESCRIPTION="Design and analysis of subsonic isolated airfoils"
-HOMEPAGE="http://raphael.mit.edu/xfoil/"
-SRC_URI="http://raphael.mit.edu/xfoil/${MY_P}.tar.gz
-	doc? ( http://raphael.mit.edu/xfoil/xfoil_doc.ps
-		http://raphael.mit.edu/xfoil/xfoil_doc.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="doc"
-
-DEPEND="virtual/blas
-		sci-libs/blas-config
-		x11-libs/libX11"
-
-S=${WORKDIR}/XFOIL${MY_PV}
-
-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 bin/Makefile \
-	-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"
-}
-
-src_compile() {
-	cd ${S}/plotlib
-	emake || die "failed to build plotlib"
-	cd ${S}/bin
-	for i in xfoil pplot pxplot; do
-		emake ${i} || die "failed to build ${i}"
-	done
-}
-
-src_install() {
-	dobin bin/pplot bin/pxplot bin/xfoil
-	dodoc version_notes.txt  xfoil_doc.txt sessions.txt README
-	use doc && dodoc ${DISTDIR}/xfoil_doc.ps ${DISTDIR}/xfoil_doc.pdf
-	docinto runs
-	dodoc runs/*
-}
diff --git a/sci-physics/xfoil/xfoil-6.96.ebuild b/sci-physics/xfoil/xfoil-6.96.ebuild
index 56f6c142c8a9..579a8f4aeaaa 100644
--- a/sci-physics/xfoil/xfoil-6.96.ebuild
+++ b/sci-physics/xfoil/xfoil-6.96.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/07/22 06:51:22 dberkholz Exp $
+# $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
 
@@ -18,21 +18,19 @@ DEPEND="x11-libs/libX11"
 
 RESTRICT="test"
 
-S=${WORKDIR}/Xfoil
+S="${WORKDIR}/Xfoil"
+
+FORTRAN="gfortran ifc g77"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	[ -z "${FFLAGS}" ] && FFLAGS="${CFLAGS}"
 
-	# As defined in toolchain-funcs.eclass
+	sed -e 's/-O3//g' -i plotlib/config.make || die "sed plotlib/config.make failed"
 	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
+	echo "FFLAGS += ${FFLAGS:--O2}" >> plotlib/config.make
 
 	sed -i \
 		-e "s/^\(FC.*\)/FC = ${FORTRANC}/g" \
@@ -40,10 +38,11 @@ src_unpack() {
 		-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"
+		bin/Makefile orrs/bin/Makefile \
+		|| die "sed for flags and compilers failed"
 
 	# fix bug #147033
-	[[ "${FORTRANC}" == "gfortran" ]] && epatch "${FILESDIR}"/${P}-gfortran.patch
+	[[ ${FORTRANC} == gfortran ]] && epatch "${FILESDIR}"/${P}-gfortran.patch
 
 	# make everything double precision
 	sed -i \
@@ -68,9 +67,9 @@ src_compile() {
 src_install() {
 	dobin bin/pplot bin/pxplot bin/xfoil || die "dobin failed"
 	insinto /usr/share/xfoil/orrs
-	doins orrs/osm*.dat
-	dodoc *.txt README
+	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
-	use doc && doins "${DISTDIR}"/dataflow.pdf
+	use examples && { doins -r runs || die "examples install failed"; }
+	use doc && { doins "${DISTDIR}"/dataflow.pdf || die "doc install failed"; }
 }