version bump wrt #396203

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 146 insertions, 2 deletions

diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index 1289793b6afe..998fa15fb4dc 100644
--- a/games-engines/stratagus/ChangeLog
+++ b/games-engines/stratagus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-engines/stratagus
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.21 2011/09/17 16:50:03 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.22 2012/05/27 20:24:24 hasufell Exp $
+
+*stratagus-2.2.6 (27 May 2012)
+
+  27 May 2012; Julian Ospald <hasufell@gentoo.org> +stratagus-2.2.6.ebuild,
+  +files/stratagus-2.2.6-build.patch:
+  version bump wrt #396203
 
   17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> stratagus-2.2.5.5.ebuild,
   +files/stratagus-2.2.5.5-libpng15.patch:
diff --git a/games-engines/stratagus/files/stratagus-2.2.6-build.patch b/games-engines/stratagus/files/stratagus-2.2.6-build.patch
new file mode 100644
index 000000000000..348c1145636b
--- /dev/null
+++ b/games-engines/stratagus/files/stratagus-2.2.6-build.patch
@@ -0,0 +1,75 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun May 20 17:02:54 UTC 2012
+Subject: build-system
+
+respect system LDFLAGS
+make install paths modifiable
+
+included upstream: https://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8279
+also merged: https://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8061
+
+--- stratagus_2.2.6.orig/CMakeLists.txt
++++ stratagus_2.2.6.orig/CMakeLists.txt
+@@ -587,6 +587,12 @@
+ 	set(ENABLE_TOUCHSCREEN ON)
+ endif()
+ 
++# Stratagus needs to have char by default signed
++# No idea how to tell this to other compilers
++if(CMAKE_COMPILER_IS_GNUCXX)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
++endif()
++
+ check_function_exists("strcasestr" HAVE_STRCASESTR)
+ check_function_exists("strnlen" HAVE_STRNLEN)
+ 
+@@ -602,9 +608,7 @@
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ 
+ if(ENABLE_STRIP)
+-	set(CMAKE_EXE_LINKER_FLAGS "-s")
+-else()
+-	set(CMAKE_EXE_LINKER_FLAGS "")
++	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
+ endif()
+ 
+ # Print compile info
+@@ -836,15 +840,22 @@
+ 
+ ########### install files ###############
+ 
+-install(TARGETS stratagus DESTINATION games)
+-install(TARGETS png2stratagus DESTINATION bin)
++# install paths
++set(BINDIR "bin" CACHE PATH "Where to install binaries")
++set(SBINDIR "sbin" CACHE PATH "Where to install metaserver binary")
++set(DOCDIR "share/doc/stratagus" CACHE STRING "Sets the doc directory to a non-default location.")
++set(MANDIR "share/man/man6" CACHE STRING "Sets the man directory to a non-default location.")
++set(STRATAGUS_HEADERS "include" CACHE STRING "Where to install stratagus headers.")
++
++install(TARGETS stratagus DESTINATION ${BINDIR})
++install(TARGETS png2stratagus DESTINATION ${BINDIR})
+ 
+ if(SQLITE_FOUND)
+-	install(TARGETS metaserver DESTINATION sbin)
++	install(TARGETS metaserver DESTINATION ${SBINDIR})
+ endif()
+ 
+ if(ENABLE_DOC AND DOXYGEN_FOUND)
+-	install(FILES doc/stratagus.6 DESTINATION share/man/man6)
++	install(FILES doc/stratagus.6 DESTINATION ${MANDIR})
+ 	install(FILES
+ 		doc/development.html
+ 		doc/faq.html
+@@ -858,9 +869,9 @@
+ 		doc/README-SDL.txt
+ 		DESTINATION share/doc/stratagus
+ 	)
+-	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION share/doc/stratagus)
++	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR})
+ endif(ENABLE_DOC AND DOXYGEN_FOUND)
+ 
+ if(ENABLE_DEV)
+-	install(FILES ${gameheaders_HDRS} DESTINATION include)
++	install(FILES ${gameheaders_HDRS} DESTINATION ${STRATAGUS_HEADERS})
+ endif()
diff --git a/games-engines/stratagus/stratagus-2.2.6.ebuild b/games-engines/stratagus/stratagus-2.2.6.ebuild
new file mode 100644
index 000000000000..3b1688d077d9
--- /dev/null
+++ b/games-engines/stratagus/stratagus-2.2.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.6.ebuild,v 1.1 2012/05/27 20:24:24 hasufell Exp $
+
+EAPI=2
+inherit cmake-utils eutils games
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="http://stratagus.sourceforge.net/"
+SRC_URI="http://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mikmod mng theora vorbis"
+
+RDEPEND="x11-libs/libX11
+	virtual/opengl
+	dev-db/sqlite:3
+	>=dev-lang/lua-5
+	dev-lua/toluapp
+	media-libs/libpng:0
+	media-libs/libsdl[audio,opengl,video]
+	bzip2? ( app-arch/bzip2 )
+	mikmod? ( media-libs/libmikmod )
+	mng? ( media-libs/libmng )
+	theora? ( media-libs/libtheora media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${PN}_${PV}.orig
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINDIR="${GAMES_BINDIR}"
+		-DSBINDIR="${GAMES_BINDIR}"
+		$(cmake-utils_use_with bzip2)
+		$(cmake-utils_use_with debug)
+		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_with mikmod)
+		$(cmake-utils_use_with mng)
+		$(cmake-utils_use_with theora)
+		$(cmake-utils_use_with vorbis oggvorbis)
+		-DENABLE_DEV=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepalldocs
+	prepgamesdirs
+}