9 files changed, 27 insertions, 79 deletions
diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index ce0da670db81..70584b2fa5a2 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2004/12/26 18:16:05 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.16 2005/02/04 19:45:51 wolf31o2 Exp $
+
+*flightgear-0.9.8 (04 Feb 2005)
+
+  04 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  flightgear-0.9.4.ebuild, -flightgear-0.9.6.ebuild,
+  +flightgear-0.9.8.ebuild, -flightgear-0.9.8_pre1.ebuild:
+  Updated to 0.9.8 final and resolving bug #78962.
 
 *flightgear-0.9.8_pre1 (26 Dec 2004)
 
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index ca10f4a0b946..6296dccae097 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,10 +1,8 @@
-MD5 654f8b79e2528f42e20945ace520f293 flightgear-0.9.4.ebuild 1277
-MD5 e12b8df13551eff1439279e36a3e6569 flightgear-0.9.6.ebuild 1256
-MD5 1d25eddc753e0c2be44029dd9a2ab1aa flightgear-0.9.8_pre1.ebuild 1283
-MD5 ba512e133a134e555225c9e329540e27 flightgear-0.9.5.ebuild 1341
-MD5 4390dae371416d2b005b0499660db977 ChangeLog 3573
+MD5 73181e8d1e245229027900470afb17d8 flightgear-0.9.4.ebuild 1278
+MD5 ea937420cf4717757e731442e88b6292 flightgear-0.9.8.ebuild 1140
+MD5 6618caa55e5ff2657442282347ba5ce2 flightgear-0.9.5.ebuild 1342
+MD5 2557713ee0da01f420cd0eccd8e83024 ChangeLog 3825
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 8476670ff5e4ce91089fc6a41be59745 files/digest-flightgear-0.9.8_pre1 149
 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
+MD5 71196a8e0d1fe4b810caf1f80abc485c files/digest-flightgear-0.9.8 139
diff --git a/games-simulation/flightgear/files/digest-flightgear-0.9.6 b/games-simulation/flightgear/files/digest-flightgear-0.9.6
deleted file mode 100644
index 68286c593be9..000000000000
--- a/games-simulation/flightgear/files/digest-flightgear-0.9.6
+++ /dev/null
@@ -1,2 +0,0 @@
-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/files/digest-flightgear-0.9.8 b/games-simulation/flightgear/files/digest-flightgear-0.9.8
new file mode 100644
index 000000000000..aa5d852dbb99
--- /dev/null
+++ b/games-simulation/flightgear/files/digest-flightgear-0.9.8
@@ -0,0 +1,2 @@
+MD5 614d11b4fc75479cb3bf42a333705242 FlightGear-0.9.8.tar.gz 1644191
+MD5 7354da8d5232ee02daee8d8759e83af3 fgfs-base-0.9.8.tar.bz2 74122557
diff --git a/games-simulation/flightgear/files/digest-flightgear-0.9.8_pre1 b/games-simulation/flightgear/files/digest-flightgear-0.9.8_pre1
deleted file mode 100644
index 4e8eb0664b92..000000000000
--- a/games-simulation/flightgear/files/digest-flightgear-0.9.8_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 27c3c8cc71080b01d3d73404ba15fccf FlightGear-0.9.8-pre1.tar.gz 1640926
-MD5 438267b2792b47d237b9daf7e9263adb fgfs-base-0.9.8-pre1.tar.bz2 89128393
diff --git a/games-simulation/flightgear/flightgear-0.9.4.ebuild b/games-simulation/flightgear/flightgear-0.9.4.ebuild
index 83341d3f5cd4..b84f2c665601 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
+# Copyright 1999-2005 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.8 2004/10/21 20:16:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.4.ebuild,v 1.9 2005/02/04 19:45:51 wolf31o2 Exp $
 
 inherit flag-o-matic games
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
-RDEPEND="=dev-games/simgear-0.3.5*
+RDEPEND="=dev-games/simgear-0.3.6*
 	>=media-libs/plib-1.7.0"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
diff --git a/games-simulation/flightgear/flightgear-0.9.5.ebuild b/games-simulation/flightgear/flightgear-0.9.5.ebuild
index 6759ab853f8a..f2364dc63a24 100644
--- a/games-simulation/flightgear/flightgear-0.9.5.ebuild
+++ b/games-simulation/flightgear/flightgear-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.5.ebuild,v 1.3 2004/12/26 18:16:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.5.ebuild,v 1.4 2005/02/04 19:45:51 wolf31o2 Exp $
 
 inherit flag-o-matic games
 
diff --git a/games-simulation/flightgear/flightgear-0.9.6.ebuild b/games-simulation/flightgear/flightgear-0.9.8.ebuild
index d86a62986acc..60f51ea4b80d 100644
--- a/games-simulation/flightgear/flightgear-0.9.6.ebuild
+++ b/games-simulation/flightgear/flightgear-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-0.9.8.ebuild,v 1.1 2005/02/04 19:45:51 wolf31o2 Exp $
 
 inherit flag-o-matic games
 
@@ -17,17 +17,15 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
-RDEPEND="=dev-games/simgear-0.3.7*
-	>=media-libs/plib-1.7.0"
+RDEPEND="=dev-games/simgear-0.3.8*
+	>=media-libs/plib-1.8.4"
 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"
+	mv ../data ./data
 }
 
 src_compile() {
@@ -44,7 +42,7 @@ src_install() {
 	egamesinstall || die
 
 	dodir "${GAMES_DATADIR}/${MY_PN}"
-	cp -a ${WORKDIR}/data/* "${D}/${GAMES_DATADIR}/${MY_PN}" || die "cp failed"
+	cp -a data/* "${D}/${GAMES_DATADIR}/${MY_PN}" || die "cp failed"
 
 	dodoc README* ChangeLog AUTHORS NEWS Thanks
 
diff --git a/games-simulation/flightgear/flightgear-0.9.8_pre1.ebuild b/games-simulation/flightgear/flightgear-0.9.8_pre1.ebuild
deleted file mode 100644
index 2492de82c657..000000000000
--- a/games-simulation/flightgear/flightgear-0.9.8_pre1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.8_pre1.ebuild,v 1.1 2004/12/26 18:16:05 seemant Exp $
-
-inherit flag-o-matic games
-
-MY_PN=FlightGear
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_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-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
-
-RDEPEND="=dev-games/simgear-0.3.8*
-	>=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
-}