gentoo resync : 24.06.2021

13 files changed, 30 insertions, 415 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5fe000993d97..262057746195 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 67ce6eef9896..31fd53608ba9 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,5 +1,6 @@
 AUX hedgewars-1.0.0-cmake_lua_version.patch 282 BLAKE2B 0a65ddbc5b69264e51b5ca6bd23a3800d8aa04ca3cb59741ed7c58b7a44b8d173c6b22f6917a57fb6c37f1199305a347099afcb806b111a8bb304ebee956766b SHA512 406d52cecded03e392dd37e3119137a47604b9fc6c72af34ee671cf4c33b93158dd727083af87763a8220cf5ff05ab8eb6366da134481c2507dc83d5c6eecb3d
+AUX hedgewars-1.0.0-fpc-3.2.patch 648 BLAKE2B 117727c993ea33e4c54037fc31b89f982ebff2cf19578380cb6fa19e0797522f6fe7f03f996d2eb641e526725958bc3f9833297c77b21c0a1324d32df4e9eb56 SHA512 5fb7c71574ece92ce5151d54c3dae4d7d97af963b63d4fcf69b97a98223cad74c5083777e3ba95374a022b7ac03ac6ea9a8f50a9d5e9effad0f610201e1f2b28
 AUX hedgewars-1.0.0-qt-5.15.patch 328 BLAKE2B 9304e4e1811e2aab876b5a6c3edea584c3271c5531035bfb2a53369000a30c61264464df655396146a26e08750ee29ffd9eb25aca8f89fa91409247b69675ad1 SHA512 f45985e878c9380f4bdcf755a79f1c906bdc6a8fa243faaa15f1c73b50d7b619c461821271ae151076f631ca0aecae31ddbe00d3d97945f13afc94610e216856
 DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
-EBUILD hedgewars-1.0.0-r100.ebuild 2409 BLAKE2B c26031b96dc175489de5afd0fb898f8fba6bcb38e2b35bdaf37bd7abc10b04756d91c345814f4144ba6588474182b9e9a536006eaf7be3ffa241be27c25b9468 SHA512 19a23bbba2991eb6111c651de8b22747ff777ab4b4ffbb903d9bf9def327b62b6f76d77048903bac1678585997235a9b0230908327c47162202a16e19422e7cb
+EBUILD hedgewars-1.0.0-r100.ebuild 2504 BLAKE2B 25c191bccfc9626f5f88c1975bcebd52765a728a91ecd9da87fa4eb33ab55b197f07c350c422793957f168c8a5579db72c0c49871302f9bbf5ffdce2d027ab25 SHA512 e6f5d7e52faf0a16440b7b951de563cbd0aeb4a6e0d47727a3be8cf8cde1525232694cadf3abfacbb177a2740c24dfe01f00cf2a45dcc6d1d08976327d27a0e2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch
new file mode 100644
index 000000000000..b04dd0b69fa4
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch
@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User alfadur
+# Date 1597053413 -10800
+# Node ID 6832dab555aefa6ef2830d9452a9a88c89299e85
+# Parent  eee2b3eff91dec595a7cb486bcfd97036520e971
+workaround for FPC 3.2.0 ICE
+
+diff -r eee2b3eff91d -r 6832dab555ae hedgewars/uWorld.pas
+--- a/hedgewars/uWorld.pas	Sun Aug 09 14:43:02 2020 +0200
++++ b/hedgewars/uWorld.pas	Mon Aug 10 12:56:53 2020 +0300
+@@ -1168,8 +1168,8 @@
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+     preShiftWorldDx:= WorldDx;
+-    WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++    Dir := Dir * LongInt(playWidth);
++    WorldDx:= WorldDx + Dir;
+ end;
+ 
+ procedure UnshiftWorld(); inline;
+
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
index 7f1d4b6f7c5b..766ec2014dc9 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -54,6 +54,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${P}-qt-5.15.patch"
 	"${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"
 )
 
 S="${WORKDIR}"/${MY_P}
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index bbfd4df18049..5555cd2eefb4 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,9 +1,3 @@
-AUX uqm-0.7.0-tempdir.patch 510 BLAKE2B bed2ffb2c9051accfc971268efc9c5769a43f87c22a5ac5bbeda86d171e69e9927671c0b8aaa2d16981febc15f62fb47fb80fb2e5fb4e46434ba7b97b4b0993a SHA512 07dc48c646e6e3642a1c917aa763996eaef8bae21e72470159b445e20e3e3315663009b4fd30c93a7f5b04ec78bf12de254434094f3c62ca523466148a2a9594
-AUX uqm-0.7.0-warning.patch 862 BLAKE2B 8e07610eea56c3c778cff5143284551a8230b35fb20ba15c11ff8266b67cedfaaa3de3c72c3aa3bf936e4799ef62bba8524e7cbe911f81c4d183f45762a38779 SHA512 d15b09a13b82a888a5c50c5e561213e755f104cb1f7b42bf3fdc7c39350bb517111c8d212218126c89136a2a4a7c47bcc4354e7c53a9df72795ce123a619a256
-DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 400309aced671a23bf325b95bb471db2e5b9aa59a0c868bc1cf971e71ad22a7a555c68fc15be1c574e4b4a8f58b0c18c4a5f85c188b494e20b36bd09ba6de02b SHA512 77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa
-DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
-DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348 SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
-DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
 DIST uqm-0.8.0-3domusic.uqm 18980671 BLAKE2B 56e2eb59026fb039e068206d0490e2449e95500c78b7aad6bf2f0e639332bbc207eea6942d89b841f5cd96b506936fbd9070fb52f00bc7034a5eeddac07da235 SHA512 23704a1f2ee5818aed2fa6e7e69252d0f101b2e9ce03ce1f2904d3d3bd28397287e983baebffacec34d149b7e0427294c9e42fc003f3e32d2e760de67b557ab7
 DIST uqm-0.8.0-content.uqm 11547353 BLAKE2B f68f880e194390770dcec230c00053422cd9968486cd8918012c348e49ef925dca1cd4487fb426003d4be8e30966467603e8d57bf7e0c2269e1400e909e7e1c5 SHA512 52219d00cae79f0184119f6c1ec66c1e41539b40540b7e59baf225d42708a8b54b56368497129e5dbf20a77379fd36aa7d4f019cace90b40f3029e98b03eccd3
 DIST uqm-0.8.0-src.tgz 1611401 BLAKE2B aa7363e42c0d4cf0d3ed09e1fdb47b417dc440e22bffbb208d815f096975c95c7284aa222b3f55464b35df90894d59d5c571bbb4d3b9258c68b6043dbac22305 SHA512 7e964aaccd69e2d775f9e5f42a01b40b2b6d9188741330e56ecaf3888a664b33aa4271418081b7a9193a093e9fa466c947e08a6931c6b91797005a0093f19217
@@ -12,7 +6,5 @@ DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814d
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
 DIST uqm-remix-disc4-1.uqm 87927958 BLAKE2B e1a603b07bb4d0535ff69fd7ef5f85f71cacf4fe4c95d559228ecac0a925ff4fa5f2117955e3477fd14facbfd0881994929a3f3cfdd8f62eb70d9e4314728fa6 SHA512 93030505d7dfc0f9de1f5d8c2a26c07b67540d67202ccfb71f6223730fbe92285011bd76dba8ff751d3e28025489a51d4804947164f9118a8e0bb742fd7803e3
-DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
-EBUILD uqm-0.7.0.1.ebuild 3025 BLAKE2B 32b12b00bc7b779279d8e776035261ced811dea61e3a6b8494a5034234622060c8c23bd527dba58f9cd5af3fe761986e54716f2879153c12c4dd96125a15eef1 SHA512 269799cf4839bf20eca5ee277f26de944dcf28cd6cd37c5b2c8143db54cb3bf4e53b8e8e2a72e365cc1b2ceb4a047a4822a40c3a398d8121adc918b93af1b443
 EBUILD uqm-0.8.0.ebuild 2147 BLAKE2B 9cf1cc895dd9cf18f889a08578844a3c61af81a929e74fb3a6b3fc892e094cfb90ac8fe6cdeed562e94a0db26d1849a85c3dde05c6cb0f4ece6a6449e28d27f3 SHA512 d3e0df25b779f746384421f4da3e656a9904e9f8d5b0129f143c09e9757e12438d47717a17e93eb38bdc05a0b8d60a6c5335a527e3e14a0144bd1f9d51ec8fa8
 MISC metadata.xml 561 BLAKE2B e68a86e394ef6ff93af35c4742528507522ed95426a86a327a24771ba05e899c4abab41fe0cb7d0461bfeac2212bc402a043d9348b245fc64f092ac8e2fdd8a5 SHA512 430cc397d8246de7a25da2b75953806d24505e8f9abd388491ecedb1d53f6d198b4dcd302de9a2603b9486ec70f85f5a57ac94833ac02dd772fb2cda9287a99e
diff --git a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
deleted file mode 100644
index dbb693c660a8..000000000000
--- a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# leaves files lying around bug #576098
-
-diff -ru uqm-0.7.0.orig/build/unix/config_functions uqm-0.7.0/build/unix/config_functions
---- uqm-0.7.0.orig/build/unix/config_functions	2011-05-20 15:25:22.000000000 -0400
-+++ uqm-0.7.0/build/unix/config_functions	2016-03-09 02:46:41.512465876 -0500
-@@ -16,7 +16,7 @@
- #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- BUILDLOG=/dev/null
--TEMPFILE="/tmp/build.$$.tmp"
-+TEMPFILE="${T:-/tmp}/build.$$.tmp"
- #KEEPTEMPFILES=keeptempfiles
- 
- 
diff --git a/games-strategy/uqm/files/uqm-0.7.0-warning.patch b/games-strategy/uqm/files/uqm-0.7.0-warning.patch
deleted file mode 100644
index 7f05ee5bd1eb..000000000000
--- a/games-strategy/uqm/files/uqm-0.7.0-warning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./src/libs/sound/decoders/aiffaud.c.orig	2011-05-20 15:24:44.000000000 -0400
-+++ ./src/libs/sound/decoders/aiffaud.c	2016-03-10 00:53:37.336198208 -0500
-@@ -307,7 +307,7 @@
- {
- 	int bytes;
- 
--	memset(fmt, sizeof(*fmt), 0);
-+	memset(fmt, 0, sizeof(*fmt));
- 	if (size < AIFF_COMM_SIZE)
- 	{
- 		aifa->last_error = aifae_BadFile;
-@@ -369,7 +369,7 @@
- 	aifa->max_pcm = 0;
- 	aifa->data_ofs = 0;
- 	memset(&aifa->fmtHdr, 0, sizeof(aifa->fmtHdr));
--	memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
-+	memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
- 
- 	// read wave header
- 	if (!aifa_readFileHeader (aifa, &fileHdr))
-@@ -635,7 +635,7 @@
- 
- 	// reset previous values for SDX2 on seek ops
- 	// the delta will recover faster with reset
--	memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
-+	memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
- 
- 	return pcm_pos;
- }
diff --git a/games-strategy/uqm/uqm-0.7.0.1.ebuild b/games-strategy/uqm/uqm-0.7.0.1.ebuild
deleted file mode 100644
index 562c43b26a89..000000000000
--- a/games-strategy/uqm/uqm-0.7.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs
-
-MY_PV=$(ver_rs 3 '-')
-MY_P="${PN}-${MY_PV}"
-BASE_PV=$(ver_cut 1-3)
-BASE_P="${PN}-${BASE_PV}"
-
-DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
-HOMEPAGE="http://sc2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sc2/${MY_P}-source.tgz
-	mirror://sourceforge/sc2/${BASE_P}-content.uqm
-	music? ( mirror://sourceforge/sc2/${BASE_P}-3domusic.uqm )
-	voice? ( mirror://sourceforge/sc2/${BASE_P}-voice.uqm )
-	remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
-		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
-		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
-		mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="music opengl remix voice"
-
-RDEPEND="
-	media-libs/libmikmod
-	media-libs/libogg
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl[X,sound,joystick,video]
-	media-libs/libvorbis
-	media-libs/sdl-image[png]
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${BASE_P}-tempdir.patch"
-	"${FILESDIR}/${BASE_P}-warning.patch"
-)
-
-src_prepare() {
-	default
-
-	local myopengl=$(usex opengl 'opengl' 'pure')
-
-	cat <<-EOF > config.state
-	CHOICE_debug_VALUE='nodebug'
-	CHOICE_graphics_VALUE='${myopengl}'
-	CHOICE_sound_VALUE='mixsdl'
-	CHOICE_accel_VALUE='plainc'
-	INPUT_install_prefix_VALUE='/usr/share'
-	INPUT_install_bindir_VALUE='\$prefix/bin'
-	INPUT_install_libdir_VALUE='\$prefix/lib'
-	INPUT_install_sharedir_VALUE='/usr/share/'
-	EOF
-
-	# Take out the read so we can be non-interactive.
-	sed -i \
-		-e '/read CHOICE/d' build/unix/menu_functions || die
-
-	# respect CFLAGS
-	sed -i \
-		-e "s/-O3//" build/unix/build.config || die
-
-	sed -i \
-		-e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
-		build/unix/uqm-wrapper.in || die
-
-	# respect CC
-	sed -i \
-		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
-		build/unix/config_proginfo_build || die
-}
-
-src_compile() {
-	MAKE_VERBOSE=1 ./build.sh uqm || die
-}
-
-src_install() {
-	# Using the included install scripts seems quite painful.
-	# This manual install is totally fragile but maybe they'll
-	# use a sane build system for the next release.
-	newbin uqm-wrapper uqm
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe uqm
-
-	insinto /usr/share/${PN}/content/packages
-	doins "${DISTDIR}"/${BASE_P}-content.uqm
-	echo ${BASE_P} > "${ED}"/usr/share/${PN}/content/version || die
-
-	insinto /usr/share/${PN}/content/addons
-	if use music; then
-		doins "${DISTDIR}"/${BASE_P}-3domusic.uqm
-	fi
-
-	if use voice; then
-		doins "${DISTDIR}"/${BASE_P}-voice.uqm
-	fi
-
-	if use remix; then
-		insinto /usr/share/${PN}/content/addons
-		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
-	fi
-
-	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
-	docinto devel
-	dodoc doc/devel/[!n]*
-	docinto devel/netplay
-	dodoc doc/devel/netplay/*
-	make_desktop_entry uqm "The Ur-Quan Masters"
-}
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index eef5b9cc33b5..d040a278b35e 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,8 +1,4 @@
-DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
-DIST warzone2100-3.4.1.tar.xz 89169752 BLAKE2B a0f379e357c315e083f8ac1542297262abb48aae1f8a3e0666898e047749a8a108924b0dea000df1731fc94ccdce9e2768bbebd3333063a730931f7fbf9192a2 SHA512 26c026400e418ed3da94d96e7bb443c765ede3e0b347785ff8a9e687a5ad87afe03012c830fd509b927634484687efac951b2ef3417e7fe027ce0e684561ca84
 DIST warzone2100-4.0.1.tar.xz 337713608 BLAKE2B 4f1bf79e71c13cd507890f2fe4131687fd70bc3b302aea68c7f17314a0d596797a34d9ab46a6736e98d823122199fb0dfcfb62b1f6b702c6d8ba99eb3c338c9e SHA512 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-3.3.0.ebuild 2347 BLAKE2B d0e8bb5e2c3927e309e732db9be52ae8198d6b05c8bd37f5a391bdb5d78c83c9b1299cf100dca97ebc418431bb79cba3539c32dff69fef3c7c55e6c3bb67ad36 SHA512 49ed12f8483c013d28281069c38e49c6b7699295fc2bec91b2eebf71f68d5b9b24307812818a49c013062bf84e9ef7c1638a1c5adc8111f163468426bf9941aa
-EBUILD warzone2100-3.4.1.ebuild 2795 BLAKE2B 037a86f8fc5ba28572ae80df915f5bb80a2dbae675e5fe77b5c9b5265d5c147d99445aa99d557bc94ebca9c48f39dd8684d80a5b8a9e143a69e6eee9a2662cc2 SHA512 e97a6a119be374ae9ce8413a93db1597631b7595fdfabbf3ff8fd63291ddf4d5f90568e1dde9744cc79e19ec730a2f0bced209f61b2aa34040fb7a990646a2dd
 EBUILD warzone2100-4.0.1.ebuild 2551 BLAKE2B ce7404e0a4fe23a372830f976530636a74f2ddbab39441edfabbe9b53a98f4979959dfc349b657f4b976da11bb15311d0aece530aa5eb141195605ce31f8cb00 SHA512 aab1404f57f3d773eb20f54507e382840f6dcb266ec3534d15f67cedb232fd845afea539267acc2535a7148cc4257731a620bbbd7639b9b02ec77ab4c823454e
 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
deleted file mode 100644
index 8f0f5308698f..000000000000
--- a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs 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/${P}_src.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug nls videos"
-
-# TODO: unbundle miniupnpc and quesoglc
-# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/harfbuzz
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libsdl2[opengl,video,X]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${CDEPEND}
-	app-text/asciidoc
-	dev-libs/fribidi
-	media-libs/fontconfig
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-BDEPEND="
-	app-arch/zip
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-	sed '/appdata\.xml/d' -i icons/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir="${EPREFIX}"/usr/share/locale
-		--with-distributor="Gentoo ${PF}"
-		--with-icondir="${EPREFIX}"/usr/share/icons/hicolor/128x128/apps
-		--with-applicationdir="${EPREFIX}"/usr/share/applications
-		$(use_enable debug debug relaxed)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local HTML_DOCS=( doc/quickstartguide.html )
-	default
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-	doman doc/warzone2100.6
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-strategy/warzone2100/warzone2100-3.4.1.ebuild b/games-strategy/warzone2100/warzone2100-3.4.1.ebuild
deleted file mode 100644
index 210b225cba54..000000000000
--- a/games-strategy/warzone2100/warzone2100-3.4.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop 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="http://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} )"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
-SLOT="0"
-#[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug discord nls videos vulkan"
-
-# TODO: unbundle miniupnpc and quesoglc
-# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	>=dev-libs/libsodium-1.0.14
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/harfbuzz
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libsdl2[opengl,video,X]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	nls? ( virtual/libintl )
-	vulkan? ( media-libs/libsdl2:=[vulkan] )
-"
-DEPEND="
-	${CDEPEND}
-	app-text/asciidoc
-	dev-libs/fribidi
-	media-libs/fontconfig
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-BDEPEND="
-	app-arch/zip
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${P}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWZ_DISTRIBUTOR="Gentoo"
-		-DWZ_ENABLE_WARNINGS_AS_ERRORS="OFF"
-		-DWZ_ENABLE_BACKEND_VULKAN="$(usex vulkan)"
-		-DWZ_PORTABLE="OFF"
-		-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() {
-	local HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
-	local DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
-	default
-
-	insinto /usr/bin
-	dobin "${BUILD_DIR}"/src/${PN}
-
-	insinto /usr/share/${PN}
-	doins "${BUILD_DIR}"/data/base.wz
-	doins "${BUILD_DIR}"/data/mp.wz
-	if use videos ; then
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-	insinto /usr/share/${PN}/music
-	doins data/music/music.wpl
-	doins data/music/menu.ogg
-	doins data/music/track1.ogg
-	doins data/music/track2.ogg
-	doins data/music/track3.ogg
-
-	doman "${BUILD_DIR}"/doc/warzone2100.6
-
-	doicon -s 128 icons/warzone2100.png
-	domenu icons/warzone2100.desktop
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2cde56868807..bd3aac819c44 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,7 @@
 AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d2ef438d68e8b6a0666fec1485152200861b4b4e32e05875a8d7115d050cc9e9030b97e8ce5a183b0f5d7aa9b8 SHA512 8e612f56a292fe3e155ab072204938888a2fda2e73559029145cdda3b4d201437e616525596610bfd7022a85ec59d761c9711732f227a335ff56040b57e94b75
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27 SHA512 a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59
+DIST wesnoth-1.15.14.tar.gz 513004602 BLAKE2B 04d0ec57a2b0627f778d1a82e592d11f360bf80b445b1faae7e3d708599b22e272be85848942edd9f2c1393bbe1979aaf3a249996ce9ae682c34de24b5c88c29 SHA512 09f803c34452d20aade2a8373c15be2f595d2ae8633885e321870aac742250430f376b753090fc6f03f19307f650972ba8477a2cc255e0fbafb2d7270d9610d2
 EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27
-EBUILD wesnoth-1.15.12-r1.ebuild 2398 BLAKE2B abb84a62f80cf5d3626bc746b3aa4a979adf861000fdfa0febfb770d5e02cd18f2ba29e65fe0ce2216dea4bef2f0182729e291d3aafd15ce82897145ecdea8f4 SHA512 60a332db8e75b1a1b6a6a0bc5d2640d0fa433432963bc96f6507a2af5865718a73ed70993ac58dcf4d5d419bf9e64cc4476369196d4e5eb661a9692b1b18f7ef
+EBUILD wesnoth-1.15.14.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.15.14.ebuild
index 8c511175a73b..c9a69554f398 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.14.ebuild
@@ -47,6 +47,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	sed 's@ coroutine@@' -i CMakeLists.txt || die
+	sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
 	if ! use doc ; then
 		sed -i \
 			-e '/manual/d' \