summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2013-03-12 16:59:50 +0000
committerThomas Kahle <tomka@gentoo.org>2013-03-12 16:59:50 +0000
commit7c831fcc2e5ba194790b51e33f120b6ad536c9e5 (patch)
tree7551a34a6acbaa3327e8b0de3977e6a0d8ae1c45 /games-strategy
parentbump, remove old (diff)
downloadgentoo-2-7c831fcc2e5ba194790b51e33f120b6ad536c9e5.tar.gz
gentoo-2-7c831fcc2e5ba194790b51e33f120b6ad536c9e5.tar.bz2
gentoo-2-7c831fcc2e5ba194790b51e33f120b6ad536c9e5.zip
bump, remove old
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC!)
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/freeorion/ChangeLog9
-rw-r--r--games-strategy/freeorion/freeorion-0.4.2_pre20120910.ebuild96
-rw-r--r--games-strategy/freeorion/freeorion-0.4.3_pre20130312.ebuild (renamed from games-strategy/freeorion/freeorion-0.4.2_pre20120910-r1.ebuild)14
3 files changed, 16 insertions, 103 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/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