[gentoo-commits] proj/gamerlay:master commit in: games-simulation/fgrun/files/, games-simulation/fgrun/

[Christian Schmitt]

commit:     35f022984e4474be5e105d04c8b5cc471d5272f8
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Jul  2 10:05:05 2012 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Mon Jul  2 10:05:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=35f02298

[games-simulation/fgrun-9999] adapt to changes from upstream, sync with portage

---
 games-simulation/fgrun/fgrun-9999.ebuild           |   30 ++++++++++---------
 .../fgrun/files/fgrun-1.5.1-fltk.patch             |   13 --------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/games-simulation/fgrun/fgrun-9999.ebuild b/games-simulation/fgrun/fgrun-9999.ebuild
index 9252575..5a1e0ef 100644
--- a/games-simulation/fgrun/fgrun-9999.ebuild
+++ b/games-simulation/fgrun/fgrun-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit games cmake-utils git-2
 
@@ -15,26 +15,28 @@ SLOT="0"
 KEYWORDS=""
 IUSE="nls"
 
-DEPEND="dev-games/openscenegraph
-	>=dev-games/simgear-9999
+COMMON_DEPEND="
+	>=dev-games/openscenegraph-3.0.1
+	sys-libs/zlib
 	x11-libs/fltk:1[opengl,threads]
-	x11-libs/libXi
-	x11-libs/libXmu
-	nls? ( virtual/libintl )"
+"
 
-RDEPEND="${DEPEND}
-	>=games-simulation/flightgear-9999"
+DEPEND="${COMMON_DEPEND}
+	>=dev-games/simgear-2.6
+	>=dev-libs/boost-1.34
+	nls? ( virtual/libintl )
+"
 
-DOCS=(AUTHORS NEWS)
+RDEPEND="${COMMON_DEPEND}
+	>=games-simulation/flightgear-2.6
+"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.5.1-fltk.patch"
-}
+DOCS=(AUTHORS NEWS)
 
 src_configure() {
 	mycmakeargs=(
 	-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
-	$(cmake-utils_use nls ENABLE_NLS)
+	$(cmake-utils_use_enable nls)
 	)
 	cmake-utils_src_configure
 }

diff --git a/games-simulation/fgrun/files/fgrun-1.5.1-fltk.patch b/games-simulation/fgrun/files/fgrun-1.5.1-fltk.patch
deleted file mode 100644
index dc00c9a..0000000
--- a/games-simulation/fgrun/files/fgrun-1.5.1-fltk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.old	2007-04-25 22:26:19.000000000 +0200
-+++ configure.ac	2007-04-25 22:27:41.000000000 +0200
-***************
-*** 138,143 ****
---- 138,146 ----
-    FLUID="$with_fltk/bin/fluid"
-    CPPFLAGS="-I$with_fltk/include $CPPFLAGS"
-    EXTRA_DIRS="${EXTRA_DIRS} $with_fltk"
-+ else
-+   CPPFLAGS="$(fltk-config --cxxflags) $CPPFLAGS"
-+   LDFLAGS="$(fltk-config --ldflags) $LDFLAGS"
-  fi
-  AC_SUBST(FLUID)