Fix LICENSE and respect CFLAGS (bugs 485508,485512, thanks hasufell), remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC!)

3 files changed, 11 insertions, 111 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index eb71cc53fb3f..e6224ced9f95 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2013/10/01 20:25:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.9 2013/10/06 22:05:04 tomka Exp $
+
+  06 Oct 2013; Thomas Kahle <tomka@gentoo.org>
+  -freeorion-0.4.3_pre20130312.ebuild, freeorion-0.4.3.ebuild:
+  Fix LICENSE and respect CFLAGS (bugs 485508,485512, thanks hasufell), remove
+  old.
 
   01 Oct 2013; Thomas Kahle <tomka@gentoo.org> freeorion-0.4.3.ebuild:
   Fix missing dependency on dev-games/ois (bug 486700
diff --git a/games-strategy/freeorion/freeorion-0.4.3.ebuild b/games-strategy/freeorion/freeorion-0.4.3.ebuild
index bf7c561decf0..72996a6a1781 100644
--- a/games-strategy/freeorion/freeorion-0.4.3.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.3.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.3.ebuild,v 1.3 2013/10/01 20:25:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild,v 1.4 2013/10/06 22:05:04 tomka Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ 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"
 
-LICENSE="GPL-2 CC-BY-SA-3.0"
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="cg"
@@ -59,6 +59,9 @@ src_prepare() {
 			>> "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
 	fi
 
+	# 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/???/6281/' CMakeLists.txt
 }
diff --git a/games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild b/games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild
deleted file mode 100644
index 3c4e37af906d..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild
+++ /dev/null
@@ -1,108 +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.3_pre20130312.ebuild,v 1.1 2013/03/12 16:59:50 tomka Exp $
-
-EAPI=4
-
-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/${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.
-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}/${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
-	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
-
-	# set revision for display in game -- update on bump!
-	sed -i -e 's/???/5854/' CMakeLists.txt
-}
-
-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
-}