unknown-horizons (and deps): bump. Fixes bugs #609854 and #610186 on Gentoo BZ

27 files changed, 364 insertions, 670 deletions

diff --git a/games-engines/fife/Manifest b/games-engines/fife/Manifest
deleted file mode 100644
index 6244fee..0000000
--- a/games-engines/fife/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fife-0.3.2r2.tar.gz 4960057 SHA256 e60b57c586e93f3323ebfcf98e6894f66dd1b8a62371d89562f6534675b9b654
-DIST fife-0.3.3.tar.gz 5493191 SHA256 f7972b5e6ffa00ec3f2ff5ca8ffcef7240108976050cb22d00a9c7d092a16494
-DIST fife_0.3.3r3.tar.gz 4930412 SHA256 172bd6ececa37c3e98689f5b4b00cb86bcf611bca714cf88aef91ba6d05ea16e SHA512 dc8ab9cc6a99cd4ad1fedc76965ce666abb2479a19773c56360f9bdaa77c7915ab8e7fd63613f9fcef086cd2d6c6ecdd2c5c4a6831f1f3e9730bad685fb948af WHIRLPOOL 6c26bf50e8186a08e4f89338cdcc5c1be47e7ac932b36c346ec923346097f85cd67019d91a1a75f9f0ae87812944196046cf03df29d57b98f4593b55cc277b58
-DIST fife_0.3.5.tar.gz 1383813 SHA256 1d3c7a19d05ae426af6ccd50a8ba79a71eb6e6f18f0226d1abdaeae7fcf9d3a8 SHA512 319790b62d119f788ceab6840628e14b922abb7f93125d617dac9056b835e6427bd932f1f030f98d3248ca807e86419ebc38c102fb31b5b03036709a8daa2d10 WHIRLPOOL a6470d6b73305e572ca8164358a29b497e0c5872bdc43e5fe9dd54d234a2d2e3db87eb254d40e7e7e4b325ea894bda0d4052d2bae599291c88d4f6970270c7d9
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/Manifest b/games-engines/fifechan/Manifest
new file mode 100644
index 0000000..1ab419a
--- /dev/null
+++ b/games-engines/fifechan/Manifest
@@ -0,0 +1 @@
+DIST fifechan-0.1.4.tar.gz 246181 SHA256 a93b015b5852b8fe2a0a2a6891d3de2cacb196732f670e081d7b7966f9ed1b87 SHA512 d52833c6c6fdb216f20dc572ad9427d868e1dff58ec1d7f5b0f4d12ea9baef4799399054cead0780fd7dee2eb8c5fdf2c9ccd25965c6522b8bdd12309919a13d WHIRLPOOL 19c4627a4efd3cb9795892e57656dd7ee329a60c08e1f667a6cab1a3f2f93bee21c745150d36a2a4ac0dfde1109bfa96856855265eaf972c63dc9878d151047d
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>mplichta@gmail.com</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/Manifest b/games-engines/fifengine/Manifest
new file mode 100644
index 0000000..2d6c1bf
--- /dev/null
+++ b/games-engines/fifengine/Manifest
@@ -0,0 +1 @@
+DIST fifengine-0.4.1.tar.gz 15972607 SHA256 bae3fc591cc2891f7d1b3a656a5d8ad700ecc2e297ad453bf4f1bcbbf82e8cb2 SHA512 97c7d00fc74ca88ea18d3088477c64e5163781fb4546cf620d64e55d848472335c164e24e9e804afc7e71b382df1c1fe1447494b97a7f67b339880598eef8fe0 WHIRLPOOL eb0397d67f41070d6fbee4b9317e8e41d05238a344196f8ec5b9b9b6f6b8f72a4f17aa3afa76935c6c6b2800e8358d0a72e997f0690624d4ed951c353c2c1a63
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
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
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
index eb2356d..eb2356d 100644
--- a/games-engines/fife/metadata.xml
+++ b/games-engines/fifengine/metadata.xml
diff --git a/games-strategy/unknown-horizons/Manifest b/games-strategy/unknown-horizons/Manifest
index 5f0d8fa..9c3ecee 100644
--- a/games-strategy/unknown-horizons/Manifest
+++ b/games-strategy/unknown-horizons/Manifest
@@ -1,5 +1 @@
-DIST 2013.3.tar.gz 152988408 SHA256 db9ffe365aa0be95bb808891573d4a135db980ba5a2316f1cf9a30e6505a638e SHA512 d30d4d4f077e9ad6926b2e751bad0d8bd4dca5e5760ae6d948db04f5c1a475283de016562f06c0e3afcade3444fbd4b943996dd58cb91ac0bc1ef37176de13f4 WHIRLPOOL 18930b0064030abe0552d0cb8b6f903a94983f8e468bde8cae20621148c08e4ea34d8ad12ca97d0dab741dbe177742af22759ca544087b69df848b5c0539da90
-DIST unknown-horizons-2011.1a.tar.xz 64190668 SHA256 0d8adce00c144acc0b3bf73839f9dbfe84537f0465c384f1606feebc28896450
-DIST unknown-horizons-2011.2.tar.xz 71843004 SHA256 f64bc787c6094f420a4d7a5f3181fd24d395034a8b2ccbea6799e7cb1ab06092
-DIST unknown-horizons-2011.3-source.tar.bz2 78490453 SHA256 16a9fdbb60707f1d3e225795100f7fc061f6b7ce12656ad74ebc615b162a0ac7
-DIST unknown-horizons-2012.1.tar.xz 96318876 SHA256 109fd61026491c7c259cc552dd2c1ac90214bde42eab7cbc736009396abb870a SHA512 e0a0531cd92ecce9b0055308630dfdc9413036e3908b2fe101666ec3fef27ff220f84859f38c101361c86e9e3e142c3a87af1d33d0c93d1d9c944b8643dc08d8 WHIRLPOOL 16d70b2a6f69229c59584215b681422429049e00cb85da6d26ed6498438ef8a52d6ac36f2e7fd16f4c937483defea150bf77358695e7b682a0c7d7cb8864aa20
+DIST unknown-horizons-2017.2.tar.gz 266301027 SHA256 ebd7d7af1c59dfebb8e28626d8b484b05ec2166f7a90e9266350a4dbd242ec09 SHA512 73cd0dc6db06a8cce9d9851b60d5b9718f731d453f69fe96e1152733a04c14f0e970fc7a7222de2b785b8111757a1c45cdd17f43e97abba3f5b1e3d196bcc01a WHIRLPOOL b20df66962b5c54303dea0bf44e9357196f9eebcaa48034c929f1dc3ba5e6f25ffa2ab2ee29fb7de1b34052a0cceb8459b234fafa5aa08c2cbddf3595d117e33
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
+}