bump to 0.4.3, remove old

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC!

3 files changed, 34 insertions, 24 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 91bab0684e6b..1dfb3899ca4c 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeorion
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.5 2013/03/12 16:59:50 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.6 2013/09/16 18:20:55 tomka Exp $
+
+*freeorion-0.4.3 (16 Sep 2013)
+
+  16 Sep 2013; Thomas Kahle <tomka@gentoo.org> +freeorion-0.4.3.ebuild,
+  -freeorion-0.4.2_pre20121225.ebuild:
+  bump to 0.4.3, remove old
 
 *freeorion-0.4.3_pre20130312 (12 Mar 2013)
 
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index f31a5021f8fc..87e64409712c 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST FreeOrion-0.4.2_pre20121225.tar.gz 173281701 SHA256 8aa69e79275e894d30493d69ddf5b0040ca1ed6c357a0f966a87cd56bd64ee7b SHA512 57afad854a55c78ce5fb692fcc97c584ee67c49cd7f0fce3597c8a15c71c76fbd8567d96fb34a2ea3f30a236a067ac84ffe0a13020dedb98b91060ebb3cb4d8a WHIRLPOOL da9dd8e5b9bf2a583a93f2be37de29b5f947b65a5a5b68d3fa4c525d448fa67a02304fd516dd24cffe3af8669a074eb28d24e209b59ef21bff227397e3e7a992
+DIST freeorion-0.4.3.tar.bz2 171281552 SHA256 f0a61a42ba09ed2c8b453b734af7320582f8711913b741c5f9d86cad214bf7cf SHA512 87a73c97af14c0c81cfa19023aec410dd785988cab1edafb0e696305e6203fb431faddcc6ca2c4040e5ef0e8a228c2fda6ccf0f0ef93b47aa48ccd0758ecbe02 WHIRLPOOL 1761c2bf6d67fc93bb8e15b60c2dc23b1145e3d101fb1fde85996f94b83875a57d0c7e518e7b404a6d2098d6909feb8458b2630b6d6415c48fd6cc709165d9df
 DIST freeorion-0.4.3_pre20130312.tar.bz2 171010452 SHA256 a6aea2fde48d55ac902ca359bdeff316d03645954d08d4febd59dd483e74a06b SHA512 4811803b0085d5b4ad8d2fe2aaa272e678ad3506e03f1130f93b40c9de1dd75abe32b89de28368e290333a1105f6f86ac82d1a936fb641f34578b465fc21a252 WHIRLPOOL 4b0263b8a9df51ac0a9be5dfda39d457f6783e688cb5bc792fb29b5354abd85e88685d13ea419afe85bc25295a6ed54c90b5f6839b21446f9b70e0bfff293692
-EBUILD freeorion-0.4.2_pre20121225.ebuild 2684 SHA256 b7c070821b920736a7c5e2e8ac337e1f5f04f1c48c3be7a5208ac897c811c1b3 SHA512 d2eb5d0b191a88e771c028ba5c11da29789f87208edbefb942643397810386fa2a95588756197504f770f96e5c99354597c90c150af23f0890a21591670273bc WHIRLPOOL b2672f834c9f9f8ee54cde7c61c7a773ba02ee824a503020ee81355192a679a843924a455d0a0fc9d597a6cbac8cd00ac8633d62b950dc4d61595d061946154a
+EBUILD freeorion-0.4.3.ebuild 2891 SHA256 3defbe88e576338d6d752bd9a54c7838a01bc1223e80d704a1041398af9bccd6 SHA512 ecd3f5aa201465b9f787391396f5157ebbccfa76716ffdcbb0aafb409abd881b562c18b18d54d8a689a42fa367152bcb3c6366dfadb842322738cb555138b0b9 WHIRLPOOL a361163e7bb27ba1ed73eae89c45594de52bcc9525876be3ba268108786d5dac37ad120d24c4e89e0c5e544a85caeb5b9343e1ededd4e7cc446155af474f44e1
 EBUILD freeorion-0.4.3_pre20130312.ebuild 2676 SHA256 09b2cdc3f3bf0d551793f75474a7496186a5c83a6b02dcc028cddbd7759ad17f SHA512 5e2cd323f58a89c33aed84b6f385040a66e9c72921332f3bacd2f0425db353d289daeaa691c6e07c220c07362ffd0300c8017333cd76b551918dde0e02923a79 WHIRLPOOL 61aa97b589d0d990f3d3170b32e5513716f44062cb530d6cab8c75c4a8ecf8ed62e0f4af0bbf9b87a161839429747dae5d176b0e98f5a1c0c24a15446325e257
-MISC ChangeLog 1575 SHA256 abe38a3971307cdd1db0caceddcd152cdb3fa37c2faf32b3962f795641de7156 SHA512 2a50e1ffccc520afab78d4f710fe4907e2cdb47031184a008d440d558ede0bff98e5b73ca5db2b16a2ab14e3258d3e37b9f9351ab65931d45108446240ac4c40 WHIRLPOOL 6e23d50372462cf34788215026fd3737d07dd987af56be4294fb2210bfea3be966ff5ffd0a3af624a44246f821c6c61471e17e49d7a90abe3838285dd400a5bf
+MISC ChangeLog 1747 SHA256 6e3c152b7ee64f633916592d7820be3c24b1a84185d4dabaece11e55f8edb90f SHA512 ecb8ef0d0e1ae9dc2338d2f749e59a5244090c3ae178383c2dc5ecc6d3a96644a6f3fc80ff11a32c3309ad3a96311122928272dc936939cf79cadfe1244dc27f WHIRLPOOL 26cba879af52f6e9bbb7ff2d002a50fdd432dd832b4ac1dd197d1a1d7e609f137dd35e036368350e9a449efe146a98d49acfd0b25d7ae878951566325cd1bf23
 MISC metadata.xml 657 SHA256 31922a4a89499c885b776d17fe427833212e76d80e78755fd202d252ee9120e4 SHA512 a00342cfa84144df06cc461da147a1211c79c6421a65dfe748e2c4ac30f4deab05eb96dc4843d2b6eb814e5df567adb3907e0e6ad0d4b2f4bf3cf387f92aff92 WHIRLPOOL aa131a7c6bcf66273a7c4d0a3a30a19bbbb135707b67359eb80a2a782b608dba169387dc479a1c72971310211ff75db0b41b9c98e50e2127251f6e088f8486ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlE/XwcACgkQid6yGVZcMrz0rAEAmvL8hfaNYCUqVmjHVErgH0ZY
-DmIh46WKsPWPTO2LgvwBAKWAaLBRJXlIBZQV03NiAmU7SKTlgKvRHyXMxeD+pfYE
-=Zvlq
+iF4EAREIAAYFAlI3TCwACgkQid6yGVZcMrzVVwD/WybQr21UCMN7ZAh9bJkow4gq
+Sq7G5N1N5OQReeJy8EQBAJda1drYj8yKpTKDhALPlTF2d3xWyVlgjb7vedOaSxT9
+=tSqE
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeorion/freeorion-0.4.2_pre20121225.ebuild b/games-strategy/freeorion/freeorion-0.4.3.ebuild
index b8ecd54004c2..1b0130f9335f 100644
--- a/games-strategy/freeorion/freeorion-0.4.2_pre20121225.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.3.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2013 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_pre20121225.ebuild,v 1.2 2013/02/07 22:17:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild,v 1.1 2013/09/16 18:20:55 tomka Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
-
-inherit cmake-utils python games
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit cmake-utils python-any-r1 games
 
 myPN="FreeOrion"
 
 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.gz"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
 
 LICENSE="GPL-2 CC-BY-SA-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.
+# Needs it's own version of GG(dev-games/gigi) which it ships.
+# The split version dev-games/gigi is not used anymore as of 0.4.3
 RDEPEND="
-	dev-games/gigi[ogre,ois]
+	!dev-games/gigi
 	dev-games/ogre[cg?,opengl]
 	>=dev-libs/boost-1.47[python]
 	media-libs/freealut
@@ -34,24 +33,24 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/opengl"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${myPN}"
+S="${WORKDIR}/${P}/${myPN}"
 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
+	python-any-r1_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
+		-e "s:PluginFolder=.*$:PluginFolder=$(pkg-config --variable=plugindir OGRE):" \
+		-i "${CMAKE_USE_DIR}"/ogre_plugins.cfg.in || die
 
 	if use cg ; then
 		# add cg ogre plugin to config
@@ -60,7 +59,7 @@ src_prepare() {
 	fi
 
 	# set revision for display in game -- update on bump!
-	sed -i -e 's/???/5576/' CMakeLists.txt
+	sed -i -e 's/???/6281/' CMakeLists.txt
 }
 
 src_configure() {
@@ -88,9 +87,14 @@ src_install() {
 		"${GAMES_BINDIR}/${PN}.bin --resource-dir ./default" \
 		"${GAMES_DATADIR}/${PN}"
 
+	# lib
+	dogameslib "${CMAKE_BUILD_DIR}"/libfreeorion{common,parse}.so || die
+	dogameslib "${CMAKE_BUILD_DIR}"/libGiGi*.so || die
+
 	# config
 	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	doins "${CMAKE_USE_DIR}"/{OISInput,ogre_plugins}.cfg || die
+	doins "${CMAKE_BUILD_DIR}"/ogre_plugins.cfg || die
+	doins "${CMAKE_USE_DIR}"/OISInput.cfg || die
 	# game uses relative paths
 	dosym "${GAMES_SYSCONFDIR}"/${PN}/ogre_plugins.cfg \
 		"${GAMES_DATADIR}"/${PN}/ogre_plugins.cfg || die