From 9c51f2971df92b9732494b7ec13e19173d13e585 Mon Sep 17 00:00:00 2001
From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Sat, 4 Feb 2017 17:17:34 +0100
Subject: games-simulation/flightgear: sync ebuilds with CMake (wrt options,
 also for simgear)

---
 games-simulation/flightgear/flightgear-2016.4.4.ebuild |  8 ++++++--
 games-simulation/flightgear/flightgear-9999.ebuild     | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'games-simulation')

diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index c0949ff80e9e..5104182f3e34 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
 
+# zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-games/openscenegraph-3.2.0[png]
@@ -38,10 +39,14 @@ COMMON_DEPEND="
 		virtual/opengl
 	)
 "
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
-	utils? ( x11-libs/libXmu )
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
@@ -73,7 +78,6 @@ src_configure() {
 		-DFG_DATA_DIR=/usr/share/${PN}
 		-DJSBSIM_TERRAIN=ON
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-		-DSIMGEAR_SHARED=ON
 		-DSP_FDMS=ON
 		-DSYSTEM_FLITE=ON
 		-DSYSTEM_HTS_ENGINE=ON
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 8d7628f03eac..5d50a5642144 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
 
+# zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-games/openscenegraph-3.2.0[png]
@@ -25,6 +26,7 @@ COMMON_DEPEND="
 	media-libs/speex
 	media-sound/gsm
 	sys-libs/zlib
+	virtual/glu
 	x11-libs/libX11
 	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
 	qt5? (
@@ -35,13 +37,20 @@ COMMON_DEPEND="
 	udev? ( virtual/udev )
 	utils? (
 		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
 		media-libs/libpng:0
 		virtual/opengl
 	)
 "
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
@@ -51,6 +60,7 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_FGCANVAS=$(usex qt5 && usex utils)
 		-DENABLE_FGCOM=$(usex utils)
 		-DENABLE_FGELEV=$(usex utils)
 		-DENABLE_FGJS=$(usex utils)
@@ -65,15 +75,16 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=OFF # NOTE dead codepath in Gentoo anyway
 		-DENABLE_TERRASYNC=$(usex utils)
 		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
 		-DENABLE_UIUC_MODEL=ON
 		-DENABLE_YASIM=ON
 		-DEVENT_INPUT=$(usex udev)
 		-DFG_DATA_DIR=/usr/share/${PN}
 		-DJSBSIM_TERRAIN=ON
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-		-DSIMGEAR_SHARED=ON
 		-DSP_FDMS=ON
 		-DSYSTEM_FLITE=ON
 		-DSYSTEM_HTS_ENGINE=ON
-- 
cgit v1.2.3-65-gdbad