removed old version and cleaned up more recent one

Package-Manager: portage-2.1.3.9

5 files changed, 36 insertions, 108 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/Manifest b/sci-physics/xfoil/Manifest
index 436a7a530a0d..28f331e15278 100644
--- a/sci-physics/xfoil/Manifest
+++ b/sci-physics/xfoil/Manifest
@@ -1,31 +1,31 @@
+-----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
-EBUILD xfoil-6.94-r1.ebuild 1703 RMD160 02799367e898805c02591be62a56cba4f04f026c SHA1 9eed10dd6bca12d9f4bad37d7edbc64d81412305 SHA256 91655bdaff69b91c6390feb44de0ad9558fec81669abd92415e1e97c2fdba010
-MD5 015f8778f25544446472d5dee4215a3f xfoil-6.94-r1.ebuild 1703
-RMD160 02799367e898805c02591be62a56cba4f04f026c xfoil-6.94-r1.ebuild 1703
-SHA256 91655bdaff69b91c6390feb44de0ad9558fec81669abd92415e1e97c2fdba010 xfoil-6.94-r1.ebuild 1703
-EBUILD xfoil-6.96.ebuild 2167 RMD160 c999b5e42017841df4c978d15aa9de66f32d1291 SHA1 d99baae4c00445e3bb8bc49981c9343fbba0f26e SHA256 59f4412c62037efe7ff02377c9b0185665c54ed26bd5a717ed76183d04a26457
-MD5 fb3acfdde5406a026419b831d99c0276 xfoil-6.96.ebuild 2167
-RMD160 c999b5e42017841df4c978d15aa9de66f32d1291 xfoil-6.96.ebuild 2167
-SHA256 59f4412c62037efe7ff02377c9b0185665c54ed26bd5a717ed76183d04a26457 xfoil-6.96.ebuild 2167
-MISC ChangeLog 2205 RMD160 73914e0dd5056695ca0a2600c66eaef468045682 SHA1 411b63868f945f24edd7bf2299ccbeb3f8490a1d SHA256 ba544f68261651d976cc97857cf44e865eed885d9d152c00f87bb46fa5f1c8eb
-MD5 e1dfb725a6be2795aa39b88e4cfbcd64 ChangeLog 2205
-RMD160 73914e0dd5056695ca0a2600c66eaef468045682 ChangeLog 2205
-SHA256 ba544f68261651d976cc97857cf44e865eed885d9d152c00f87bb46fa5f1c8eb ChangeLog 2205
+EBUILD xfoil-6.96.ebuild 2318 RMD160 b28e8738f184be5ee903d301b730611471886845 SHA1 5581abe4d3a709f5dfc5528b3f4a49ee74bd54d5 SHA256 ab655b090eabe2df8e984c65ab8cb0bfb46816b397a42ea37cdbb2a872886feb
+MD5 dc7033b3861a150ef8d9dbd36e92cb58 xfoil-6.96.ebuild 2318
+RMD160 b28e8738f184be5ee903d301b730611471886845 xfoil-6.96.ebuild 2318
+SHA256 ab655b090eabe2df8e984c65ab8cb0bfb46816b397a42ea37cdbb2a872886feb xfoil-6.96.ebuild 2318
+MISC ChangeLog 2357 RMD160 f2d4c277ecd0409065fcdde81952d36f282f710a SHA1 a3b311b5420904d0c54b164a546dc997c447c516 SHA256 1142b27706f71dc5346245eb8d2151450bea5119bae648496360eae9f3aff68e
+MD5 5e122efea377e3770b038008ccf84ec2 ChangeLog 2357
+RMD160 f2d4c277ecd0409065fcdde81952d36f282f710a ChangeLog 2357
+SHA256 1142b27706f71dc5346245eb8d2151450bea5119bae648496360eae9f3aff68e ChangeLog 2357
 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
 MD5 7da0140dee7298ae57e369b3e09754cc files/digest-xfoil-6.96 443
 RMD160 c95e29604d7d7e37317ce795bacb08043ce22913 files/digest-xfoil-6.96 443
 SHA256 435d37de8b3deb87999c062ec5957857d90eec68ec5480753de616e00d2da7b3 files/digest-xfoil-6.96 443
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFG+2Xm1ycZbhPLE2ARAtgQAJ915yQ6BeYg+/dquMLlunRz7aD/iQCbBBKC
+4kPtePzjLDJ9vMVCht+YumA=
+=78uC
+-----END PGP SIGNATURE-----
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"; }
 }