gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-strategy
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
66 files changed, 632 insertions, 1034 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 7fede52a38d8..86b771533ebe 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 862541a8be37..5c9a1a38671e 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,5 +1,5 @@
 AUX colobot-0.1.12-includes.patch 1283 BLAKE2B 0f1e402e770d57365d53488b86838f401815e0749065bf2581d228a566873b31d021a1486ce7cf4a051407b96c540c954ce56ef9efc168522f0ea94ec1606fcd SHA512 26c1bbbd9605482a5a6ffef4b3a919518224e3802bcf0d7248bba94227039bf69a5d6a41bcacdb1ec170e58e719f1cde722f869c4ec26cf20ecd7d1eae091cd0
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
-EBUILD colobot-0.1.12.ebuild 1537 BLAKE2B e6bb074e216f58e6fc245c974f71e79df73cc364456b142258dbcd3c266221486b9315dfe6f4cf880505bab18f762c5dc40430f2e8c362f7affdbf38ad170a5e SHA512 cbb4b8e358d9dc2a3a1cb87153d9c5bd69320855647a4cda0cd03b954c3822f240006815d204e4e56289903330798e76de86e03cdd5a7ab0b3c9e13fc59e82de
-EBUILD colobot-9999.ebuild 1385 BLAKE2B 8da648dc75425e71c3f2becd7f7c5a2d2ba1778915a17c4a420753bddf9b94f26641835e4c0e467d69744fbd746dbcd175752614db8201332aab566b908b7536 SHA512 e2d237c6235bd99e90c5e8350044128e9c4c4841519a5a6cf08f399d0487daaf637dd7a25e29c02e68789e84f985cec708716e2684d0a078d9ce3dbd1b70b2f6
+EBUILD colobot-0.1.12.ebuild 1529 BLAKE2B 10963bb2d419873121541c8beedb01c79309c25c210979cb1ecab20993233085fb5c93371102dc460af743cf9a0bdf7b3630382ac467af768bb8bc5506c1c1e2 SHA512 0505d423b3e9b3e076e88fbea3cd7a1a6d0a45b7216671d442b2fa4f49dae920d0b4dccd0ea9675b08853a0245a1b155540ca7be334bd60d429ad1c138827aaa
+EBUILD colobot-9999.ebuild 1377 BLAKE2B 98d1de0557f5edc06166bc191e5fe1beb4bf0f7f8975069d81f2a8aaf005c17348f649f477a3c16ab5aa5b35130a10607bb5395266c1c983816fed0b9f811bb2 SHA512 61b61b0cdb4c29348333c30a13c1986d69587164734bc2c52e07e63b1d5b795270bae19642055662155563b1cc91cd5cb7697b1172fecd1ae375702e879dcbe8
 MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index d44fe2672822..56e82f5815b8 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A real-time strategy game, where you can program your bots"
 HOMEPAGE="https://colobot.info/"
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index 441ad6386dc2..c70b50c9fba1 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop git-r3 xdg-utils
+inherit cmake git-r3 xdg-utils
 
 DESCRIPTION="A real-time strategy game, where you can program your bots"
 HOMEPAGE="https://colobot.info/"
diff --git a/games-strategy/darwinia-demo/Manifest b/games-strategy/darwinia-demo/Manifest
index de976462695a..a07a7dd269ea 100644
--- a/games-strategy/darwinia-demo/Manifest
+++ b/games-strategy/darwinia-demo/Manifest
@@ -1,3 +1,3 @@
 DIST darwinia-demo2-1.3.0.sh 22470072 BLAKE2B 3169e6de1293eb8e62094e1773dbb871882a5f18d993dd495c27455525c178d02ce21a47425e070da01153eb8d0cdb764f6276da8919d6b0492718701ddf8fb9 SHA512 f561f3e741052888d8a23445f01e0c2a8d2b207b7786b25f297d76d0f4b4ef91bbf7d1ec842e5e2b1051f3f122af12058e2bcb2495478846713e49c2c7d7d92d
-EBUILD darwinia-demo-1.3.0-r2.ebuild 1058 BLAKE2B 8927281b183d6ff4900f3cf8cd19ba00ab9388e51f0022c717d97f08d08e6570593ec0eb33f62f3ebc5034652dcbaabc63937d0bb7c58fe9e75898fa1142bb11 SHA512 1b24b60fb49116f88bca65ff6051bfdbf1514316bbe44faf4124fbe68d992462588c2d875f0b84d49fbb39c4ef085bd89dce64855ace97376d8b20041eabd5af
+EBUILD darwinia-demo-1.3.0-r3.ebuild 1068 BLAKE2B 08386bfadaa48a88a46d740ace6718ee57220a24a04272a20b56bed1b2e8fb3ed55a0cd0d727aa21eb2a8e1c305de0aff21847d27906365646dc7d13316f6c2d SHA512 e3d0f548386244e326f141e64c85f0f287e13b4d0ab49786162745fd6b4afb24c2d36c979eb8c1ba80d19c887845e4b646aa01c5fec3b29c2d3c0e7099a16690
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r2.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild
index fbd30a5970a4..14ce93699bca 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r2.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils unpacker
+
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Darwinia, the hyped indie game of the year. By the Uplink creators"
 HOMEPAGE="http://www.darwinia.co.uk/downloads/demo_linux.html"
@@ -37,7 +38,7 @@ src_install() {
 	doins lib/{sounds,main,language}.dat
 
 	insinto "${dir}"
-	dodoc README
+	doins README
 
 	exeinto "${dir}"
 	doexe bin/Linux/x86/darwinia
diff --git a/games-strategy/darwinia/Manifest b/games-strategy/darwinia/Manifest
index 9f08f65a7085..49678acdeb37 100644
--- a/games-strategy/darwinia/Manifest
+++ b/games-strategy/darwinia/Manifest
@@ -1,3 +1,3 @@
 DIST darwinia-full-1.4.0b9.sh 4228121 BLAKE2B f1cae61e3ad6802a1e04fc5306bfbb7194ad08df29a82a376dc7f1945ab8f1f99620653800bb2458941f2004488abf441c211bc3f6d7c65e4d3f47cb9155e5f6 SHA512 ed228943d4e70fc5799bbe7566b4fd862f2494f9d02bcd874f0d1b93d7bbc9a2c24a98fb5b8219fed20759bfe2af54d6ea33c60ddd8d8850e591a89822b41bb5
-EBUILD darwinia-1.4.0_beta9-r1.ebuild 1472 BLAKE2B 6c7c37ee5fb93272893daf7805668de3452ff76106b902f6e5977c08545029242d5281cccea912cfb43faa75e08eaad70501a8394beb406c140907dcfa088a4c SHA512 5de21a6d608cfcd2a1b8196abeb60563518162c33476320072799726eab614272943f1fd73a68cf289f761c1194f9ff72edec621c6cf76c92e305fc12afaa2ac
+EBUILD darwinia-1.4.0_beta9-r2.ebuild 1414 BLAKE2B 9b1aaa2591799c7beb3f72bd5b8eebe69c909e5dc6339d889063c9237e5cf8cb92123565f4da676007649e1cc589a4b125cfdf032a01c37f2b0a562e6b8fb3d8 SHA512 2ac79b583b5619d8183fdabf513b10a50e4fa11fdea59d13d5f9fc80e9ac426c7bd29544f37c0e19de16e56f008a4e9cb32c14b3bdb5f53dfe58838664c2636c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9-r1.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9-r2.ebuild
index d1f5e9d5f83a..562267b62e43 100644
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9-r1.ebuild
+++ b/games-strategy/darwinia/darwinia-1.4.0_beta9-r2.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 CDROM_OPTIONAL="yes"
-inherit eutils unpacker cdrom games
+inherit cdrom desktop unpacker wrapper
 
 MY_PV=${PV/_beta/b}
-DESCRIPTION="the hyped indie game of the year. By the Uplink creators"
+DESCRIPTION="The hyped indie game of the year - by the Uplink creators"
 HOMEPAGE="http://www.darwinia.co.uk/support/linux.html"
 SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${MY_PV}.sh"
+S="${WORKDIR}"
 
 LICENSE="Introversion"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
@@ -21,11 +22,10 @@ RDEPEND="
 	media-libs/libsdl[abi_x86_32(-)]
 	media-libs/libvorbis[abi_x86_32(-)]
 	virtual/glu[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S=${WORKDIR}
+	virtual/opengl[abi_x86_32(-)]
+"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
+dir=opt/${PN}
 QA_PREBUILT="${dir:1}/lib/darwinia.bin.x86"
 
 src_unpack() {
@@ -50,9 +50,8 @@ src_install() {
 	dodoc README
 	newicon darwinian.png darwinia.png
 
-	games_make_wrapper darwinia ./darwinia "${dir}" "${dir}"
+	make_wrapper darwinia ./darwinia "${dir}" "${dir}"
 	make_desktop_entry darwinia "Darwinia"
-	prepgamesdirs
 }
 
 pkg_postinst() {
@@ -60,5 +59,4 @@ pkg_postinst() {
 		ewarn "To play the game, you need to copy main.dat and sounds.dat"
 		ewarn "from gamefiles/ on the game CD to ${dir}/lib/."
 	fi
-	games_pkg_postinst
 }
diff --git a/games-strategy/defcon-demo/Manifest b/games-strategy/defcon-demo/Manifest
index d9ad57c39f3d..46bc282e9159 100644
--- a/games-strategy/defcon-demo/Manifest
+++ b/games-strategy/defcon-demo/Manifest
@@ -1,5 +1,5 @@
 AUX defcon 400 BLAKE2B 1258e4b6db8262ecd08cf481799a6a296bb7043af3a03a320a10d17ecb4672e990031ef3d2a8e1e2be915fb8f47696fb755fa4502fc194b0cdb3ca590b031857 SHA512 d417fcf9560a3b3a7232e3c86b4315f0de6ed86ce8263348520910ff6bc1d14e649f31d500f52c70c2be655836261219ca9dce4f8df9a32d5ca2b00421667058
 DIST defcon_1.6-1_amd64.deb 62377900 BLAKE2B ad6047a5f57492facf17da50a9d3003181d4352eebaa08e7185a676b3dcfb8a2c3d1001c96c09ae417d482b3a97894032084ede22f841516b9f67ed014861743 SHA512 b71aacc3cd94eec8f1ea19ee03d8098fcdd96191c12d614f55076826ef0bb44c8ada66dfd3df7d94d042b33bdd8fa5f0f58e69fc980d6213c320ab4ce2d682a9
 DIST defcon_1.6-1_i386.deb 62311684 BLAKE2B 3dddd5495410dc875d4ac9ecaea26cbbf2cb258ccdf0ffe0ddb7234009b7986c1ebcb17bdef93a579db8b41eeefaeecea9ebb09bcdb049bee14c0b6af6df26c7 SHA512 0e60e8fbca2f3046228b656990e3adb471de4f64a99d435c96b1e5a8cc49b1250c48ceeb19a4bcb58354e750398de2559256d26a38b20286dec3c0ce7f97ebb8
-EBUILD defcon-demo-1.60-r1.ebuild 2183 BLAKE2B c5594dfda814dce73390ac3344a05bf6d1f4378a9007064b1968014c00f1c4f8e140cba7c378c0b9b8593fe22d00da7b3ebc76f6fc5dd91d76c28d9bc186096a SHA512 5efed68267d838efe1439c50161fc484c49b8154a638e582a961b87a81c145b8fef532241e8f957ccb0d8c1d8ec93745b75ba0a19782fba082dba74de169ccb1
+EBUILD defcon-demo-1.60-r1.ebuild 2193 BLAKE2B 5af10babcafc1524dfed7fee2b8ae740a7ff626f8f87785b5e8cdbf5ceda947526e2c22673603a7d667951ad9d6671fc64f05ea752980a5475bc518317b6d3c5 SHA512 6735cab603ea06a39ce06994a6e2b64737c63c174114fa341062bd4ca11e1e1e67849ab59beb832774ef0105898a2df6d39460de77230ed6a5eb33bddd882b01
 MISC metadata.xml 390 BLAKE2B a7ff9a2ca8c3de7f31c7acea1ca630c3d0aa39fa108d6bc515c68d2801402051a863a4f1ff260ed56249cf5eef72d0638d86b746293f0b54c85642f4f569b3bb SHA512 afc01361f043a0267f09fc1a83571ade9a3cb3633744ff18e5b5c5f14ac061b5e9d6876c0b3805664a8321a6572bb6c2c3c1f3f0d9f0762d306b80a1b517ea5b
diff --git a/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild b/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
index 4d2f1544bc82..123c3f6c0bef 100644
--- a/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
+++ b/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs gnome2-utils
+
+inherit desktop toolchain-funcs gnome2-utils
 
 MY_PN=defcon
 MY_PV=${PV:0:3}
@@ -31,7 +32,6 @@ RDEPEND="
 	x11-libs/libXdmcp
 	x11-libs/libXext
 	system-libs? ( media-libs/libsdl[sound,video] )"
-DEPEND=""
 
 QA_PREBUILT="/opt/${PN}/lib/${MY_PN}.bin.x86"
 
@@ -61,17 +61,17 @@ src_prepare() {
 }
 
 src_compile() {
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c || die
+	echo "$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c"
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c || die
 }
 
 src_install() {
-	local dir="/opt/${PN}"
+	local dir=/opt/${PN}
 
-	insinto "${dir}/lib"
+	insinto ${dir}/lib
 	doins *.dat
 
-	exeinto "${dir}"/lib
+	exeinto ${dir}/lib
 	doexe lib/*.so
 	doexe ${MY_PN}.bin.x86
 
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
index a67fa6e3e648..a90edfe439f5 100644
--- a/games-strategy/dominions2/Manifest
+++ b/games-strategy/dominions2/Manifest
@@ -3,5 +3,5 @@ DIST dominions2.png 1135 BLAKE2B 4bfbe3fcdded6eec7a3eea6c9b3dc8b2ae9be2a9f932957
 DIST dompatch216_linux_ppc.tgz 1982323 BLAKE2B 2d56f278fcf188a8e8aa32032872359fa57204d26a37e3b5369367e8297d1f6fb1adc290328ea052be57928efd6c42642294bb62f5b3d209f9028da5c3293bb1 SHA512 6b1ff8b5a041c42193b8f369ee0ff242048fd589ffd9b610628a7bf7a0d159fe6e590b04b914ecbf3b94ef2b94a66a062be84d595777127d8f11311fa92c3ae9
 DIST dompatch216_linux_x86.tgz 1892714 BLAKE2B 72102240b577f696a96ee4ee493180621b5ca65c2fb1394e355210aa3e3ae145e9d8501dff95ffd185344b4259d6df622844504022d9f3475564a6eafc890367 SHA512 9bb2a024235585181f91d8414c07ce8c490fed5ddab9d25817b7ea01618f0f2cf8714fb39a4406abe88e25b354f14ba1ef2db79c39d4c30b4e399d1b60477c2d
 DIST manual_addenda.pdf 192454 BLAKE2B c0fe48855fa8f20cf44c4de3b475494cfa75ba17737f6eab2d537d63fdb7346194a59d3280ad29de1bff1283f3a496a36a8c946841f608a36facb4bbb1719f8b SHA512 ec582e9685edf7164ba8e7c6c99880b30c8a6737d2d339eec2642196abd175857bfef2e1ea3da3ccb0110d441c477c8fad64d47fbb8b1aa39b405484eb548443
-EBUILD dominions2-2.16.ebuild 2650 BLAKE2B a74ba0e758187643a3c69a02825e4adb2c97ae2def4e4f9ceda4a4e71d28a013c40be1881f00e21839fe40568f426db0e9ba9fab89f4051ab110e9b81cef3e01 SHA512 3350412fb2f8679d591441320e6139fd83bde6e74e6ee0ee7c76a6f720b67c30ba59ee85b8bebdb6af7e6c22c53ab71a29eff8461c08f884d150412c08ff6e01
+EBUILD dominions2-2.16-r1.ebuild 2601 BLAKE2B 828a339a444fb29f83636f051792f5d78410ec10495e6788bfeb38a2b707d123f8ec016cfd0ea3df722302c620c84c7bfaceeb447c3f5a6457c963c5a193f408 SHA512 805095ea10b0f6c20a80d9664c51fe16b4ecff9c01d8066dc47bcd8d62cd8e66e5f0bc7a4d6cfcbddf5387fac3bf74b28d52f0772a35e18a2a5191a639b8cba2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16-r1.ebuild
index eca8acd9d25d..0f7d0a64c0f4 100644
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ b/games-strategy/dominions2/dominions2-2.16-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils cdrom games
+EAPI=7
+
+inherit cdrom desktop wrapper
 
 DESCRIPTION="Dominions 2: The Ascension Wars is an epic turn-based fantasy strategy game"
 HOMEPAGE="http://www.illwinter.com/dom2/index.html"
@@ -22,6 +23,7 @@ LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
+
 RESTRICT="bindist strip"
 
 RDEPEND="
@@ -36,10 +38,11 @@ RDEPEND="
 			virtual/opengl[abi_x86_32(-)]
 			virtual/glu[abi_x86_32(-)]
 		)
-	)"
+	)
+"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
 
 src_unpack() {
 	mkdir -p "${S}"/patch || die
@@ -61,6 +64,7 @@ src_install() {
 	elif use ppc ; then
 		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2*
 	fi
+
 	insinto "${dir}"
 	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/*
 	dodoc "${CDROM_ROOT}"/doc/*
@@ -75,7 +79,7 @@ src_install() {
 
 	if use doc; then
 		elog ""
-		elog "Installing extra documentation to '/usr/share/doc/${P}'"
+		elog "Installing extra documentation to '/usr/share/doc/${PF}'"
 		elog ""
 		elog "You may want to study 'DOM2_Walkthrough.pdf' carefully if"
 		elog "you are new to Dominions II."
@@ -86,17 +90,13 @@ src_install() {
 	doicon "${DISTDIR}"/${PN}.png
 
 	# update times
-	find "${D}" -exec touch '{}' \;
+	find "${D}" -exec touch '{}' \; || die
 
-	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
+	make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
 	make_desktop_entry dominions2 "Dominions II" dominions2
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "To play the game run:"
 	elog " dominions2"
-	echo
 }
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 0900d499c74d..359041771241 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,6 +1,4 @@
 AUX freeciv-2.6.2-qt515.patch 1069 BLAKE2B 36d66375826386961ef393385f987b146d812c2e9ee31db7545cc7eb79d48ad4ebabc26bcbc606db31c763b5583c359e0b26da1968ba1aa26ead03310d4699ba SHA512 6a35304cb1ef35ebce91cf80f46c1f602e782dba9da4c7a65bcc88ab0dcf1e4e9b59b0df7a90fc562b9448d0b073a25998cb4d4896b3c6853d052d162da95122
-DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
-EBUILD freeciv-2.5.12.ebuild 4536 BLAKE2B 2673bcafd06b9c720d3aa62c57f281028ee5b796fa63535bf1ccfd90acaac744fd74c3cd14ce470f8b18f9920a09a7d33b54eb194a41e90af611d7ff3ba39712 SHA512 a6fdaa207990d2fd5521d627a54d24fd2fa62fbe42578e8176f35c598fb2a4149b8ab728f6ac516a63ce3b4923912a54096c87c65f5035a6b1e221e579a8e600
 EBUILD freeciv-2.6.2.ebuild 4857 BLAKE2B f441ef92692f71d6a67ffcca49405f19f517c42b57b40ac6bd338c7c57ee09ef0b58363559085d6eca72934802bb7b28db496cc00507fad6c132b009d2235ca2 SHA512 3e7dd216d356063662e16916d66bf2580bfcd2d860293e759f5c6160b1c900c6134ac2c621b1bb853cfc52154ededda67b7bd8cccf7ec3c2c880f65c4832dc67
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.5.12.ebuild b/games-strategy/freeciv/freeciv-2.5.12.ebuild
deleted file mode 100644
index 4e4d76e39381..000000000000
--- a/games-strategy/freeciv/freeciv-2.5.12.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic gnome2-utils ltprune
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( dev-db/mysql-connector-c:0= )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-	)
-	readline? ( sys-libs/readline:0= )
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)"
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient mydatabase myeconfargs
-
-	if use auth ; then
-		if ! use mysql && ! use sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase+=" mysql"
-			use sqlite && mydatabase+=" sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myeconfargs+=( --enable-server )
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl"
-			use gtk && myclient+=" gtk2"
-			if use qt5 ; then
-				myclient+=" qt"
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myeconfargs+=( $(use_enable server) --without-ggz-client )
-	fi
-
-	myeconfargs+=(
-		--enable-aimodules="$(usex aimodules "yes" "no")"
-		--enable-client="${myclient}"
-		--enable-fcdb="${mydatabase}"
-		--enable-fcmp="$(usex modpack "gtk2" "no")"
-		# disabling shared libs will break aimodules USE flag
-		--enable-shared
-		--localedir=/usr/share/locale
-		$(use_enable ipv6)
-		$(use_enable mapimg)
-		$(use_enable nls)
-		$(use_enable sound sdl-mixer)
-		$(use_enable system-lua sys-lua)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${ED%/}/usr/share/pixmaps"
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			docinto html
-			dodoc manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${ED}" -name "freeciv-manual*" -delete
-
-	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
index c3dd85d53b68..c6c5c38c88da 100644
--- a/games-strategy/galaxyhack/Manifest
+++ b/games-strategy/galaxyhack/Manifest
@@ -1,10 +1,10 @@
-AUX galaxyhack-1.74-boost-1.50.patch 3206 BLAKE2B c97b67ac602a440eb90ae481e0ef5837e64cf9ad3c07e722899b7e1c6701536df1af3dca5e7e645dc13bd3622b8bf7e1a274c0c0de24cb9f39287f1af2e5e14f SHA512 ce441bd44c44000b28520bba3c76b4e3d37fef5b424ddae1be4ee2e0675859ce22090c9e79a7fca37f46b16312b581201eb413d89cdddab3d6169c97ec0d6304
-AUX galaxyhack-1.74-boost.patch 245 BLAKE2B afb356c6fb7d2f5243466f84d5605e1cc13da00b842c2bc554d791f20de6c37ab6b563e3320b3f0f6ca242987c75ffe6fbaba5ba236bd833a3bc86361be689b9 SHA512 19a6ef4ee430edab619d60d4410d318e07ba3dd75b48036331029ff0de11ad5ccc73970825708764a7da9870d9ae8a7708a22176aa6698fdd4c2837bf3a91885
-AUX galaxyhack-1.74-destdirs.patch 390 BLAKE2B 5c807a22493528f472e3d5e9366ab4b8bacfb7d3a7c31291a3a1e8cf872fcd2cf9c3e373e53bffa9d92af68bf9549c6ebf44a6aaa8d6cd10f6afcfd6e6906690 SHA512 d154eb0b0116fa1e067bae12db82cef5eb3bf882683f624becb54244ffa744a3bdc7ebe77fe6e87c634f42f649cc8dd0fb7067aa5d2cb5b8a72cf50cdbfe7702
-AUX galaxyhack-1.74-format.patch 1768 BLAKE2B 5a0ee8e935c557ac25b470e1914f242da093352321ba34c067ca3997e3892aff3f6330b827bc7d08c7541cc1e9e0cb2e0b4e0d938ddd1f9cfd21916b11f978e3 SHA512 e38280f9a06426a77abea3a10de6ce23868dd2d4df0c398832856bfa5e39c329cf39b39bd4ff766c54fd72813933c502ca9a63750b7a4160e536a40a08bc0ba3
-AUX galaxyhack-1.74-gcc43.patch 309 BLAKE2B f8af1b8b2d4d50bb37eb13237915638d746a79daa621d81958bf99d7071178d3402989fa0fbeb9d67abffea4a15a97d1da263855b5ac17b1caf96213ebddcb31 SHA512 21169edbaf8f4c0d8f4fcd44a494e0121fb332b42cf14ba09818cf871cfdb792e4bbe00c7ae1b9ddc9094c96edda785f2763c76a70dcf92ec7ea163e3248aaa0
-AUX galaxyhack-1.74-gentoo.patch 992 BLAKE2B 63ca6fee15f9f088e2c8a73566d5a7579ed4636d8048771ee01aa40a6f8edd1013e1d6a710d45caa951311709c19ed3d670014bfd1513982c317d6ea5d1b4d34 SHA512 e268019e57c95caf6f24331e0c1f6bb0f47507940e8621cf5307f5cdd24cdd9ab49307208f6914558df35bedd725db38374c04b4f887c89814896ce9902f7b0a
+AUX galaxyhack-1.74-boost-1.50.patch 2835 BLAKE2B 3604f846dc2d9dae1dc1cdd95a9bb16dc167d9be0f014a5d8ddbd9c73833f793c278396338a60814622535d9a10902df201831a6ea3e6514682993d3743f4d4c SHA512 9db0c3956590f1040635c5606cd6b96a62ce0c14e7bb1b05030b92ddca578e011a94dea461c75771be5b695813c21f740387a98a2b40cc91f69c5e8153f1f3fa
+AUX galaxyhack-1.74-boost.patch 233 BLAKE2B 5c03e01035714028a9e85abbd29b0a74fcc35189b7b4252107850ecdbb2bed4ff94d41f9db47f00e74c9dd6b34322bb1fbf875f2efdb03d23a31d867b562e5ef SHA512 96d05643dd897bef167e41e8e3823b5b15be462ac9a3f2e89ec61abd02feb5ebd2b403f367ae1a2da84fd8eb2bab24c044ffb467a5fddfb9927bfefebf3c80a0
+AUX galaxyhack-1.74-destdirs.patch 306 BLAKE2B b353c01bbdb53f1077a6b9c0943d5998852ebcc81076fe14868615472d3a2dd4fdc7a6ff930d4dea419829545a26534208921e2f6c1e5cc09c78869c78969bb2 SHA512 315a8138d5a0ce35ff4ef915b776b4918530e9e28b4066169960fe20ebb70628a2c8cc7fb1ba19739269ac6adaf9e6271dfd8f294a1e1a9e05ddaabc3d67807a
+AUX galaxyhack-1.74-format.patch 1636 BLAKE2B a0f2c534c0431ccf40bbe59d787627254334cb596fa8081c99eb9e1bd82fcbdb6050359cfcf968ce19cebc5a2666aedee69a8ee8db210c669ec504244465898d SHA512 2b550b897fc43e491cbac75c1c07085f444c2d4df9e4b71683c9bc1c1ddf853aaa37d1deb78cb27d2ffcf9b673099a8c10348fb3d6d57febbc974b745de7bf8e
+AUX galaxyhack-1.74-gcc43.patch 181 BLAKE2B 4c65af90380a2232eac5b9ba6dce9f2e8d0f1a0d213579f037c2229c864e0d0281265667efb5cf8fff8b2187186d095460bbbb9715ae46e3337d95cbf8694afc SHA512 7bef8937152d9db692613b888e4c62ed70c827b7c771e7cffd7ae69da8e76af228990f5b4f2dd2f2f32f1943c6461baac9de0376eb70b8a2ed2b775d83b99e6a
+AUX galaxyhack-1.74-gentoo.patch 916 BLAKE2B 2ac8e2416500bd8048601d39a7b055774737676093c7de9d895f9059b276d95add72f2cde781c89066903dede423d0ce0912c94747be48adb200a4d3ae087d87 SHA512 800e5169daf1e87469aa29dc01a5a7d6e9ba83b18b24c3dd942fcde9c24a8a6b4eff4036a091c4584203124a8ebe553161e5358753850c9751af5a2e413c8ad1
 DIST galaxyhack-1.74.tar.bz2 9948336 BLAKE2B 2029e4a27e2995ebd8bb4f7e9192fc353b22a0246e5bca5294a9a09ee936c0050682dcff52a233b87d659a6a4e98f56fcd4b563fb1159b52f6f596a5413a687b SHA512 d708494b1ad572c0243da9e7168b4707112ec3c99a09498b87f8e0cb2e4e5bc9df8dc4631e3fb4d3cd7517ec4b17e937798dec3fcf770de9d0fc1b5e29a0bd58
 DIST galaxyhack.png 819 BLAKE2B c19a6c05313eedfd118de0b02b688e98dc011a760da10c5edc6ee15eea3668e7dbf19fcbc7546807221b3b727056c5d5075c91cae699300c6d7b19c939b0f2b6 SHA512 b8ab4dd1c18c079ec3f60b3d04843fbb7a892feb8f872d498c20eb3142e7de26bff90c93b308656e1afe5ee77074fcb3f78542dfd175c27a9b865a512e0b0200
-EBUILD galaxyhack-1.74-r1.ebuild 1592 BLAKE2B afde825de3df81f6b18cce5376f30059763dfeab87c154a8b3f7fa9c4a7d011a66cd53b2a3df165bd3c05eb858317c1f9ee20545b10295fb76eca3691a5c265d SHA512 abd828bf419949722c7261439c6bb386b9f6813da6bd6c68c91d8084ae4a0d04f2b6f6660116a8cc969a742ed62ce05bec3306fa58bca93d79186af3d00c4072
+EBUILD galaxyhack-1.74-r2.ebuild 1806 BLAKE2B 8c1cfa6835995735cf28f1a7992f654178e720f79806f530986b9abee14c0ab9ec82899f0e03345156467e9a29aa616a70c11d1b2a43417df0f200196fd006af SHA512 dfc570dba4ca8582ed1b4551f56c451beab4dd89d83f69d2d4d005ad56394df50de336aba2c4b585c88533a46dc4eb2a938cd0a9e744e403f2f252092c81ae73
 MISC metadata.xml 1383 BLAKE2B b358635bd0e1f15560dc84368bc32eb1de4a487ca377924d82f3d2b28912ec702a07fa34565fea4fdf77280599403187b670a103d3d158e0c5ccfa3265257725 SHA512 1857f21b7f01d16e5eaa7fd6f3b653c820837d5b47022bf47c02af44c5bb00f0010c36c722aa1225d0cf0cdec8d85c4f6f14e5c7c0785da8706ea9886a72b285
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
index ed8ff748aa98..f3468ecf4be8 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
@@ -1,77 +1,77 @@
---- a/ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
-+++ b/ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
+--- a/ForceSelectWin.cpp
++++ b/ForceSelectWin.cpp
 @@ -1596,15 +1596,15 @@
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
- 	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
- 		if (is_directory(*iter)) {
--			fs::create_directory(destPath.string() + "/" + iter->leaf());
--			DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());
-+			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());
-+			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());
- 			continue;
- 		}
- 		string destFile;
--		if (iter->leaf() == sideName + ".dat")
-+		if (iter->path().filename() == sideName + ".dat")
- 			destFile = theInput + ".dat";
- 		else	
--			destFile = iter->leaf();
-+			destFile = iter->path().filename().string();
- 		
- 		fs::copy_file(*iter, destPath.string() + "/" + destFile);
- 	}
---- a/Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
-+++ b/Main.cpp	2012-08-20 17:50:51.000000000 +0200
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
+ 		if (is_directory(*iter)) {
+-			fs::create_directory(destPath.string() + "/" + iter->leaf());
+-			DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());
++			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());
++			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());
+ 			continue;
+ 		}
+ 		string destFile;
+-		if (iter->leaf() == sideName + ".dat")
++		if (iter->path().filename() == sideName + ".dat")
+ 			destFile = theInput + ".dat";
+ 		else	
+-			destFile = iter->leaf();
++			destFile = iter->path().filename().string();
+ 		
+ 		fs::copy_file(*iter, destPath.string() + "/" + destFile);
+ 	}
+--- a/Main.cpp
++++ b/Main.cpp
 @@ -339,12 +339,6 @@
- 
- void GameInit(char* argv[]) {
- 	namespace fs = boost::filesystem;
--	//boost is really quite stupid
--	#ifndef WIN32
--		fs::path::default_name_check(fs::windows_name);
--	#else
--		fs::path::default_name_check(fs::native);
--	#endif
- 	
- 	FindHomePath();
- 	LoadSettings(argv);
---- a/Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
-+++ b/Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
+ 
+ void GameInit(char* argv[]) {
+ 	namespace fs = boost::filesystem;
+-	//boost is really quite stupid
+-	#ifndef WIN32
+-		fs::path::default_name_check(fs::windows_name);
+-	#else
+-		fs::path::default_name_check(fs::native);
+-	#endif
+ 	
+ 	FindHomePath();
+ 	LoadSettings(argv);
+--- a/Menu_Base.cpp
++++ b/Menu_Base.cpp
 @@ -206,7 +206,7 @@
- 
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
- 	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {
--		string filename = iter->leaf();
-+		string filename = iter->path().filename().string();
- 
- 		if (filename.find('.') == filename.npos)
- 			continue;
+ 
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {
+-		string filename = iter->leaf();
++		string filename = iter->path().filename().string();
+ 
+ 		if (filename.find('.') == filename.npos)
+ 			continue;
 @@ -237,7 +237,7 @@
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
- 	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {
- 		if (fs::is_directory(*iter)) {
--			string fleetName = iter->leaf();
-+			string fleetName = iter->path().filename().string();
- 
- 			if (CheckFleetExists(fleetName)) {
- 				tempItem.desc = fleetName;
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {
+ 		if (fs::is_directory(*iter)) {
+-			string fleetName = iter->leaf();
++			string fleetName = iter->path().filename().string();
+ 
+ 			if (CheckFleetExists(fleetName)) {
+ 				tempItem.desc = fleetName;
 @@ -261,7 +261,7 @@
- 	fs::path iterPath(GetFleetDir(whichSide));
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
- 	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {
--		string filename = iter->leaf();
-+		string filename = iter->path().filename().string();
- 
- 		if (filename.find('.') == filename.npos)
- 			continue;
---- a/Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
-+++ b/Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
+ 	fs::path iterPath(GetFleetDir(whichSide));
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {
+-		string filename = iter->leaf();
++		string filename = iter->path().filename().string();
+ 
+ 		if (filename.find('.') == filename.npos)
+ 			continue;
+--- a/Stuff.cpp
++++ b/Stuff.cpp
 @@ -657,7 +657,7 @@
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
- 	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {
- 		if (fs::is_directory(*iter) && !fs::is_empty(*iter))
--			RemoveDirectory(iter->string());
-+			RemoveDirectory(iter->path().string());
- 		else
- 			fs::remove(*iter);
- 	}
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {
+ 		if (fs::is_directory(*iter) && !fs::is_empty(*iter))
+-			RemoveDirectory(iter->string());
++			RemoveDirectory(iter->path().string());
+ 		else
+ 			fs::remove(*iter);
+ 	}
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
index c7fd49135dee..0da874e8715e 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
@@ -1,11 +1,11 @@
---- src/SetupBattle.cpp
-+++ src/SetupBattle.cpp
+--- a/SetupBattle.cpp
++++ b/SetupBattle.cpp
 @@ -18,7 +18,7 @@
- #include "PreBattle.h"
- 
- #include <sstream>
--#include <boost/filesystem/exception.hpp>
-+#include <boost/filesystem.hpp>
- 
- using std::stringstream;
- using std::getline;
+ #include "PreBattle.h"
+ 
+ #include <sstream>
+-#include <boost/filesystem/exception.hpp>
++#include <boost/filesystem.hpp>
+ 
+ using std::stringstream;
+ using std::getline;
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
index 7c60c4efa624..01283c5ab50f 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
@@ -1,11 +1,11 @@
---- a/Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
-+++ b/Main.cpp	2006-07-28 00:08:28.000000000 +0200
+--- a/Main.cpp
++++ b/Main.cpp
 @@ -184,7 +184,7 @@
- #ifndef WIN32
- 	string settingsPath = userHomePath + "settings.dat";
- 	if (!DoesFileExist(settingsPath))
--		settingsPath = "settings.dat";
-+		settingsPath = "@GAMES_DATADIR@/galaxyhack/settings.dat";
- #else
- 	string settingsPath = "settings.dat";
- #endif
+ #ifndef WIN32
+ 	string settingsPath = userHomePath + "settings.dat";
+ 	if (!DoesFileExist(settingsPath))
+-		settingsPath = "settings.dat";
++		settingsPath = "@GAMES_DATADIR@/galaxyhack/settings.dat";
+ #else
+ 	string settingsPath = "settings.dat";
+ #endif
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
index 478e58001c73..f878fbd904a5 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
@@ -1,64 +1,64 @@
---- a/JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
-+++ b/JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
+--- a/JSDL.cpp
++++ b/JSDL.cpp
 @@ -47,14 +47,14 @@
- 	if (!globalSettings.batch) {
- 		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {
- 			char output[120];
--			sprintf(output, SDL_GetError());
-+			strcpy(output, SDL_GetError());
- 			throw runtime_error(output);
- 		}
- 		
- 		if (!globalSettings.disableSound) {
- 			if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {
- 				char error[120];
--				sprintf(error, SDL_GetError());
-+				strcpy(error, SDL_GetError());
- 				string errorStr = error;
- 				errorStr += ", continuing without initialising sound.";
- 				WriteLog(errorStr);
+ 	if (!globalSettings.batch) {
+ 		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {
+ 			char output[120];
+-			sprintf(output, SDL_GetError());
++			strcpy(output, SDL_GetError());
+ 			throw runtime_error(output);
+ 		}
+ 		
+ 		if (!globalSettings.disableSound) {
+ 			if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {
+ 				char error[120];
+-				sprintf(error, SDL_GetError());
++				strcpy(error, SDL_GetError());
+ 				string errorStr = error;
+ 				errorStr += ", continuing without initialising sound.";
+ 				WriteLog(errorStr);
 @@ -81,7 +81,7 @@
- 		//4096 is rather a large chunksize, should be smaller if I add sound effects
- 		if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) == -1) {
- 			char output[100];
--			sprintf(output, Mix_GetError());
-+			strcpy(output, Mix_GetError());
- 			throw runtime_error(output);
- 		}
- 	}
+ 		//4096 is rather a large chunksize, should be smaller if I add sound effects
+ 		if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) == -1) {
+ 			char output[100];
+-			sprintf(output, Mix_GetError());
++			strcpy(output, Mix_GetError());
+ 			throw runtime_error(output);
+ 		}
+ 	}
 @@ -101,7 +101,7 @@
- 	if (screen == NULL) {
- 		SDL_Quit();
- 		char output[120];
--		sprintf(output, SDL_GetError());
-+		strcpy(output, SDL_GetError());
- 		throw runtime_error(output);
- 	}
- }
+ 	if (screen == NULL) {
+ 		SDL_Quit();
+ 		char output[120];
+-		sprintf(output, SDL_GetError());
++		strcpy(output, SDL_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
 @@ -114,7 +114,7 @@
- 
- 	if (loadingSurface == NULL) {
- 		char output[100];
--		sprintf(output, IMG_GetError());
-+		strcpy(output, IMG_GetError());
- 		throw runtime_error(output);
- 	}
- 
+ 
+ 	if (loadingSurface == NULL) {
+ 		char output[100];
+-		sprintf(output, IMG_GetError());
++		strcpy(output, IMG_GetError());
+ 		throw runtime_error(output);
+ 	}
+ 
 @@ -308,7 +308,7 @@
- 
- 	if (!theMusic) {
- 		char output[100];
--		sprintf(output, Mix_GetError());
-+		strcpy(output, Mix_GetError());
- 		throw runtime_error(output);
- 	}
- }
+ 
+ 	if (!theMusic) {
+ 		char output[100];
+-		sprintf(output, Mix_GetError());
++		strcpy(output, Mix_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
 @@ -319,7 +319,7 @@
- 
- 	if (Mix_PlayMusic(theMusic, -1) == -1) {
- 		char output[100];
--		sprintf(output, Mix_GetError());
-+		strcpy(output, Mix_GetError());
- 		throw runtime_error(output);
- 	}
- }
+ 
+ 	if (Mix_PlayMusic(theMusic, -1) == -1) {
+ 		char output[100];
+-		sprintf(output, Mix_GetError());
++		strcpy(output, Mix_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
index eeb64d12e587..817958b0403a 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
@@ -1,12 +1,11 @@
-diff -aur src.old/JSDL.cpp src/JSDL.cpp
---- src.old/JSDL.cpp	2008-07-17 18:31:38.000000000 +0200
-+++ src/JSDL.cpp	2008-07-17 19:19:39.000000000 +0200
+--- a/JSDL.cpp
++++ b/JSDL.cpp
 @@ -20,7 +20,7 @@
- #include <cstdlib>
- #include <fstream>
- #include <stdexcept>
--
-+#include <cstring>
- using std::runtime_error;
- using std::memcpy;
- 
+ #include <cstdlib>
+ #include <fstream>
+ #include <stdexcept>
+-
++#include <cstring>
+ using std::runtime_error;
+ using std::memcpy;
+ 
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
index 9e55c941bfeb..e9fb838826ec 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
@@ -1,5 +1,5 @@
---- a/Makefile.old	2009-02-11 22:21:26.000000000 +0100
-+++ b/Makefile	2009-02-11 22:20:58.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -6,12 +6,11 @@
  # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
  #
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild
index aead3e7b9481..d82d02f9b103 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74-r2.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic readme.gentoo-r1
+EAPI=7
+
+inherit desktop edos2unix toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Multiplayer AI script based strategy game"
 HOMEPAGE="http://galaxyhack.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 	mirror://gentoo/${PN}.png"
+S="${WORKDIR}/${PN}/src"
 
 LICENSE="GPL-2 galaxyhack"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="
+DEPEND="
+	>=dev-libs/boost-1.34:=
 	media-libs/libsdl[video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[mod,vorbis]
-	>=dev-libs/boost-1.34
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}/src"
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 Settings will default to those found in
@@ -35,30 +34,46 @@ Additional user submitted fleets can be downloaded from
 http://galaxyhack.sourceforge.net/viewfleets.php
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-destdirs.patch
+	"${FILESDIR}"/${P}-boost.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-boost-1.50.patch
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
+	edos2unix *.cpp Makefile
+
 	default
-	edos2unix Makefile
-	eapply \
-		"${FILESDIR}"/${P}-destdirs.patch \
-		"${FILESDIR}"/${P}-boost.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-boost-1.50.patch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
+
 	sed -i "s:@GAMES_DATADIR@:/usr/share:" \
 		Main.cpp || die
 	sed -i "/Base data path/s:pwd:/usr/share/${PN}:" \
 		../settings.dat || die
+
+	sed -i \
+		-e 's:INSTALL_DIR="${GAMES_DATADIR}":INSTALL_DIR="/usr/share/":' \
+		-e 's:INSTALL_BIN_DIR="${GAMES_BINDIR}":INSTALL_BIN_DIR="/usr/bin":' \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
-	dobin "${PN}"
-	cd ..
+	dobin ${PN}
+	cd .. || die
+
 	insinto /usr/share/${PN}
 	doins -r fleets gamedata graphics music standardpictures \
 		settings.dat
+
 	dodoc readme.txt
 	readme.gentoo_create_doc
+
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} GalaxyHack
 }
diff --git a/games-strategy/ja2-stracciatella-data/Manifest b/games-strategy/ja2-stracciatella-data/Manifest
index 8addf31b54bb..d41044e54b55 100644
--- a/games-strategy/ja2-stracciatella-data/Manifest
+++ b/games-strategy/ja2-stracciatella-data/Manifest
@@ -1,2 +1,2 @@
-EBUILD ja2-stracciatella-data-1.ebuild 1317 BLAKE2B 3e0d23809ea2608b60627f739f94b7c02c3ae342ce99d25433de5fa2a31ee49556a9a97c3e967971f79fac304ca01dbf87185669ddd6a890a2a34e9c2da307b3 SHA512 b99aa7cd634b5f42a5ac807133e13918ec0029525c9224c17acb7fd29b0c854e7591a36d820b82570afd20d37dac3c9443f990ba6691eac823280bc65f02fcd7
+EBUILD ja2-stracciatella-data-1-r1.ebuild 1268 BLAKE2B 5542562c7121acfbd99d2cc9e22f778e4dd58a7b1612909a36b84762196fd786b358eecd76fc66fb2531ec02d6d829a88b59a25b250031b17e0ed41d54210db9 SHA512 c7a702983acd39dc9b71bb2f3c9d7ec9ee17a0ef546fead8f98a6df795492e72a4d494d577e996b903e64ebd46b742e622895fa0536d328faf5b71f970760872
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild
index 8b035b0ff0ad..ccf6a75a48a4 100644
--- a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
+++ b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cdrom check-reqs games
+EAPI=7
+
+CHECKREQS_DISK_BUILD="3G"
+CHECKREQS_DISK_USR="1G"
+inherit cdrom check-reqs
 
 DESCRIPTION="A port of Jagged Alliance 2 to SDL (data files)"
 HOMEPAGE="http://tron.homeunix.org/ja2/"
-SRC_URI=""
+S="${WORKDIR}"
 
 LICENSE="SIR-TECH"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unshield"
-
-S=${WORKDIR}
 
-CHECKREQS_DISK_BUILD="3G"
-CHECKREQS_DISK_USR="1G"
+BDEPEND="app-arch/unshield"
 
 src_unpack() {
 	export CDROM_NAME="INSTALL_CD"
@@ -31,8 +28,10 @@ src_unpack() {
 
 src_prepare() {
 	cd "${S}"/Ja2_Files/Data || die
-	local lower i
 
+	default
+
+	local lower i
 	# convert to lowercase
 	find . \( -iname "*.jsd" -o -iname "*.wav" -o -iname "*.sti" -o -iname "*.slf" \) \
 		-exec sh -c 'echo "${1}"
@@ -41,17 +40,15 @@ src_prepare() {
 	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
 
 	# remove possible leftover
-	rm -r ./TILECACHE ./STSOUNDS
+	rm -r ./TILECACHE ./STSOUNDS || die
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/ja2/data
+	insinto /usr/share/ja2/data
 	doins -r "${S}"/Ja2_Files/Data/*
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "This is just the data portion of the game. You will need to install"
 	elog "games-strategy/ja2-stracciatella to play the game."
 }
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index a7c1035c799c..bbfca19cb75f 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -1,6 +1,3 @@
-AUX ja2-convert.sh 411 BLAKE2B 5b6f0682475d1cdacd914f9b0656e35608631e814ac54be81f19cfa39565e9d334499ec658095d3071fa2eb7c9200a81fe5650e4eea16a2077c86dd3edae2261 SHA512 478a8e94c10d69c18812a42fdc6766b77ef743793df38665677e9a878743a770a5565fed1a487e992ce0609d0fa371fb027ee55a9e01c32c283ad75f8a62c09d
-AUX ja2-stracciatella-0.12.1_p7072-gcc6.patch 526 BLAKE2B 22567919e68d467447befb3bb3a42bd64a80df24166375f0925d8d7237bb4471daa1a7a617a193ed9b3320c4fa1ae2bfd37116bc91aae0cb41fd5ca56abfa7f4 SHA512 15aabca2fc0e9d7cab0b4c7ed471eda8029e073250959f038a714eccbddddc1a0dc0aab54e7f45dd988347b52346386e90e75c29025698c9d7814c3fb10a5b1f
-AUX ja2-stracciatella-0.12.1_p7072-makefile.patch 3666 BLAKE2B 11c110649dce7650a315511edbff12036ad2a257d7d4c3d4da5a14a7d3ae0e9949fc2c8b5f435789a3090cf2a200f4b1d9e2175a1fa94466eaa6e1c209bfcee7 SHA512 07cd2f1367bd9dbad9bc6ec3d633fc77bf337dddf69d69da7c297722c1684c9c80e88b918b89dc2e02e83160b224cf7b22f6e21fce2de525ee480a513c64cd99
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
@@ -27,7 +24,6 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dunce-1.0.0.crate 5167 BLAKE2B 17bab325b025e06cb7c0c8eb704e4204e3080281f2603a5e5b1c4dd07f7045de875dd48a1a176b88a010824e738e372699effc6ced7e866481a6dbb173c51471 SHA512 2ef42f8be790e890342e8ae49e3bd7d71f48dfe337b89d1315469b3f3c1493069f62cd25b1953bef29f65e41e0ee893500d7d24253d0a6a735ce7ae32dc1ddc6
-DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
@@ -36,7 +32,6 @@ DIST hermit-abi-0.1.10.crate 9127 BLAKE2B 59582bd4f7ec1dc38b3df7df0ce77c6161a246
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411
 DIST ja2-stracciatella-0.17.0-editor.slf 563450 BLAKE2B 388b798efc2e6169ff0fee4c4baf0baa9c347c578a0cf15b932bfc9fd25db21da3c958c606f528f38c4d780200bb3b9e8a0a72649a03f3d7532fde499306dcde SHA512 7a177343f407dbd204586d029c04fa16b9418f27fba414fb0f3eba09dc879e628a4e0822cf53a7cae1a8efe13342392f77381b9e5be1b1933ea10ad9e4e2971b
 DIST ja2-stracciatella-0.17.0.tar.gz 22101197 BLAKE2B 165e3bc76bde65f8d72e45dd90f842b683353208f7796580d8bdbcfe65df921964ab07029750be1865f549c6d4012aafaeecb4c46bf3475f8e47cfaf48bd2f36 SHA512 a83a0346c5e4ff5e1e2b1a5a44d87376930b6b52a25746e14e496e5323555a4c1ce504b7a83e621775f39b955492b45083a459e7a1e5e892ca34b387ac500b0c
 DIST json_comments-0.2.0.crate 7272 BLAKE2B dfff442aba212c139340a447abe18273add4838cb11c471db73532273dcc3309c59ef9f00f773944297da9130d466b736aadc2078aed413d47ca3973a52b3a30 SHA512 da13a4849503bb1efa9d18a5d9d327f972d692b384738d6e8c36a2af832129a0ecfc59ce5352199e03b9dbb387582ae08a6a8ecdc4ab42a1c0c34a3534b85e0e
@@ -90,6 +85,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2113 BLAKE2B d576c681712e3d5c29aaf038a19fdc430a84fe934446a6ee0e54ce9b1a40321c60b6df8e6d478e3f04b49da3825d96dfa8417a5c8da2b2f82a479b1549977d5f SHA512 8a825972f55db374c65e3be2d07f3ea6ee89545f84028740040cef915c6e76efbd95fa83d20044aa180c19f8128963b1830890e896e7e5f45254c53e65c88880
 EBUILD ja2-stracciatella-0.17.0.ebuild 4069 BLAKE2B c1634f4133b344d82437aa6f937bb54f92240b9f89414967ca32abad241f6051ad9c612dbc20389923deea882a265def84bc51b98af787655f56dc491b4035d0 SHA512 052e8b3f8cdee6d217ca83ab2264691c52f0967ad33bbab71d11b75820e02fb07d2836707c99c63f05a58aa72824abf2f2bbb765524c6a87936a84db788ae404
 MISC metadata.xml 630 BLAKE2B 095a713902bd996796d1988f8cb4a7e5316e83cf7bb07692adc16bde1da1339532321538dfd1054f93868b802bfd0aa9c924248cb602b1136f9267dcac648efa SHA512 e50db86a2d81709cbd781045e8ad287173ca62c13b2442cb3e492861d72fd19470f29e1f49da583bdc5834c9baf869bb109d652063204bd6cb742cde05675edb
diff --git a/games-strategy/ja2-stracciatella/files/ja2-convert.sh b/games-strategy/ja2-stracciatella/files/ja2-convert.sh
deleted file mode 100644
index 4f337ca75351..000000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-convert.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Convert names of data-files to lower-case
-
-# location of the data-files
-GAMES_DATADIR=@GAMES_DATADIR@
-
-cd "${GAMES_DATADIR}" || exit 1
-
-# convert to lowercase
-find . -exec sh -c 'echo "${1}"
-lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}`
-[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-# remove leftover
-rm -r ./TILECACHE ./STSOUNDS
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
deleted file mode 100644
index 2661b19d6c77..000000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/600082
-
---- a/Build/Laptop/BobbyRGuns.cc
-+++ b/Build/Laptop/BobbyRGuns.cc
-@@ -700,7 +700,7 @@
- 	//center picture in frame
- 	ETRLEObject const& pTrav   = uiImage->SubregionProperties(0);
- 	UINT32      const  usWidth = pTrav.usWidth;
--	INT16       const  sCenX   = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
-+	INT16       const  sCenX   = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
- 	INT16       const  sCenY   = PosY + 8;
- 
- 	//blt the shadow of the item
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
deleted file mode 100644
index 0475773bd361..000000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue May  8 19:16:08 UTC 2012
-Subject: build system
-
---- Makefile
-+++ Makefile
-@@ -16,106 +16,94 @@
- MANPREFIX ?= $(PREFIX)
- 
- INSTALL         ?= install
--INSTALL_PROGRAM ?= $(INSTALL) -m 555 -s
--INSTALL_MAN     ?= $(INSTALL) -m 444
--INSTALL_DATA    ?= $(INSTALL) -m 444
-+INSTALL_PROGRAM ?= $(INSTALL) -m 755
-+INSTALL_MAN     ?= $(INSTALL) -m 644
-+INSTALL_DATA    ?= $(INSTALL) -m 644
- 
-+# compiler CFLAGS
-+CFLAGS += -std=gnu99
- 
-+# sdl-flags
- SDL_CONFIG  ?= sdl-config
- ifndef CFLAGS_SDL
- CFLAGS_SDL  := $(shell $(SDL_CONFIG) --cflags)
- endif
- ifndef LDFLAGS_SDL
--LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs)
-+LIBS_SDL := $(shell $(SDL_CONFIG) --libs)
- endif
- 
-+# LIBS
-+LIBS += $(LIBS_SDL)
-+LIBS += -lm
-+
-+ifdef WITH_ZLIB
-+LIBS += -lz
-+endif
- 
--CFLAGS += $(CFLAGS_SDL)
--CFLAGS += -I Build
--CFLAGS += -I Build/Tactical
--CFLAGS += -I Build/Strategic
--CFLAGS += -I Build/Editor
--CFLAGS += -I Build/Res
--CFLAGS += -I Build/Laptop
--CFLAGS += -I Build/Utils
--CFLAGS += -I Build/TileEngine
--CFLAGS += -I Build/TacticalAI
--CFLAGS += -I sgp
--
--#CFLAGS += -Wall
--#CFLAGS += -W
--CFLAGS += -Wpointer-arith
--CFLAGS += -Wreturn-type
--CFLAGS += -Wunused-label
--CFLAGS += -Wunused-variable
--CFLAGS += -Wwrite-strings
- 
--CFLAGS += -DJA2
-+# preprocessor flags
-+CPPFLAGS += $(CFLAGS_SDL)
-+CPPFLAGS += -I Build
-+CPPFLAGS += -I Build/Tactical
-+CPPFLAGS += -I Build/Strategic
-+CPPFLAGS += -I Build/Editor
-+CPPFLAGS += -I Build/Res
-+CPPFLAGS += -I Build/Laptop
-+CPPFLAGS += -I Build/Utils
-+CPPFLAGS += -I Build/TileEngine
-+CPPFLAGS += -I Build/TacticalAI
-+CPPFLAGS += -I sgp
- 
-+CPPFLAGS += -DJA2
- 
- ifdef WITH_DEMO
--  CFLAGS += -DJA2DEMO
-+  CPPFLAGS += -DJA2DEMO
- endif
- 
- ifdef WITH_DEMO_ADS
-   ifndef WITH_DEMO
-     $(error WITH_DEMO_ADS needs WITH_DEMO)
-   endif
--  CFLAGS += -DJA2DEMOADS
-+  CPPFLAGS += -DJA2DEMOADS
- endif
- 
- ifdef WITH_FIXMES
--  CFLAGS += -DWITH_FIXMES
-+  CPPFLAGS += -DWITH_FIXMES
- endif
- 
- ifdef WITH_MAEMO
--  CFLAGS += -DWITH_MAEMO
-+  CPPFLAGS += -DWITH_MAEMO
- endif
- 
- ifdef WITH_SOUND_DEBUG
--  CFLAGS += -DWITH_SOUND_DEBUG
-+  CPPFLAGS += -DWITH_SOUND_DEBUG
- endif
- 
- ifdef _DEBUG
--  CFLAGS += -D_DEBUG
-+  CPPFLAGS += -D_DEBUG
-   ifndef JA2TESTVERSION
-     JA2TESTVERSION := yes
-   endif
- endif
- 
- ifdef JA2TESTVERSION
--  CFLAGS += -DJA2TESTVERSION
-+  CPPFLAGS += -DJA2TESTVERSION
-   ifndef JA2BETAVERSION
-   	JA2BETAVERSION := yes
-   endif
- endif
- 
- ifdef JA2BETAVERSION
--CFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
-+CPPFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
- endif
- 
- ifdef JA2EDITOR
--CFLAGS += -DJA2EDITOR
-+CPPFLAGS += -DJA2EDITOR
- endif
- 
--CFLAGS += -D$(LNG)
--
--CFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
--
--CCFLAGS += $(CFLAGS)
--CCFLAGS += -std=gnu99
--CCFLAGS += -Werror-implicit-function-declaration
--CCFLAGS += -Wimplicit-int
--CCFLAGS += -Wmissing-prototypes
-+CPPFLAGS += -D$(LNG)
-+CPPFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
- 
--CXXFLAGS += $(CFLAGS)
--
--LDFLAGS += $(LDFLAGS_SDL)
--LDFLAGS += -lm
--
--ifdef WITH_ZLIB
--LDFLAGS += -lz
--endif
- 
- SRCS :=
- SRCS += Build/AniViewScreen.cc
-@@ -468,7 +456,7 @@
- .SUFFIXES:
- .SUFFIXES: .c .cc .d .o
- 
--Q ?= @
-+Q = 
- 
- all: $(BINARY)
- 
-@@ -476,15 +464,15 @@
- 
- $(BINARY): $(OBJS)
- 	@echo '===> LD $@'
--	$(Q)$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@
-+	$(Q)$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $@ $(LIBS)
- 
- .c.o:
- 	@echo '===> CC $<'
--	$(Q)$(CC) $(CCFLAGS) -c -MMD -o $@ $<
-+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
- 
- .cc.o:
- 	@echo '===> CXX $<'
--	$(Q)$(CXX) $(CXXFLAGS) -c -MMD -o $@ $<
-+	$(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
- 
- clean distclean:
- 	@echo '===> CLEAN'
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
deleted file mode 100644
index 74f846424ca0..000000000000
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A port of Jagged Alliance 2 to SDL"
-HOMEPAGE="https://ja2-stracciatella.github.io/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	http://tron.homeunix.org/ja2/editor.slf.gz"
-
-LICENSE="SFI-SCLA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cdinstall editor ru-gold zlib"
-
-DEPEND="media-libs/libsdl[X,sound,video]
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	cdinstall? ( games-strategy/ja2-stracciatella-data )"
-
-LANGS="l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru"
-IUSE="$IUSE $LANGS"
-REQUIRED_USE="^^ ( ${LANGS//+/} )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-
-	sed \
-		-e "s:/some/place/where/the/data/is:${GAMES_DATADIR}/ja2:" \
-		-i sgp/FileMan.cc || die
-
-	sed \
-		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}/ja2/data:" \
-		"${FILESDIR}"/ja2-convert.sh > "${T}"/ja2-convert || die
-}
-
-src_compile() {
-	local myconf
-
-	case ${L10N} in
-		de) myconf="LNG=GERMAN" ;;
-		nl) myconf="LNG=DUTCH" ;;
-		fr) myconf="LNG=FRENCH" ;;
-		it) myconf="LNG=ITALIAN" ;;
-		pl) myconf="LNG=POLISH" ;;
-		ru) myconf="LNG=$(usex ru-gold RUSSIAN_GOLD RUSSIAN)" ;;
-		en) myconf="LNG=ENGLISH" ;;
-		*) die "wat" ;;
-	esac
-	elog "Chosen language is ${myconf#LNG=}"
-
-	use editor && myconf+=" JA2EDITOR=yes JA2BETAVERSION=yes"
-	use zlib && myconf+=" WITH_ZLIB=yes"
-
-	emake ${myconf}
-}
-
-src_install() {
-	dogamesbin ja2 "${T}"/ja2-convert
-
-	if use editor; then
-		insinto "${GAMES_DATADIR}"/ja2/data
-		doins "${WORKDIR}"/editor.slf
-	fi
-
-	make_desktop_entry ja2 ${PN}
-	doman ja2.6
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "You need ja2 in the chosen language, otherwise set it in package.use!"
-
-	if ! use cdinstall ; then
-		elog "You need to copy all files from the Data directory of"
-		elog "Jagged Alliance 2 installation to"
-		elog "${GAMES_DATADIR}/ja2/data "
-		elog "Make sure the filenames are lowercase. You may want to run the"
-		elog "script":
-		elog "${GAMES_BINDIR}/ja2-convert"
-	fi
-}
diff --git a/games-strategy/knights-demo/Manifest b/games-strategy/knights-demo/Manifest
index 152c63cfe4f3..3e27811b1ceb 100644
--- a/games-strategy/knights-demo/Manifest
+++ b/games-strategy/knights-demo/Manifest
@@ -1,3 +1,3 @@
 DIST knights-demo-1.32.run 31667235 BLAKE2B ee9c63a261aaea93122b790ef3d4df21b30b53d8f47e2f1549c3e6aaf7a09f04b5f7985e6d26e395266176fa9135cb7257bfc5c6f5eba7524da19758ab241715 SHA512 f53cf9524811b4a83ec2531f62ea251fc5a939cb09445ab850c7bbac85301e8b8275dda12a8dc991e4412eb4358d7597d0c007bd9263fd875289b039b941ed9c
-EBUILD knights-demo-1.32-r2.ebuild 1183 BLAKE2B 7474ab747a641cb6913a5aa26d4fcaf1e0fd319b5db9e50d133ba05af9828a6caf76318f66d627ce23b19880c92fc2e2ef27e12b3511e298d57995844a4005ce SHA512 213b7a7f8fe80e919077ad35fa68ed7d7c111ef408917e55ab307afade34ea4843bf6a0f2d6ac4a01f2d10768fd57d8bd670c04f3a20389e8d6a2485a8a8b231
+EBUILD knights-demo-1.32-r2.ebuild 1589 BLAKE2B b886373214af11d19782f46dafe7bfd31f0116e176ae4f6083baac99a164195f3e419cc63b2e7d04acf8b822ec84da8b5aada071bbce86d19243dae54ec5711c SHA512 a18137cf781549b3ebaf108bde6aa4caad971e2f0436d4df32d927c93251fd80f941495a9ba3fd24f2d0355fdc7f6e43615a97582eaf98e59a8dabb62ac790d1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
index d314a019ee7c..0fab85fe334d 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -1,20 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils unpacker
+EAPI=7
+
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
 HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
 # Unversioned upstream filename
 SRC_URI="mirror://gentoo/${P}.run"
+S="${WORKDIR}"
 
 LICENSE="knights-demo"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="strip"
 
+# Deps for the .dynamic binary which we don't support but install anyway
+# TODO: wants gtk-1.2?!
+# TODO: wants libgrapple?
+DYNAMIC_DEPS="
+	dev-libs/glib
+	media-libs/libogg
+	media-libs/libsdl
+	media-libs/libvorbis
+	media-libs/sdl-mixer
+	media-libs/smpeg
+	sys-libs/zlib
+"
 RDEPEND="
 	sys-libs/glibc
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
@@ -23,13 +36,19 @@ RDEPEND="
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 "
-S="${WORKDIR}"
+
+# RDEPEND+=" ${DYNAMIC_DEPS}"
+
+QA_FLAGS_IGNORED="
+	opt/knights-demo/knights-demo.dynamic
+	opt/knights-demo/knights-demo
+"
 
 src_unpack() {
 	unpack_makeself ${P}.run
-	mv -f data{,-temp}
+	mv -f data{,-temp} || die
 	unpack ./data-temp/data.tar.gz
-	rm -rf data-temp lgp_* setup*
+	rm -rf data-temp lgp_* setup* || die
 }
 
 src_install() {
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index c93473a9a0c6..063e5bf03fd3 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -2,5 +2,5 @@ AUX liquidwar-5.6.5-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd0
 AUX liquidwar-5.6.5-gcc10.patch 1084 BLAKE2B 9d22731a10775c42009ab97c1cc1c7ddd92f32373e148af0a6fc2753486c88c95518c6e657038c2fa444fdf4f149b18bacf9ad8138f9e37b8fd09e519206d56c SHA512 e2880aa19c869ccc7774f7a8f5f22e82be0235f41a9fc3aa39bf287a577ee1765b75259b6d804dce5d2c8a7c9dbc02421561aa6273e498b1981df67b2d8c5b53
 AUX liquidwar-5.6.5-makefile.patch 4909 BLAKE2B 3154d05b02ed7d38150f4456299abcbb5b383837f43f5b6bfb27c64c3f1a2b496eafe6f4fc448a8480a1d6b3180a4fff23e3b556da5d1561d565c177094ae1d9 SHA512 b61c7728543939d98c303af912162c3a433374c4e19d19eac7784b2cc05f7c0f03e18e8736063faa932eac254d980b7a3767cecd9af6254b29d36e503be9fa85
 DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25
-EBUILD liquidwar-5.6.5.ebuild 1039 BLAKE2B fecb93b52cad359ee53b1796533ae9633ae42b1e717bfc3c21f30a56252be4f3120d67078f09db6bf25b6dea91f3ce8b2b96219de0c4d934467ded50791f97cc SHA512 18818b92a64733411efbd4b57b27eeb8a08330b7252927ce38d7fafaffb322d9fbdf112181b1fdd3dd32dd3b8199ed4f3dfc11aadf46b69b39abbbb68269bcd5
+EBUILD liquidwar-5.6.5.ebuild 1046 BLAKE2B dc2928b5408d75f5cffab905866a8f53709a39e9520ca9705107cdeb65cdb1581b05c721178d340a79ed71f11b8c87dd437796a0e3df229b2858b0d9930e2938 SHA512 031d94c0a24394f06d28903efbbd88b8eb80f9df889e7ec0b49ef4b3acbc9a05e9dbca03c1535968dc9c71ee89928d65d07cd8dca8bac15d2063cfdff439503f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild
index 47a0e6ddf7a1..48530526991a 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://ufoot.org/download/liquidwar/v5/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=media-libs/allegro-4.2:0[X]"
 DEPEND="${RDEPEND}"
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index 604588d38dcb..5791c6236172 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -1,3 +1,3 @@
 DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
-EBUILD majesty-demo-1.0.0-r1.ebuild 1027 BLAKE2B e4f175d0ea4fb620e5d5dc20912d0c343cd001c34f8ccea6d8f00ac6004248002ee8c3f3cea4eeb801637fb98d7b961838c57a265ecd6bc3a4982a4afe601f13 SHA512 e0c92d128cd1a9ba809cc4bfc1e871177a0005eb0e440711b2dc075b921adfea0aa93504a46d53e764a22429c2b80bbd198fdad820596372ce2e085b690875b2
+EBUILD majesty-demo-1.0.0-r1.ebuild 1037 BLAKE2B 378bc88678bbd709ed38b0bde6146df60a4e4a020fb8f39a58becbff298ea17aaaad61d1472af7d66dd595267b70cbacd60811b68e5cfbdc575f50ef937dfdb3 SHA512 033c411cb301c5e5f23201726416783f91ba4092332198f526118bd20b84df56f3c4f3f8df43ca4674fac0ef61762ed14e9ecc0db2b2b623e7b83e4361faacf3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
index 6f11eefbab83..1511d51ed930 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils unpacker
+
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Control your own kingdom in this simulation"
 HOMEPAGE="https://www.linuxgamepublishing.com/info.php?id=8&"
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
index 5114b65f724a..7f45d303c99c 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,5 +1,5 @@
 DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
 DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383 SHA512 ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c
 EBUILD megaglest-data-3.11.1-r1.ebuild 622 BLAKE2B 8442d613c7bb399394dfc2eb4b8113ee6677c417e2cb8b87283633f3ef9c2a91b3ac8bc1e9ca6191a4abf62896d0c54d95e1e99cd1d91dd07cb8305da9d366a5 SHA512 cc45ffc465d32cd741625e19d0bb5b273899ff1c3c95b3c9ad8b6635b43116ded4e101f6900b7b1f831577f91ade69b427182579d085f78399b0764cab21cebc
-EBUILD megaglest-data-3.13.0.ebuild 779 BLAKE2B ae8ac8a8822e1703b935aacb47cec4bb08cf66719b22127af704436cf63fe681f2a38e2c7b2d2123f2edbfda231d1cebfc80c0d2ac454aee1f12443c51a03159 SHA512 b62c989b67d33fbf489a4683f875dbf2db63fa0df09f1b4621992513763ed32042e6b251a70f562f7656c0ea6e9adf37ad1a7faa51a4ecdf256ecf778443bd77
+EBUILD megaglest-data-3.13.0.ebuild 786 BLAKE2B 5bdf6608b7c2622981b30716b32979c8c66cfb82ac1353621828943c668565e0e7b3999e26a8ae40419b2a326a8f1ae7190e2fcd194a3f8dc5c477b55203073d SHA512 84165dfe9e8ab75a076459245ab38a5a8326708150874faca24fddc9b237473347d60862a41a89bc269fc673042f4940ef89eb2d1741d40f31218b3a9ca98cbf
 MISC metadata.xml 342 BLAKE2B 3e1f532ee136e71fe0c923694e49cedfdce563f052f0e1a48bad9086fa511ffdef728107969738251cb13fe8df360270df227d1b7dec383110564f5cad54ab1e SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe
diff --git a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index b96462b4fb9e..9a1f00300e1b 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/meg
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
 DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index c9b8f5ee62b5..2c528364c427 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -5,6 +5,6 @@ AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385
 AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
 DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c
-EBUILD megaglest-3.11.1-r100.ebuild 3988 BLAKE2B d55b7b4f230a9f5bbcda78c673757d4fb02efc24b17ba9afc4d3956f1b136f2689247810a91665525ab4f9b9629fbbeca642e9c24c4cbd74c257c5bc63f564ea SHA512 9f318046640d0f45701e635a664cc35b3fb1e1b987409aaf908b64c6cc241bbecd153df3fe7497e4a676fcf242a0f6b912e1a0eeda454028f6bf33318b2e60b6
-EBUILD megaglest-3.13.0.ebuild 3661 BLAKE2B d1b2872064d89ad7460ea3c31b3681c3b6f6e9738cacd382749d36b9cabbe32298f831cbe7982d164d1820c85758da0fd94e08001daa97a09201f405ecaf7474 SHA512 e989a36ffbd52dcf6f7ca7e7dec4bcb263b782cfbafc986b410dcb2b04207e292e81710b217c1e42cfcb0b638a7181a3a27caad0f2d145ed5361055c8a75646a
+EBUILD megaglest-3.11.1-r100.ebuild 3993 BLAKE2B 9cac50646fc06f9a73bb233b91c460a1b6c876b1c9b7f1022bce037e854602dc33d86127fcb139d158f932a502bbd046d58dbff1cf3911ee2fcce337390303db SHA512 a95153df30b853b16d28202edadae744c8dbc1de026e5c2d04099d730a5a7414274169417982c482530e629cc0f7425b5511ff6b0166f625b649e8893dd2643c
+EBUILD megaglest-3.13.0.ebuild 3681 BLAKE2B 637c56194556b157e5eabf97051e27a3c988a92d52ba028299490ce5038fb9ff46186e2d59fc689931c4582789d5ef5738f79588c901b14c5ad2a211dc6d613d SHA512 36f9bd1b500ee3c5d05b0df26a862a11db2b7602ff87608a6af8b7191fe3b93def37c697879862fbf038900d1327510f8da64d6cb897a0abb2a5e5fcfc3935a6
 MISC metadata.xml 1621 BLAKE2B c8cbe108c70355825dfc84d74a64380ca7fd84b335abee058738e2139f00a25c3e79f6a7a3faa0da5cd06051809315ef482cf661ab29bac7f1254f41abdab8fc SHA512 b2bb0fc5043314a798b697ca6e337b7b4896475502c14c0e31ebf8b9d56e6629ef8c4dded03338b1ec7669db5a3ab84021177893dae2e0fae9d661d1f27216d1
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
index d19c6ffd579d..0ee6393c8030 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -14,7 +14,8 @@ LUA_COMPAT=( lua5-{1..2} )
 # Only needed by certain features
 VIRTUALX_REQUIRED="manual"
 
-inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
+WX_GTK_VER="3.0"
+inherit cmake desktop lua-single virtualx wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
 HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
@@ -43,9 +44,9 @@ RDEPEND="${LUA_DEPS}
 	virtual/glu
 	x11-libs/libX11
 	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:3.0[X] )
+	model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 	dev-libs/xerces-c[icu]
 	media-libs/ftgl
 	media-libs/glew:=
@@ -73,7 +74,6 @@ src_prepare() {
 	cmake_src_prepare
 
 	if use editor || use model-viewer ; then
-		WX_GTK_VER="3.0"
 		setup-wxwidgets
 	fi
 }
diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild b/games-strategy/megaglest/megaglest-3.13.0.ebuild
index 9b8867d2938c..1a07d154d993 100644
--- a/games-strategy/megaglest/megaglest-3.13.0.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -13,6 +13,7 @@ LUA_COMPAT=( lua5-{1..2} )
 # Only needed by certain features
 VIRTUALX_REQUIRED="manual"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -21,7 +22,7 @@ SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -49,9 +50,9 @@ RDEPEND="
 	virtual/jpeg:0=
 	x11-libs/libX11
 	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:3.0-gtk3[X] )
+	model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 	videos? ( media-video/vlc )
 "
 DEPEND="${RDEPEND}"
@@ -69,7 +70,6 @@ src_prepare() {
 	cmake_src_prepare
 
 	if use editor || use model-viewer ; then
-		WX_GTK_VER="3.0"
 		setup-wxwidgets
 	fi
 }
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 08bbf4784d5e..bad28ceba79d 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,6 +1,5 @@
-DIST naev-0.7.0-ndata.zip 319608404 BLAKE2B e6edd79282171d4b327d220b33af37720e09f7137a26697de472e3494587525de5d9509865bfccc1093f5d4befa11faa10e0d4f4c59ea8621ecd8d564eb546fe SHA512 5fa8faad36e410f0d2af1c80e6fedbffdd020da72dc96b329ce623e9836490cfb515c1bb88719045491366ca96a32888374029eec6cd14ed86ac8597750995ca
-DIST naev-0.7.0.tar.bz2 1076658 BLAKE2B 582bbfbc16e33d16600c19928ed6810dfe5fd3165930e6a51ec9b65d25305cd0bbfaf6f4cced12c5b7f76163ed4dc36b7108e81f4a4e82dc626c6045d3fe769f SHA512 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
 DIST naev-0.8.1-source.tar.gz 359781119 BLAKE2B 021824b0af031af8ff2aa565989c3d7811fcbcdc082649f208e8318b0d69b1c3c27492936a6afdc38de9448aa0dcca2f8ef73879155217e34968f81246017aa6 SHA512 8f9aede300d06b0beae12d4809cc58ac740bc1934c2fa5fdb04452cd2eb63de697e0bbf2aacf5af4878b62eee30878ed50388ee8386fbb19f9d56cb7cad8d7f2
-EBUILD naev-0.7.0-r100.ebuild 1762 BLAKE2B a12a17eb355d9eee407e8d7f7ad67336f7d7fe67c91a1172edce75bc4f02f82ca617648690a66c3355306c89fec00824f367a1dd495da42cdb263ba5ffbfad63 SHA512 4999ea6b00f059bc257c5c2e13201cf2ad6f02e55d1b36251b2010ecb9b3739f493d333f231506317e1b719d2517541e089248ad3dfc088b78c1820530ed2ac5
+DIST naev-0.8.2-source.tar.gz 394232958 BLAKE2B 2e109636cb1d282bc8236c84ee40b9b96224baf70bf315677b6a02bf9c4c0059d34c5225c31b925a8c66c5995fd9ab8fc022816b66a7e1c174e017e3ebf5e956 SHA512 2ad120639efc13635370bb498d0a4100b2306779cf593e6aecffd331e0f4dec1b8af4729b2c4d484af1be9069d2ac7e47e17ebdc8ce65af878fcff9484f810b0
 EBUILD naev-0.8.1.ebuild 1552 BLAKE2B d398392bf128e0c2f64913d7225f8f46bc1e8e9e934a8e2bf6376339936a0341fc6c9beae7995bcdb55dab5b64cd7f788f820d23e8ea7f2a4ec9dc1a0fc8604c SHA512 e87e1bdd566a5fd1ad0b34955b258b8b75ff099102fcf74cd7885b3b8276b68c9ca66b9a9710e04164c71e792ec935f88cf092d57cd2adcdb1791657080039f7
+EBUILD naev-0.8.2.ebuild 1734 BLAKE2B 4820a0ba8a88f935ef6e96b948871c503224cdfcdecce2d0e25a266881343d02e514ca068f1bbdd64511289d872ff35a61150a8e5e2c976c1685b10a21aa5c85 SHA512 1e4028e470263c4a548a97f1a9281c5ff79b077a1dea0ac5a9a426296f4ce3a4925324c34e1ec5253e1cf2885a2fb4aa7fbe501408f82c940ac4097629cf18e8
 MISC metadata.xml 480 BLAKE2B 4d01de527c3e9c5d5b97dfc169be7b0639be97a2cfa75564b6f2f3f0543c783f9b2403b15471191ecd0b1cf6ddc97eb87d9e04d7f53fe9534fd3626398f02425 SHA512 48c3f9af6ccc92e0cd032f169c8febe7a954cc3b304717e329d2bc9f8d4fff4d9be72bcab2cbfa2c3b75c46ab85a044fe76c786638c062c2a8a9005f1fff6b54
diff --git a/games-strategy/naev/naev-0.7.0-r100.ebuild b/games-strategy/naev/naev-0.7.0-r100.ebuild
deleted file mode 100644
index b3122510f64c..000000000000
--- a/games-strategy/naev/naev-0.7.0-r100.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit lua-single xdg-utils
-
-DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
-SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
-	https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
-
-LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +mixer +openal"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	media-libs/libsdl2[X,sound,video]
-	dev-libs/libzip
-	dev-libs/libxml2
-	>=media-libs/freetype-2:2
-	>=media-libs/libvorbis-1.2.1
-	>=media-libs/libpng-1.2:0=
-	virtual/glu
-	virtual/opengl
-	mixer? ( media-libs/sdl2-mixer )
-	openal? ( media-libs/openal )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-# This is so that only the source tarball is unpacked - the data file
-# is supposed to be installed *zipped*. This is why we do not need unzip
-# in BDEPEND in spite of what repoman/pkgcheck might say.
-src_unpack() {
-	unpack ${P}.tar.bz2
-}
-
-src_configure() {
-	econf \
-		--enable-lua=$(usex lua_single_target_luajit luajit shared) \
-		$(use_enable debug) \
-		$(use_with openal) \
-		$(use_with mixer sdlmixer)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		appicondir=/usr/share/pixmaps \
-		appdatadir=/usr/share/metainfo \
-		Graphicsdir=/usr/share/applications \
-		install
-	insinto /usr/share/${PN}
-	newins "${DISTDIR}/${P}-ndata.zip" ndata
-
-	rm -f "${D}/usr/share/doc/${PF}/LICENSE"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-strategy/naev/naev-0.8.2.ebuild b/games-strategy/naev/naev-0.8.2.ebuild
new file mode 100644
index 000000000000..22f730350b05
--- /dev/null
+++ b/games-strategy/naev/naev-0.8.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+inherit lua-single meson python-any-r1 virtualx xdg
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +mixer nls +openal"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/libzip
+	dev-libs/libxml2
+	media-libs/libsdl2[opengl,sound,video,X]
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	sci-libs/suitesparse
+	virtual/glu
+	virtual/opengl
+	mixer? ( media-libs/sdl2-mixer )
+	nls? ( virtual/libintl )
+	openal? (
+		media-libs/libvorbis
+		media-libs/openal
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		dev-lua/ldoc
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:lua51:lua5.1:g" meson.build || die
+	# meson can't into docdir!
+	sed -i -e "s:doc/naev:doc/${PF}:g" meson.build || die
+	sed -i -e "s:'doc/naev':get_option('datadir') / 'doc/${PF}':g" docs/meson.build || die
+	# remove license file from install
+	sed -i -e "/'LICENSE'/d" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc docs_c)
+		$(meson_feature doc docs_lua)
+		$(meson_feature lua_single_target_luajit luajit)
+		$(meson_feature nls)
+		$(meson_feature openal)
+		$(meson_feature mixer sdl_mixer)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index 751ce52fc116..f216c4015634 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -11,5 +11,5 @@ DIST SharpFont-4.0.1.zip 151532 BLAKE2B 3745959e449b0745b5cd1c20a9653595ce2166f4
 DIST SharpZipLib-0.86.0.zip 463599 BLAKE2B 5d6374c5daef33afc1faf814992df1ef7001b593594a022657406ac8ce67ac5e00f71cfe9365c4acab2925ef458f9add83ec62dd22e4db74e17efdd1e1091542 SHA512 70ac4a39b599a37ff45733477ba1afb4caee177262b72037998b7eb08a737177f8689bb690759b8090d25b9d408ba8c84e56bec3509997adde62724fcfcdc2b5
 DIST openra-20190314.tar.gz 24551126 BLAKE2B ed6289bbfab9f55aa88ac834dab3a2bab4cea3cb5a3b6934e24feb78bea1df71d839d4434242df666cda6180027a8e6d5b7766b6155ab2e85a4ee639a7950e12 SHA512 a16884cf626a31b3cf21662c307aef505bfcf6d34330f09b10510aa6c88d9d1026f17f2037565827fc95148776b0651fe0559c65db493295957df428793b2d71
 DIST rix0rrr.BeaconLib-1.0.1.zip 17989 BLAKE2B 2a65c9276b725ac6c433eb2cf6e4a13d6e5c07446dbff1e096b100a20eebb2a432c81cfbc13c11fdf672fbd37eb5985497b3fa425a317afe39049a6a967e3a7e SHA512 4fe4c6dfd7ad0f7eb5549c66fe53cd38f74026a8202d3553481bdfdab8ce0788f8b31f05092d93f9751a687badf75a1ec22da201235f2e505893192bb371367f
-EBUILD openra-20190314-r100.ebuild 5055 BLAKE2B 772c610a2432159ac3bff97bb74a577b543f0b49cad12572c588363fb531462ed702108baf9199d320fd75cca0dfe63c316c8ce36f2b59edca7f77e5cf96ee9e SHA512 301b69fa0f05373b8ea1e3180e403d038332962dd66aed84123e9095742198100651083d039b86ee855a224bcc1e488fba157e32a8707b9f92c801f6954a5c3f
+EBUILD openra-20190314-r100.ebuild 5057 BLAKE2B 40feb35b396cbf309a36d9cf290a31ec7e3442bebdfc564c1734f9d755bfd981ce0d582d07b19acb91622de5e472e1a0c03c80f2ee056488490d7314ee3ff4ad SHA512 0e81fd0da69a10c4f769acc35d56531184863592a877812666b1428fcffb6bd25f04964c82d26ec3f12fffc7ac83591180a8ce026ccde97760f4ee04be651a5a
 MISC metadata.xml 507 BLAKE2B 41509ed4d51adffd4aaf548f986ff19ccdf2b382e6265eeca268ccf693fcbf47468fad4ba1fcafb73f2a7fd5893942944f4118ca3b388a2b9299fd9130621d5e SHA512 ffeb53c6a7368c79336656bee82ea41fcdec13ef68f22e70a2ef70b5ba644ae1ad3832406cf54c7afd888ebe3357d2530528f39b07d515b813cf090248fa5186
diff --git a/games-strategy/openra/openra-20190314-r100.ebuild b/games-strategy/openra/openra-20190314-r100.ebuild
index 7548dcc3a522..c06f2cddb249 100644
--- a/games-strategy/openra/openra-20190314-r100.ebuild
+++ b/games-strategy/openra/openra-20190314-r100.ebuild
@@ -173,6 +173,6 @@ pkg_config() {
 	if [[ -n ${ROOT} ]]; then
 		echo
 		ewarn "Mono's cert-sync cannot write to your ROOT system so you must manually"
-		ewarn "copy the certificates from ${BROOT}/usr/share/.mono to ${EROOT}/usr/share/.mono."
+		ewarn "copy the certificates from ${EPREFIX}/usr/share/.mono to ${EROOT}/usr/share/.mono."
 	fi
 }
diff --git a/games-strategy/satellite-reign/Manifest b/games-strategy/satellite-reign/Manifest
index cb59bcde91c3..15f0eee9f976 100644
--- a/games-strategy/satellite-reign/Manifest
+++ b/games-strategy/satellite-reign/Manifest
@@ -1,3 +1,3 @@
 DIST SatelliteReignLinux0113_06.zip 674306806 BLAKE2B 4525fdb2568d631422a23ba9b3fcffaf3e2f62e146e96c3468c3305507589698ac94f60302d4fe7cde0e3359dd1ad1f88232f6c749be1d63450b121cd8c219d1 SHA512 66ec91728c664975cb2c45b287465fb38fd40e1dcaa7cfe19bbbdeb040cefab1ce349f160e46171a276f3bdd068a4a584379e9899dd7052c4fd1ecd74936c43e
-EBUILD satellite-reign-1.13.06.ebuild 1411 BLAKE2B 34a4e86d802dbe6cdcd2f8f659af5f5601396e9e73780c89b5533e02ef2387f71aa2120d0a5bf60f64309b1b224f6f59d60afd81cfc7ea48ab381339d1f1f7e6 SHA512 c3fb5d239c333a5f825b17a93fe4b9831b69ddf921588e1998cecfb489cb226933638de75a0c83e42feed640d62c6d884174f284634577d04aaf00deb9f714dc
+EBUILD satellite-reign-1.13.06.ebuild 1412 BLAKE2B c51985529ef215f3119141a3b6026a31045bf745ee1a2fc9ad9ea250ae22e4796f283a3a18e969588bc089eb66112e4e017baff79abf9fe8e7265a5c7479129e SHA512 1f24a760223fa26f67d961c5b1d0366633f890dea9b3fd316f7e9ed9f392a654ace06ad88e246a3b126c9e6d2f70607158cbb0879dd8a83aef1f5c6acb03c6ed
 MISC metadata.xml 354 BLAKE2B 620415356736dd403be27ef2547bd0d23a3812b3c16b7976125c582118af837336c258d7c0657dbe70b254ee773041f7e169939a34cc616870a5f54ad8429c31 SHA512 6ae66494681059ab163da720d574906da7db8facc7c383db8b8dd0d5ea78f41deb5f19389b1fd8fc2848cfb7ae5c11bd3ba2750a90799b382f0bfe8f70d48637
diff --git a/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild b/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
index 0af09014bd71..a8fdb593abcb 100644
--- a/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
+++ b/games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop xdg-utils
+inherit desktop wrapper xdg-utils
 
 MY_PN="SatelliteReignLinux"
 MY_PV="${PV/.}"
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 1050b3936f30..7262beaee39c 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -7,5 +7,5 @@ AUX scorched3d-44-odbc.patch 503 BLAKE2B 90c212fd77732bad90d5455e967cbc18f3e28c6
 AUX scorched3d-44-win32.patch 464 BLAKE2B 51362a695212dd8d37013c1b4a11d77fb1b8564b54e3ec9ce3e0165ee83e42d65883dc3df964180d975885a555b1ae02e87fc20cc3c85d4507308110ee7cf810 SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd
 AUX scorched3d-44-wxgtk.patch 7001 BLAKE2B b120e1cc12343fa5be2e4348930d2656eb2c727224a8e9e63f00dfb4da71888918d3fcccc1a9a439737ce2f6fbe6224be06d4801b4cb857ad1e4765d2c444e4e SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120
 DIST Scorched3D-44-src.tar.gz 41689613 BLAKE2B 61f5536ad6e9dedeb0e778f90d73aa918f890632385278d4d788a43f1e199e817d6199f923c264dadbe8084fa53c32968b599c9b08784de0d5752069f9bed818 SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca
-EBUILD scorched3d-44-r2.ebuild 2301 BLAKE2B ff038355d46948eef5702741babf7e15932295f04889757c4543ce8c8fd7cf8cfcd4cd59821796f82891c9b82a088f50cb800f02ed33b72ce3de4c94a113bd01 SHA512 fbc910fdc1ab6385ca6f8e1f5a6ccabb4c845d041aea151e98644b26c8e190426057eff38f8fe91a9089d25ffa61d5a1eb82fdb3e19159b9857908f43ba52bdb
+EBUILD scorched3d-44-r2.ebuild 2304 BLAKE2B ef34d75cc048db10b3ccce46c38295951db7fb189e93911d6936c3ca4864b60ea298ffad473778b2a46679681872e35ff0a5aa0cc5fe8889baf1a7b79bbbc3b8 SHA512 70e44e513480ad18276e89e981dd0b06b18e4404439f9be5f9cdefce97e2fc432133c088290d56615a775e1c835251ea28690ef70bcf410012c070a5c284600e
 MISC metadata.xml 333 BLAKE2B da791c5728d5a17950492280dcf23b0543b6c444885f852b491a8eaa65f2befcd755470183e8084034a16fb6507b073b2de91afdb00d4db2eaca68077495daa8 SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index 384864e070c0..2916571b3d99 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER=3.0
-
-inherit autotools eutils wxwidgets
+WX_GTK_VER="3.0"
+inherit autotools desktop edos2unix wxwidgets
 
 DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
 HOMEPAGE="http://www.scorched3d.co.uk/"
 SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
+S="${WORKDIR}/scorched"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,10 +37,8 @@ RDEPEND="
 		sci-libs/fftw:3.0=
 	)
 	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	!dedicated? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/scorched
+DEPEND="${RDEPEND}"
+BDEPEND="!dedicated? ( virtual/pkgconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fixups.patch
@@ -53,10 +51,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-c++14.patch
 )
 
-pkg_setup() {
-	setup-wxwidgets
-}
-
 src_prepare() {
 	edos2unix \
 		src/launcher/wxdialogs/SettingsDialog.cpp \
@@ -68,6 +62,7 @@ src_prepare() {
 }
 
 src_configure() {
+	setup-wxwidgets
 	econf \
 		--datadir="${EPREFIX}"/usr/share/${PN} \
 		--with-fftw="${EPREFIX}"/usr \
@@ -84,7 +79,7 @@ src_install() {
 	default
 
 	# remove bundled fonts
-	rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
+	rm "${ED}"/usr/share/${PN}/data/fonts/* || die
 	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
 	dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
 	dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
diff --git a/games-strategy/spaz/Manifest b/games-strategy/spaz/Manifest
index 5bb7b1b2cac4..edc13c2a888c 100644
--- a/games-strategy/spaz/Manifest
+++ b/games-strategy/spaz/Manifest
@@ -1,3 +1,3 @@
 DIST spaz-linux-humblebundle-09182012-bin 157466422 BLAKE2B c3b832c4cb8b68bbe353bc019d4af6af335b45e3bcc89209f2a61a840b52448f4d09eaf1544f67995049d377600eae433ce2140171d189afcd7d3c388d67ec78 SHA512 ba62be6a247dfb1ee04db8784b3e173140e7491f2bd68a528ad9c81cab4bc8f807bfeb4593fa37c76e43401420a6f788075cd2541fd16ed7443fe4301a76d50c
-EBUILD spaz-1.605-r1.ebuild 933 BLAKE2B da2d4f6275db8f7b58629099bea88d7828650af4889f45412fb99f337cb3b577f82cbddb61a0fff33ed11674e824b75fefe12c55f7c4da1d23196835ccd3ace8 SHA512 132a36add3e49c02e7748cc00ac968121bf85adc77804a2ed1ea1073de9a1c6350bdeacd3bb22e45387324789bea71ddf9f78b3dfe8fedb9ac136c06d6583e1a
+EBUILD spaz-1.605-r1.ebuild 919 BLAKE2B e50b72665ac319c471ff41d8ba29eedbd08c06fd4f832143805504fd9011ee0dd59dfaa211515cede4c22fdbf446558df703af5278717701bafc604ed2bb5b5f SHA512 5a34b82526a6d90a75d4e22d625ee6b63c75566c79528369ff2c21f803e76810b9b1ea3409b3494389973eb090104eaa3a6d5f02b92865a99115f227057d1322
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-strategy/spaz/spaz-1.605-r1.ebuild b/games-strategy/spaz/spaz-1.605-r1.ebuild
index 98f1843747b1..3f312216a859 100644
--- a/games-strategy/spaz/spaz-1.605-r1.ebuild
+++ b/games-strategy/spaz/spaz-1.605-r1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop eutils unpacker
+
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Space Pirates and Zombies"
 HOMEPAGE="http://minmax-games.com/SpacePiratesAndZombies/"
 SRC_URI="${PN}-linux-humblebundle-09182012-bin"
+S="${WORKDIR}"/data
+
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa pulseaudio"
 RESTRICT="bindist fetch strip"
 
-DEPEND=""
-BDEPEND="app-arch/unzip"
 RDEPEND="
 	>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
 	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
 "
-
-S="${WORKDIR}"/data
+BDEPEND="app-arch/unzip"
 
 QA_PREBUILT="opt/spaz/SPAZ"
 
@@ -29,10 +29,10 @@ src_unpack() {
 }
 
 src_install() {
-	local dir="/opt/${PN}"
+	local dir=/opt/${PN}
 
-	insinto "${dir}"
-	exeinto "${dir}"
+	insinto ${dir}
+	exeinto ${dir}
 	doexe SPAZ
 	doins -r common game mods
 	doins audio.so
diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
index 435f770a2b1a..f3047b20972a 100644
--- a/games-strategy/tornado/Manifest
+++ b/games-strategy/tornado/Manifest
@@ -1,4 +1,4 @@
 AUX tornado-1.4-r2-gentoo.patch 13288 BLAKE2B 35b3eb05fd6894ec5733e42b2423f19f3ef4ff2e71b90f6f71380fdaec0ad862caafd15a8fb7f0785927f8fee0fdead741dc4bfb34343b510fd330ac649f893e SHA512 683a5dcac5fc12b065ebb4dfc5c9972a6fe6c87ee645cdbdf038313068ae43cc1e022ad8772c6f509f7bc102862bda6cc34ce5ccf132fc06f7d1cabd2d93817a
 DIST tornado-1.4.tar.gz 56341 BLAKE2B 81b99ab6484c5267c90792cfefb9dad638d8057224e4eb755dde85638e17bfb5cc17fe64bf84b0d631905493e8e1e276f0842b4f9bbe2eb40e740931a8f422a8 SHA512 32a9e078c0d0498befff78f5cafaa1e45ee2ad45d661f7d89e9038f8ca44c34b27ca846e3e4d68a15f203da20b5f6aeb41826c00159d66d9640f3b2bdd6b6e12
-EBUILD tornado-1.4-r2.ebuild 758 BLAKE2B 2fa73141de0e2fcabab32ae6df569f45d789312445b8b55057e7b446097b417d1998be9643f95837cac7f6c289cd5e95c9c8b70b7ee1374a7a4dcb7fbaa07407 SHA512 a76a01381e5911d1977a7df6fe25582a3c64792f4e8eb973930b5f5e05ed671d5cdc0b27a76ecbc7fe02aa33c01cb4d6b5b04f85b73cf1260c11d63b02b4316e
+EBUILD tornado-1.4-r2.ebuild 777 BLAKE2B 002f92d9d73b2e4681bcb8df4bb90efa241508c1b7226d3c0221565ba3e11f1e2966f7fad7b1f359120621ced18d9690c49a3a4b8a88c5302ffc7daa2f97f28b SHA512 829a2780c60293bd29022e9752ecdf73f817a0e148ae47305bf8fc08b9be0629513b2d7630113e7a2bd23b9900fbcd6225efc67ffb72aa5e8791b54942e66c6d
 MISC metadata.xml 324 BLAKE2B 0f55b12563dec62df2173a78c547b96968f11c45f7360345cfebe13d4eb4a3772817c674beb82cffe178b663b041c14ca6473a68c6f5411748b8131191430e46 SHA512 2b00c1db92f99aaf62fc3a76e0062c63f3608fc1e48838be2d7b9ddb09788f11fbf63156aa10cc88ae5d30fcd5409f59ca19b65d3c6ec5cf6412ea97244d72b5
diff --git a/games-strategy/tornado/tornado-1.4-r2.ebuild b/games-strategy/tornado/tornado-1.4-r2.ebuild
index 8ba22468f47e..06cbc3b53969 100644
--- a/games-strategy/tornado/tornado-1.4-r2.ebuild
+++ b/games-strategy/tornado/tornado-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 DEPEND="
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index f8a208399d29..12ddec945552 100644
--- a/games-strategy/triplea/Manifest
+++ b/games-strategy/triplea/Manifest
@@ -1,6 +1,7 @@
 AUX mkdir.sh 28 BLAKE2B e23eb97930e3fd2f5860a0acd5c5a79fd43ebb6577bb79c03b369b74172ec7110b39b5324580e2392c95e5235c86a8b786c67d97adfdd6ae804e4fcc36409973 SHA512 f49b4476521ad392ab91550ce1ef150b4fe4243020f7a173a3fe0d11e31476c22c11773058d4da1a013b63cb3b7017ac8ed38d4793d921a691546481c280ad37
 AUX paths.patch 3867 BLAKE2B 18c958a16855b39e8e800c62976aba0cebb42914a8b67cf3ff09e65dc4a3f505a2a0aa6f5d97a63281300788c2e425248c4319bcc69d3daa691a96a1b0786555 SHA512 bc411daa31e6d7a56a1c762eb785547d0be2f9dfc33dc1311f43e78c9d6337c0786860b52f63c817e61bf137fc71099a4019e6441fca1b469bc4f96a79b0300a
+AUX triplea-1.8.0.9-drop-ant-check.patch 1135 BLAKE2B 664a0e9f8fcf6451af198b2f788c95ffffa3fa82b988ab271c2105172f26077a0c2d99497634dc871e35bd1b5cbcd3d4cbbd606be718f138e7ca298a121b2277 SHA512 98e41c7475792b3069a36c51646f421b62b3e9288cd934586a30d3d9f9e34011c52300b71b2e340fc334d12ce93319aa98a4bda80a67e37ab7be0ec9b213f0eb
 AUX upnplib.patch 999 BLAKE2B 4fd4113eee4b1e695b4bfcada24b57dcf1aa49b346b896926b8ef18d6dc2db8da0720d3c572cb99c6d047cfc0a9256e08ba280096fdb1780fe16492bcbfaf2c9 SHA512 2195e3aec282935bce60017e99e8211bd153165b3359636517fbe518a4630f1e4464beef57015d92e522a399eb9ea79ad75ced36c4b87388905b16705e341283
 DIST triplea_1_8_0_9_source_code_only.zip 378475905 BLAKE2B b9266467d7a919cc4d6e25d30604a21c738761f4b2a31076fd7e2c98c004c5d7b80c98231d388adae619ce29281eec4a9590c6be31fecdbf547d240f81c8951c SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d
-EBUILD triplea-1.8.0.9-r1.ebuild 2328 BLAKE2B 550c6033bf98560da85a62dfc114b0c5cb4e2a826e01422931c9ced89cd6ff50e7e177f1875a4b19a7341e28b8fbac8293ed256ac25e9a14a6e52c7a6146574d SHA512 c5d9b751355b475429e1b96bd1dc1e45c1b60db0733c706dbf9a571fee566a3e90f1b78997672873779bb452866b70e8ea1eb67d2aa30f49aa302357c3edb2ef
+EBUILD triplea-1.8.0.9-r2.ebuild 2421 BLAKE2B 326f39becbc7c074bff3314f5ecbc264b863cd536b88725e3c41372ecea738937cc7cd159ab66020a03f9186c6348c1f605a43b7ad58e5096dda95d6cdc0a937 SHA512 cd968dd9b72e922ac01167580c06a5a190ab423eabdffd59e4108722c45336e1e073688915ed9fb0b4aa9ed2f359e450f0b23b2d8582a86652d423a1142c3b64
 MISC metadata.xml 330 BLAKE2B e5affd70d163a58ffd63374d6a23a291f38eb5e27aa45d0d4f16857d3483b0a1cc64944ef5fe1284b5742ad5ee72ccb2d4ae0cb9a0c4a8470c8bb1e450dc0ff9 SHA512 25e53b4fda63cde7b2211a94b42804a0eb166fe5159eadcbaf5609645526064790a4b01483fe1e15b5b84fb90c73c55b66afe1c1039bb2dc8354e4c603588ea6
diff --git a/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch b/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
new file mode 100644
index 000000000000..2a41521c4aed
--- /dev/null
+++ b/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
@@ -0,0 +1,29 @@
+Fix version check failure with 1.10.9
+--- a/build.xml
++++ b/build.xml
+@@ -110,25 +110,6 @@
+ 
+ 	<!--checkBuildEnv -->
+ 	<target name="checkBuildEnv">
+-		<!-- Check ant version first (pre-1.6.5 reports java version it was built 
+-			with, not what it's running under, so an ant built with 1.5 would report 
+-			that even if it's currently running under < 1.5). 1.6.5 was released in June 
+-			2005, so it's fairly unlikely that anyone would be using an older version, 
+-			but checking it is still a good idea, and it only takes a tiny fraction of 
+-			a second. -->
+-		<fail message="Ant version 1.6.5 or greater is required">
+-			<condition>
+-				<not>
+-					<or>
+-						<contains string="${ant.version}" substring="1.6.5" />
+-						<contains string="${ant.version}" substring="1.7" />
+-						<contains string="${ant.version}" substring="1.8" />
+-						<contains string="${ant.version}" substring="1.9" />
+-					</or>
+-				</not>
+-			</condition>
+-		</fail>
+-		<echo message="${ant.version}" />
+ 		<!-- we require jdk 1.6 or greater -->
+ 		<fail
+ 			message="jdk 1.6 or greater required, you are currently using: ${ant.java.version}">
diff --git a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
index ad0f13584c8a..32eb7c5cbf3c 100644
--- a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild
+++ b/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
@@ -1,13 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 versionator
+EAPI=7
 
-MY_PV=$(replace_all_version_separators _)
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib"
+inherit desktop java-pkg-2 java-ant-2
+
+MY_PV=$(ver_rs 1- _)
 DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
 HOMEPAGE="http://triplea.sourceforge.net/"
 SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
+S="${WORKDIR}"/${PN}_${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,28 +19,36 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="test" # Needs X11 maybe use virtualx.eclass
 
-RDEPEND="dev-java/apple-java-extensions-bin:0
+DEPEND="
+	dev-java/apple-java-extensions-bin:0
 	dev-java/commons-httpclient:3
 	dev-java/oracle-javamail:0
 	dev-java/osgi-core-api:0
-	dev-java/upnplib:0"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.7
+	dev-java/upnplib:0
+"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+DEPEND+=" >=virtual/jdk-1.8:*"
+BDEPEND="
 	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )"
-RDEPEND="${RDEPEND}
-	>=virtual/jre-1.7"
+	test? ( dev-java/ant-junit:0 )
+"
 
-S=${WORKDIR}/${PN}_${MY_PV}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib"
-
-java_prepare() {
+PATCHES=(
 	# Use ~/.triplea, not ~/triplea.
 	# Don't write server files under /usr/share or ${PWD}.
 	# Fix to build against our packaged upnplib.
-	epatch "${FILESDIR}"/{paths,upnplib}.patch
+	"${FILESDIR}"/{paths,upnplib}.patch
+	# Fix build with newer Ant
+	"${FILESDIR}"/${PN}-1.8.0.9-drop-ant-check.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-2_src_prepare
 
 	# Remove packaged or unneeded libs. Unfortunately Apache Derby was
 	# last-rited due to packaging issues. See bug #561410.
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest
index 28d64f782d6e..c756d2b01f64 100644
--- a/games-strategy/warmux/Manifest
+++ b/games-strategy/warmux/Manifest
@@ -2,8 +2,9 @@ AUX warmux-11.04.1-action.patch 549 BLAKE2B d22e26bae34efd28729cbdb98e97365fb2e4
 AUX warmux-11.04.1-fix-c++14.patch 488 BLAKE2B 0f60ce6c6d4238ec9eaa06428b4ff251fca1bfb8e3d05cb5c57a9a5d9e229c0775b76fffe33704aa6d8b636959cffc4f529d19cd09065e5842ccfd89745207cd SHA512 c8c6d5d070e926f7ffd03766c95481c0db8b43a8a0f3fad301e7e7210013098696ad5af0c5ab8c70f0081711b6b50847d8873af0ea79315c4c45c760e915eb88
 AUX warmux-11.04.1-gcc47.patch 335 BLAKE2B cfa1e6b42a00a0683c06257bd9156a8a85eef3181ba385f3eb4a82f944259cd2db1b0b56bccf0f68b6b09505f6825e02394fc07c8cd76bd8772340eefa43bc65 SHA512 33e403ce0dd69ae782ca3696838bfaf8126520b92b3b813ac491559dafd429ae3379131965a49e2c7ca2955a384ce41989f89db611696f999edf41c4abdd1270
 AUX warmux-11.04.1-gentoo.patch 1543 BLAKE2B 23c3cb85c720c0df37ed274dfe824f94ffce3362528bf2967b790bb51d7d8ec5bbd803d019dd0d4a68bc757cbe82bf4ca4f03745ffb6c91cbe76e17c34ce9e8e SHA512 30e565a3b212a3b54c29267b29a43343d21a3fbadf2bc70552fb074b0f174f08cf66a6565f19de4f0187dbfe68e9124fda42a0cd85d592f1d596f217f5c3c4f9
+AUX warmux-11.04.1-respect-AR.patch 261 BLAKE2B c50a7d8e50facda13e0af255ddc6e844dd88cfaa4a023a76177fa1706288d20663a18d543efe6c04822316b283f55f37e495da6353a2d7e85faedfdefc0310c2 SHA512 2d2152f137bc296a12a7e64d28fc97135e70ca11290c5ce3d1cd3e190ef78025ea95856bf3c03268566afa06da269f341e37b2a8c538e57b59bd5e74a68161df
 AUX warmux-11.04.1-stat.patch 1746 BLAKE2B 886a8dc439e1546d823e27bbe2313aeff913d02f754abf4355221b99f504d8408ad1c652a3e61abd4fae10e832284f929c7d31767eca317174619f54eaf5f7db SHA512 f0af67d2109585e6cc02621a9ff249cfe5154783216d46d2c7641ec825a8e30d34767122d12ced8bfd916c3c966cadad49eeb43b44aa1954905950272c0c9902
 AUX warmux-11.04.1-zlib.patch 416 BLAKE2B a41b14d70de3c828368835825a240d8708b7d81cbd64fa0cc06540eee60e4f4bced5d7dd6566d4cec49e9e8ed2f2b03ec9578a334c7223d2b43e8c844f1b950a SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c
 DIST warmux-11.04.1.tar.bz2 110083622 BLAKE2B 50d575986d780e9e1bde2740297e11d3e720afe8396106ff05cd6051ed57315b8cd94d946b85956981743455c1013c8da91e5db0874db1e226b13bd72b3516eb SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d
-EBUILD warmux-11.04.1-r1.ebuild 1449 BLAKE2B d8a4f647f40761553c03f64cdb19592c67ead7f74ff0c7d87994cf8e01075b6256f0313f0c7a034a81019f522e8c454d32a78fcc7aac49bb721d986007f7e75e SHA512 14d19386fca2e32c2e39a76fbaaa2a77f59a40eb8b691cb5a4c5d9156970bc85d18c87b1e7ee68b9a4920effa41ba1d1393e325f27cf9d052ad4706c01679d96
+EBUILD warmux-11.04.1-r1.ebuild 1488 BLAKE2B f87c2c032e30cef1b8e86994a509f047c5fd571993371a90c7c3336157cba59f17020c0f70461d489a3a8cb1ce5647a88a756487c58e5ec6f0df75aae5ff9daa SHA512 ddd926521d1aaf4f775fa4cd9b0dd7ce921b3c52c2869644f55aac1f617477d9b202ffb16f63f03fa8e69c3383484613e07edff2913be1449da0f6b766aab817
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/warmux/files/warmux-11.04.1-respect-AR.patch b/games-strategy/warmux/files/warmux-11.04.1-respect-AR.patch
new file mode 100644
index 000000000000..229e5963ad5d
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-respect-AR.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index a799477..d31e40c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ AC_PROG_CXX
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_CHECK_TOOL(STRIP, strip)
+ AC_CHECK_TOOL(WINDRES, windres)
+ 
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
index f143ac0a47c5..fd2b025c8fa8 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="A free Worms clone"
 HOMEPAGE="http://gna.org/projects/warmux/"
 SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
+S="${WORKDIR}"/${PN}-11.04
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,8 +32,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-11.04
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-zlib.patch
@@ -40,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-stat.patch
 	"${FILESDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-respect-AR.patch
 )
 
 src_prepare() {
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 7bcda70441ec..eef5b9cc33b5 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,9 +1,8 @@
-DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
-DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
 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.2.3.ebuild 2575 BLAKE2B 2712f209478693da3b3e106ac00149ab01fe49a798f29c1ec3397d6d39bc552fbf63a6e915f59ec9569276dfd235e9c44392fa09d40fe181516a8814b3cbbcbf SHA512 f19f25b22e9664053c07741990976fc297ed8d6389a4449d30f14ee4616261c63d72943ed5a50f4c223fd14695de8bbdd7a19b2bb983480cac64f898be48e70a
 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.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
deleted file mode 100644
index 74fa50ea82f2..000000000000
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs eutils versionator gnome2-utils
-
-MY_PV=$(get_version_component_range -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}.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-
-SRC_URI+=" https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> ${PN}-3.2.3-qt_compile_fix.patch"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug nls sdl 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/qtscript:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/harfbuzz
-	media-libs/libogg
-	media-libs/libpng:0
-	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 )
-	!sdl? (
-		dev-qt/qtopengl:5
-		dev-qt/qtx11extras:5
-	)
-	sdl? ( media-libs/libsdl2[opengl,video,X] )
-"
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	dev-libs/fribidi
-	media-libs/fontconfig
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-
-src_prepare() {
-	default
-
-	# https://developer.wz2100.net/ticket/4580
-	eapply "${DISTDIR}/${P}-qt_compile_fix.patch"
-
-	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=/usr/share/locale
-		--with-distributor="Gentoo ${PF}"
-		--with-icondir=/usr/share/icons/hicolor/128x128/apps
-		--with-applicationdir=/usr/share/applications
-		$(use_enable debug debug relaxed)
-		$(use_enable nls)
-		--with-backend=$(usex sdl "sdl" "qt")
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-	doman doc/warzone2100.6
-	dodoc doc/quickstartguide.pdf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.0.1.ebuild b/games-strategy/warzone2100/warzone2100-4.0.1.ebuild
new file mode 100644
index 000000000000..d1a62cac0865
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.0.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 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="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} )"
+
+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=
+	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}
+	doins -r data/music
+
+	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 7bce7ba96a1f..496011f8c4e9 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.4.tar.gz 500087559 BLAKE2B bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466 SHA512 b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d
+DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27 SHA512 a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59
 EBUILD wesnoth-1.14.14.ebuild 2582 BLAKE2B 55d9b00566e58fd82d5afe249ab0885eeb1d7f25b75445bdb62a5d5adec67a506dc8192436353084c1d11fc7ff72a8042957efd25824fc9437266f4cdedb300d SHA512 18ee95ee5b9ae62b2aee00ae6f71d132d3f3075976b18c73573776f470ec814085fe1b72c693336d091fa0c25a6e8fb1c4ee7e80bf7f6c928a8ce023e9a9c21a
-EBUILD wesnoth-1.15.4.ebuild 2570 BLAKE2B 0ba8ec3c027da454e679f166b7f35ee2faae15c60da9739c2eba13aad850aa7989d0e47e9f120ffd0f3c7c08b7c735ad45733e63ede211adaea7dc49a7a2f69f SHA512 2b32bf85157098d8c49644f8629a07248998e7075e0d83cb1b9606f1b082c94bbaf7b488a994a58f65d482d1af00c667fa3dd4a21a61f310ed153d2a77a1ef0d
+EBUILD wesnoth-1.15.12.ebuild 2456 BLAKE2B 8a30ec94fbc138e0c42e474223ebb0f416396fd5bea0f3697cd17f7919145b28d14e19e588a0f02c4722f0ba885d0c468a76b684cfd612897786114a9112e660 SHA512 c9afae51cde76444455f86cb1afbd53585306262e56889df364ee17ca7ccea2e7464bcf08a23abd650cb19b1b2993a61454192d0b9b5871e47126f2ac3435532
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
index 4d50bca27254..1733f0d27342 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
+IUSE="dbus dedicated doc libressl nls server"
 
 RDEPEND="
 	acct-group/wesnoth
@@ -30,13 +30,11 @@ RDEPEND="
 		>=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/sdl2-ttf-2.0.12
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
 		>=x11-libs/cairo-1.10.0
 		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
 	)"
 DEPEND="${RDEPEND}
 	x11-libs/libX11
@@ -46,13 +44,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/wesnoth-1.14.14-ar.patch"
-)
-
 src_prepare() {
 	cmake_src_prepare
 
+	sed 's@ coroutine@@' -i CMakeLists.txt || die
 	if ! use doc ; then
 		sed -i \
 			-e '/manual/d' \
@@ -96,7 +91,6 @@ src_configure() {
 		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_STRICT_COMPILATION="OFF"
 		)
 	cmake_src_configure
diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest
index 3ced68c2c9b2..d3e0a8d1715e 100644
--- a/games-strategy/xbattleai/Manifest
+++ b/games-strategy/xbattleai/Manifest
@@ -1,4 +1,4 @@
 AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076
 DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18
-EBUILD xbattleai-1.2.2-r2.ebuild 989 BLAKE2B 483226fc6c987f27424b9b211049cde75bc2097bd65b56d7cdba96cbad66ea881bafda0c633b87ea7dd1e230efdab8735bbe68b6e9e489b39e0a78ded1389f75 SHA512 60ecbc9efe6394b2527d4d7dda9ea767fd8818e51a5942f5e2661b00997ef78d2a46b7bc75b38f7d3f9061f448603ccded22e35e430862c1d4fc9cb3369d30a7
+EBUILD xbattleai-1.2.2-r2.ebuild 1043 BLAKE2B e67dcaab1d14fc3a1f1e32c61af26cbc6fd083d58735406ad385cbc955336d2f5a49c2a06ec23308cdd621706e61f2fd07ad0ca52ee842529a74b3c90a59e446 SHA512 61eb7f6c7db69f66a14190efa86c5321961e664ebe60ab4957211ccf221254661b80ebf52721c89ad58a1013d9e56d73e55937c489e33d452774668e04ec00a0
 MISC metadata.xml 1356 BLAKE2B 13ecdee27af4359fa0052f3db53c55243a92de5fb9419272f8f97cb576ebbb8bdc04734bb10b72088e6ba31ea6ec9d32c129fb6704f037d30bd41f2a0b81db96 SHA512 fca551005a6b3e52d30e6a53b82e8d961debba3654a4e4f99e8cd23818a15bf4adfbcc1ffbd19cbe892c0118e5b24a5e83846ab7d72f8613c2e02cd58327cf7f
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
index e7b53bcc541e..f76d66031ae2 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A multi-player game of strategy and coordination"
 HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/"
@@ -11,7 +12,6 @@ SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattle
 LICENSE="xbattle"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Since this uses similar code and the same binary name as the original XBattle,
 # we want to make sure you can't install both at the same time
@@ -20,11 +20,18 @@ RDEPEND="
 	dev-lang/tk:0
 	x11-libs/libX11
 	x11-libs/libXext
-	!games-strategy/xbattle"
-DEPEND="${RDEPEND}
+	!games-strategy/xbattle
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
 	app-text/rman
 	x11-misc/imake
-	x11-base/xorg-proto"
+"
+
+DOCS=( CONTRIBUTORS README README.AI TODO xbattle.dot )
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sandbox.patch
@@ -33,10 +40,12 @@ PATCHES=(
 src_prepare() {
 	default
 	rm -f xbcs/foo.xbc~ || die
+	rm config.cache || die
+
+	tc-export CC
 }
 
 src_install() {
-	DOCS="CONTRIBUTORS README README.AI TODO xbattle.dot" \
-		default
-	mv "${D}/usr/bin/"{,xb_}gauntletCampaign || die
+	default
+	mv "${ED}/usr/bin/"{,xb_}gauntletCampaign || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-strategy
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)