summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/0ad/0ad-0.0.26_alpha.ebuild (renamed from games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild)24
-rw-r--r--games-strategy/0ad/Manifest8
-rw-r--r--games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch131
-rw-r--r--games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch156
-rw-r--r--games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild4
-rw-r--r--games-strategy/colobot/colobot-0.2.0_alpha.ebuild4
-rw-r--r--games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild3
-rw-r--r--games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild5
-rw-r--r--games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild4
-rw-r--r--games-strategy/galaxyhack/metadata.xml30
-rw-r--r--games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch122
-rw-r--r--games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild4
-rw-r--r--games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild4
-rw-r--r--games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild4
-rw-r--r--games-strategy/liquidwar/liquidwar-5.6.5.ebuild4
-rw-r--r--games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch4
-rw-r--r--games-strategy/s25rttr/s25rttr-0.9.5.ebuild2
-rw-r--r--games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild2
-rw-r--r--games-strategy/warzone2100/Manifest3
-rw-r--r--games-strategy/warzone2100/warzone2100-4.2.7.ebuild (renamed from games-strategy/warzone2100/warzone2100-4.2.6.ebuild)0
-rw-r--r--games-strategy/warzone2100/warzone2100-4.3.1.ebuild117
-rw-r--r--games-strategy/wesnoth/Manifest2
-rw-r--r--games-strategy/wesnoth/wesnoth-1.16.3.ebuild2
-rw-r--r--games-strategy/wesnoth/wesnoth-1.16.6.ebuild100
-rw-r--r--games-strategy/wesnoth/wesnoth-1.17.5.ebuild2
-rw-r--r--games-strategy/wesnoth/wesnoth-1.17.9.ebuild100
-rw-r--r--games-strategy/widelands/Manifest2
-rw-r--r--games-strategy/widelands/files/widelands-1.0-boost-1.77.patch16
-rw-r--r--games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch29
-rw-r--r--games-strategy/widelands/widelands-1.1.ebuild (renamed from games-strategy/widelands/widelands-1.0.ebuild)29
-rw-r--r--games-strategy/widelands/widelands-9999.ebuild28
31 files changed, 527 insertions, 418 deletions
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
index 0939933bda9..c440f50e133 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
@@ -4,14 +4,21 @@
EAPI=8
WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{8..10} )
+# In alpha26 bundled spidermonkey-78.6.0 does not build with python 3.11.
+PYTHON_COMPAT=( python3_10 )
inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/"
LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
-# Upstream signs releases (and only them) with app-crypt/minisign.
-# The (public) key can be found on https://play0ad.com/download/source.
+# Upstream signs releases with app-crypt/minisign which is not supported
+# by IUSE="verify-sig", bug #783066. As a workaround the minisign key
+# is hardcoded and verifed manually in this ebuild.
+#
+# The public key can be found upstream - last update was w/ alpha 26:
+# https://trac.wildfiregames.com/wiki/VerifyingYourDownloads
+MINISIGN_KEY="RWTWLbO12+ig3lUExIor3xd6DdZaYFEozn8Bu8nIzY3ImuRYQszIQyyy"
+
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/0ad/0ad"
@@ -23,7 +30,6 @@ elif [[ ${PV} == *_pre* ]]; then
else
# Trailing whitespace for IUSE append below
IUSE="verify-sig "
- MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
MY_P="0ad-${PV/_/-}"
SRC_URI="
http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
@@ -40,8 +46,8 @@ KEYWORDS="~amd64 ~arm64 ~x86"
IUSE+="editor +lobby nvtt pch test"
RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
-CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
+CHECKREQS_DISK_BUILD="9000M" # 8795916 KiB (8.3 GiB) for alpha 26
+CHECKREQS_DISK_USR="3500M" # 3555340 KiB (3.3 GiB)
# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
# build and/or startup issues.
@@ -56,8 +62,8 @@ BDEPEND="
virtual/rust
test? ( dev-lang/perl )
"
-# Upstream uses minisign which is not supported by verify-sign, bug #783066.
-# Signatures are only provided for releases.
+
+# For IUSE="verify-sig", see note about SRC_URI block.
if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
BDEPEND+=" app-crypt/minisign"
fi
@@ -91,8 +97,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
"${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
- "${FILESDIR}"/${PN}-0.0.25b_alpha-python3.10.patch
- "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-name-collision-glibc.patch
)
pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index afaaebc4f84..9f53ffa1fb5 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,4 +1,4 @@
-DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
-DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2
-DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1
-DIST 0ad-0.0.25b-alpha-unix-data.tar.xz.minisig 326 BLAKE2B 41975d4c4369780bd36edef448ab928c91ece0d60ddad04fbccd1da0ed5068b56c86fd57708c6158277c5db9faadc768f5e455d97fe5ae3c30a7522005c374e6 SHA512 ad3ef78b785db9eb37d547a86d2bf274e0b6635118a9c512d013adc45e4a0f071b86f0fb5bf696631596e0713b2de153b0ad245cbba86beb3ea153036178b07e
+DIST 0ad-0.0.26-alpha-unix-build.tar.xz 75599800 BLAKE2B ddd589840b0dacee2377ff4e5624f69646b92da4217015d788c6abec097578e44aee6641b6a6945d15f50d8e50673a1d44587c2faf02278d981a0ed30c950214 SHA512 aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272
+DIST 0ad-0.0.26-alpha-unix-build.tar.xz.minisig 333 BLAKE2B 9f3146abda592fe6ab9433f6ee30060bcd4c5b594e00cb3fccc0aebb74652f3bc2ddd7b19a296da7ca13126ea9cc0337750f859e24f46adfcb84272bd2cce452 SHA512 eda542c1c363c7c0e6b235e6d8dfbd96d1c1e7cfca408b7215cf247b96c9f42b8bc206bbb4dd48dc41ee373db17d4a76cba940e454840dc41638dd572c580850
+DIST 0ad-0.0.26-alpha-unix-data.tar.xz 1351511480 BLAKE2B 2f483593b79a6ae87d7582625e89c890cfcf4ad7116348b184dae6c47a814d95a7b9f3018cb79e8f024a61c647abd39d6faf5ad3d3fcbb0c7a0583d0479d9b18 SHA512 8fe29fce68737d5b7001c8c2a7198766583b22556129cd2d927823da9b2c58f224fb1207f35bd03abea9380cf24d00ab6257b0dba86ce3ad1f357d7006f051d6
+DIST 0ad-0.0.26-alpha-unix-data.tar.xz.minisig 332 BLAKE2B fb4ec1bcabad79052a5e391557623ad61234d4948ec919d9a79011037855b6c7c94445d8f1667f1725bf80d15d66d1aa32c4e2b259831fbe088fe79e800515b3 SHA512 6dd55dda4e6cd52642b331aa571bc4ccfe30a33ad12a5d3ccf51c708d05dd74bf3234ca722c2a6501ba797bc1f8fa7c7aeb4d836dc4792bfd0c6bbccdc2c1237
diff --git a/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch
deleted file mode 100644
index e8d88e794c9..00000000000
--- a/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-name-collision-glibc.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-https://bugs.gentoo.org/834578
-https://trac.wildfiregames.com/changeset/26536/
-​https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103735
-​https://sourceware.org/bugzilla/show_bug.cgi?id=28713
---- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
-+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
-@@ -1,3 +1,3 @@
--/* Copyright (C) 2021 Wildfire Games.
-+/* Copyright (C) 2022 Wildfire Games.
- * This file is part of 0 A.D.
- *
-@@ -30,6 +30,4 @@
- static Observable<AtlasMessage::sEnvironmentSettings> g_EnvironmentSettings;
-
--const float M_PIf = 3.14159265f;
--
- //////////////////////////////////////////////////////////////////////////
-
-@@ -86,10 +84,13 @@
- m_Var(var)
- {
-- m_Conn = g_EnvironmentSettings.RegisterObserver(0, &VariableListBox::OnSettingsChange, this);
-+ m_Conn = g_EnvironmentSettings.RegisterObserver(
-+ 0, &VariableListBox::OnSettingsChange, this);
-
- m_Sizer = new wxStaticBoxSizer(wxVERTICAL, this, label);
- SetSizer(m_Sizer);
-
-- m_Combo = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxArrayString(), wxCB_READONLY),
-+ m_Combo = new wxComboBox(
-+ this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
-+ wxArrayString(), wxCB_READONLY),
- m_Sizer->Add(m_Combo, wxSizerFlags().Expand());
- }
-@@ -207,6 +208,7 @@
- }
-
--EnvironmentSidebar::EnvironmentSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer)
--: Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer)
-+EnvironmentSidebar::EnvironmentSidebar(
-+ ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer)
-+ : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer)
- {
- wxSizer* scrollSizer = new wxBoxSizer(wxVERTICAL);
-@@ -218,13 +220,22 @@
- wxSizer* waterSizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _T("Water settings"));
- scrollSizer->Add(waterSizer, wxSizerFlags().Expand());
-- waterSizer->Add(new wxButton(scrolledWindow, ID_RecomputeWaterData, _("Reset Water Data")), wxSizerFlags().Expand());
-- waterSizer->Add(m_WaterTypeList = new VariableListBox(scrolledWindow, _("Water Type"), g_EnvironmentSettings.watertype), wxSizerFlags().Expand());
-- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Water height"), g_EnvironmentSettings.waterheight, 0.f, 1.2f), wxSizerFlags().Expand());
-- waterSizer->Add(new wxButton(scrolledWindow, ID_PickWaterHeight, _("Pick Water Height")), wxSizerFlags().Expand());
-- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Water waviness"), g_EnvironmentSettings.waterwaviness, 0.f, 10.f), wxSizerFlags().Expand());
-- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Water murkiness"), g_EnvironmentSettings.watermurkiness, 0.f, 1.f), wxSizerFlags().Expand());
-- waterSizer->Add(new VariableSliderBox(scrolledWindow, _("Wind angle"), g_EnvironmentSettings.windangle, -M_PIf, M_PIf), wxSizerFlags().Expand());
-- waterSizer->Add(new VariableColorBox(scrolledWindow, _("Water color"), g_EnvironmentSettings.watercolor), wxSizerFlags().Expand());
-- waterSizer->Add(new VariableColorBox(scrolledWindow, _("Water tint"), g_EnvironmentSettings.watertint), wxSizerFlags().Expand());
-+ waterSizer->Add(new wxButton(
-+ scrolledWindow, ID_RecomputeWaterData, _("Reset Water Data")), wxSizerFlags().Expand());
-+ waterSizer->Add(m_WaterTypeList = new VariableListBox(
-+ scrolledWindow, _("Water Type"), g_EnvironmentSettings.watertype), wxSizerFlags().Expand());
-+ waterSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Water height"), g_EnvironmentSettings.waterheight, 0.f, 1.2f), wxSizerFlags().Expand());
-+ waterSizer->Add(new wxButton(
-+ scrolledWindow, ID_PickWaterHeight, _("Pick Water Height")), wxSizerFlags().Expand());
-+ waterSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Water waviness"), g_EnvironmentSettings.waterwaviness, 0.f, 10.f), wxSizerFlags().Expand());
-+ waterSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Water murkiness"), g_EnvironmentSettings.watermurkiness, 0.f, 1.f), wxSizerFlags().Expand());
-+ waterSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Wind angle"), g_EnvironmentSettings.windangle, -static_cast<float>(M_PI), static_cast<float>(M_PI)), wxSizerFlags().Expand());
-+ waterSizer->Add(new VariableColorBox(
-+ scrolledWindow, _("Water color"), g_EnvironmentSettings.watercolor), wxSizerFlags().Expand());
-+ waterSizer->Add(new VariableColorBox(
-+ scrolledWindow, _("Water tint"), g_EnvironmentSettings.watertint), wxSizerFlags().Expand());
-
- std::vector<std::wstring> list;
-@@ -236,23 +247,38 @@
- scrollSizer->Add(sunSizer, wxSizerFlags().Expand().Border(wxTOP, 8));
-
-- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Sun rotation"), g_EnvironmentSettings.sunrotation, -M_PIf, M_PIf), wxSizerFlags().Expand());
-- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Sun elevation"), g_EnvironmentSettings.sunelevation, -M_PIf/2, M_PIf/2), wxSizerFlags().Expand());
-- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Sun overbrightness"), g_EnvironmentSettings.sunoverbrightness, 1.0f, 3.0f), wxSizerFlags().Expand());
-- sunSizer->Add(new LightControl(scrolledWindow, wxSize(150, 150), g_EnvironmentSettings));
-- sunSizer->Add(new VariableColorBox(scrolledWindow, _("Sun color"), g_EnvironmentSettings.suncolor), wxSizerFlags().Expand());
-- sunSizer->Add(m_SkyList = new VariableListBox(scrolledWindow, _("Sky set"), g_EnvironmentSettings.skyset), wxSizerFlags().Expand());
-- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Fog Factor"), g_EnvironmentSettings.fogfactor, 0.0f, 0.01f), wxSizerFlags().Expand());
-- sunSizer->Add(new VariableSliderBox(scrolledWindow, _("Fog Thickness"), g_EnvironmentSettings.fogmax, 0.5f, 0.0f), wxSizerFlags().Expand());
-- sunSizer->Add(new VariableColorBox(scrolledWindow, _("Fog color"), g_EnvironmentSettings.fogcolor), wxSizerFlags().Expand());
-- sunSizer->Add(new VariableColorBox(scrolledWindow, _("Ambient color"), g_EnvironmentSettings.ambientcolor), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Sun rotation"), g_EnvironmentSettings.sunrotation, -static_cast<float>(M_PI), static_cast<float>(M_PI)), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Sun elevation"), g_EnvironmentSettings.sunelevation, -static_cast<float>(M_PI) / 2.0f, static_cast<float>(M_PI) / 2.0f), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Sun overbrightness"), g_EnvironmentSettings.sunoverbrightness, 1.0f, 3.0f), wxSizerFlags().Expand());
-+ sunSizer->Add(new LightControl(
-+ scrolledWindow, wxSize(150, 150), g_EnvironmentSettings));
-+ sunSizer->Add(new VariableColorBox(
-+ scrolledWindow, _("Sun color"), g_EnvironmentSettings.suncolor), wxSizerFlags().Expand());
-+ sunSizer->Add(m_SkyList = new VariableListBox(
-+ scrolledWindow, _("Sky set"), g_EnvironmentSettings.skyset), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Fog Factor"), g_EnvironmentSettings.fogfactor, 0.0f, 0.01f), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Fog Thickness"), g_EnvironmentSettings.fogmax, 0.5f, 0.0f), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableColorBox(
-+ scrolledWindow, _("Fog color"), g_EnvironmentSettings.fogcolor), wxSizerFlags().Expand());
-+ sunSizer->Add(new VariableColorBox(
-+ scrolledWindow, _("Ambient color"), g_EnvironmentSettings.ambientcolor), wxSizerFlags().Expand());
-
- wxSizer* postProcSizer = new wxStaticBoxSizer(wxVERTICAL, scrolledWindow, _T("Post-processing settings"));
- scrollSizer->Add(postProcSizer, wxSizerFlags().Expand().Border(wxTOP, 8));
-
-- postProcSizer->Add(m_PostEffectList = new VariableListBox(scrolledWindow, _("Post Effect"), g_EnvironmentSettings.posteffect), wxSizerFlags().Expand());
-- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Brightness"), g_EnvironmentSettings.brightness, -0.5f, 0.5f), wxSizerFlags().Expand());
-- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Contrast (HDR)"), g_EnvironmentSettings.contrast, 0.5f, 1.5f), wxSizerFlags().Expand());
-- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Saturation"), g_EnvironmentSettings.saturation, 0.0f, 2.0f), wxSizerFlags().Expand());
-- postProcSizer->Add(new VariableSliderBox(scrolledWindow, _("Bloom"), g_EnvironmentSettings.bloom, 0.2f, 0.0f), wxSizerFlags().Expand());
-+ postProcSizer->Add(m_PostEffectList = new VariableListBox(
-+ scrolledWindow, _("Post Effect"), g_EnvironmentSettings.posteffect), wxSizerFlags().Expand());
-+ postProcSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Brightness"), g_EnvironmentSettings.brightness, -0.5f, 0.5f), wxSizerFlags().Expand());
-+ postProcSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Contrast (HDR)"), g_EnvironmentSettings.contrast, 0.5f, 1.5f), wxSizerFlags().Expand());
-+ postProcSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Saturation"), g_EnvironmentSettings.saturation, 0.0f, 2.0f), wxSizerFlags().Expand());
-+ postProcSizer->Add(new VariableSliderBox(
-+ scrolledWindow, _("Bloom"), g_EnvironmentSettings.bloom, 0.2f, 0.0f), wxSizerFlags().Expand());
-
- m_Conn = g_EnvironmentSettings.RegisterObserver(0, &SendToGame);
-
diff --git a/games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch b/games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch
deleted file mode 100644
index 80991e3c7a6..00000000000
--- a/games-strategy/0ad/files/0ad-0.0.25b_alpha-python3.10.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-https://github.com/0ad/0ad/commit/c2ec217eea6952c4877095969e11900b70c7cda3
-https://bugs.gentoo.org/845987
-
-From: s0600204 <s0600204@3db68df2-c116-0410-a063-a993310a9797>
-Date: Wed, 23 Feb 2022 20:30:38 +0000
-Subject: [PATCH] Fix building spidermonkey on systems with python 3.10
-
-Tested by:
-* Langbart - macOS 10.15.7: `homebrew`ed python 3.9.9 & 3.10.1
-* andy5995 - Manjaro 21.2.3: python 3.10.2
-* s0600204 - ArchLinux: python 3.10.2
-
-Differential Revision: https://code.wildfiregames.com/D4437
-
-
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@26475 3db68df2-c116-0410-a063-a993310a9797
---- /dev/null
-+++ b/libraries/source/spidermonkey/FixPythonCollectionABC.diff
-@@ -0,0 +1,87 @@
-+--- a/python/mach/mach/config.py
-++++ b/python/mach/mach/config.py
-+@@ -144,7 +144,7 @@
-+ return _
-+
-+
-+-class ConfigSettings(collections.Mapping):
-++class ConfigSettings(collections.abc.Mapping):
-+ """Interface for configuration settings.
-+
-+ This is the main interface to the configuration.
-+@@ -190,7 +190,7 @@
-+ will result in exceptions being raised.
-+ """
-+
-+- class ConfigSection(collections.MutableMapping, object):
-++ class ConfigSection(collections.abc.MutableMapping, object):
-+ """Represents an individual config section."""
-+ def __init__(self, config, name, settings):
-+ object.__setattr__(self, '_config', config)
-+--- a/python/mach/mach/decorators.py
-++++ b/python/mach/mach/decorators.py
-+@@ -159,7 +159,7 @@
-+ 'Conditions argument must take a list ' + \
-+ 'of functions. Found %s instead.'
-+
-+- if not isinstance(command.conditions, collections.Iterable):
-++ if not isinstance(command.conditions, collections.abc.Iterable):
-+ msg = msg % (command.name, type(command.conditions))
-+ raise MachError(msg)
-+
-+--- a/python/mach/mach/main.py
-++++ b/python/mach/mach/main.py
-+@@ -16,7 +16,7 @@
-+ import sys
-+ import traceback
-+ import uuid
-+-from collections import Iterable
-++from collections.abc import Iterable
-+
-+ from six import string_types
-+
-+--- a/python/mozbuild/mozbuild/backend/configenvironment.py
-++++ b/python/mozbuild/mozbuild/backend/configenvironment.py
-+@@ -9,7 +9,8 @@
-+ import sys
-+ import json
-+
-+-from collections import Iterable, OrderedDict
-++from collections import OrderedDict
-++from collections.abc import Iterable
-+ from types import ModuleType
-+
-+ import mozpack.path as mozpath
-+--- a/python/mozbuild/mozbuild/makeutil.py
-++++ b/python/mozbuild/mozbuild/makeutil.py
-+@@ -7,7 +7,7 @@
-+ import os
-+ import re
-+ import six
-+-from collections import Iterable
-++from collections.abc import Iterable
-+
-+
-+ class Makefile(object):
-+--- a/python/mozbuild/mozbuild/util.py
-++++ b/python/mozbuild/mozbuild/util.py
-+@@ -782,7 +782,7 @@
-+ self._strings = StrictOrderingOnAppendList()
-+ self._children = {}
-+
-+- class StringListAdaptor(collections.Sequence):
-++ class StringListAdaptor(collections.abc.Sequence):
-+ def __init__(self, hsl):
-+ self._hsl = hsl
-+
-+--- a/testing/mozbase/manifestparser/manifestparser/filters.py
-++++ b/testing/mozbase/manifestparser/manifestparser/filters.py
-+@@ -15,1 +15,2 @@
-+-from collections import defaultdict, MutableSequence
-++from collections import defaultdict
-++from collections.abc import MutableSequence
-+--- a/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py
-++++ b/third_party/python/pipenv/pipenv/vendor/jinja2/sandbox.py
-+@@ -82,1 +82,1 @@
-+-from collections import MutableSet, MutableMapping, MutableSequence
-++from collections.abc import MutableSet, MutableMapping, MutableSequence
---- /dev/null
-+++ b/libraries/source/spidermonkey/FixVirtualenvForPython310.diff
-@@ -0,0 +1,15 @@
-+--- a/third_party/python/virtualenv/virtualenv.py
-++++ b/third_party/python/virtualenv/virtualenv.py
-+@@ -1804,7 +1804,11 @@
-+ pass
-+ else:
-+ # noinspection PyProtectedMember
-+- if sysconfig._get_default_scheme() == "posix_local":
-++ try: # Python >= 3.10
-++ default_scheme = sysconfig.get_default_scheme()
-++ except: # Python < 3.10
-++ default_scheme = sysconfig._get_default_scheme()
-++ if default_scheme == "posix_local":
-+ local_path = os.path.join(home_dir, "local")
-+ if not os.path.exists(local_path):
-+ os.mkdir(local_path)
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -52,6 +60,11 @@ patch -p1 < ../FixMSVCRootedVoid.diff
- # so this patches it to an arbitrarily high Mac OS 11
- patch -p1 < ../FixMacBuild.diff
-
-+# In python 3.3, the Collections' Abstract Base Classes were moved from `collections` to
-+# `collections.abc`, and aliases were set up for backwards compatibility.
-+# In python 3.10, these aliases were removed, requiring all code that used them to update.
-+patch -p1 < ../FixPythonCollectionABC.diff
-+
- # Fix FP access breaking compilation on RPI3+
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
-
-diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
-index 2a3e165..5dde46f 100644
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,11 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+# In python 3.10 `sysconfig._get_default_scheme()` was renamed to
-+# `sysconfig.get_default_scheme()`. This breaks the version of
-+# `virtualenv` bundled with the spidermonkey source code.
-+patch -p1 < ../FixVirtualenvForPython310.diff
-+
- # Mozglue symbols need to be linked against static builds.
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1588340
- patch -p1 < ../FixMozglue.diff
diff --git a/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild b/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
index 4800d0ed10c..76d688ad08e 100644
--- a/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
+++ b/games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ S=${WORKDIR}/${PN}-${MY_P}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
IUSE="+music"
BDEPEND=${PYTHON_DEPS}
diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
index 3897d69816c..b49ad40a24d 100644
--- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${MY_P}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
IUSE="devbuild doc +openal test tools"
RESTRICT="!test? ( test )"
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild
index 14ce93699bc..30e71f67f4a 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,6 +19,7 @@ RDEPEND="
media-libs/libsdl[abi_x86_32(-)]
media-libs/libvorbis[abi_x86_32(-)]
virtual/glu[abi_x86_32(-)]
+ sys-libs/glibc
sys-libs/libstdc++-v3:5
virtual/opengl[abi_x86_32(-)]"
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
index 73c5504bd03..d56766b9c12 100644
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
+++ b/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,9 +18,10 @@ KEYWORDS="-* ~amd64 ~x86"
RESTRICT="bindist mirror strip"
RDEPEND="
- sys-libs/libstdc++-v3:5
media-libs/libsdl[abi_x86_32(-)]
media-libs/libvorbis[abi_x86_32(-)]
+ sys-libs/glibc
+ sys-libs/libstdc++-v3:5
virtual/glu[abi_x86_32(-)]
virtual/opengl[abi_x86_32(-)]
"
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild
index d82d02f9b10..d85e5bdbe33 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="
- >=dev-libs/boost-1.34:=
+ dev-libs/boost:=
media-libs/libsdl[video]
media-libs/sdl-image[png]
media-libs/sdl-mixer[mod,vorbis]
diff --git a/games-strategy/galaxyhack/metadata.xml b/games-strategy/galaxyhack/metadata.xml
index 76e87b2f52a..4e8913cca97 100644
--- a/games-strategy/galaxyhack/metadata.xml
+++ b/games-strategy/galaxyhack/metadata.xml
@@ -6,23 +6,23 @@
<name>Gentoo Games Project</name>
</maintainer>
<longdescription lang="en">
-GalaxyHack allows you to design a fleet of spaceships which can then be tested
-in AI script based battles against fleets designed by other players. Though
-battles take place in real time, the strategy comes before hand, both in
-writing short AI scripts in a simple scripting language, and also in the set up
-and selection of your fleet. You don't actually have any control over your
-units at all mid-battle, but rather use the time to see where the set up of
-your fleets is working, where your fleets' weaknesses lie and changes are
-needed, and perhaps also to learn from the strategy of your opponent.
+ GalaxyHack allows you to design a fleet of spaceships which can then be tested
+ in AI script based battles against fleets designed by other players. Though
+ battles take place in real time, the strategy comes before hand, both in
+ writing short AI scripts in a simple scripting language, and also in the set up
+ and selection of your fleet. You don't actually have any control over your
+ units at all mid-battle, but rather use the time to see where the set up of
+ your fleets is working, where your fleets' weaknesses lie and changes are
+ needed, and perhaps also to learn from the strategy of your opponent.
-The game revolves around very large capital ships, from which smaller ships are
-launched, but which are not designed for attacking themselves, and which cannot
-be moved mid-battle. To win a battle you must destroy of all of your opponent's
-capital ships before they destroy yours.
+ The game revolves around very large capital ships, from which smaller ships are
+ launched, but which are not designed for attacking themselves, and which cannot
+ be moved mid-battle. To win a battle you must destroy of all of your opponent's
+ capital ships before they destroy yours.
-There can be hundreds of units in any one battle, but there is no harvesting,
-resource management or base building.
-</longdescription>
+ There can be hundreds of units in any one battle, but there is no harvesting,
+ resource management or base building.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">galaxyhack</remote-id>
</upstream>
diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch
new file mode 100644
index 00000000000..7c76e4854f5
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch
@@ -0,0 +1,122 @@
+Description: Cherry-pick change 42f7e397894c5132b4706f478e62ce5d648119c1 into our custom embedded version
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Forwarded: irc
+Last-Update: 2022-08-05
+
+--- hedgewars-1.0.0.orig/cmake_modules/CMakeSystemSpecificInformation.cmake
++++ hedgewars-1.0.0/cmake_modules/CMakeSystemSpecificInformation.cmake
+@@ -1,70 +1,6 @@
+-# XXX Emscripten:
+-# This file is copied as-is from the CMake source tree. Due to how CMake
+-# platform toolchain files work, we must have a copy of this file located
+-# relative to Emscripten platform toolchain file, or file inclusion order
+-# in cmGlobalGenerator::EnableLanguage will not find Emscripten.cmake
+-# toolchain file, and as a result, it is not possible to set the default
+-# compilation output suffix to .js, and as a consequence the script
+-# check_function_exists() will not function properly (it will try to
+-# build to wrong file suffix)
+-
+-# CMake - Cross Platform Makefile Generator
+-# Copyright 2000-2014 Kitware, Inc.
+-# Copyright 2000-2011 Insight Software Consortium
+-# All rights reserved.
+-
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-
+-# * Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-
+-# * Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-
+-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
+-# nor the names of their contributors may be used to endorse or promote
+-# products derived from this software without specific prior written
+-# permission.
+-
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-
+-# ------------------------------------------------------------------------------
+-
+-# The above copyright and license notice applies to distributions of
+-# CMake in source and binary form. Some source files contain additional
+-# notices of original copyright by their contributors; see each source
+-# for details. Third-party software packages supplied with CMake under
+-# compatible licenses provide their own copyright notices documented in
+-# corresponding subdirectories.
+-
+-# ------------------------------------------------------------------------------
+-
+-# CMake was initially developed by Kitware with the following sponsorship:
+-
+-# * National Library of Medicine at the National Institutes of Health
+-# as part of the Insight Segmentation and Registration Toolkit (ITK).
+-
+-# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
+-# Visualization Initiative.
+-
+-# * National Alliance for Medical Image Computing (NAMIC) is funded by the
+-# National Institutes of Health through the NIH Roadmap for Medical Research,
+-# Grant U54 EB005149.
++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
++# file Copyright.txt or https://cmake.org/licensing for details.
+
+-# * Kitware, Inc.
+
+ # This file is included by cmGlobalGenerator::EnableLanguage.
+ # It is included after the compiler has been determined, so
+@@ -78,8 +14,19 @@
+ set(APPLE )
+ set(UNIX )
+ set(CYGWIN )
++set(MSYS )
+ set(WIN32 )
+
++function(_cmake_record_install_prefix )
++ set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_VALUE "${CMAKE_INSTALL_PREFIX}" PARENT_SCOPE)
++ set(count 0)
++ foreach(value IN LISTS CMAKE_SYSTEM_PREFIX_PATH)
++ if(value STREQUAL CMAKE_INSTALL_PREFIX)
++ math(EXPR count "${count}+1")
++ endif()
++ endforeach()
++ set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_COUNT "${count}" PARENT_SCOPE)
++endfunction()
+
+ # include Generic system information
+ include(CMakeGenericSystem)
+@@ -91,17 +38,16 @@ include(${CMAKE_SYSTEM_INFO_FILE} OPTION
+
+ if(NOT _INCLUDED_SYSTEM_INFO_FILE)
+ message("System is unknown to cmake, create:\n${CMAKE_SYSTEM_INFO_FILE}"
+- " to use this system, please send your config file to "
+- "cmake@www.cmake.org so it can be added to cmake")
++ " to use this system, please post your config file on "
++ "discourse.cmake.org so it can be added to cmake")
+ if(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
+ configure_file(${CMAKE_BINARY_DIR}/CMakeCache.txt
+ ${CMAKE_BINARY_DIR}/CopyOfCMakeCache.txt COPYONLY)
+ message("Your CMakeCache.txt file was copied to CopyOfCMakeCache.txt. "
+- "Please send that file to cmake@www.cmake.org.")
+- endif()
++ "Please post that file on discourse.cmake.org.")
++ endif()
+ endif()
+
+-
+ # optionally include a file which can do extra-generator specific things, e.g.
+ # CMakeFindEclipseCDT4.cmake asks gcc for the system include dirs for the Eclipse CDT4 generator
+ if(CMAKE_EXTRA_GENERATOR)
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
index 766ec2014dc..a173b734abf 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -56,6 +56,8 @@ PATCHES=(
"${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch"
# http://hg.hedgewars.org/hedgewars/rev/6832dab555ae
"${FILESDIR}/${PN}-1.0.0-fpc-3.2.patch"
+ # Patch by Debian
+ "${FILESDIR}/${P}-cmake-3.24.patch" # bug 870010
)
S="${WORKDIR}"/${MY_P}
diff --git a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild
index ccf6a75a48a..aaf4253650a 100644
--- a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild
+++ b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}"
LICENSE="SIR-TECH"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
BDEPEND="app-arch/unshield"
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
index 78580ea5af6..117abcdb634 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -102,7 +102,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})"
LICENSE="public-domain SFI-SCLA"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="cdinstall editor ru-gold test"
# Run with ja2 --unittest
# Needs data files?
diff --git a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
index 48530526991..16f65163c6b 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Unique multiplayer wargame"
HOMEPAGE="https://ufoot.org/liquidwar/"
SRC_URI="https://ufoot.org/download/liquidwar/v5/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
index a793c122b21..b0275156bda 100644
--- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
@@ -1,7 +1,7 @@
https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac
---- /source/shared_lib/sources/platform/posix/socket.cpp
-+++ /source/shared_lib/sources/platform/posix/socket.cpp
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -2610,8 +2610,10 @@
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
index 465e763ee22..e5f8470614a 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
RDEPEND="${LUA_DEPS}
app-arch/bzip2
- >=dev-libs/boost-1.73:0=[nls]
+ dev-libs/boost:=[nls]
>=media-libs/libsamplerate-0.1.9
>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
media-libs/libsndfile
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
index a373d565385..2499b114bad 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 5d242b9b9de..581f780c01e 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,2 +1,3 @@
-DIST warzone2100-4.2.6.tar.xz 338691628 BLAKE2B 234d78feb1fceb0eff23c2c1b8d85a5fd9e5ef8912b324ae159ffdb43be728d6e4aa78bdf01561e60c64826083936bc36c2dfd1cee443aed06a52eaa047e8517 SHA512 5cddeff5b66d9e710b0c4d6d2863100106a901c17815220b7a97633a3980be41eaa192921d39bffff60f547fb5f5358fa1e63a54f41b5083203916314bb3d2a1
+DIST warzone2100-4.2.7.tar.xz 338687576 BLAKE2B b504f8ed6b5c1b040b4368429394b7f077c279979ef7847734eeb333512fc374799c73119924fba206a6fc925db54697569a756e113d0a322dd46768c80d0b72 SHA512 af538f3bdf6ec543e5f919377c95c35c730fa6efa5c3ea8d140347595dd9f8056677d4b494677ea20c98da305e0fb588cdb00a3da1c497f96edc58ca8772e45b
+DIST warzone2100-4.3.1.tar.xz 320493184 BLAKE2B 98f3fb13e36f3455532f0f054eaddb495b1f5fbf55fa30f356ab7d315536cd198697b0a084b47c5e1cb9ec0a5cc4bc0159be45669317469bdd2f7b24a62d46d2 SHA512 914d18a8226c11faa8bd03ab5b8f0a52e6e2b8531db501244ceb27f19b76209cbf668e51be59ce35b7203f74c5e62ad78e02ef0fb8505243948fa681f25d583e
DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
diff --git a/games-strategy/warzone2100/warzone2100-4.2.6.ebuild b/games-strategy/warzone2100/warzone2100-4.2.7.ebuild
index c52979b6546..c52979b6546 100644
--- a/games-strategy/warzone2100/warzone2100-4.2.6.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.2.7.ebuild
diff --git a/games-strategy/warzone2100/warzone2100-4.3.1.ebuild b/games-strategy/warzone2100/warzone2100-4.3.1.ebuild
new file mode 100644
index 00000000000..dbaffbebef5
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.3.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
+inherit cmake plocale xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="https://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+ videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+CDEPEND="
+ >=dev-games/physfs-2[zip]
+ dev-db/sqlite:3
+ >=dev-libs/libsodium-1.0.14:=
+ media-libs/freetype:2
+ media-libs/harfbuzz:=
+ media-libs/libogg
+ media-libs/libpng:=
+ media-libs/libsdl2[opengl,video,X]
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ nls? ( virtual/libintl )
+ vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+ ${CDEPEND}
+ dev-libs/fribidi
+ media-libs/fontconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ media-fonts/dejavu
+"
+BDEPEND="
+ app-arch/zip
+ app-text/asciidoc
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.xz
+}
+
+src_prepare() {
+ sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+ # Delete translations we're not using
+ cleanup_po() {
+ local locale=${1}
+ einfo "Cleaning up disabled locale: ${locale}"
+ rm po/${locale}.po || die
+ }
+
+ plocale_for_each_disabled_locale cleanup_po
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # TODO: unbundle basisu (needs packaging)
+ # TODO: unbundle nlohmann-json
+ # TODO: unbundle fmt
+ local mycmakeargs=(
+ -DWZ_DISTRIBUTOR="Gentoo Linux"
+ -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
+ -DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
+ -DBUILD_SHARED_LIBS=OFF
+ -DENABLE_NLS=$(usex nls)
+ -DENABLE_DISCORD=$(usex discord)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+ cmake_src_install
+
+ # We cover licencing within the ebuild itself
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* \
+ "${ED}"/usr/share/doc/${PF}/copyright || die
+
+ if use videos ; then
+ insinto /usr/share/${PN}
+ newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+ fi
+}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 46760920e34..ace2a5cd659 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,4 @@
DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
+DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
+DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9 SHA512 c8f9eb8cc77ea239e710e52a23333636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157
diff --git a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
index 17cdd9a055f..1ee6998e389 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc nls server"
RDEPEND="
acct-group/wesnoth
acct-user/wesnoth
- dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
+ dev-libs/boost:=[bzip2,context,icu,nls]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
new file mode 100644
index 00000000000..1ee6998e389
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+ https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+ acct-group/wesnoth
+ acct-user/wesnoth
+ dev-libs/boost:=[bzip2,context,icu,nls]
+ >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+ !dedicated? (
+ dev-libs/glib:2
+ dev-libs/openssl:0=
+ >=media-libs/fontconfig-2.4.1
+ >=media-libs/sdl2-image-2.0.0[jpeg,png]
+ >=media-libs/sdl2-mixer-2.0.0[vorbis]
+ media-libs/libvorbis
+ >=x11-libs/pango-1.22.0
+ >=x11-libs/cairo-1.10.0
+ sys-libs/readline:0=
+ dbus? ( sys-apps/dbus )
+ )"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use doc ; then
+ sed -i \
+ -e '/manual/d' \
+ doc/CMakeLists.txt || die
+ fi
+
+ # respect LINGUAS (bug #483316)
+ if [[ ${LINGUAS+set} ]] ; then
+ local lang langs=()
+ for lang in $(cat po/LINGUAS) ; do
+ has ${lang} ${LINGUAS} && langs+=( ${lang} )
+ done
+ echo "${langs[@]}" > po/LINGUAS || die
+ fi
+}
+
+src_configure() {
+ filter-flags -ftracer -fomit-frame-pointer
+
+ if use dedicated || use server ; then
+ mycmakeargs=(
+ -DENABLE_CAMPAIGN_SERVER="ON"
+ -DENABLE_SERVER="ON"
+ -DSERVER_UID="${PN}"
+ -DSERVER_GID="${PN}"
+ -DFIFO_DIR="/run/wesnothd"
+ )
+ else
+ mycmakeargs=(
+ -DENABLE_CAMPAIGN_SERVER="OFF"
+ -DENABLE_SERVER="OFF"
+ )
+ fi
+ mycmakeargs+=(
+ -Wno-dev
+ -DENABLE_GAME="$(usex !dedicated)"
+ -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_NOTIFICATIONS="$(usex dbus)"
+ -DENABLE_STRICT_COMPILATION="OFF"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ local DOCS=( README.md changelog.md )
+ cmake_src_install
+ if use dedicated || use server ; then
+ rmdir "${ED}"/run{/wesnothd,} || die
+ newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+ fi
+}
diff --git a/games-strategy/wesnoth/wesnoth-1.17.5.ebuild b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
index 764fb71cac2..5724bdef29f 100644
--- a/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc nls server"
RDEPEND="
acct-group/wesnoth
acct-user/wesnoth
- dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
+ dev-libs/boost:=[bzip2,context,icu,nls]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2
diff --git a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
new file mode 100644
index 00000000000..5724bdef29f
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+ https://github.com/wesnoth/wesnoth"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+ acct-group/wesnoth
+ acct-user/wesnoth
+ dev-libs/boost:=[bzip2,context,icu,nls]
+ >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+ !dedicated? (
+ dev-libs/glib:2
+ dev-libs/openssl:0=
+ >=media-libs/fontconfig-2.4.1
+ >=media-libs/sdl2-image-2.0.0[jpeg,png]
+ >=media-libs/sdl2-mixer-2.0.0[vorbis]
+ media-libs/libvorbis
+ >=x11-libs/pango-1.22.0
+ >=x11-libs/cairo-1.10.0
+ sys-libs/readline:0=
+ dbus? ( sys-apps/dbus )
+ )"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use doc ; then
+ sed -i \
+ -e '/manual/d' \
+ doc/CMakeLists.txt || die
+ fi
+
+ # respect LINGUAS (bug #483316)
+ if [[ ${LINGUAS+set} ]] ; then
+ local lang langs=()
+ for lang in $(cat po/LINGUAS) ; do
+ has ${lang} ${LINGUAS} && langs+=( ${lang} )
+ done
+ echo "${langs[@]}" > po/LINGUAS || die
+ fi
+}
+
+src_configure() {
+ filter-flags -ftracer -fomit-frame-pointer
+
+ if use dedicated || use server ; then
+ mycmakeargs=(
+ -DENABLE_CAMPAIGN_SERVER="ON"
+ -DENABLE_SERVER="ON"
+ -DSERVER_UID="${PN}"
+ -DSERVER_GID="${PN}"
+ -DFIFO_DIR="/run/wesnothd"
+ )
+ else
+ mycmakeargs=(
+ -DENABLE_CAMPAIGN_SERVER="OFF"
+ -DENABLE_SERVER="OFF"
+ )
+ fi
+ mycmakeargs+=(
+ -Wno-dev
+ -DENABLE_GAME="$(usex !dedicated)"
+ -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_NOTIFICATIONS="$(usex dbus)"
+ -DENABLE_STRICT_COMPILATION="OFF"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ local DOCS=( README.md changelog.md )
+ cmake_src_install
+ if use dedicated || use server ; then
+ rmdir "${ED}"/run{/wesnothd,} || die
+ newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+ fi
+}
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 413b5f84b64..0a4c8d53cb7 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1 @@
-DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
+DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
diff --git a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch b/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
deleted file mode 100644
index 69c1cb8caf4..00000000000
--- a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/808747
-
-https://github.com/widelands/widelands/commit/316eaea
-From: matthiakl <t-m.42@mailpost.spdns.org>
-Date: Sat, 14 Aug 2021 19:24:08 +0200
-Subject: [PATCH] Added missing direct incude (#5025)
---- a/src/network/bufferedconnection.h
-+++ b/src/network/bufferedconnection.h
-@@ -20,6 +20,7 @@
- #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
- #define WL_NETWORK_BUFFEREDCONNECTION_H
-
-+#include <map>
- #include <memory>
- #include <mutex>
- #include <thread>
diff --git a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch b/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
deleted file mode 100644
index a00603a7969..00000000000
--- a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Drop -Werror= (uninitialized cause issues from gcc-12) and also backport
-fix for the offending variable.
-
-Note: upstream changed how -Werror is handled next release, currently pass
-a hard non-specific -Werror and disables it for gcc-12 (review on bump, see
-commit/PR below).
-
-https://bugs.gentoo.org/859277
-https://github.com/widelands/widelands/pull/5415
-https://github.com/widelands/widelands/commit/e4da6d624
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,8 +312,2 @@
- if(NOT MSVC)
-- # Turn some warnings into errors.
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
--
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
---- a/src/editor/editorinteractive.h
-+++ b/src/editor/editorinteractive.h
-@@ -87,4 +87,4 @@
- EditorIncreaseResourcesTool increase_resources;
-- EditorSetPortSpaceTool set_port_space;
- EditorUnsetPortSpaceTool unset_port_space;
-+ EditorSetPortSpaceTool set_port_space;
- EditorSetOriginTool set_origin;
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.1.ebuild
index 62799a6e424..8d19ee6f56b 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.1.ebuild
@@ -1,14 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1 xdg
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -18,7 +14,10 @@ else
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+LICENSE="GPL-2+ || ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 MIT OFL-1.1"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -32,27 +31,21 @@ RDEPEND="
media-libs/sdl2-image[jpeg,png]
media-libs/sdl2-mixer[vorbis]
media-libs/sdl2-ttf
- net-misc/curl
- sys-libs/zlib:=
+ sys-libs/zlib:=[minizip]
virtual/libintl"
DEPEND="
${RDEPEND}
- dev-libs/boost"
+ dev-cpp/asio"
BDEPEND="
${PYTHON_DEPS}
sys-devel/gettext"
-PATCHES=(
- "${FILESDIR}"/${P}-boost-1.77.patch
- "${FILESDIR}"/${P}-gcc12-werror.patch
-)
-
src_configure() {
- CMAKE_BUILD_TYPE="Release"
+ CMAKE_BUILD_TYPE=Release # disables -Werror
local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
-DGTK_UPDATE_ICON_CACHE=OFF
-DOPTION_BUILD_TESTS=$(usex test)
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 6b04bc90639..8d19ee6f56b 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1 xdg
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/widelands/widelands.git"
else
SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+LICENSE="GPL-2+ || ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 MIT OFL-1.1"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -32,22 +31,21 @@ RDEPEND="
media-libs/sdl2-image[jpeg,png]
media-libs/sdl2-mixer[vorbis]
media-libs/sdl2-ttf
- net-misc/curl
- sys-libs/zlib:=
+ sys-libs/zlib:=[minizip]
virtual/libintl"
DEPEND="
${RDEPEND}
- dev-libs/boost"
+ dev-cpp/asio"
BDEPEND="
${PYTHON_DEPS}
sys-devel/gettext"
src_configure() {
- CMAKE_BUILD_TYPE="Release"
+ CMAKE_BUILD_TYPE=Release # disables -Werror
local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
-DGTK_UPDATE_ICON_CACHE=OFF
-DOPTION_BUILD_TESTS=$(usex test)