[gentoo-commits] proj/gamerlay:master commit in: dev-games/simgear/, games-simulation/flightgear/

["Christian Schmitt" <chris@ilovelinux.de>]

commit:     ad7db0c177552ab7a33e546ae40c04afa1da7876
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Thu Feb 21 11:33:10 2013 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Thu Feb 21 11:33:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ad7db0c1

[games-simulation/flightgear] version 2.10 is in tree now. update live ebuilds a bit

---
 dev-games/simgear/simgear-2.10.0.ebuild            |   48 ------------
 dev-games/simgear/simgear-9999.ebuild              |    6 +-
 .../flightgear/flightgear-2.10.0.ebuild            |   79 --------------------
 games-simulation/flightgear/flightgear-9999.ebuild |   20 +++--
 4 files changed, 16 insertions(+), 137 deletions(-)

diff --git a/dev-games/simgear/simgear-2.10.0.ebuild b/dev-games/simgear/simgear-2.10.0.ebuild
deleted file mode 100644
index 0adee44..0000000
--- a/dev-games/simgear/simgear-2.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug jpeg subversion test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-games/openscenegraph-3.0.1
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	jpeg? ( virtual/jpeg )
-	subversion? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.37
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RTI=OFF
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		$(cmake-utils_use jpeg JPEG_FACTORY)
-		$(cmake-utils_use_enable subversion LIBSVN)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index b85b9a4..a7f6cc1 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_BRANCH="next"
 EGIT_PROJECT="simgear.git"
@@ -44,6 +44,8 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RTI=OFF
+		-DENABLE_SOUND=ON
+		-DJPEG_FACTORY=OFF
 		-DSIMGEAR_SHARED=ON
 		-DSYSTEM_EXPAT=ON
 		$(cmake-utils_use_enable subversion LIBSVN)

diff --git a/games-simulation/flightgear/flightgear-2.10.0.ebuild b/games-simulation/flightgear/flightgear-2.10.0.ebuild
deleted file mode 100644
index d110ae5..0000000
--- a/games-simulation/flightgear/flightgear-2.10.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~x86"
-IUSE="debug fgpanel jpeg +jsbsim oldfdm subversion test +udev +yasim"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	>=dev-games/openscenegraph-3.0.1[png]
-	~dev-games/simgear-${PV}[jpeg?,subversion?]
-	sys-libs/zlib
-	virtual/opengl
-	udev? ( virtual/udev )
-	fgpanel? (
-		media-libs/freeglut
-		media-libs/libpng
-	)
-"
-# 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/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_PROFILE=OFF
-		-DENABLE_RTI=OFF
-		-DSYSTEM_SQLITE=ON
-		-DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}
-		-DSIMGEAR_SHARED=ON
-		$(cmake-utils_use_with fgpanel)
-		$(cmake-utils_use jpeg JPEG_FACTORY)
-		$(cmake-utils_use_enable jsbsim)
-		$(cmake-utils_use_enable oldfdm LARCSIM)
-		$(cmake-utils_use_enable oldfdm UIUC_MODEL)
-		$(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 yasim)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ../data/*
-	newicon icons/fg-48.png ${PN}.png
-	newmenu package/${PN}.desktop ${PN}.desktop
-
-	prepgamesdirs
-}

diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 84f3624..e79e44e 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_BRANCH="next"
 EGIT_PROJECT="flightgear.git"
@@ -17,7 +17,7 @@ EGIT_REPO_URI="git://gitorious.org/fg/flightgear.git
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug fgpanel +jsbsim oldfdm +subversion test +yasim"
+IUSE="debug fgpanel +jsbsim oldfdm +subversion test +udev +yasim"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3
@@ -25,17 +25,17 @@ COMMON_DEPEND="
 	>=dev-games/simgear-9999[subversion?,-headless]
 	sys-libs/zlib
 	virtual/opengl
-	virtual/udev
+	udev? ( virtual/udev )
+	fgpanel? (
+		media-libs/freeglut
+		media-libs/libpng
+	)
 "
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.37
 	media-libs/openal
 	>=media-libs/plib-1.8.5
-	fgpanel? (
-		media-libs/freeglut
-		media-libs/libpng
-	)
 	subversion? (
 		dev-libs/apr
 		dev-vcs/subversion
@@ -53,14 +53,18 @@ src_configure() {
 		-DENABLE_FGADMIN=OFF
 		-DENABLE_PROFILE=OFF
 		-DENABLE_RTI=OFF
+		-DJPEG_FACTORY=OFF
 		-DSIMGEAR_SHARED=ON
+		-DSP_FDMS=OFF
 		-DSYSTEM_SQLITE=ON
 		$(cmake-utils_use_with fgpanel)
 		$(cmake-utils_use_enable jsbsim)
 		$(cmake-utils_use_enable oldfdm LARCSIM)
 		$(cmake-utils_use_enable oldfdm UIUC_MODEL)
 		$(cmake-utils_use_enable subversion LIBSVN)
+		$(cmake-utils_use_enable test LOGGING)
 		$(cmake-utils_use_enable test TESTS)
+		$(cmake-utils_use udev EVENT_INPUT)
 		$(cmake-utils_use_enable yasim)
 	)
 
@@ -69,7 +73,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	newicon icons/fg-48.png ${PN}.png
+	newicon -s 48 icons/fg-48.png ${PN}.png
 	newmenu package/${PN}.desktop ${PN}.desktop
 	prepgamesdirs
 }