tomka       15/01/12 13:05:17

  Modified:             freeorion-0.4.3.ebuild ChangeLog
  Added:                freeorion-0.4.4.ebuild
  Log:
  bump, compatibility with ogre-1.9, make 0.4.3 depend on old ogre (bug #528480)
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
565C32BC)

Revision  Changes    Path
1.6                  games-strategy/freeorion/freeorion-0.4.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild?r1=1.5&r2=1.6

Index: freeorion-0.4.3.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freeorion-0.4.3.ebuild      7 Oct 2013 08:08:35 -0000       1.5
+++ freeorion-0.4.3.ebuild      12 Jan 2015 13:05:17 -0000      1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.3.ebuild,v 1.5 
2013/10/07 08:08:35 tomka Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.3.ebuild,v 1.6 
2015/01/12 13:05:17 tomka Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@
 # 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/ogre-1.9[cg?,ois,opengl]
        dev-games/ois
        >=dev-libs/boost-1.47[python]
        media-libs/freealut



1.11                 games-strategy/freeorion/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/ChangeLog?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/ChangeLog?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog   7 Oct 2013 08:08:35 -0000       1.10
+++ ChangeLog   12 Jan 2015 13:05:17 -0000      1.11
@@ -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.10 
2013/10/07 08:08:35 tomka Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.11 
2015/01/12 13:05:17 tomka Exp $
+
+*freeorion-0.4.4 (12 Jan 2015)
+
+  12 Jan 2015; Thomas Kahle <to...@gentoo.org> +files/ogre-1.9-compat.patch,
+  +freeorion-0.4.4.ebuild, freeorion-0.4.3.ebuild:
+  bump, compatibility with ogre-1.9, make 0.4.3 depend on old ogre (bug 
#528480)
 
   07 Oct 2013; Thomas Kahle <to...@gentoo.org> freeorion-0.4.3.ebuild:
   fix insecure runpaths (bug 485510, thanks hasufell)



1.1                  games-strategy/freeorion/freeorion-0.4.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/freeorion-0.4.4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/freeorion-0.4.4.ebuild?rev=1.1&content-type=text/plain

Index: freeorion-0.4.4.ebuild
===================================================================
# 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.1 
2015/01/12 13:05:17 tomka Exp $

EAPI=5

PYTHON_COMPAT=( python2_6 python2_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";

LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="cg"

# 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
        dev-games/ogre[cg?,ois,opengl]
        dev-games/ois
        >=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}
        ${PYTHON_DEPS}
        virtual/pkgconfig"

# S="${WORKDIR}/${P}/${myPN}"
CMAKE_USE_DIR="${S}"
CMAKE_VERBOSE="1"

pkg_setup() {
        # build system is using FindPythonLibs.cmake which needs python:2
        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.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 "${FILESDIR}/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
}

src_configure() {
        local mycmakeargs=(
                -DRELEASE_COMPILE_FLAGS=""
                -DCMAKE_SKIP_RPATH=ON
                )

        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}"

        # lib
        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 \
                ${PN}.png || die
        make_desktop_entry ${PN} ${PN} ${PN}

        # permissions
        prepgamesdirs
}




Reply via email to