Fix bugs 434954, 434996. Thanks hasufell

Package-Manager: portage-2.1.11.16/cvs/Linux x86_64

3 files changed, 118 insertions, 5 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 96bb9a0cb6df..7122895a12d1 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeorion
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.1 2012/09/11 16:01:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.2 2012/09/16 19:53:39 tomka Exp $
+
+*freeorion-0.4.2_pre20120910-r1 (16 Sep 2012)
+
+  16 Sep 2012; Thomas Kahle <tomka@gentoo.org>
+  +freeorion-0.4.2_pre20120910-r1.ebuild:
+  Fix bugs 434954, 434996. Thanks hasufell
 
 *freeorion-0.4.2_pre20120910 (11 Sep 2012)
 
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 52bf3cc8f986..b32569130aab 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA256
 
 DIST FreeOrion-0.4.2_pre20120910.tar.bz2 337118644 SHA256 7b66ae65075e68af8b7eb03b28be4813522ff61724b1ae52647a583eca35daa2 SHA512 2fb59f83c5219b73fbf9ebf309675789e701bca5460db4c8d4a367ebf4b5be7b4c5d50d9715794949804c272ed8be82b5caf63e61de0fbd3a0ea19c449593a67 WHIRLPOOL 3b81424e92fbc48cc8383558d885b4a59928b41aa81dcce0120d3ceec4e56a0fc20621bd141393229042fc5582544e0cd5392281bc04d486091ff3bf6babb84a
+EBUILD freeorion-0.4.2_pre20120910-r1.ebuild 2743 SHA256 828b4e39e367f4bf604b36a5fb4f08b5e6a75af957258c572c0454a9b51514e6 SHA512 829812a65def6f832b6b486d82e1bbc3a3d042d48fb7456bb6d6775c0b26d007f9a3810fa0612e71cfb32a1d4d90e1bf8e528307eb6dcab5592cadccc216e2f5 WHIRLPOOL d1643ceb354d1fe7eec7475b27286e4214381e0d53a75b4320fd4781355568fe35ea62d29bec4858d9d62eb944d48bfe9883464199bc055228bc05df24e2b26f
 EBUILD freeorion-0.4.2_pre20120910.ebuild 2453 SHA256 1b35cb965c4c5818d026ab609847610eba0e3c5cd0bf24378fc1da27ee935d42 SHA512 22f8bdd7f2a03a8c079daee7920aa748cf2eb554a83b505097dd0880ef014b18d65dc79cfdd26f1ce1ff6f565063281cb108d2a0a1a78eedfd16b70d0b041539 WHIRLPOOL 5c18da577cec858c29a2b1e3b389087476df1744784972b7cca5061a0a5f0869184eabba011a671f8e04ead85f9eaa4f9385a607bdb710ea15eddfb1601bbdb0
-MISC ChangeLog 815 SHA256 b1fa0ecab1c74682c38559c9f961d8e5986331c936520a338d2c1e1f30062e1c SHA512 5a1ead0c75a30da2e4b73615dd6fb9765bd9b4634d4e64656ba57fbcf7c8670a6518643a120e6a690d6b6ad564a9ca80b5c1e9033fedeb89dd931886bfb5f854 WHIRLPOOL 513de82492cb4ae47378672f03a3b525debe2753d05561163d8605a3cc52c2f42420f455f0e0126834a2984d3b9267aa87aecc0d84b22ea9b9f881dae29ad374
+MISC ChangeLog 995 SHA256 bb15e2914b4f09e5c9c8792b37c00122ae1b805c8db0299c65e69571c4ebe0fc SHA512 2cec89e5a3eab0f44f2d0d944c6e453c815abb7d48910ffeefb1437d079079b47c44833d6e1c022f68adb65bd8ec02e711e892f5bbc4753f5619bfeb56d010bc WHIRLPOOL a2e2e22dd3ad11037bb2d7018ea88c03708a46aade680cd010e31f3480c794b4a23d4eb0a808b08b5e452ccf41ce59ac0ff56ca34dd33ff748b2975abff828d3
 MISC metadata.xml 657 SHA256 31922a4a89499c885b776d17fe427833212e76d80e78755fd202d252ee9120e4 SHA512 a00342cfa84144df06cc461da147a1211c79c6421a65dfe748e2c4ac30f4deab05eb96dc4843d2b6eb814e5df567adb3907e0e6ad0d4b2f4bf3cf387f92aff92 WHIRLPOOL aa131a7c6bcf66273a7c4d0a3a30a19bbbb135707b67359eb80a2a782b608dba169387dc479a1c72971310211ff75db0b41b9c98e50e2127251f6e088f8486ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBPYEkACgkQid6yGVZcMrx0kQD+JN1cXkfBaKrY7pZBq15SmpU4
-sThLcu+OP1XxsAw1WN0A/1Uulc6V+vRMX+FW7Uv2PhBeNBSTudkbNJhwwXhxtrI9
-=zrp2
+iF4EAREIAAYFAlBWLkkACgkQid6yGVZcMrzlxAD+PXr1l2R+kHLks26FhSJbjQYD
+hvQji02lRaWoZFgNfD4A/i+LrX/7lVWAT4p6JIB8a4lF20hjFLcAWALcl0OBv6Xg
+=7Kc1
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild
new file mode 100644
index 000000000000..94e1a1b7b8ea
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild,v 1.1 2012/09/16 19:53:39 tomka Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit cmake-utils python games
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+SRC_URI="http://dev.gentoo.org/~tomka/files/FreeOrion-${PV}.tar.bz2"
+
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cg"
+
+# Needs a dev-games/gigi from the freeorion source directory.
+# It's safest to use the same version.
+RDEPEND="
+	dev-games/gigi[ogre,ois]
+	dev-games/ogre[cg?,opengl]
+	>=dev-libs/boost-1.47[python]
+	media-libs/freealut
+	media-libs/libogg
+	media-libs/libsdl[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/FreeOrion-${PV}/"
+CMAKE_USE_DIR="${S}"
+CMAKE_VERBOSE="1"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python_set_active_version 2
+	python_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	# set OGRE plugin-dir
+	sed \
+		-e "s:PluginFolder=.:PluginFolder=$(pkg-config --variable=plugindir OGRE):" \
+		-i "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
+
+	if use cg ; then
+		# add cg ogre plugin to config
+		echo "Plugin=Plugin_CgProgramManager" \
+			>> "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRELEASE_COMPILE_FLAGS=""
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	# data files
+	rm "${CMAKE_USE_DIR}"/default/COPYING || die
+	# get rid of .svn (remove from next snapshot!)
+	find "${CMAKE_USE_DIR}"default/ -depth -type d -name .svn \
+		-exec rm -rf '{}' \; || die
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${CMAKE_USE_DIR}"/default || die
+
+	# bin
+	dogamesbin "${CMAKE_BUILD_DIR}"/${PN}{ca,d} || die
+	newgamesbin "${CMAKE_BUILD_DIR}"/${PN} ${PN}.bin || die
+	games_make_wrapper ${PN} \
+		"${GAMES_BINDIR}/${PN}.bin --resource-dir ./default" \
+		"${GAMES_DATADIR}/${PN}"
+
+	# config
+	insinto "${GAMES_SYSCONFDIR}"/${PN}
+	doins "${CMAKE_USE_DIR}"/{OISInput,ogre_plugins}.cfg || die
+	# game uses relative paths
+	dosym "${GAMES_SYSCONFDIR}"/${PN}/ogre_plugins.cfg \
+		"${GAMES_DATADIR}"/${PN}/ogre_plugins.cfg || die
+	dosym "${GAMES_SYSCONFDIR}"/${PN}/OISInput.cfg \
+		"${GAMES_DATADIR}"/${PN}/OISInput.cfg || die
+
+	# other
+	dodoc "${CMAKE_USE_DIR}"/changelog.txt || die
+	newicon "${CMAKE_USE_DIR}"/default/data/art/icons/FO_Icon_32x32.png \
+		${PN}.png || die
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	# permissions
+	prepgamesdirs
+}