[gentoo-commits] proj/gamerlay:master commit in: games-engines/fifengine/, games-engines/fifengine/files/

[Azamat H. Hackimov]

commit:     d01094fc35e9f4d71395186162f4ae99950687e1
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Mar  3 23:34:12 2020 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Mar  3 23:34:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=d01094fc

games-engines/fifengine: update package

Fixes Python dependencies, update to 0.4.2

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>

 ...fengine-0.4.1.ebuild => fifengine-0.4.2.ebuild} | 37 ++++------
 games-engines/fifengine/fifengine-9999.ebuild      | 81 ----------------------
 ...patch => fifengine-0.4.2-unbundle-libpng.patch} |  0
 .../files/fifengine-9999-unbundle-libpng.patch     | 25 -------
 games-engines/fifengine/metadata.xml               |  7 +-
 5 files changed, 21 insertions(+), 129 deletions(-)

diff --git a/games-engines/fifengine/fifengine-0.4.1.ebuild b/games-engines/fifengine/fifengine-0.4.2.ebuild
similarity index 62%
rename from games-engines/fifengine/fifengine-0.4.1.ebuild
rename to games-engines/fifengine/fifengine-0.4.2.ebuild
index f48afad..d9c9a6d 100644
--- a/games-engines/fifengine/fifengine-0.4.1.ebuild
+++ b/games-engines/fifengine/fifengine-0.4.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-#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 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit eutils python-single-r1 cmake-utils
 
@@ -15,12 +13,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="debug +log +opengl +zip +fifechan librocket cegui python"
+IUSE="debug +log +opengl +zip +fifechan cegui python"
 
 RDEPEND="
-	librocket? ( dev-libs/libRocket )
 	cegui? ( dev-games/cegui )
 	fifechan? ( games-engines/fifechan )
 	dev-libs/tinyxml
@@ -39,7 +36,7 @@ RDEPEND="
 	virtual/opengl
 	virtual/glu
 	python? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pyyaml
 		${PYTHON_DEPS}
 	)
 "
@@ -50,26 +47,22 @@ DEPEND="
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-
-usx() { usex $* ON OFF; }
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-libpng.patch"
+)
 
 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)
+		-Dopengl=$(usex opengl)
+		-Dfifechan=$(usex fifechan)
+		-Dlibrocket=OFF
+		-Dcegui=$(usex cegui)
+		-Dlogging=$(usex log)
+		-Dbuild-python=$(usex python)
 		-Dbuild-library=ON
 	)
 

diff --git a/games-engines/fifengine/fifengine-9999.ebuild b/games-engines/fifengine/fifengine-9999.ebuild
deleted file mode 100644
index 5923bd6..0000000
--- a/games-engines/fifengine/fifengine-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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/tinyxml
-	media-libs/libpng
-	media-libs/mesa
-	>=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/files/fifengine-0.4.1-unbundle-libpng.patch b/games-engines/fifengine/files/fifengine-0.4.2-unbundle-libpng.patch
similarity index 100%
rename from games-engines/fifengine/files/fifengine-0.4.1-unbundle-libpng.patch
rename to games-engines/fifengine/files/fifengine-0.4.2-unbundle-libpng.patch

diff --git a/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch b/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
deleted file mode 100644
index 9509211..0000000
--- a/games-engines/fifengine/files/fifengine-9999-unbundle-libpng.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: image.h
-===================================================================
---- a/engine/core/video/image.h	(revision 3239)
-+++ b/engine/core/video/image.h	(working copy)
-@@ -27,8 +27,6 @@
- 
- // 3rd party library includes
- #include <SDL.h>
--#define PNG_SKIP_SETJMP_CHECK
--#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/fifengine/metadata.xml b/games-engines/fifengine/metadata.xml
index eb2356d..c0bc2a6 100644
--- a/games-engines/fifengine/metadata.xml
+++ b/games-engines/fifengine/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>krytzz@×××××××.eu</email>
 	<name>steffen stramm</name>
 </maintainer>
+<use>
+<flag name="cegui">Enable cegui support</flag>
+<flag name="fifechan">Enable Fifechan GUI subsystem</flag>
+<flag name="log">Enable logging</flag>
+</use>
 </pkgmetadata>