[gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/, games-arcade/mars-game/files/

[gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/, games-arcade/mars-game/files/

[Marcel Unbehaun]

commit:     2ca7d39c83618fb152b49f7bfa5995d9ce3246bf
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Wed Nov  9 16:24:33 2011 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Wed Nov  9 16:24:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=2ca7d39c

[games-arcade/mars-game]	small patch for mars-game-9999.ebuild

---
 .../mars-game/files/mars-game-9999-hotfix.patch    |   11 +++++++++++
 games-arcade/mars-game/mars-game-9999.ebuild       |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/games-arcade/mars-game/files/mars-game-9999-hotfix.patch b/games-arcade/mars-game/files/mars-game-9999-hotfix.patch
new file mode 100644
index 0000000..9870f8b
--- /dev/null
+++ b/games-arcade/mars-game/files/mars-game-9999-hotfix.patch
@@ -0,0 +1,11 @@
+diff -Naur mars-game-9999/src/Teams/Team.cpp mars-game-9999-p/src/Teams/Team.cpp
+--- mars-game-9999/src/Teams/Team.cpp	2011-11-09 17:03:09.150988068 +0100
++++ mars-game-9999-p/src/Teams/Team.cpp	2011-11-09 17:06:37.035985521 +0100
+@@ -25,6 +25,7 @@
+ # include "Controllers/KeyController.hpp"
+ # include "Games/games.hpp"
+ # include "Controllers/BotController.hpp"
++#include <set>
+ 
+ Team::Team(Color3f const& color):
+     evaluationTimer_(0.f),

diff --git a/games-arcade/mars-game/mars-game-9999.ebuild b/games-arcade/mars-game/mars-game-9999.ebuild
index 63602f6..2be33b5 100644
--- a/games-arcade/mars-game/mars-game-9999.ebuild
+++ b/games-arcade/mars-game/mars-game-9999.ebuild
@@ -21,6 +21,7 @@ DEPEND=">=media-libs/libsfml-2.0
 RDEPEND="${DEPEND}"
 
 src_prepare(){
+	epatch "${FILESDIR}"/${P}-hotfix.patch
 	sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt
 }
 

[gentoo-commits] proj/gamerlay:master commit in: games-arcade/mars-game/, games-arcade/mars-game/files/

[Marcel Unbehaun]

commit:     146bae8be67d03a210bc3659fa348ed12f8570e2
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Fri Jul 13 14:57:27 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Fri Jul 13 14:57:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=146bae8b

[games-arcade/mars-game]	updated mars-game-9999.ebuild

---
 .../mars-game/files/mars-game-9999-glib.patch      |   12 ++++++++
 .../mars-game/files/mars-game-9999-hotfix.patch    |   11 --------
 games-arcade/mars-game/mars-game-0.7.4.ebuild      |   28 --------------------
 games-arcade/mars-game/mars-game-9999.ebuild       |    2 +-
 4 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/games-arcade/mars-game/files/mars-game-9999-glib.patch b/games-arcade/mars-game/files/mars-game-9999-glib.patch
new file mode 100644
index 0000000..e112dd5
--- /dev/null
+++ b/games-arcade/mars-game/files/mars-game-9999-glib.patch
@@ -0,0 +1,12 @@
+--- CMakeLists.txt-O	2012-07-13 11:49:06.000000000 +0200
++++ CMakeLists.txt	2012-07-13 11:59:31.590809749 +0200
+@@ -48,6 +48,9 @@
+ # Fribidi library needed for bi-directional texts
+ 	find_library(FRIBIDI_LIBRARY fribidi)
+ 
++	find_package(PkgConfig)
++	pkg_check_modules(GLIB glib-2.0)
++   include_directories(${GLIB_INCLUDE_DIRS})
+ # set the executable output path
+ if(APPLE)
+ 	set(EXECUTABLE_OUTPUT_PATH ${MARS_BINARY_DIR})

diff --git a/games-arcade/mars-game/files/mars-game-9999-hotfix.patch b/games-arcade/mars-game/files/mars-game-9999-hotfix.patch
deleted file mode 100644
index 9870f8b..0000000
--- a/games-arcade/mars-game/files/mars-game-9999-hotfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur mars-game-9999/src/Teams/Team.cpp mars-game-9999-p/src/Teams/Team.cpp
---- mars-game-9999/src/Teams/Team.cpp	2011-11-09 17:03:09.150988068 +0100
-+++ mars-game-9999-p/src/Teams/Team.cpp	2011-11-09 17:06:37.035985521 +0100
-@@ -25,6 +25,7 @@
- # include "Controllers/KeyController.hpp"
- # include "Games/games.hpp"
- # include "Controllers/BotController.hpp"
-+#include <set>
- 
- Team::Team(Color3f const& color):
-     evaluationTimer_(0.f),

diff --git a/games-arcade/mars-game/mars-game-0.7.4.ebuild b/games-arcade/mars-game/mars-game-0.7.4.ebuild
deleted file mode 100644
index de856c7..0000000
--- a/games-arcade/mars-game/mars-game-0.7.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/mars-game/mars-game-0.7.4.ebuild,v 1.2 2011/10/15 09:13:36 frostwork Exp $
-
-EAPI=4
-
-inherit cmake-utils eutils
-
-MY_PN="mars"
-DESCRIPTION="a ridiculous shooter"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_source_${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug"
-
-DEPEND=">=media-libs/libsfml-2.0
-		virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare(){
-	sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt
-}
-

diff --git a/games-arcade/mars-game/mars-game-9999.ebuild b/games-arcade/mars-game/mars-game-9999.ebuild
index 2be33b5..4616846 100644
--- a/games-arcade/mars-game/mars-game-9999.ebuild
+++ b/games-arcade/mars-game/mars-game-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND=">=media-libs/libsfml-2.0
 RDEPEND="${DEPEND}"
 
 src_prepare(){
-	epatch "${FILESDIR}"/${P}-hotfix.patch
+	epatch "${FILESDIR}"/${P}-glib.patch
 	sed -i -e "s:{CMAKE_INSTALL_PREFIX}/games:{CMAKE_INSTALL_PREFIX}/games/bin:g" -i src/CMakeLists.txt
 }