Version bump, bug 405281. Remove old. Original ebuild by Christian Schmitt.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

8 files changed, 97 insertions, 129 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index 0799b19bff55..4ca81863fa3b 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.54 2012/08/21 07:08:05 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.55 2012/08/27 23:59:46 reavertm Exp $
+
+*flightgear-2.8.0 (27 Aug 2012)
+
+  27 Aug 2012; Maciej Mrozowski <reavertm@gentoo.org> +flightgear-2.8.0.ebuild,
+  -files/flightgear-1.9.1-gcc44.patch, -files/flightgear-1.9.1-parallel.patch,
+  -files/flightgear-1.9.1-sdl.patch, -flightgear-1.9.1.ebuild,
+  -flightgear-2.0.0.ebuild, metadata.xml:
+  Version bump, bug 405281. Remove old. Original ebuild by Christian Schmitt.
 
   21 Aug 2012; Michael Weber <xmw@gentoo.org> flightgear-2.4.0.ebuild:
   ppc stable (405665)
diff --git a/games-simulation/flightgear/files/flightgear-1.9.1-gcc44.patch b/games-simulation/flightgear/files/flightgear-1.9.1-gcc44.patch
deleted file mode 100644
index 778ffe506d99..000000000000
--- a/games-simulation/flightgear/files/flightgear-1.9.1-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/GPSsmooth/UGear_command.cxx.old	2009-05-22 08:46:02.000000000 +0200
-+++ utils/GPSsmooth/UGear_command.cxx	2009-05-22 08:46:58.000000000 +0200
-@@ -1,6 +1,7 @@
- #include <cstring>
- 
- #include "UGear_command.hxx"
-+#include <cstdio>
- 
- 
- UGCommand::UGCommand():
diff --git a/games-simulation/flightgear/files/flightgear-1.9.1-parallel.patch b/games-simulation/flightgear/files/flightgear-1.9.1-parallel.patch
deleted file mode 100644
index 61147475ed4a..000000000000
--- a/games-simulation/flightgear/files/flightgear-1.9.1-parallel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Main/Makefile.am.old    2009-03-05 16:57:02.000000000 +0100
-+++ src/Main/Makefile.am        2009-03-05 16:57:26.000000000 +0100
-@@ -61,7 +61,7 @@
- fgfs_SOURCES = bootstrap.cxx
- 
- fgfs_LDADD = \
--	$(top_builddir)/src/Main/libMain.a \
-+	libMain.a \
- 	$(top_builddir)/src/Aircraft/libAircraft.a \
- 	$(top_builddir)/src/ATCDCL/libATCDCL.a \
- 	$(top_builddir)/src/Cockpit/libCockpit.a \
diff --git a/games-simulation/flightgear/files/flightgear-1.9.1-sdl.patch b/games-simulation/flightgear/files/flightgear-1.9.1-sdl.patch
deleted file mode 100644
index 835d0f4c0006..000000000000
--- a/games-simulation/flightgear/files/flightgear-1.9.1-sdl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-09-08 12:57:35.000000000 -0400
-+++ configure.ac	2008-09-08 12:58:50.000000000 -0400
-@@ -268,6 +268,8 @@
-     AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ])
-     if test "x$enable_sdl" = "xyes"; then
-         AC_SEARCH_LIBS(SDL_Init, SDL)
-+        CFLAGS="$CFLAGS `sdl-config --cflags`"
-+        CXXFLAGS="$CXXFLAGS `sdl-config --cflags`"
-     fi
-     ;;
- 
diff --git a/games-simulation/flightgear/flightgear-1.9.1.ebuild b/games-simulation/flightgear/flightgear-1.9.1.ebuild
deleted file mode 100644
index 9f0b5e4fca4c..000000000000
--- a/games-simulation/flightgear/flightgear-1.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-1.9.1.ebuild,v 1.10 2011/02/26 13:30:27 armin76 Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-MY_PN=FlightGear
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz
-	mirror://flightgear/Shared/${MY_PN}-data-1.9.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="sdl"
-
-DEPEND="media-libs/freeglut
-	~dev-games/simgear-1.9.1
-	dev-games/openscenegraph[png]
-	x11-libs/libXmu"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sdl.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-parallel.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-dependency-tracking \
-		$(use_enable sdl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto "${GAMES_DATADIR}"/${MY_PN}
-	doins -r ../data/* || die "doins failed"
-	newicon ../data/Aircraft/A6M2/thumbnail.jpg ${PN}.jpg
-	make_desktop_entry fgfs FlightGear /usr/share/pixmaps/${PN}.jpg
-	dodoc AUTHORS ChangeLog NEWS README Thanks
-	prepgamesdirs
-}
diff --git a/games-simulation/flightgear/flightgear-2.0.0.ebuild b/games-simulation/flightgear/flightgear-2.0.0.ebuild
deleted file mode 100644
index ee10cb80810d..000000000000
--- a/games-simulation/flightgear/flightgear-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.0.0.ebuild,v 1.7 2011/02/26 13:30:27 armin76 Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-MY_PN=FlightGear
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://flightgear/Source/${MY_P}.tar.gz
-	mirror://flightgear/Shared/${MY_PN}-data-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="sdl"
-
-DEPEND=">=media-libs/freeglut-2.6.0
-	~dev-games/simgear-2.0.0
-	dev-games/openscenegraph[png]
-	x11-libs/libXmu
-	x11-libs/libXi
-	dev-vcs/subversion"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-dependency-tracking \
-		$(use_enable sdl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto "${GAMES_DATADIR}"/${MY_PN}
-	doins -r ../data/* || die "doins failed"
-	newicon ../data/Aircraft/A6M2/thumbnail.jpg ${PN}.jpg
-	make_desktop_entry fgfs FlightGear /usr/share/pixmaps/${PN}.jpg
-	dodoc AUTHORS ChangeLog NEWS README Thanks
-	prepgamesdirs
-}
diff --git a/games-simulation/flightgear/flightgear-2.8.0.ebuild b/games-simulation/flightgear/flightgear-2.8.0.ebuild
new file mode 100644
index 000000000000..fa4ded0c3ce8
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2.8.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.1 2012/08/27 23:59:46 reavertm Exp $
+
+EAPI=4
+
+inherit games cmake-utils
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://flightgear/Source/${P}.tar.bz2 mirror://flightgear/Shared/FlightGear-data-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug jpeg +jsbsim larcsim subversion test +udev uiuc +yasim"
+#fgpanel - disabled for now, doesn't link
+#fgpanel? (
+#		media-libs/freeglut
+#		media-libs/libpng
+#	)
+
+COMMON_DEPEND="
+	>=dev-games/openscenegraph-3.0.1[png]
+	>=dev-games/simgear-2.8[jpeg?,subversion?]
+	sys-libs/zlib
+	virtual/opengl
+	udev? ( sys-fs/udev )
+"
+# Most entries below are just buildsystem bugs (deps unconditionally
+# inherited from static version of simgear)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.37
+	media-libs/freealut
+	media-libs/openal
+	>=media-libs/plib-1.8.5
+	jpeg? ( virtual/jpeg )
+	subversion? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DENABLE_FGADMIN=OFF
+		-DENABLE_RTI=OFF
+		-DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}
+		-DSIMGEAR_SHARED=ON
+		-DWITH_FGPANEL=OFF
+		$(cmake-utils_use jpeg JPEG_FACTORY)
+		$(cmake-utils_use_enable jsbsim)
+		$(cmake-utils_use_enable larcsim)
+		$(cmake-utils_use_enable subversion LIBSVN)
+		$(cmake-utils_use test LOGGING)
+		$(cmake-utils_use_enable test TESTS)
+		$(cmake-utils_use udev EVENT_INPUT)
+		$(cmake-utils_use_enable uiuc UIUC_MODEL)
+		$(cmake-utils_use_enable yasim)
+	)
+	#$(cmake-utils_use_with fgpanel)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ../data/*
+	newicon package/${PN}.ico ${PN}.ico
+	newmenu package/${PN}.desktop ${PN}.desktop
+
+	prepgamesdirs
+}
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index bf9480ea717d..b4f10c917f06 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -6,4 +6,13 @@
 	<email>reavertm@gentoo.org</email>
 	<name>Maciej Mrozowski</name>
 </maintainer>
+<use>
+	<!--	<flag name="fgpanel">Enables standalone lightweight 2D-panel rendering utility</flag>-->
+	<flag name="larcsim">Enables LaRCsim Flight Dynamics Model</flag>
+	<flag name="jsbsim">Enables JSBSim Flight Dynamics Model (default)</flag>
+	<flag name="subversion">Enables terrasync scenery downloader</flag>
+	<flag name="udev">Enables event-based Input devices through <pkg>sys-fs/udev</pkg></flag>
+	<flag name="uiuc">Enables UIUC Flight Dynamics Model</flag>
+	<flag name="yasim">Enables YASim Flight Dynamics Model</flag>
+</use>
 </pkgmetadata>