bump and remove old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

3 files changed, 17 insertions, 37 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 80e255390380..3ba865cd467a 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeorion
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.13 2015/03/26 19:55:38 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.14 2015/03/27 14:05:26 tomka Exp $
+
+*freeorion-0.4.5_pre (27 Mar 2015)
+
+  27 Mar 2015; Thomas Kahle <tomka@gentoo.org> +freeorion-0.4.5_pre.ebuild,
+  -freeorion-0.4.4.ebuild:
+  bump and remove old
 
   26 Mar 2015; Thomas Kahle <tomka@gentoo.org> -freeorion-0.4.3.ebuild:
   drop old
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index f6cc6354c375..754c4b6bbeb4 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST freeorion-0.4.4-ogre-1.9-compat.patch.bz2 3950 SHA256 068f2f18ccf9f8188cafa06559aea91ae6a638d2650bd39633ce94a107b3c374 SHA512 2ae9744502e81cd24ff644c0c747ff57412e22fa3580532289f5afdadd1b88b42b956082357c3b3aa785499e967dc2127df8d0eeb116718b4246f7d9954b1e10 WHIRLPOOL c0dc3f7191b7f2c2ce6f83d21a2d85abaa9e699d28a557bb4cbf51035b62f37f0b0d3dd9cb9c8f0d8e84e72724a5875d6f73cf942fd0a8432e4146845aac70d3
-DIST freeorion-0.4.4.tar.bz2 143462526 SHA256 0941242cb690ef00d9e2faec833b0a0ec2d593b97faba5af5866b738111c6203 SHA512 b2989c859af6c13a945b28b8f1344025230d71d0b0b7f0b46c4a3b2c88775b7fe3f88b7250233dab7a5887a0e6d7936da970647a7e056e97ea5f0fef08df6513 WHIRLPOOL 44b8a85b8300394a7b64991ce6d3399e089be6231f7eba1298bcd72009cc83fb49ffaaa6877ced00b275b64f1b63858c87270f6207f9b7c380c11b6a719916f6
-EBUILD freeorion-0.4.4.ebuild 3094 SHA256 f452bbbc267921383f607380ee753bdc3951f0c3b92aeda4f949dc333af5aba7 SHA512 dae7ad4824e4cd2fd0357d5e7c000f031762a1bc12ff1a6f52819209844886a1a6be9f0091f0e9a272cf179f07771d554ebd937c659949320159ca8b4dbd1b44 WHIRLPOOL cb461b219316ae77f24c9887c7f01168520c492432b48d5e0b0be65ad82d52042c94b76ec837e9b23faa8f53d388e734474526c06a530e27027618b38cd779e0
-MISC ChangeLog 2770 SHA256 72ed954869b1a7524bd429293f11a18e299b19745c5fff294108d8a82cb48989 SHA512 de437782de6e66466994042c2fe3176034f04b2ff62d20b6c22b42655cb8dc9b70085826ab4bd223fab1dff1ce875615a994d07436c82152b23f830e35301742 WHIRLPOOL 51498abd4a06a6edb149698bab301c219e06964991eae4032b39c72897edfa7529579f594906af0d0b75f43bb5b547d8392ca8a061cc4a0d1fb13d4287546473
+DIST freeorion-0.4.5_pre.tar.bz2 141068240 SHA256 a3d326a1fa05327cf23b14ef08672c0199fc08df15bb3679f579575115172b4a SHA512 33dc4a89264ccf8f146021d8b9dabc51f11e7869a5323effb7a783800db77f37ed27880c60c483dd83ea62bc9ea84872f53c25b4571ccdf13dc594bcb368b903 WHIRLPOOL 1229aefdc22b95c38e71a94f493026230e750948c37544f636d1a43030b96d487307a7a1885bb32d4ae697bc64f431b97323cb647eca516d3363898120528d0d
+EBUILD freeorion-0.4.5_pre.ebuild 2266 SHA256 6d327b99b74bbf71976b209fae6889182f3d8d4879913944b75027298409ff93 SHA512 87394977627d2faf2e80be797dd4a9b96e2a7de6953c5337ecc1c295ea55bccc0733464cca15fd60e629911f39df8d5f5fbed09b9326233f281f280b8553254a WHIRLPOOL 5767bb97e0a610b034fbd68cec0d0358ce23e5ee7561ac8334c5dd0b0136cd6eb5a7d11e0e75d7ea94d0456fe78678fe0749611b012f857dfd6348f4b5a29fbc
+MISC ChangeLog 2932 SHA256 6eca6a7086f6695c4b3a98e667e4ed481122592716bb0a818655b1cc83063a6a SHA512 2984efb91ac3463c6b7c3ff9d20e52c822d916cf466a5a319fd8c9ad74c5b447c9515e9f6dec5ebf9598ab80d96403bf1264bc29eea0a080dcebaf0a608f8a11 WHIRLPOOL 7a660d8cba675366126ee3f767c8293115feefd28dbb02419426aac415ec5d9220237e0beeab33b4c0ca5540580cd07a78bba5e1c9e083a9a7a2b69b9dd2c7e1
 MISC metadata.xml 657 SHA256 31922a4a89499c885b776d17fe427833212e76d80e78755fd202d252ee9120e4 SHA512 a00342cfa84144df06cc461da147a1211c79c6421a65dfe748e2c4ac30f4deab05eb96dc4843d2b6eb814e5df567adb3907e0e6ad0d4b2f4bf3cf387f92aff92 WHIRLPOOL aa131a7c6bcf66273a7c4d0a3a30a19bbbb135707b67359eb80a2a782b608dba169387dc479a1c72971310211ff75db0b41b9c98e50e2127251f6e088f8486ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUUZL0ACgkQid6yGVZcMrw4xgD+Nx8+viNldFYHcfPGImp1zVch
-8pB8nR/dkIAvL+RPo8MA/jtCLTeTpsZ48/XpRWEYMWH+1UkBaWjl67w7UzjH5JRn
-=x547
+iF4EAREIAAYFAlUVZCEACgkQid6yGVZcMrwpBgD/V2+YoaTUFlKcPOVtM2ZjHwjL
+HN7wI1s7DFVYZ++EIUkA/AqgqM2yPQJzAltleQeodTit78hN8d0zX2Dw/U5rhpFo
+=z0L+
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeorion/freeorion-0.4.4.ebuild b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
index cbf8a8cb2a85..ebcf25deb5ed 100644
--- a/games-strategy/freeorion/freeorion-0.4.4.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.4.ebuild,v 1.2 2015/01/20 08:27:24 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild,v 1.1 2015/03/27 14:05:26 tomka Exp $
 
 EAPI=5
 
@@ -9,8 +9,7 @@ inherit cmake-utils python-any-r1 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/${P}.tar.bz2
-		 http://dev.gentoo.org/~tomka/files/${P}-ogre-1.9-compat.patch.bz2"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
@@ -21,8 +20,7 @@ IUSE="cg"
 # The split version dev-games/gigi is not used anymore as of 0.4.3
 RDEPEND="
 	!dev-games/gigi
-	dev-games/ogre[cg?,ois,opengl]
-	dev-games/ois
+	media-libs/libsdl2
 	>=dev-libs/boost-1.47[python]
 	media-libs/freealut
 	media-libs/libogg
@@ -46,24 +44,11 @@ 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.in || die
-
-	if use cg ; then
-		# add cg ogre plugin to config
-		echo "Plugin=Plugin_CgProgramManager" \
-			>> "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
-	fi
-
-	epatch "${WORKDIR}/${P}-ogre-1.9-compat.patch"
-
 	# parse subdir sets -O3
 	sed -e "s:-O3::" -i parse/CMakeLists.txt
 
 	# set revision for display in game -- update on bump!
-	sed -i -e 's/???/7708/' CMakeLists.txt
+	sed -i -e 's/???/8051/' CMakeLists.txt
 }
 
 src_configure() {
@@ -96,16 +81,6 @@ src_install() {
 	dogameslib "${CMAKE_BUILD_DIR}"/libfreeorion{common,parse}.so || die
 	dogameslib "${CMAKE_BUILD_DIR}"/libGiGi*.so || die
 
-	# config
-	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	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
-	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 \