version bump wrt #396203

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 159 insertions, 8 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/Manifest b/games-engines/stratagus/Manifest
index ae6b34a7f05b..85a04dc5d42d 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1,15 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX stratagus-2.2.5.5-libpng15.patch 2260 RMD160 e830d532aadcb7d849a5177ea7f8670778ded586 SHA1 b7f20472c1481223a36363579c4cfcc43b8898a9 SHA256 bf36f8f99da8cace616923f6fd3979a147bf201b462a82f3f059cec01487c61f
+AUX stratagus-2.2.6-build.patch 2558 RMD160 0d443db116b9b801a568da22e01f2da0815ac7ab SHA1 5bbd7de493d41d0ca707c017aeee0d80c338d89d SHA256 08c713dc3ce2773a37c4bbdc99488f5bf8f645d0739d4c0eb81146c7cee0127f
 DIST stratagus_2.2.5.5.orig.tar.gz 976972 RMD160 371ded2944db34b930a337ed5a08eca32f772541 SHA1 c7b9ac70c96289ba964919fa9add93e93c879b0d SHA256 e0c8fe592ee3ad0c5806937aa950aad39019780de5344987366fe76901377285
+DIST stratagus_2.2.6.orig.tar.gz 921369 RMD160 6143371de078dbff88ceb81df0ba6540c342e444 SHA1 aebd554418b88ccda63b6e82555ee01bbfe0a88a SHA256 d3678b75aa49e211d6cf5654d6b1b9bb451df9205a28d4ce98ed3459e3f1258c
 EBUILD stratagus-2.2.5.5.ebuild 1442 RMD160 4798b414efdce299cc799b3bf9ebf74b921e7d28 SHA1 b1f6a59ed3b1ada3f6ce66b62a053ac59cebea81 SHA256 c3b6f0ac3ebbb95244867a7ab41efa9e6f5ceca6adf2f183c28de86fb14fe51e
-MISC ChangeLog 3285 RMD160 2812c0094a78858284107aa796b1fb63073f1928 SHA1 8dee38103335e15285053038b3ce92e4f6145de2 SHA256 d7fa2411d24cc80a46bc16173525161c250e0883ddcb03b9078fa610812db4c7
+EBUILD stratagus-2.2.6.ebuild 1520 RMD160 963db20eb19a51bcd5a14b4419e5301470903b8b SHA1 694f6c801cc845f1f9ad054bd243def08eb4c0c8 SHA256 6b43cd1fae3a3da48478bae83bc1910edf938f7a0fbc2c35843c2b77875cfd63
+MISC ChangeLog 3458 RMD160 5fb42f44a5b918ebe5987354ce2767838ca9f4a6 SHA1 8a91dfe5d6c85d44e1b707b86b2f19c20de67683 SHA256 b60255df18ee6bf93c4decce978cb79172db71a170f9004402859b5e790f58bc
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk50z/cACgkQXkR9YqOcLPGe9wD+NXfOVYCdqvwOgZDsFCWlYkUV
-jj6anNqgGzrao35ePboA/RuiswSrtfvlLLAcSh2JTIgywCjgINIgqbo0ifkulq2T
-=/0LH
+iQEcBAEBAgAGBQJPwoziAAoJEFpvPKfnPDWzgrsH/A1Sf9vb03MPfhkpDYLTg+M0
+DPXE3d3+KD9FHd/P6Fuc87o60745vBAVq/mHTB9KTfwHNsJe3vWqsZFMBIPjicT1
+voKrfDUdfc6FA8tB5cMM5DOcQ9/iuM8zPP3gfcNqVrZiFlmWlWK/U4mmK0aa4rPs
+gdu2+Qq5i84frwgMcFIXAX5DKWEihrwL5pw5n1Aa5XJDqAAd80O6LnUEUlVNkn25
+X8cM43oTC3xAX1zCr0mfccrjxC1QFjbBbH3LmPdeFfDmAJZV/U5DA7Qe07qnJZwN
+Ug5EUyilXkJ2ebhICg0aruTdPFWgFjljYw8LnAdVa3tRyj/+psxt+G+kUaO3Sfk=
+=yhot
 -----END PGP SIGNATURE-----
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
+}