commit: be5d3cdcd1f360dc65d54d7e1e44d32524229d51
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Feb 26 11:17:47 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Feb 26 11:17:47 2017 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=be5d3cdc
unknown-horizons (and deps): bump. Fixes bugs #609854 and #610186 on Gentoo BZ
games-engines/fife/fife-0.3.2.2.ebuild | 63 -----------------
games-engines/fife/fife-0.3.3-r2.ebuild | 63 -----------------
games-engines/fife/fife-0.3.3-r3.ebuild | 70 -------------------
games-engines/fife/fife-0.3.5.ebuild | 68 -------------------
games-engines/fife/fife-9999.ebuild | 67 -------------------
.../fife/files/fife-0.3.3-fix-memory-leak.patch | 29 --------
.../fife/files/fife-0.3.3-unbundle-libpng.patch | 24 -------
.../fife/files/fife-0.3.5-unbundle-libpng.patch | 24 -------
games-engines/fifechan/fifechan-0.1.4.ebuild | 49 ++++++++++++++
games-engines/fifechan/fifechan-9999.ebuild | 49 ++++++++++++++
games-engines/fifechan/metadata.xml | 12 ++++
games-engines/fifengine/fifengine-0.4.1.ebuild | 78 ++++++++++++++++++++++
games-engines/fifengine/fifengine-9999.ebuild | 78 ++++++++++++++++++++++
.../files/fifengine-0.4.1-unbundle-libpng.patch} | 3 +-
.../files/fifengine-9999-unbundle-libpng.patch} | 3 +-
games-engines/{fife => fifengine}/metadata.xml | 0
.../unknown-horizons-2011.1a.ebuild | 38 -----------
.../unknown-horizons-2011.2.ebuild | 38 -----------
.../unknown-horizons-2011.3.ebuild | 37 ----------
.../unknown-horizons-2012.1.ebuild | 61 -----------------
.../unknown-horizons-2013.3.ebuild | 60 -----------------
.../unknown-horizons-2017.2.ebuild | 52 +++++++++++++++
.../unknown-horizons/unknown-horizons-9999.ebuild | 56 +++++++++++-----
23 files changed, 361 insertions(+), 661 deletions(-)
diff --git a/games-engines/fife/fife-0.3.2.2.ebuild
b/games-engines/fife/fife-0.3.2.2.ebuild
deleted file mode 100644
index f9671ec..0000000
--- a/games-engines/fife/fife-0.3.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils python scons-utils versionator
-
-MY_PV=$(replace_version_separator 3 'r')
-
-DESCRIPTION="Flexible Isometric Free Engine, 2D"
-HOMEPAGE="http://fifengine.de";
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/active/src/${PN}-${MY_PV}.tar.gz";
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug profile"
-
-RDEPEND="dev-libs/boost
- dev-python/pyyaml
- media-libs/libsdl
- media-libs/sdl-ttf
- media-libs/sdl-image[png]
- media-libs/libvorbis
- media-libs/libogg
- media-libs/openal
- sys-libs/zlib
- x11-libs/libXcursor
- x11-libs/libXext
- dev-games/guichan[sdl,opengl]
- virtual/opengl
- virtual/glu"
-DEPEND="${RDEPEND}
- dev-lang/swig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- rm -r ext #delete bundled libs
- epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
-}
-
-# Compiles only with one thread
-SCONSOPTS="-j1"
-
-src_compile() {
- escons \
- --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" \
- $(use_scons debug) \
- $(use_scons debug log log) \
- $(use_scons profile) \
- || die "scons failed"
-}
-
-src_install() {
- escons install-python --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" || die "install failed"
-}
diff --git a/games-engines/fife/fife-0.3.3-r2.ebuild
b/games-engines/fife/fife-0.3.3-r2.ebuild
deleted file mode 100644
index 2edf4f7..0000000
--- a/games-engines/fife/fife-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils python scons-utils versionator
-
-MY_PV=$(replace_version_separator 3 'r')
-
-DESCRIPTION="Flexible Isometric Free Engine, 2D"
-HOMEPAGE="http://fifengine.de";
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/active/src/${PN}-${MY_PV}.tar.gz";
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug profile"
-
-RDEPEND="dev-libs/boost
- dev-python/pyyaml
- media-libs/libsdl
- media-libs/sdl-ttf
- media-libs/sdl-image[png]
- media-libs/libvorbis
- media-libs/libogg
- media-libs/openal
- sys-libs/zlib
- x11-libs/libXcursor
- x11-libs/libXext
- dev-games/guichan[sdl,opengl]
- virtual/opengl
- virtual/glu"
-DEPEND="${RDEPEND}
- dev-lang/swig"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_prepare() {
- rm -r ext #delete bundled libs
- epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
-}
-
-# Compiles only with one thread
-SCONSOPTS="-j1"
-
-src_compile() {
- escons \
- --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" \
- $(use_scons debug) \
- $(use_scons debug log log) \
- $(use_scons profile) \
- || die "scons failed"
-}
-
-src_install() {
- escons install-python --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" || die "install failed"
-}
diff --git a/games-engines/fife/fife-0.3.3-r3.ebuild
b/games-engines/fife/fife-0.3.3-r3.ebuild
deleted file mode 100644
index cf3a6a2..0000000
--- a/games-engines/fife/fife-0.3.3-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.7"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python scons-utils
-
-DESCRIPTION="Flexible Isometric Free Engine, 2D"
-HOMEPAGE="http://fifengine.de";
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/active/src/${PN}_${PV}${PR}.tar.gz";
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug profile"
-
-RDEPEND="dev-libs/boost
- dev-python/pyyaml
- media-libs/libsdl
- media-libs/sdl-ttf
- media-libs/sdl-image[png]
- media-libs/libvorbis
- media-libs/libogg
- media-libs/openal
- sys-libs/zlib
- x11-libs/libXcursor
- x11-libs/libXext
- dev-games/guichan[sdl,opengl]
- virtual/opengl
- virtual/glu"
-DEPEND="${RDEPEND}
- dev-lang/swig"
-
-S=${WORKDIR}/${PN}_${PV}${PR}
-
-# just setting RESTRICT_PYTHON_ABI is not enough to install only for python2
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- rm -r ext #delete bundled libs
- epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
- # apply upstream changeset 3949 to remove memory leak warning on console
- epatch "${FILESDIR}/${P}-fix-memory-leak.patch"
-}
-
-# Compile is only succesfull with one thread
-SCONSOPTS="-j1"
-
-src_compile() {
- escons \
- --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" \
- $(use_scons debug) \
- $(use_scons debug log log) \
- $(use_scons profile) \
- || die "scons failed"
-}
-
-src_install() {
- escons install-python --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" || die "install failed"
-}
diff --git a/games-engines/fife/fife-0.3.5.ebuild
b/games-engines/fife/fife-0.3.5.ebuild
deleted file mode 100644
index b9adc03..0000000
--- a/games-engines/fife/fife-0.3.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.7"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python scons-utils
-
-DESCRIPTION="Flexible Isometric Free Engine, 2D"
-HOMEPAGE="http://fifengine.de";
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/active/src/${PN}_${PV}.tar.gz";
-
-LICENSE="GPL-2"
-
-KEYWORDS=""
-SLOT="0"
-IUSE="debug profile"
-
-RDEPEND=">=dev-libs/boost-1.33.1
- dev-python/pyyaml
- >=media-libs/libsdl-1.2.8
- >=media-libs/sdl-ttf-2.0.0
- >media-libs/sdl-image-1.2.9[png]
- media-libs/libvorbis
- media-libs/libogg
- media-libs/openal
- >=sys-libs/zlib-1.2
- x11-libs/libXcursor
- x11-libs/libXext
- dev-games/guichan[sdl,opengl]
- virtual/opengl
- virtual/glu"
-DEPEND="${RDEPEND}
- >=dev-lang/swig-1.3.40"
-
-S=${WORKDIR}/${PN}_${PV}
-
-# just setting RESTRICT_PYTHON_ABI is not enough to install only for python2
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- rm -r ext #delete bundled libs
- epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
-}
-
-# Compile is only succesfull with one thread
-#SCONSOPTS="-j1"
-
-src_compile() {
- escons \
- --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" \
- $(use_scons debug) \
- $(use_scons debug log log) \
- $(use_scons profile) \
- || die "scons failed"
-}
-
-src_install() {
- escons install-python --python-prefix="${D}/$(python_get_sitedir)" \
- --prefix="${D}/usr" || die "install failed"
-}
diff --git a/games-engines/fife/fife-9999.ebuild
b/games-engines/fife/fife-9999.ebuild
deleted file mode 100644
index 6f40beb..0000000
--- a/games-engines/fife/fife-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-
-inherit subversion python
-
-DESCRIPTION="Flexible Isometric Free Engine"
-HOMEPAGE="http://fifengine.de/";
-
-ESVN_REPO_URI="http://fife.svn.cvsdude.com/engine/trunk";
-
-LICENSE="LGPL-2"
-
-SLOT="0"
-IUSE="debug profile"
-
-RDEPEND="dev-libs/boost
- dev-python/pyyaml
- media-libs/libsdl
- media-libs/sdl-ttf
- media-libs/sdl-image[png]
- media-libs/libvorbis
- media-libs/libogg
- media-libs/openal
- sys-libs/zlib
- x11-libs/libXcursor
- virtual/opengl
- virtual/glu
- dev-games/guichan[sdl,opengl]
- media-libs/libpng
- x11-libs/libXext
-"
-
-DEPEND="${RDEPEND}
- dev-util/scons
- dev-lang/swig
-"
-
-src_prepare() {
- #remove bundled libs
- rm -r ext
- epatch "${FILESDIR}/${PN}-0.3.1-unbundle-libpng.patch"
-}
-
-# Compiles only with one thread
-SCONSOPTS="-j1"
-
-src_compile() {
- local SCONS_ARGS=""
- if use debug; then
- SCONS_ARGS="$SCONS_ARGS --enable-debug"
- fi
-
- if use profile; then
- SCONS_ARGS="$SCONS_ARGS --enable-profile"
- fi
-
- scons --python-prefix="${D}"/$(python_get_sitedir) --prefix="${D}"/usr
"$SCONS_ARGS"
-}
-
-src_install() {
- scons install-python --python-prefix="${D}/$(python_get_sitedir)"
--prefix="${D}/usr" || die 'install failed'
-}
diff --git a/games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch
b/games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch
deleted file mode 100644
index f3640e3..0000000
--- a/games-engines/fife/files/fife-0.3.3-fix-memory-leak.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./engine/core/eventchannel/eventchannel.i.orig 2013-01-03
21:42:16.041324952 +0000
-+++ ./engine/core/eventchannel/eventchannel.i 2013-01-03 21:44:34.871329004
+0000
-@@ -58,7 +58,7 @@
- virtual int32_t getTimeStamp() const;
- virtual std::string getDebugString() const;
- virtual const std::string& getName() const;
-- virtual ~IEvent() {}
-+ virtual ~Event() {}
- private:
- Event();
- };
-@@ -70,7 +70,7 @@
- virtual bool isControlPressed() const;
- virtual bool isMetaPressed() const;
- virtual bool isShiftPressed() const;
-- virtual ~IInputEvent() {}
-+ virtual ~InputEvent() {}
- private:
- InputEvent();
- };
-@@ -153,7 +153,7 @@
- virtual int32_t getY() const;
- virtual MouseEventType getType() const;
- virtual MouseButtonType getButton() const;
-- virtual ~IMouseEvent();
-+ virtual ~MouseEvent();
- private:
- MouseEvent();
- };
diff --git a/games-engines/fife/files/fife-0.3.3-unbundle-libpng.patch
b/games-engines/fife/files/fife-0.3.3-unbundle-libpng.patch
deleted file mode 100644
index 580edfa..0000000
--- a/games-engines/fife/files/fife-0.3.3-unbundle-libpng.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: image.h
-===================================================================
---- a/engine/core/video/image.h (revision 3239)
-+++ b/engine/core/video/image.h (working copy)
-@@ -27,7 +27,6 @@
-
- // 3rd party library includes
- #include <SDL.h>
--#include <png.h>
-
- // FIFE includes
- // These includes are split up in two parts, separated by one empty line
-Index: image.cpp
-===================================================================
---- a/engine/core/video/image.cpp (revision 3239)
-+++ b/engine/core/video/image.cpp (working copy)
-@@ -25,6 +25,7 @@
-
- // 3rd party library includes
- #include <SDL.h>
-+#include <png.h>
-
- // FIFE includes
- // These includes are split up in two parts, separated by one empty line
diff --git a/games-engines/fife/files/fife-0.3.5-unbundle-libpng.patch
b/games-engines/fife/files/fife-0.3.5-unbundle-libpng.patch
deleted file mode 100644
index 580edfa..0000000
--- a/games-engines/fife/files/fife-0.3.5-unbundle-libpng.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: image.h
-===================================================================
---- a/engine/core/video/image.h (revision 3239)
-+++ b/engine/core/video/image.h (working copy)
-@@ -27,7 +27,6 @@
-
- // 3rd party library includes
- #include <SDL.h>
--#include <png.h>
-
- // FIFE includes
- // These includes are split up in two parts, separated by one empty line
-Index: image.cpp
-===================================================================
---- a/engine/core/video/image.cpp (revision 3239)
-+++ b/engine/core/video/image.cpp (working copy)
-@@ -25,6 +25,7 @@
-
- // 3rd party library includes
- #include <SDL.h>
-+#include <png.h>
-
- // FIFE includes
- // These includes are split up in two parts, separated by one empty line
diff --git a/games-engines/fifechan/fifechan-0.1.4.ebuild
b/games-engines/fifechan/fifechan-0.1.4.ebuild
new file mode 100644
index 0000000..23f1725
--- /dev/null
+++ b/games-engines/fifechan/fifechan-0.1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Lightweight cross platform GUI C++ library designed for games"
+HOMEPAGE="http://fifengine.github.io/fifechan/";
+SRC_URI="https://github.com/fifengine/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="allegro +opengl +sdl irrlicht"
+
+DEPEND="
+ x11-libs/libXext
+ irrlicht? (
+ dev-games/irrlicht
+ )
+ sdl? (
+ media-libs/libsdl2
+ media-libs/sdl-ttf
+ media-libs/sdl2-image[png]
+ )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ )
+ allegro? (
+ media-libs/allegro:0
+ )
+"
+RDEPEND="${DEPEND}"
+
+usx() { usex $* ON OFF; }
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_ALLEGRO=$(usx allegro)
+ -DENABLE_OPENGL=$(usx opengl)
+# -DENABLE_OPENGL_CONTRIB=$(usx opengl)
+ -DENABLE_SDL=$(usx sdl)
+ -DENABLE_SDL_CONTRIB=$(usx sdl)
+ -DENABLE_IRRLICHT=$(usx irrlicht)
+ )
+ cmake-utils_src_configure
+}
diff --git a/games-engines/fifechan/fifechan-9999.ebuild
b/games-engines/fifechan/fifechan-9999.ebuild
new file mode 100644
index 0000000..cdd5bcc
--- /dev/null
+++ b/games-engines/fifechan/fifechan-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="Lightweight cross platform GUI C++ library designed for games"
+HOMEPAGE="http://fifengine.github.io/fifechan/";
+EGIT_REPO_URI="https://github.com/fifengine/fifechan";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="allegro +opengl +sdl irrlicht"
+
+DEPEND="
+ x11-libs/libXext
+ irrlicht? (
+ dev-games/irrlicht
+ )
+ sdl? (
+ media-libs/libsdl2
+ media-libs/sdl-ttf
+ media-libs/sdl2-image[png]
+ )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ )
+ allegro? (
+ media-libs/allegro:0
+ )
+"
+RDEPEND="${DEPEND}"
+
+usx() { usex $* ON OFF; }
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_ALLEGRO=$(usx allegro)
+ -DENABLE_OPENGL=$(usx opengl)
+# -DENABLE_OPENGL_CONTRIB=$(usx opengl)
+ -DENABLE_SDL=$(usx sdl)
+ -DENABLE_SDL_CONTRIB=$(usx sdl)
+ -DENABLE_IRRLICHT=$(usx irrlicht)
+ )
+ cmake-utils_src_configure
+}
diff --git a/games-engines/fifechan/metadata.xml
b/games-engines/fifechan/metadata.xml
new file mode 100644
index 0000000..b6d976a
--- /dev/null
+++ b/games-engines/fifechan/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="person">
+ <email>[email protected]</email>
+ <name>Michal Plichta</name>
+ </maintainer>
+ <use>
+ <flag name="allegro">Support for
<pkg>media-libs/allegro</pkg></flag>
+ <flag name="irrlicht">Support for
<pkg>dev-games/irrlicht</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/games-engines/fifengine/fifengine-0.4.1.ebuild
b/games-engines/fifengine/fifengine-0.4.1.ebuild
new file mode 100644
index 0000000..0d5d63d
--- /dev/null
+++ b/games-engines/fifengine/fifengine-0.4.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+#PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5}} )
+# py3 is not yet tested by upstream -> not merged in master
+PYTHON_COMPAT=( pypy python2_7 )
+
+inherit eutils python-single-r1 cmake-utils
+
+DESCRIPTION="Flexible Isometric Free Engine, 2D"
+HOMEPAGE="http://fifengine.de";
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS=""
+SLOT="0"
+IUSE="debug +log +opengl +zip +fifechan librocket cegui python"
+
+RDEPEND="
+ librocket? ( dev-libs/libRocket )
+ cegui? ( dev-games/cegui )
+ fifechan? ( games-engines/fifechan )
+ >=dev-libs/boost-1.33.1
+ media-libs/libsdl2
+ media-libs/sdl2-ttf
+ media-libs/sdl2-image[png]
+ media-libs/libvorbis
+ media-libs/libogg
+ media-libs/openal
+ >=sys-libs/zlib-1.2
+ x11-libs/libXcursor
+ x11-libs/libXext
+ virtual/opengl
+ virtual/glu
+ python? (
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ python? ( >=dev-lang/swig-1.3.40 )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+
+usx() { usex $* ON OFF; }
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dopengl=$(usx opengl)
+ -Dfifechan=$(usx fifechan)
+ -Dlibrocket=$(usx librocket)
+ -Dcegui=$(usx cegui)
+ -Dlogging=$(usx log)
+ -Dbuild-python=$(usx python)
+ -Dbuild-library=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/games-engines/fifengine/fifengine-9999.ebuild
b/games-engines/fifengine/fifengine-9999.ebuild
new file mode 100644
index 0000000..30c4ab1
--- /dev/null
+++ b/games-engines/fifengine/fifengine-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+#PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5}} )
+# py3 is not yet tested by upstream -> not merged in master
+PYTHON_COMPAT=( pypy python2_7 )
+
+inherit eutils python-single-r1 cmake-utils git-r3
+
+DESCRIPTION="Flexible Isometric Free Engine, 2D"
+HOMEPAGE="http://fifengine.de";
+EGIT_REPO_URI="https://github.com/${PN}/${PN}";
+
+LICENSE="GPL-2"
+
+KEYWORDS=""
+SLOT="0"
+IUSE="debug +log +opengl +zip +fifechan librocket cegui python"
+
+RDEPEND="
+ librocket? ( dev-libs/libRocket )
+ cegui? ( dev-games/cegui )
+ fifechan? ( games-engines/fifechan )
+ >=dev-libs/boost-1.33.1
+ media-libs/libsdl2
+ media-libs/sdl2-ttf
+ media-libs/sdl2-image[png]
+ media-libs/libvorbis
+ media-libs/libogg
+ media-libs/openal
+ >=sys-libs/zlib-1.2
+ x11-libs/libXcursor
+ x11-libs/libXext
+ virtual/opengl
+ virtual/glu
+ python? (
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ python? ( >=dev-lang/swig-1.3.40 )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+
+usx() { usex $* ON OFF; }
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-unbundle-libpng.patch"
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dopengl=$(usx opengl)
+ -Dfifechan=$(usx fifechan)
+ -Dlibrocket=$(usx librocket)
+ -Dcegui=$(usx cegui)
+ -Dlogging=$(usx log)
+ -Dbuild-python=$(usx python)
+ -Dbuild-library=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/games-engines/fife/files/fife-0.3.1-unbundle-libpng.patch
b/games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch
similarity index 93%
rename from games-engines/fife/files/fife-0.3.1-unbundle-libpng.patch
rename to games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch
index 580edfa..9509211 100644
--- a/games-engines/fife/files/fife-0.3.1-unbundle-libpng.patch
+++ b/games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch
@@ -2,10 +2,11 @@ Index: image.h
===================================================================
--- a/engine/core/video/image.h (revision 3239)
+++ b/engine/core/video/image.h (working copy)
-@@ -27,7 +27,6 @@
+@@ -27,8 +27,6 @@
// 3rd party library includes
#include <SDL.h>
+-#define PNG_SKIP_SETJMP_CHECK
-#include <png.h>
// FIFE includes
diff --git a/games-engines/fife/files/fife-0.3.2.2-unbundle-libpng.patch
b/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
similarity index 93%
rename from games-engines/fife/files/fife-0.3.2.2-unbundle-libpng.patch
rename to games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
index 580edfa..9509211 100644
--- a/games-engines/fife/files/fife-0.3.2.2-unbundle-libpng.patch
+++ b/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
@@ -2,10 +2,11 @@ Index: image.h
===================================================================
--- a/engine/core/video/image.h (revision 3239)
+++ b/engine/core/video/image.h (working copy)
-@@ -27,7 +27,6 @@
+@@ -27,8 +27,6 @@
// 3rd party library includes
#include <SDL.h>
+-#define PNG_SKIP_SETJMP_CHECK
-#include <png.h>
// FIFE includes
diff --git a/games-engines/fife/metadata.xml
b/games-engines/fifengine/metadata.xml
similarity index 100%
rename from games-engines/fife/metadata.xml
rename to games-engines/fifengine/metadata.xml
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2011.1a.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2011.1a.ebuild
deleted file mode 100644
index 3bb60a3..0000000
--- a/games-strategy/unknown-horizons/unknown-horizons-2011.1a.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="sqlite"
-
-inherit distutils games
-DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://www.unknown-horizons.org/";
-
-SRC_URI="mirror://sourceforge/unknownhorizons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyyaml
- =games-engines/fife-0.3.2.2
- dev-python/python-distutils-extra"
-
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}"/${PN}
-
-src_compile() {
- distutils_src_compile build_i18n
-}
-
-src_install() {
- # FIXME: exe and data-files goes into wrong place, games.gentoo.org
policy
- # violation
- distutils_src_install
- prepgamesdirs
-}
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2011.2.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2011.2.ebuild
deleted file mode 100644
index 3bb60a3..0000000
--- a/games-strategy/unknown-horizons/unknown-horizons-2011.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="sqlite"
-
-inherit distutils games
-DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://www.unknown-horizons.org/";
-
-SRC_URI="mirror://sourceforge/unknownhorizons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyyaml
- =games-engines/fife-0.3.2.2
- dev-python/python-distutils-extra"
-
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}"/${PN}
-
-src_compile() {
- distutils_src_compile build_i18n
-}
-
-src_install() {
- # FIXME: exe and data-files goes into wrong place, games.gentoo.org
policy
- # violation
- distutils_src_install
- prepgamesdirs
-}
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2011.3.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2011.3.ebuild
deleted file mode 100644
index f73d0c3..0000000
--- a/games-strategy/unknown-horizons/unknown-horizons-2011.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="sqlite berkdb"
-
-inherit distutils games
-DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://www.unknown-horizons.org/";
-
-SRC_URI="mirror://sourceforge/unknownhorizons/${P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyyaml
- =games-engines/fife-0.3.3-r2"
-
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}"/${PN}
-
-src_compile() {
- distutils_src_compile build_i18n
-}
-
-src_install() {
- # FIXME: exe and data-files goes into wrong place, games.gentoo.org
policy
- # violation
- distutils_src_install
- prepgamesdirs
-}
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2012.1.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2012.1.ebuild
deleted file mode 100644
index e2e73a5..0000000
--- a/games-strategy/unknown-horizons/unknown-horizons-2012.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.7"
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_USE_WITH="sqlite"
-
-inherit python games distutils
-
-DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://www.unknown-horizons.org/";
-
-SRC_URI="mirror://sourceforge/unknownhorizons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyyaml
- dev-python/bsddb3
- =games-engines/fife-0.3.3-r3"
-
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- games_pkg_setup
-}
-
-src_compile() {
- distutils_src_compile build_i18n
-}
-
-src_prepare() {
- # make sure version two is started for startup scripts
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- distutils_src_install
- # fix install paths to Gentoo specific locations
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r content || die "doins failed"
- rm -rf "${D}/usr/share/${PN}/content"
- dogamesbin "${D}/usr/bin/${PN}" || die "dogamesbin failed"
- rm -rf "${D}/usr/bin/"
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- distutils_pkg_postinst
-}
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2013.3.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2013.3.ebuild
deleted file mode 100644
index f69a564..0000000
--- a/games-strategy/unknown-horizons/unknown-horizons-2013.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.7"
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_USE_WITH="sqlite"
-
-inherit python games distutils
-
-DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://www.unknown-horizons.org/";
-SRC_URI="http://github.com/unknown-horizons/unknown-horizons/archive/${PV}.tar.gz";
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyyaml
- dev-python/bsddb3
- >=games-engines/fife-0.3.5"
-
-RDEPEND="$DEPEND"
-
-#S="${WORKDIR}"/${PN}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- games_pkg_setup
-}
-
-src_compile() {
- distutils_src_compile build_i18n
-}
-
-src_prepare() {
- # make sure version two is started for startup scripts
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- distutils_src_install
- # fix install paths to Gentoo specific locations
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r content || die "doins failed"
- rm -rf "${D}/usr/share/${PN}/content"
- dogamesbin "${D}/usr/bin/${PN}" || die "dogamesbin failed"
- rm -rf "${D}/usr/bin/"
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- distutils_pkg_postinst
-}
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2017.2.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2017.2.ebuild
new file mode 100644
index 0000000..fc07388
--- /dev/null
+++ b/games-strategy/unknown-horizons/unknown-horizons-2017.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Anno-like real time strategy game"
+HOMEPAGE="http://www.unknown-horizons.org/";
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ test? (
+ dev-python/greenlet[${PYTHON_USEDEP}]
+ dev-python/polib[${PYTHON_USEDEP}]
+ dev-python/isort[${PYTHON_USEDEP}]
+ dev-python/pylint[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+ )
+ games-engines/fifengine[${PYTHON_USEDEP}]
+ games-engines/fifechan
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="$DEPEND"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_test() {
+ ${PYTHON} ./run_tests.py
+}
+
+src_compile() {
+ distutils-r1_src_compile build_i18n
+}
+
+src_install() {
+ distutils-r1_src_install
+}
diff --git a/games-strategy/unknown-horizons/unknown-horizons-9999.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-9999.ebuild
index d742ab1..63cc011 100644
--- a/games-strategy/unknown-horizons/unknown-horizons-9999.ebuild
+++ b/games-strategy/unknown-horizons/unknown-horizons-9999.ebuild
@@ -1,30 +1,52 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="3"
+EAPI=6
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="sqlite"
+PYTHON_COMPAT=( python2_7 pypy )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="sqlite"
-inherit git-2 distutils python
+inherit distutils-r1 git-r3
DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://unknown-horizons.org/";
-
-EGIT_REPO_URI="git://github.com/unknown-horizons/unknown-horizons.git"
-
-SRC_URI=""
+HOMEPAGE="http://www.unknown-horizons.org/";
+EGIT_REPO_URI="http://github.com/${PN}/${PN}";
LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE=""
+IUSE="test"
DEPEND="
- dev-python/bsddb3
- =games-engines/fife-9999
- dev-python/pyyaml
- dev-python/python-distutils-extra
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ test? (
+ dev-python/greenlet[${PYTHON_USEDEP}]
+ dev-python/polib[${PYTHON_USEDEP}]
+ dev-python/isort[${PYTHON_USEDEP}]
+ dev-python/pylint[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+ )
+ games-engines/fifengine[${PYTHON_USEDEP}]
+ games-engines/fifechan
+ ${PYTHON_DEPS}
"
+
RDEPEND="$DEPEND"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_test() {
+ ${PYTHON} ./run_tests.py
+}
+
+src_compile() {
+ distutils-r1_src_compile build_i18n
+}
+
+src_install() {
+ distutils-r1_src_install
+}
