[gentoo-commits] proj/gamerlay:master commit in: games-strategy/unknown-horizons/, games-strategy/unknown-horizons/files/
commit: 4900137dde22ca34250c4de54fb1d2ec3e569170
Author: Vadim Misbakh-Soloviov gentoo org>
AuthorDate: Tue Jan 16 04:21:43 2024 +
Commit: Vadim Misbakh-Soloviov gentoo org>
CommitDate: Tue Jan 16 04:24:30 2024 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=4900137d
games-strategy/unknown-horizons: fix build
Closes: https://bugs.gentoo.org/905123
Signed-off-by: Vadim Misbakh-Soloviov gentoo.org>
.../unknown-horizons/files/json_decoder.patch| 8
.../unknown-horizons/files/python-3.8.patch | 19 +++
.../unknown-horizons/files/unitmanager.patch | 20
.../unknown-horizons/files/util_preloader.patch | 14 ++
games-strategy/unknown-horizons/metadata.xml | 14 +++---
...19.1.ebuild => unknown-horizons-2019.1-r1.ebuild} | 17 +++--
6 files changed, 83 insertions(+), 9 deletions(-)
diff --git a/games-strategy/unknown-horizons/files/json_decoder.patch
b/games-strategy/unknown-horizons/files/json_decoder.patch
new file mode 100644
index 000..bb355a4
--- /dev/null
+++ b/games-strategy/unknown-horizons/files/json_decoder.patch
@@ -0,0 +1,8 @@
+--- a/horizons/util/loaders/jsondecoder.py 2019-01-12 16:15:42.0
+0100
b/horizons/util/loaders/jsondecoder.py 2022-09-04 02:23:14.570074926
+0200
+@@ -37,4 +37,4 @@
+ return newdict
+
+ with open(path, "r") as f:
+- return json.load(f, encoding="ascii",
object_hook=_decode_dict)
++ return json.loads(f.read().encode("ascii"),
object_hook=_decode_dict)
diff --git a/games-strategy/unknown-horizons/files/python-3.8.patch
b/games-strategy/unknown-horizons/files/python-3.8.patch
new file mode 100644
index 000..f994250
--- /dev/null
+++ b/games-strategy/unknown-horizons/files/python-3.8.patch
@@ -0,0 +1,19 @@
+--- a/setup.py 2022-09-01 12:49:18.429156294 +0200
b/setup.py 2022-09-01 12:55:09.679161589 +0200
+@@ -26,6 +26,7 @@
+ import json
+ import os
+ import platform
++import distro
+ import sys
+ from distutils.command.build import build
+ from distutils.core import setup
+@@ -39,7 +40,7 @@
+ # Ensure we are in the correct directory
+ os.chdir(os.path.realpath(os.path.dirname(__file__)))
+
+-if platform.dist()[0].lower() in ('debian', 'ubuntu'):
++if distro.id().lower() in ('debian', 'ubuntu'):
+ executable_path = 'games'
+ else:
+ executable_path = 'bin'
diff --git a/games-strategy/unknown-horizons/files/unitmanager.patch
b/games-strategy/unknown-horizons/files/unitmanager.patch
new file mode 100644
index 000..901ea64
--- /dev/null
+++ b/games-strategy/unknown-horizons/files/unitmanager.patch
@@ -0,0 +1,20 @@
+--- a/horizons/ai/aiplayer/combat/unitmanager.py 2019-01-12
16:15:42.0 +0100
b/horizons/ai/aiplayer/combat/unitmanager.py 2022-09-04
03:17:12.660088944 +0200
+@@ -151,7 +151,7 @@
+ """
+ Rule stating that ship has to be in any of given states.
+ """
+- if not isinstance(ship_states, collections.Iterable):
++ if not isinstance(ship_states, collections.abc.Iterable):
+ ship_states = (ship_states,)
+ return lambda ship: (state_dict[ship] in ship_states)
+
+@@ -178,7 +178,7 @@
+ @param rules: conditions each ship has to meet (AND)
+ @type rules: iterable of lambda(ship) or single lambda(ship)
+ """
+- if not isinstance(rules, collections.Iterable):
++ if not isinstance(rules, collections.abc.Iterable):
+ rules = (rules,)
+ return [ship for ship in ships if all((rule(ship) for rule in
rules))]
+
diff --git a/games-strategy/unknown-horizons/files/util_preloader.patch
b/games-strategy/unknown-horizons/files/util_preloader.patch
new file mode 100644
index 000..c584f26
--- /dev/null
+++ b/games-strategy/unknown-horizons/files/util_preloader.patch
@@ -0,0 +1,14 @@
+--- a/horizons/util/preloader.py 2019-01-12 16:15:42.0 +0100
b/horizons/util/preloader.py 2022-09-04 02:18:05.73586 +0200
+@@ -79,9 +79,9 @@
+ """
+ self.lock.acquire()
+ # wait until it finished its current action
+- if self.isAlive():
++ if self.is_alive():
+ self.join()
+- assert not self.isAlive()
++ assert not self.is_alive()
+ else:
+ try:
+ self.lock.release()
diff --git a/games-strategy/unknown-horizons/metadata.xml
b/games-strategy/unknown-horizons/metadata.xml
index 7a6f11a..5df3482 100644
--- a/games-strategy/unknown-horizons/metadata.xml
+++ b/games-strategy/unknown-horizons/metadata.xml
@@ -1,11 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd;>
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/unknown-horizons/
commit: 7116671f4fb0dd8b4983d68f5a4923a4595dc713
Author: Vadim Misbakh-Soloviov gentoo org>
AuthorDate: Sat Apr 15 21:02:03 2023 +
Commit: Vadim Misbakh-Soloviov gentoo org>
CommitDate: Sat Apr 15 21:02:03 2023 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=7116671f
games-strategy/unknown-horizons: fix download url
Signed-off-by: Vadim Misbakh-Soloviov gentoo.org>
games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild
index e211ff9..9bea365 100644
--- a/games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild
+++ b/games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
DESCRIPTION="Anno-like real time strategy game"
HOMEPAGE="https://www.unknown-horizons.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/unknown-horizons/
commit: 373742308d4e4b6b312aa6e76dd74a9769327de8
Author: Azamat H. Hackimov gmail com>
AuthorDate: Wed Mar 4 00:04:09 2020 +
Commit: Azamat H. Hackimov gentoo ru>
CommitDate: Wed Mar 4 00:04:09 2020 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=37374230
games-strategy/unknown-horizons: update to 2019.1
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov gmail.com>
games-strategy/unknown-horizons/metadata.xml | 2 +-
.../unknown-horizons-2017.2.ebuild | 52 -
.../unknown-horizons-2019.1.ebuild | 53 ++
.../unknown-horizons/unknown-horizons-.ebuild | 52 -
4 files changed, 54 insertions(+), 105 deletions(-)
diff --git a/games-strategy/unknown-horizons/metadata.xml
b/games-strategy/unknown-horizons/metadata.xml
index 31afb77..7a6f11a 100644
--- a/games-strategy/unknown-horizons/metadata.xml
+++ b/games-strategy/unknown-horizons/metadata.xml
@@ -1,7 +1,7 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
+
toty...@unknown-horizons.org
totycro
diff --git a/games-strategy/unknown-horizons/unknown-horizons-2017.2.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2017.2.ebuild
deleted file mode 100644
index fc07388..000
--- a/games-strategy/unknown-horizons/unknown-horizons-2017.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-2019.1.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild
new file mode 100644
index 000..da04746
--- /dev/null
+++ b/games-strategy/unknown-horizons/unknown-horizons-2019.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ dev-python/pyyaml
+ dev-python/pillow
+ >=games-engines/fifengine-0.4.2[python]
+ >=games-engines/fifechan-0.1.5
+ ${PYTHON_DEPS}
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/greenlet
+ dev-python/polib
+ dev-python/isort
+ dev-python/pylint
+ dev-python/mock
+ dev-python/nose
+ dev-python/pycodestyle
+ )
+"
+
+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-.ebuild
b/games-strategy/unknown-horizons/unknown-horizons-.ebuild
deleted file mode 100644
index 63cc011..000
--- a/games-strategy/unknown-horizons/unknown-horizons-.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 git-r3
-
-DESCRIPTION="Anno-like real time strategy game"
-HOMEPAGE="http://www.unknown-horizons.org/;
-EGIT_REPO_URI="http://github.com/${PN}/${PN};
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
-
[gentoo-commits] proj/gamerlay:master commit in: games-strategy/unknown-horizons/, games-engines/fifengine/, ...
commit: be5d3cdcd1f360dc65d54d7e1e44d32524229d51
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Sun Feb 26 11:17:47 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Sun Feb 26 11:17:47 2017 +
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-.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-.ebuild| 49 ++
games-engines/fifechan/metadata.xml| 12
games-engines/fifengine/fifengine-0.4.1.ebuild | 78 ++
games-engines/fifengine/fifengine-.ebuild | 78 ++
.../files/fifengine-0.4.1-unbundle-libpng.patch} | 3 +-
.../files/fifengine--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-.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..000
--- 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..000
--- 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"
