[gentoo-commits] proj/gamerlay:master commit in: games-engines/fife/, games-engines/fife/files/

["Bernhard Mallinger" <b.mallinger@gmx.at>]

commit:     09386d1e012e332a969e0e4ec0605a01c31282b8
Author:     totycro <totycro <AT> unknown-horizons <DOT> org>
AuthorDate: Thu Nov  3 14:53:43 2011 +0000
Commit:     Bernhard Mallinger <b.mallinger <AT> gmx <DOT> at>
CommitDate: Thu Nov  3 14:53:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=09386d1e

Added games-engines/fife/fife-0.3.3-r2.ebuild

---
 .../{fife-0.3.1.ebuild => fife-0.3.3-r2.ebuild}    |    9 ++++---
 .../fife/files/fife-0.3.3-unbundle-libpng.patch    |   24 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/games-engines/fife/fife-0.3.1.ebuild b/games-engines/fife/fife-0.3.3-r2.ebuild
similarity index 88%
rename from games-engines/fife/fife-0.3.1.ebuild
rename to games-engines/fife/fife-0.3.3-r2.ebuild
index 5add1a3..97ca694 100644
--- a/games-engines/fife/fife-0.3.1.ebuild
+++ b/games-engines/fife/fife-0.3.3-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.7"
 
 inherit eutils python scons-utils versionator
 
@@ -31,22 +31,23 @@ RDEPEND="dev-libs/boost
 	sys-libs/zlib
 	x11-libs/libXcursor
 	x11-libs/libXext
-	dev-games/guichan
+	dev-games/guichan[sdl]
 	opengl? ( virtual/opengl virtual/glu )"
 DEPEND="${RDEPEND}
 	dev-lang/swig"
 
-S=${WORKDIR}/${PN}-${MY_PV}
+S=${WORKDIR}/${PN}_${PV}
 
 src_prepare() {
 	rm -r ext #delete bundled libs
 	epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
 }
 
-# Can compiles only with one thread
+# Can compile only with one thread
 SCONSOPTS="-j1"
 
 src_compile() {
+	export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
 	escons \
 		--python-prefix="${D}/$(python_get_sitedir)" \
 		--prefix="${D}/usr" \

diff --git a/games-engines/fife/files/fife-0.3.3-unbundle-libpng.patch b/games-engines/fife/files/fife-0.3.3-unbundle-libpng.patch
new file mode 100644
index 0000000..580edfa
--- /dev/null
+++ b/games-engines/fife/files/fife-0.3.3-unbundle-libpng.patch
@@ -0,0 +1,24 @@
+Index: image.h
+===================================================================
+--- a/engine/core/video/image.h	(revision 3239)
++++ b/engine/core/video/image.h	(working copy)
+@@ -27,7 +27,6 @@
+ 
+ // 3rd party library includes
+ #include <SDL.h>
+-#include <png.h>
+ 
+ // FIFE includes
+ // These includes are split up in two parts, separated by one empty line
+Index: image.cpp
+===================================================================
+--- a/engine/core/video/image.cpp	(revision 3239)
++++ b/engine/core/video/image.cpp	(working copy)
+@@ -25,6 +25,7 @@
+ 
+ // 3rd party library includes
+ #include <SDL.h>
++#include <png.h>
+ 
+ // FIFE includes
+ // These includes are split up in two parts, separated by one empty line