removed 0.9.3, and moved 0.9.4 to stable x86. Now, 0.9.5 came from Alonso Schaich <AlonsoSchaich@gmx.de> in bug #59001 and compiles cleanly with gcc-3.4. Version 0.9.6 came from Adam Babcock <ababcock@sympatico.ca> in bug #67809. I personally had problems with 0.9.6 and found 0.9.5 to be much better, but your mileage may vary. For this reason, I have added both, and I expect to hear from the gamers which version is the superior. So bug report me please

8 files changed, 87 insertions, 17 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index e3eae65fa0f7..b2060526dc96 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.12 2004/06/24 23:22:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.13 2004/10/21 20:16:48 seemant Exp $
+
+*flightgear-0.9.6 (21 Oct 2004)
+
+  21 Oct 2004; Seemant Kulleen <seemant@gentoo.org>
+  -flightgear-0.9.3.ebuild, flightgear-0.9.4.ebuild,
+  +flightgear-0.9.5.ebuild, +flightgear-0.9.6.ebuild:
+  removed 0.9.3, and moved 0.9.4 to stable x86. Now, 0.9.5 came from Alonso
+  Schaich <AlonsoSchaich@gmx.de> in bug #59001 and compiles cleanly with
+  gcc-3.4. Version 0.9.6 came from Adam Babcock <ababcock@sympatico.ca> in bug
+  #67809. I personally had problems with 0.9.6 and found 0.9.5 to be much
+  better, but your mileage may vary. For this reason, I have added both, and I
+  expect to hear from the gamers which version is the superior. So bug report
+  me please
 
   11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
   flightgear-0.9.4.ebuild:
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index e8260b61893f..df2a7e395827 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,6 +1,8 @@
-MD5 a5def81542732dd49804bbfed348ceff flightgear-0.9.4.ebuild 1280
-MD5 175127e33834bfa1e61ab7a6be209357 flightgear-0.9.3.ebuild 1194
-MD5 3f08baa48fd06d7e3280a9aa4f9f4a72 ChangeLog 2595
+MD5 654f8b79e2528f42e20945ace520f293 flightgear-0.9.4.ebuild 1277
+MD5 e12b8df13551eff1439279e36a3e6569 flightgear-0.9.6.ebuild 1256
+MD5 7d63725d540ae58b26555d54fb562fce flightgear-0.9.5.ebuild 1256
+MD5 e261315a941cb115b693d0f6bda3e2dc ChangeLog 3258
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 3d09238b7ecb04e753e165a9d41dad44 files/digest-flightgear-0.9.3 139
 MD5 791042f02ab42bb5ce5b38d24c9be717 files/digest-flightgear-0.9.4 139
+MD5 e77a8fdf3764bab350ecb01d917fb43a files/digest-flightgear-0.9.5 139
+MD5 453cd0a13fbdbc3048d2de9ab12633f3 files/digest-flightgear-0.9.6 139
diff --git a/games-simulation/flightgear/files/digest-flightgear-0.9.3 b/games-simulation/flightgear/files/digest-flightgear-0.9.3
deleted file mode 100644
index cee5a8975bf9..000000000000
--- a/games-simulation/flightgear/files/digest-flightgear-0.9.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6e5b672fb0167f73a4e4346a9a6250e3 FlightGear-0.9.3.tar.gz 1361944
-MD5 3717ddd1ad3aa35df6b458a878835c8e fgfs-base-0.9.3.tar.bz2 65907092
diff --git a/games-simulation/flightgear/files/digest-flightgear-0.9.5 b/games-simulation/flightgear/files/digest-flightgear-0.9.5
new file mode 100644
index 000000000000..fcd5b1d1ddbe
--- /dev/null
+++ b/games-simulation/flightgear/files/digest-flightgear-0.9.5
@@ -0,0 +1,2 @@
+MD5 ff744ab274fe853efc168b77e08d7dd0 FlightGear-0.9.5.tar.gz 1531258
+MD5 5b770b558807b120d94bf697d4267451 fgfs-base-0.9.5.tar.bz2 77686837
diff --git a/games-simulation/flightgear/files/digest-flightgear-0.9.6 b/games-simulation/flightgear/files/digest-flightgear-0.9.6
new file mode 100644
index 000000000000..68286c593be9
--- /dev/null
+++ b/games-simulation/flightgear/files/digest-flightgear-0.9.6
@@ -0,0 +1,2 @@
+MD5 ab6e8826a392eaa15bd0224eba2f2a38 FlightGear-0.9.6.tar.gz 1600405
+MD5 fc167ed777d2fe184940541670bc72b1 fgfs-base-0.9.6.tar.bz2 81807095
diff --git a/games-simulation/flightgear/flightgear-0.9.4.ebuild b/games-simulation/flightgear/flightgear-0.9.4.ebuild
index 89a6640e076f..83341d3f5cd4 100644
--- a/games-simulation/flightgear/flightgear-0.9.4.ebuild
+++ b/games-simulation/flightgear/flightgear-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.4.ebuild,v 1.7 2004/06/24 23:22:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.4.ebuild,v 1.8 2004/10/21 20:16:48 seemant Exp $
 
 inherit flag-o-matic games
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
 RDEPEND="=dev-games/simgear-0.3.5*
diff --git a/games-simulation/flightgear/flightgear-0.9.3.ebuild b/games-simulation/flightgear/flightgear-0.9.5.ebuild
index b8eb84dfe43b..3f7b34acfced 100644
--- a/games-simulation/flightgear/flightgear-0.9.3.ebuild
+++ b/games-simulation/flightgear/flightgear-0.9.5.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.3.ebuild,v 1.9 2004/06/24 23:22:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.5.ebuild,v 1.1 2004/10/21 20:16:48 seemant Exp $
 
 inherit flag-o-matic games
 
 MY_PN=FlightGear
 MY_P=${MY_PN}-${PV}
-
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="http://www.flightgear.org/"
 SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz
@@ -15,17 +14,19 @@ SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
-DEPEND="=dev-games/simgear-0.3.4*
+RDEPEND="=dev-games/simgear-0.3.6*
+	>=media-libs/plib-1.7.0"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i \
-		-e 's:#include <simgear/screen/jpgfactory.hxx>:#include <simgear/screen/jpgfactory.hxx-faile-include>:g' \
+		's:\(#include <simgear/screen/jpgfactory.hxx\)>:\1-faile-include>:g' \
 		configure || die "sed configure failed"
 }
 
@@ -42,8 +43,8 @@ src_compile() {
 src_install() {
 	egamesinstall || die
 
-	dodir ${GAMES_LIBDIR}/${MY_PN}
-	cp -a data/* ${D}/${GAMES_LIBDIR}/${MY_PN}
+	dodir "${GAMES_DATADIR}/${MY_PN}"
+	cp -a ${WORKDIR}/data/* "${D}/${GAMES_DATADIR}/${MY_PN}" || die "cp failed"
 
 	dodoc README* ChangeLog AUTHORS NEWS Thanks
 
diff --git a/games-simulation/flightgear/flightgear-0.9.6.ebuild b/games-simulation/flightgear/flightgear-0.9.6.ebuild
new file mode 100644
index 000000000000..d86a62986acc
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-0.9.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.6.ebuild,v 1.1 2004/10/21 20:16:48 seemant Exp $
+
+inherit flag-o-matic games
+
+MY_PN=FlightGear
+MY_P=${MY_PN}-${PV}
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz
+	mirror://flightgear/Shared/fgfs-base-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+
+RDEPEND="=dev-games/simgear-0.3.7*
+	>=media-libs/plib-1.7.0"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		's:\(#include <simgear/screen/jpgfactory.hxx\)>:\1-faile-include>:g' \
+		configure || die "sed configure failed"
+}
+
+src_compile() {
+	use hppa && replace-flags -march=2.0 -march=1.0
+	egamesconf \
+		--with-multiplayer \
+		--with-network-olk \
+		--with-threads \
+		--with-x || die
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	egamesinstall || die
+
+	dodir "${GAMES_DATADIR}/${MY_PN}"
+	cp -a ${WORKDIR}/data/* "${D}/${GAMES_DATADIR}/${MY_PN}" || die "cp failed"
+
+	dodoc README* ChangeLog AUTHORS NEWS Thanks
+
+	prepgamesdirs
+}