bump, remove old

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

4 files changed, 22 insertions, 120 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 9aa304df41f6..91bab0684e6b 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2013/02/07 22:17:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.5 2013/03/12 16:59:50 tomka Exp $
+
+*freeorion-0.4.3_pre20130312 (12 Mar 2013)
+
+  12 Mar 2013; Thomas Kahle <tomka@gentoo.org>
+  +freeorion-0.4.3_pre20130312.ebuild, -freeorion-0.4.2_pre20120910-r1.ebuild,
+  -freeorion-0.4.2_pre20120910.ebuild:
+  bump, remove old
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org>
   freeorion-0.4.2_pre20120910.ebuild, freeorion-0.4.2_pre20120910-r1.ebuild,
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 4d690ab3935b..f31a5021f8fc 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST FreeOrion-0.4.2_pre20120910.tar.bz2 337118644 SHA256 7b66ae65075e68af8b7eb03b28be4813522ff61724b1ae52647a583eca35daa2 SHA512 2fb59f83c5219b73fbf9ebf309675789e701bca5460db4c8d4a367ebf4b5be7b4c5d50d9715794949804c272ed8be82b5caf63e61de0fbd3a0ea19c449593a67 WHIRLPOOL 3b81424e92fbc48cc8383558d885b4a59928b41aa81dcce0120d3ceec4e56a0fc20621bd141393229042fc5582544e0cd5392281bc04d486091ff3bf6babb84a
 DIST FreeOrion-0.4.2_pre20121225.tar.gz 173281701 SHA256 8aa69e79275e894d30493d69ddf5b0040ca1ed6c357a0f966a87cd56bd64ee7b SHA512 57afad854a55c78ce5fb692fcc97c584ee67c49cd7f0fce3597c8a15c71c76fbd8567d96fb34a2ea3f30a236a067ac84ffe0a13020dedb98b91060ebb3cb4d8a WHIRLPOOL da9dd8e5b9bf2a583a93f2be37de29b5f947b65a5a5b68d3fa4c525d448fa67a02304fd516dd24cffe3af8669a074eb28d24e209b59ef21bff227397e3e7a992
-EBUILD freeorion-0.4.2_pre20120910-r1.ebuild 2722 SHA256 1b89a6ff4f81dfcab1ba3717e7deee3db98eba8baaf60368a5f287a3badfe8c7 SHA512 a0d9a958a098fe91cbaa03e5310fe925ceb83e42dd3d4d2e4cd96331ad29b146770853178b8efe178fbdb9121c9ea70d7b11c562e3ff35ccb38b76408bf86b8c WHIRLPOOL 5cb2c524bda87ae0076ce8671cfc1166ecb30becb1f4b3c71ee4b45e3aa43a797945dfa4aa9588ed0e919ef163a0d36c0b203fa42b4dd7dbe529a92d18ba153b
-EBUILD freeorion-0.4.2_pre20120910.ebuild 2432 SHA256 73edf0e0542b7550ff82021024ebd5068ea3ab848aa74247b8103cc4d99f7f51 SHA512 f9887183a6fa040b061a0ca4de4c8fbd92b21e41ddae1bafbcf4a054b98c78f1f70e58c063c0bda3db19dea9cbd01b4e647dd7d6ffa2a6d4485616a134b06d10 WHIRLPOOL 35fe2c90a704973ca0831b3dcbde4a6645b564b640b556981f07c0f696fbbca0cb2c9a47897467b03c4dc867e3ce6d7b34f3a70957f5bd6d086723c9648b6cf3
+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
-MISC ChangeLog 1344 SHA256 a9608679ddfdc06e904a295e40f462c1cc929edab270ae4ff0137981e6e8ecb2 SHA512 d61208c2711a43c895eec0140f9c40a6cbe9eeabfd910816d2e4944c8c2b3dbc0a6166aa2a6d494460dfd403b3039b463230a5c757bb395eff576b25caec609f WHIRLPOOL e4f0d44a9db955b17d4c69dce020c5723816b910c33208ef84da3a9f3d86397573500cd4e3733f93bcf0bd8980b0e0aae15ecb3df6dc6a0f94fe72dce1b8d108
+EBUILD freeorion-0.4.3_pre20130312.ebuild 2676 SHA256 09b2cdc3f3bf0d551793f75474a7496186a5c83a6b02dcc028cddbd7759ad17f SHA512 5e2cd323f58a89c33aed84b6f385040a66e9c72921332f3bacd2f0425db353d289daeaa691c6e07c220c07362ffd0300c8017333cd76b551918dde0e02923a79 WHIRLPOOL 61aa97b589d0d990f3d3170b32e5513716f44062cb530d6cab8c75c4a8ecf8ed62e0f4af0bbf9b87a161839429747dae5d176b0e98f5a1c0c24a15446325e257
+MISC ChangeLog 1575 SHA256 abe38a3971307cdd1db0caceddcd152cdb3fa37c2faf32b3962f795641de7156 SHA512 2a50e1ffccc520afab78d4f710fe4907e2cdb47031184a008d440d558ede0bff98e5b73ca5db2b16a2ab14e3258d3e37b9f9351ab65931d45108446240ac4c40 WHIRLPOOL 6e23d50372462cf34788215026fd3737d07dd987af56be4294fb2210bfea3be966ff5ffd0a3af624a44246f821c6c61471e17e49d7a90abe3838285dd400a5bf
 MISC metadata.xml 657 SHA256 31922a4a89499c885b776d17fe427833212e76d80e78755fd202d252ee9120e4 SHA512 a00342cfa84144df06cc461da147a1211c79c6421a65dfe748e2c4ac30f4deab05eb96dc4843d2b6eb814e5df567adb3907e0e6ad0d4b2f4bf3cf387f92aff92 WHIRLPOOL aa131a7c6bcf66273a7c4d0a3a30a19bbbb135707b67359eb80a2a782b608dba169387dc479a1c72971310211ff75db0b41b9c98e50e2127251f6e088f8486ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFCjKAAoJEDxpGckxwJCBAJ8P/AgIzZJA/Dk5A0E4RDcMqgrx
-0lL2Jhi+/GctzzVusGmRXcTTJcUAS+XD6brVEyYF4TN4J7O2SHa4KHtreDUwZ7+X
-9HC2CuHZxtFnd12ye2bfwNuDB9GshgWHLD1nLdUYEhB3A3iPRQ5PXWUznHtr/Glq
-5cMSSQJsK2fcdATxHjC+WULSxwkPRkn0eRjWxqFdVoOHCPECNbt4tBKpPSb8CfI2
-TJqTRSS3/ebImqenc3Qn5joFKUUUuQF7YXvpINjwpVx8B+qja/5W+Ls4LTI3JL9S
-F2OlLe3jV9lxKhqblaJg8oQGJ1+JlQY+qLMaRlVluIAYNp5MVmW1W9Fk5pISm5jM
-Hn9FtgXX9HV9fRiUzvKX8bjg5YUaNTMVfnzcxyu1SKUMID0NUxfwsRmz84YR0GlB
-8E/w132Fnlt9tgeSvVonquv9M0bVDGPNp2mhbnfcPKT4Igco0O1N/nCkp5CSyC5z
-cKtOeozuEzs2WTH5IVWjhWwluW9+tr8Vt9k+jX3nAt1kjHP+kLSfYyI3ePmJNnPQ
-KBHfcdltKwfwYNGdrWtslwKZmT64x0MubWEAZrvvCP6w+eRrYDW0+r+X00pSWgd2
-z3RuV5tzpRAzXwDYcmnOMS06uAY7ADvfjuBdsr52OYWTr6ozvgbo4jeTavoAE8y/
-WCNas3OA76XAe6L72DgN
-=GLp1
+iF4EAREIAAYFAlE/XwcACgkQid6yGVZcMrz0rAEAmvL8hfaNYCUqVmjHVErgH0ZY
+DmIh46WKsPWPTO2LgvwBAKWAaLBRJXlIBZQV03NiAmU7SKTlgKvRHyXMxeD+pfYE
+=Zvlq
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeorion/freeorion-0.4.2_pre20120910.ebuild b/games-strategy/freeorion/freeorion-0.4.2_pre20120910.ebuild
deleted file mode 100644
index 949794170dcc..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.2_pre20120910.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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_pre20120910.ebuild,v 1.2 2013/02/07 22:17:01 ulm 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 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.
-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"
-
-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
-	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
-}
diff --git a/games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild
index 91062b69508c..3c4e37af906d 100644
--- a/games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild
@@ -1,6 +1,6 @@
 # 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_pre20120910-r1.ebuild,v 1.2 2013/02/07 22:17:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild,v 1.1 2013/03/12 16:59:50 tomka Exp $
 
 EAPI=4
 
@@ -8,9 +8,11 @@ PYTHON_DEPEND="2"
 
 inherit cmake-utils python 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.bz2"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
 
 LICENSE="GPL-2 CC-BY-SA-3.0"
 SLOT="0"
@@ -34,7 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/FreeOrion-${PV}/"
+S="${WORKDIR}/${myPN}"
 CMAKE_USE_DIR="${S}"
 CMAKE_VERBOSE="1"
 
@@ -56,6 +58,9 @@ src_prepare() {
 		echo "Plugin=Plugin_CgProgramManager" \
 			>> "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
 	fi
+
+	# set revision for display in game -- update on bump!
+	sed -i -e 's/???/5854/' CMakeLists.txt
 }
 
 src_configure() {
@@ -73,9 +78,6 @@ 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