gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /games-fps
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
41 files changed, 236 insertions, 1186 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 0a6cb4aec82b..46e840f2c4cb 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index d373144c0bf1..0c0151c9f437 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,4 +1,6 @@
-AUX alienarena-20130827-format.patch 400 BLAKE2B b98e23612337d8adcb2a0337ea2d7b0b6bcc5f2cafcd4c11996d94198c0bf4904e6ab5dcd33f690e6bfe3aee22a1d4cc85df522be139ee5bfe4c117ec2cbdfa8 SHA512 f64c502e306a7508258c62882711cc2a8b3261ebea2dd12a43624bb21d5c74f361ae82db3c629a3e903eab166c25013473fc4f0739bddc476e6740a06b69e2a6
+AUX alienarena-7.66-C99-inline.patch 841 BLAKE2B fc907aa4b287bb295589095936ca568a681f8a877f2470fd437bba50925454a51ff3559945052301fa94229288b2032da0a834770b0c7d0e8398b1f74b14dffe SHA512 acc6ac30e0d03345d8594ad9ed00ec56ec96ba68f157d2cc214224b6e1490c959511ecc1d15c3050f87d3bb33ebbd3316986c8b6840d842448407298911cf402
+AUX alienarena-7.66-ar.patch 264 BLAKE2B f1e290ad0cf6f29c93412f8e2277ebcd378740bb44c5a5e668c8d7e5b97b0480d1aed7d049d8541e060cad7b59186bc39e7dbade76b7ca5d11c628a319ca30d2 SHA512 24bad1c2fbb0073e73b4651ef4990b8df9dc8325e46812faa2da1b2295622a630977eaacc7244c86da1d8c8d88a0a7c6f6b3999d51defe1e78b5fe2d32813b60
+AUX alienarena-7.66-format.patch 400 BLAKE2B b98e23612337d8adcb2a0337ea2d7b0b6bcc5f2cafcd4c11996d94198c0bf4904e6ab5dcd33f690e6bfe3aee22a1d4cc85df522be139ee5bfe4c117ec2cbdfa8 SHA512 f64c502e306a7508258c62882711cc2a8b3261ebea2dd12a43624bb21d5c74f361ae82db3c629a3e903eab166c25013473fc4f0739bddc476e6740a06b69e2a6
 DIST alienarena-7.66-linux20130827.tar.gz 617636649 BLAKE2B 9f15772f12329dc48496d3f998f2913e801b3d2523be63c1b87b72ca278d70cbb32b676652b5287cc7adc5aeb98f7afdf4160a1f9125c1c92b63bf502809e08d SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3
-EBUILD alienarena-20130827-r1.ebuild 1496 BLAKE2B 5a300f1d79c38cf061b19d0901fd34c65d76ca9658e7c20cf4381087027b000089f1d1bd83e2f568f984c3ce4289e00ea536bea2d039b379894c8fe8bcbaa0fe SHA512 ffdfc4d2ff979c6bf1cd78508328916cdded0791d045223a38491b2a1ea2cdb63798035513a59d60e1afaafe110d7c8eba8c872feadc4304d6963fbf01387e5c
+EBUILD alienarena-7.66.ebuild 1512 BLAKE2B 8ce31045d3e119cc6e2c3498cc6bdf9dc98ef873f16bae314d43d0dc1f760332afe7ad4b7928b2d2528a3118ddf7cb1ecc3143c60dc33bd1248fb28fc7845f7f SHA512 dbd9746d4ecab3c99cc308199d13f8159e49b6a2e4fa58879e6cededd825d6a2e4252dd407fabbd1afad9f15fd46c4351c6098c24a98ba27cefdaf87f15f6aba
 MISC metadata.xml 377 BLAKE2B 7eb47fff4c65e732aeba6aa299d74e2e8bbb70b2ae0236c2ea9fe821829e5fc4d1a2d2658de762fd238ed9884e65fe822f1b8f9cf7b3bf92a69cf9e4680ca0f9 SHA512 50fc923e0986e11991d55b60137facbf8234dd9d180336664030a1c3d7dfa60665326e1937170b1803577cc55774a806824e2611fb3a1552d31426da5f662b4d
diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
deleted file mode 100644
index 8f32fffbdf54..000000000000
--- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-MY_PN="alienarena-7.66"
-
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
-	http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +dga +vidmode +zlib"
-
-UIRDEPEND="
-	virtual/jpeg:0
-	media-libs/openal
-	media-libs/libvorbis
-	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
-	dga? ( x11-libs/libXxf86dga )
-	vidmode? ( x11-libs/libXxf86vm )
-	zlib? ( sys-libs/zlib )
-	net-misc/curl
-"
-UIDEPEND="
-	dga? ( x11-base/xorg-proto )
-	vidmode? ( x11-base/xorg-proto )
-"
-RDEPEND="!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
-	!dedicated? ( ${UIDEPEND} )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN/_/.}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
-
-src_configure() {
-	econf \
-		--with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
-		--without-system-libode \
-		--disable-documents \
-		$(use_enable !dedicated client) \
-		$(use_with zlib) \
-		$(use_with vidmode xf86vm) \
-		$(use_with dga xf86dga)
-}
-
-src_install() {
-	DOCS="docs/README.txt README" default
-	if ! use dedicated ; then
-		make_desktop_entry ${PN} "Alien Arena"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/alienarena/alienarena-7.66.ebuild b/games-fps/alienarena/alienarena-7.66.ebuild
new file mode 100644
index 000000000000..1630e7efd263
--- /dev/null
+++ b/games-fps/alienarena/alienarena-7.66.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic xdg
+
+MY_P="${P}-linux20130827"
+
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="
+	http://icculus.org/alienarena/Files/${MY_P}.tar.gz
+	http://red.planetarena.org/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode +zlib"
+
+RDEPEND="
+	!dedicated? (
+		media-libs/freetype:2
+		media-libs/libvorbis
+		media-libs/openal
+		net-misc/curl
+		virtual/glu
+		virtual/jpeg:0
+		virtual/opengl
+		dga? ( x11-libs/libXxf86dga )
+		vidmode? ( x11-libs/libXxf86vm )
+		zlib? ( sys-libs/zlib )
+	)"
+DEPEND="${RDEPEND}
+	!dedicated? (
+		dga? ( x11-base/xorg-proto )
+		vidmode? ( x11-base/xorg-proto )
+	)"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-C99-inline.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# too many variables defined in .h to patch, https://bugs.gentoo.org/707814
+	append-cflags -fcommon
+
+	econf \
+		--with-icondir="${EPREFIX}/usr/share/icons/hicolor/48x48/apps/" \
+		--without-system-libode \
+		--disable-documents \
+		$(use_enable !dedicated client) \
+		$(use_with zlib) \
+		$(use_with vidmode xf86vm) \
+		$(use_with dga xf86dga)
+}
+
+src_install() {
+	DOCS=( docs/README.txt README )
+	default
+
+	use !dedicated && make_desktop_entry ${PN} "Alien Arena"
+}
diff --git a/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch
new file mode 100644
index 000000000000..0b9166a2631f
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo@debian.org>
+Date: Fri, 18 Aug 2017 23:24:22 +0200
+Subject: gcc7
+
+Fix FTBFS with GCC 7.
+
+Bug-Debian: https://bugs.debian.org/871218
+Forwarded: no
+---
+ source/ref_gl/r_iqm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/ref_gl/r_iqm.c b/source/ref_gl/r_iqm.c
+index ba5d178..cb3d2da 100644
+--- a/source/ref_gl/r_iqm.c
++++ b/source/ref_gl/r_iqm.c
+@@ -1263,7 +1263,7 @@ void IQM_Vlight (vec3_t baselight, mnormal_t *normal, vec3_t angles, vec3_t ligh
+ void R_Mesh_SetupShell (int shell_skinnum, qboolean ragdoll, qboolean using_varray, vec3_t lightcolor);
+ void R_Mesh_SetupGLSL (int skinnum, rscript_t *rs, vec3_t lightcolor);
+ 
+-inline void IQM_DrawVBO (qboolean tangents)
++void IQM_DrawVBO (qboolean tangents)
+ {
+ 	qglEnableClientState( GL_VERTEX_ARRAY );
+ 	GL_BindVBO(vbo_xyz);
diff --git a/games-fps/alienarena/files/alienarena-7.66-ar.patch b/games-fps/alienarena/files/alienarena-7.66-ar.patch
new file mode 100644
index 000000000000..7674e00e561d
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-7.66-ar.patch
@@ -0,0 +1,13 @@
+Fix for -native-symlinks
+
+diff -r 262952236ff5 configure.ac
+--- a/configure.ac	Sun Oct 11 11:33:09 2020 +0000
++++ b/configure.ac	Sun Oct 11 11:33:37 2020 +0000
+@@ -65,6 +65,7 @@
+ AC_PROG_RANLIB
+ AC_PROG_MKDIR_P
+ AM_PROG_CC_C_O
++AM_PROG_AR
+ PKG_PROG_PKG_CONFIG
+ 
+ 
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-7.66-format.patch
index 3162a558afad..3162a558afad 100644
--- a/games-fps/alienarena/files/alienarena-20130827-format.patch
+++ b/games-fps/alienarena/files/alienarena-7.66-format.patch
diff --git a/games-fps/avp/Manifest b/games-fps/avp/Manifest
index 372a3bd1ee63..5f92d5f837e2 100644
--- a/games-fps/avp/Manifest
+++ b/games-fps/avp/Manifest
@@ -1,3 +1,4 @@
+AUX avp-20150214-fno-common.patch 458 BLAKE2B dcc21e9ff1b85497ec1d9434e153deb181d3d535629ad3caf0d0843a27921ebe43dc72b3fe6ce7235f456c246df9e1c6be1e251b65ae10bd0260a6e9e92b86de SHA512 bbd7791f386de34dee55f29c24ddab8e0ccf3094c1a1bb940b68fa85853010c8b12f40934356724d3678daf171393e288aa69405395560375dde05be314a33e6
 DIST avp-20150214.tar.gz 1718303 BLAKE2B cc328bdb8c35046d7bde587c7feff22e890c2c68c4890ef431ccd0b3acfbbd08c784164f59a0111a6d0b6ded63a8edfb026b17e92f74554b9a948426be8c8185 SHA512 c485a55ff455498bcf82bc17f2056d35d4c646bdf7809f4c326fc7063a9ce5db9e4893af67dff3f6bedb7d5f96e82f792d7f516044fdbab638113091a5505158
-EBUILD avp-20150214-r1.ebuild 853 BLAKE2B 4d36bc15b891a0a30a04b3ccdb077afa93d4594c9314b92d1522f643b124d598fb3c723934ceaa1c3458765c717167585e47838450a629713c9b57170920a354 SHA512 a4a61535565aca35c1460cd01730331862c2fe0395876961e7844995a2a5953ed8d86ff8b359b38558e824e3c05397dae505f8747f73ffaf1a121347c26812ea
+EBUILD avp-20150214-r1.ebuild 817 BLAKE2B 745002263b58ed7cd3b322b39d1ddefcf14c1be1ce658ed9e754ec692daf42639ac13d99c4320528af3d8680add247d95f45e136d33e3256455841058345c9ac SHA512 641e557a63ee8654682c836e97d77f39ee5f46813361eeb65cc09457a5b33f7d5b3836afb256878c690d6b499d17d788540ed93ac7ef3bbd67d4a8a2eb133849
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/avp/avp-20150214-r1.ebuild b/games-fps/avp/avp-20150214-r1.ebuild
index 7a41b588eaad..fb38321a71fb 100644
--- a/games-fps/avp/avp-20150214-r1.ebuild
+++ b/games-fps/avp/avp-20150214-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils cmake-utils
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Linux port of Aliens vs Predator"
 HOMEPAGE="http://www.icculus.org/avp/"
@@ -11,36 +12,30 @@ SRC_URI="http://www.icculus.org/avp/files/${P}.tar.gz"
 LICENSE="AvP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	media-libs/libsdl[video,joystick,opengl]
 	media-libs/openal"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-CMAKE_BUILD_TYPE=Release
+PATCHES=( "${FILESDIR}"/avp-20150214-fno-common.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
 		-DSDL_TYPE=SDL
 		-DOPENGL_TYPE=OPENGL
 	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
+	cmake_src_configure
 }
 
 src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-	dodoc README
+	dobin "${BUILD_DIR}"/avp
+	einstalldocs
 }
 
 pkg_postinst() {
-	elog "Please follow the instructions in /usr/share/doc/${PF}"
+	elog "Please follow the instructions in ${EROOT}/usr/share/doc/${PF}"
 	elog "to install the rest of the game."
 }
diff --git a/games-fps/avp/files/avp-20150214-fno-common.patch b/games-fps/avp/files/avp-20150214-fno-common.patch
new file mode 100644
index 000000000000..0f25b1cf267f
--- /dev/null
+++ b/games-fps/avp/files/avp-20150214-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/avp/win95/d3d_render.cpp
++++ b/src/avp/win95/d3d_render.cpp
+@@ -2990,7 +2990,7 @@
+ //#define WATER_POLY_SCALE 256
+ int MeshXScale;
+ int MeshZScale;
+-int WaterFallBase;
++extern int WaterFallBase;
+ void PostLandscapeRendering(void)
+ {
+ 	extern int NumOnScreenBlocks;
+--- a/src/opengl.c
++++ b/src/opengl.c
+@@ -2796,7 +2796,7 @@
+ 
+ int MeshXScale;
+ int MeshZScale;
+-int WaterFallBase;
++extern int WaterFallBase;
+ 
+ int WaterXOrigin;
+ int WaterZOrigin;
diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest
index ccd5a3e5dc1b..16b478c29cc9 100644
--- a/games-fps/chocolate-doom/Manifest
+++ b/games-fps/chocolate-doom/Manifest
@@ -11,8 +11,8 @@ AUX chocolate-doom-3.0.1-bash-completion-run-docgen-with-z-argument.patch 892 BL
 AUX chocolate-doom-3.0.1-configure-add-AM_PROG_AR-macro.patch 753 BLAKE2B c3e93573a6db50a12f0b371907494abe15c0219531eee8e3c048cf4d2dd6820a98addb554f97f6a76ba407ab8f3f0361ec6371da8ad981f4eeaa3130803144e1 SHA512 adfca882ffd5fcb5ded12392f735d3c77cd62798b8bf3c7f524c10560b5737053208690815622ad2fadb87a5de5033dae270773b3054ebdba331bf390f03a70a
 AUX chocolate-doom-3.0.1-further-manpage-substitutions-and-fixes.patch 13342 BLAKE2B 8ceec61cdae27a31a019080dd9dc77256ecf492212b2528f70508496832f3e77f61711db604752d87ffb3501161b3f787c5ac734536e45b494ca59b8e40d635c SHA512 c13e2049c254f8172202132ce087c5132f263c00b1100c78ce1238f30050dde365b9a77a33447487bf108ddfea9eb39f257a370e4dc4f1b0b1a415424263151e
 AUX chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.patch 890 BLAKE2B bed8d484ff1b4640f1626b7bc3b2f1f751b71acf4dacc49cf7318ecbee2de1c7458acd69297c5db00e59d2e647c3cade93a18dcc956a03f84f4c66d49253aa81 SHA512 77490a5b2a4691611b2460eeba10e232f90f88dd87bbfdcd485589841022be65f8d62867100d3228bd94dee839569582182e0e8f940cfb54d8fa16bf3a6e3a60
-AUX chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26737 BLAKE2B ec7955b2a94c918a40394aa57d18c709e33caf3d7724a16333178d2ae7dea5af3fce2e824d4ce6565adc9da8a540e81e9d1f2cfc8c0efbc9720d814b2a5a6013 SHA512 03091ab41580712b8f74b97d4bd6fb0cfdb0b77d49b55282a891a6f30252bd6aee8bf4c3bee03521163696e9ea8e22eb53a1a32789bc2517179fb5ab2cb20eba
 AUX chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch 5485 BLAKE2B d89e14a071349cd772e5f91962429d0cdf152e2acd92be842068ee39569f79f451513a5bbd5a35f6abcd15d3eb73235e429025db1fb320c58f28feb3ca5c1d98 SHA512 e12d7e64baaaab44d8f6372cd057b4622e3758de6fb39365bcb047980eeccb6ec0b571185d084a56ac4c28a1d2916d3a8beef29466bb5d406eced60a3b2ddc6d
+DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554
 DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214
-EBUILD chocolate-doom-3.0.1.ebuild 2373 BLAKE2B 45aa78065367ecc0368701bd8b82cc7c949159e2872194fb77f8ebd52858efdedacb5cbbf9aefb1b9499f46a1138f1fc4b8ce0b61d5d7177bc0e48068dec9124 SHA512 dc9e7e5d007f941431166ec9f4c9eddf7a25fe8e77dc1980f515af30749d09c0ed2c41ba413b19b53791a1e3eac575dcd6b598e956e0cbc14b75b745feb8e935
+EBUILD chocolate-doom-3.0.1.ebuild 2542 BLAKE2B b76b53b7d38911ad46925ac94ca424b30cd50211ce3721b17127e92fa31e1b5c024fbda903ac4797c936bbb81e068fb44ef3406b4d9014c04efcd4199e2a9db1 SHA512 945a609b14c3a2df1504a8ae0fd65a9666cd3a9470a8819ce7e9974aa954787331219e9ddea1f36de06e06cc7b362347cdfeb39c1e04e08b364fe958f094577d
 MISC metadata.xml 1003 BLAKE2B 7d7f22f55c7c99f6578170dbd54c5fb069659e84014435de02b9b4aadc5db709869037f0b3289627e2ea599d9c6b4ee8dc72105efb7618d8a0b067ac916863b2 SHA512 792c554618194cd1a36ee2ec6eab0b63efc7485ea5097059c749beba812f0af3ef53d455c62f74d558efba2a0a906c92cab82e78ccca8f4e55bb298525baf2d6
diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
index 5809e2bf6321..42f25a285d47 100644
--- a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
+++ b/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
@@ -9,7 +9,8 @@ inherit autotools prefix python-any-r1 xdg
 
 DESCRIPTION="A Doom source port that is minimalist and historically accurate"
 HOMEPAGE="https://www.chocolate-doom.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz
+	https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/${P}-overhaul-manpages-add-parameters.patch"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
@@ -30,7 +31,7 @@ BDEPEND="
 S="${WORKDIR}/${PN}-${P}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-overhaul-manpages-add-parameters.patch"
+	"${DISTDIR}/${P}-overhaul-manpages-add-parameters.patch"
 	"${FILESDIR}/${P}-further-manpage-substitutions-and-fixes.patch"
 	"${FILESDIR}/${P}-bash-completion-run-docgen-with-z-argument.patch"
 	"${FILESDIR}/${P}-install-AppStream-metadata-into-the-proper-location.patch"
diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
deleted file mode 100644
index 95e01e53e1f7..000000000000
--- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
+++ /dev/null
@@ -1,695 +0,0 @@
-From e0b8a7e0a9e0ee8c5983b94b849a8a69a5592464 Mon Sep 17 00:00:00 2001
-From: Jonathan Dowland <jon@dow.land>
-Date: Mon, 27 Nov 2017 21:17:55 +0000
-Subject: [PATCH] overhaul manpages, add parameters
-
-This is in order to better support derivative engines.
-
-Rework the manpages to be parameterized with @PROGRAM_PREFIX@ and
-@PACKAGE_NAME@. Alter the `docgen` generator to substitute those
-parameters. Supply those parameters via the autofoo Makefile.
-
-Adjust the fixed path chocolate-server.6 to be generated from
-server.template, similar to doom.template -> chocolate-doom.6.
-
-Further work is required, not least renaming chocolate-setup.6,
-but several further parameterizations.
----
- man/Makefile.am                             | 68 ++++++++++++++-------
- man/bash-completion/Makefile.am             | 13 ++--
- man/chocolate-setup.6                       | 22 +++----
- man/default.cfg.template                    | 18 +++---
- man/docgen                                  | 32 ++++++----
- man/doom.template                           | 30 ++++-----
- man/extra.cfg.template                      | 24 ++++----
- man/heretic.template                        | 20 +++---
- man/hexen.template                          | 20 +++---
- man/{chocolate-server.6 => server.template} | 20 +++---
- man/strife.template                         | 18 +++---
- 11 files changed, 161 insertions(+), 124 deletions(-)
- rename man/{chocolate-server.6 => server.template} (74%)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index cfd2dc66..5916edf9 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -29,7 +29,8 @@ GENERATED_MAN_PAGES =               \
-            @PROGRAM_PREFIX@hexen.cfg.5    \
-            @PROGRAM_PREFIX@strife.6       \
-            strife.cfg.5             \
--           @PROGRAM_PREFIX@strife.cfg.5
-+           @PROGRAM_PREFIX@strife.cfg.5   \
-+           @PROGRAM_PREFIX@server.6
- 
- SETUP_MAN_PAGES =                          \
-            @PROGRAM_PREFIX@doom-setup.6    \
-@@ -37,8 +38,7 @@ SETUP_MAN_PAGES =                          \
-            @PROGRAM_PREFIX@hexen-setup.6   \
-            @PROGRAM_PREFIX@strife-setup.6
- 
--man_MANS = chocolate-server.6             \
--           chocolate-setup.6              \
-+man_MANS = chocolate-setup.6              \
-            $(GENERATED_MAN_PAGES)         \
-            $(SETUP_MAN_PAGES)
- 
-@@ -51,24 +51,29 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
-              $(doomdocs_DATA) $(hereticdocs_DATA) \
-              $(hexendocs_DATA) $(strifedocs_DATA)
- DOCGEN = $(srcdir)/docgen
-+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@"
- 
- $(SETUP_MAN_PAGES): chocolate-setup.6
- 	cp $(srcdir)/chocolate-setup.6 $@
- 
- @PROGRAM_PREFIX@doom.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
--	$(DOCGEN) -g doom -m $(srcdir)/doom.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -m $(srcdir)/doom.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/doom > $@
- 
- default.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
--	$(DOCGEN) -g doom -m $(srcdir)/default.cfg.template \
--                 -c default $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -m $(srcdir)/default.cfg.template \
-+                  -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@doom.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g doom -m $(srcdir)/extra.cfg.template \
--                 -c extended $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -m $(srcdir)/extra.cfg.template \
-+                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.doom : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/doom
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
- 
- INSTALL.doom: INSTALL.template
-@@ -76,19 +81,23 @@ INSTALL.doom: INSTALL.template
- 
- 
- @PROGRAM_PREFIX@heretic.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) heretic.template
--	$(DOCGEN) -g heretic -m $(srcdir)/heretic.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g heretic -m $(srcdir)/heretic.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
- 
- heretic.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
--	$(DOCGEN) -g heretic -m $(srcdir)/default.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g heretic -m $(srcdir)/default.cfg.template \
-                   -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@heretic.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g heretic -m $(srcdir)/extra.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g heretic -m $(srcdir)/extra.cfg.template \
-                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.heretic : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/heretic
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
- 
- INSTALL.heretic: INSTALL.template
-@@ -96,19 +105,23 @@ INSTALL.heretic: INSTALL.template
- 
- 
- @PROGRAM_PREFIX@hexen.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
--	$(DOCGEN) -g hexen -m $(srcdir)/hexen.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g hexen -m $(srcdir)/hexen.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
- 
- hexen.cfg.5: $(top_srcdir)/src default.cfg.template
--	$(DOCGEN) -g hexen -m $(srcdir)/default.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g hexen -m $(srcdir)/default.cfg.template \
-                  -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@hexen.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g hexen -m $(srcdir)/extra.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g hexen -m $(srcdir)/extra.cfg.template \
-                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.hexen : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/hexen
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
- 
- INSTALL.hexen: INSTALL.template
-@@ -116,19 +129,28 @@ INSTALL.hexen: INSTALL.template
- 
- 
- @PROGRAM_PREFIX@strife.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
--	$(DOCGEN) -g strife -m $(srcdir)/strife.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -m $(srcdir)/strife.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/strife > $@
- 
-+@PROGRAM_PREFIX@server.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g server -m $(srcdir)/server.template \
-+                  $(top_srcdir)/src > $@
-+
- strife.cfg.5: $(top_srcdir)/src default.cfg.template
--	$(DOCGEN) -g strife -m $(srcdir)/default.cfg.template \
--                 -c default $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -m $(srcdir)/default.cfg.template \
-+                  -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@strife.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g strife -m $(srcdir)/extra.cfg.template \
--                 -c extended $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -m $(srcdir)/extra.cfg.template \
-+                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.strife : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/strife
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
- 
- INSTALL.strife: INSTALL.template
-diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am
-index 2c036acf..801dd212 100644
---- a/man/bash-completion/Makefile.am
-+++ b/man/bash-completion/Makefile.am
-@@ -19,21 +19,26 @@ CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS)
- 
- MANDIR = $(top_srcdir)/man
- DOCGEN = $(MANDIR)/docgen
-+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@"
- 
- @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g doom -b $(MANDIR)/doom.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -b $(MANDIR)/doom.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/doom > $@
- 
- @PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g heretic -b $(MANDIR)/heretic.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g heretic -b $(MANDIR)/heretic.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
- 
- @PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g hexen -b $(MANDIR)/hexen.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g hexen -b $(MANDIR)/hexen.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
- 
- @PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g strife -b $(MANDIR)/strife.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -b $(MANDIR)/strife.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/strife > $@
- 
- EXTRA_DIST = \
-diff --git a/man/chocolate-setup.6 b/man/chocolate-setup.6
-index 21c9d5d4..64f65937 100644
---- a/man/chocolate-setup.6
-+++ b/man/chocolate-setup.6
-@@ -1,20 +1,20 @@
--.TH chocolate\-setup 6
-+.TH @PROGRAM_SPREFIX@\-setup 6
- .SH NAME
--chocolate\-setup \- configuration tool for chocolate\-doom
-+@PROGRAM_SPREFIX@\-setup \- configuration tool for @PROGRAM_SPREFIX@\-doom
- .SH SYNOPSIS
--.B chocolate\-setup
-+.B @PROGRAM_SPREFIX@\-setup
- [OPTIONS]
- .SH DESCRIPTION
- .PP
--Chocolate Doom is a modern Doom engine designed to behave
-+@PACKAGE_NAME@ is a modern Doom engine designed to behave
- as similar to the original Doom game as is possible.
- .PP
--.B chocolate\-setup
--is a tool for configuring Chocolate Doom. It provides a menu\-based
-+.B @PROGRAM_SPREFIX@\-setup
-+is a tool for configuring @PACKAGE_NAME@. It provides a menu\-based
- interface for the display, joystick, keyboard, mouse, sound and
- compatibility settings.
- .PP
--.B chocolate\-setup
-+.B @PROGRAM_SPREFIX@\-setup
- can also be used to start and join network games.
- .PP
- .SH OPTIONS
-@@ -23,15 +23,15 @@ can also be used to start and join network games.
- Load configuration from the specified file, instead of default.cfg. 
- .TP
- \fB-extraconfig <file>\fR
--Load extra configuration from the specified file, instead of chocolate-doom.cfg. 
-+Load extra configuration from the specified file, instead of @PROGRAM_SPREFIX@\-doom.cfg. 
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
-+\fB@CHOCOLATE_SPREFIX@\-doom\fR(6),
- \fBdefault.cfg\fR(5),
--\fBchocolate-doom.cfg\fR(5)
-+\fB@CHOCOLATE_SPREFIX@\-doom.cfg\fR(5)
- .SH AUTHOR
- Chocolate Doom is written and maintained by Simon Howard.
- .PP
--This manual was written by Jon Dowland.
-+This manual was written by Jonathan Dowland.
- .SH COPYRIGHT
- Copyright \(co id Software Inc.
- Copyright \(co 2005-8 Simon Howard.
-diff --git a/man/default.cfg.template b/man/default.cfg.template
-index 5cf6256f..70c0d657 100644
---- a/man/default.cfg.template
-+++ b/man/default.cfg.template
-@@ -1,21 +1,21 @@
- .TH default.cfg 5
- .SH NAME
--default.cfg \- Chocolate Doom configuration file
-+default.cfg \- @PACKAGE_NAME@ configuration file
- .SH DESCRIPTION
- .PP
- \fIdefault.cfg\fR
--is the configuration file for \fBchocolate-doom\fR(6).  The configuration
-+is the configuration file for \fB@PROGRAM_SPREFIX@\-doom\fR(6).  The configuration
- options stored in the file are the same as those stored in the
- original DOS Vanilla Doom. 
--Extra Chocolate Doom-specific options are stored in a separate 
--configuration file, \fBchocolate-doom.cfg\fR.
-+Extra @PACKAGE_NAME@-specific options are stored in a separate 
-+configuration file, \fB@PROGRAM_SPREFIX@\-doom.cfg\fR.
- .PP
- \fIdefault.cfg\fR is normally stored in the user's home directory,
--as \fI~/.local/share/chocolate-doom/default.cfg\fR.  The path can be
-+as \fI~/.local/share/@PROGRAM_SPREFIX@\-doom/default.cfg\fR.  The path can be
- overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
- Base Directory Specification).
- .PP
--The \fBchocolate-setup\fR(6) tool provides a simple to use front-end
-+The \fB@PROGRAM_SPREFIX@\-setup\fR(6) tool provides a simple to use front-end
- for editing \fIdefault.cfg\fR.
- .br
- .SH FILE FORMAT
-@@ -49,7 +49,7 @@ indicating "false" and a non-zero value indicating "true".
- @content
- 
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-doom.cfg\fR(5),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- 
-diff --git a/man/docgen b/man/docgen
-index e477e74e..defb9060 100755
---- a/man/docgen
-+++ b/man/docgen
-@@ -430,7 +430,7 @@ def process_files(path):
- 
-         process_file(path)
- 
--def print_template(template_file, content):
-+def print_template(template_file, program_prefix, package_name, content):
-     f = io.open(template_file, encoding='UTF-8')
- 
-     try:
-@@ -440,14 +440,16 @@ def print_template(template_file, content):
-                 filename = match.group(1)
-                 filename = os.path.join(os.path.dirname(template_file),
-                                         filename)
--                print_template(filename, content)
-+                print_template(filename, program_prefix, package_name, content)
-             else:
-                 line = line.replace("@content", content)
-+                line = line.replace("@PROGRAM_SPREFIX@", program_prefix)
-+                line = line.replace("@PACKAGE_SHORTNAME@", package_name)
-                 stdout(line.rstrip().encode('UTF-8') + b'\n')
-     finally:
-         f.close()
- 
--def manpage_output(targets, template_file):
-+def manpage_output(targets, program_prefix, package_name, template_file):
- 
-     content = ""
- 
-@@ -456,7 +458,7 @@ def manpage_output(targets, template_file):
- 
-     content = content.replace("-", "\\-")
- 
--    print_template(template_file, content)
-+    print_template(template_file, program_prefix, package_name, content)
- 
- def wiki_output(targets, template):
-     read_wikipages()
-@@ -464,29 +466,31 @@ def wiki_output(targets, template):
-     for t in targets:
-         stdout(t.wiki_output().encode('UTF-8') + b'\n')
- 
--def plaintext_output(targets, template_file):
-+def plaintext_output(targets, program_prefix, package_name, template_file):
- 
-     content = ""
- 
-     for t in targets:
-         content += t.plaintext_output() + "\n"
- 
--    print_template(template_file, content)
-+    print_template(template_file, program_prefix, package_name, content)
- 
--def completion_output(targets, template_file):
-+def completion_output(targets, program_prefix, package_name, template_file):
- 
-     content = ""
- 
-     for t in targets:
-         content += t.completion_output() + "\n"
- 
--    print_template(template_file, content)
-+    print_template(template_file, program_prefix, package_name, content)
- 
- def usage():
--    print("Usage: %s [-V] [-c tag] [-g game] ( -m | -w | -p ) <dir>..." \
-+    print("Usage: %s [-V] [-c tag] [-g game] -n name ( -m | -w | -p ) <dir>..." \
-             % sys.argv[0])
-     print("   -c :  Provide documentation for the specified configuration file")
-     print("         (matches the given tag name in the source file)")
-+    print("   -s :  Package name (for substitution)")
-+    print("   -n :  Program name (for substitution)")
-     print("   -m :  Manpage output")
-     print("   -w :  Wikitext output")
-     print("   -p :  Plaintext output")
-@@ -497,14 +501,20 @@ def usage():
- 
- # Parse command line
- 
--opts, args = getopt.getopt(sys.argv[1:], "m:wp:b:c:g:V")
-+opts, args = getopt.getopt(sys.argv[1:], "n:s:m:wp:b:c:g:V")
- 
- output_function = None
- template = None
- doc_config_file = None
- match_game = None
-+program_prefix = None
-+package_name = None
- 
- for opt in opts:
-+    if opt[0] == "-n":
-+        program_prefix = opt[1]
-+    if opt[0] == "-s":
-+        package_name = opt[1]
-     if opt[0] == "-m":
-         output_function = manpage_output
-         template = opt[1]
-@@ -546,5 +556,5 @@ else:
- 
-     # Generate the output
- 
--    output_function(documentation_targets, template)
-+    output_function(documentation_targets, program_prefix, package_name, template)
- 
-diff --git a/man/doom.template b/man/doom.template
-index 845147a8..da8d2141 100644
---- a/man/doom.template
-+++ b/man/doom.template
-@@ -1,35 +1,35 @@
--.TH chocolate\-doom 6
-+.TH @PROGRAM_SPREFIX@\-doom 6
- .SH NAME
--chocolate\-doom \- historically compatible Doom engine
-+@PROGRAM_SPREFIX@\-doom \- historically compatible Doom engine
- .SH SYNOPSIS
--.B chocolate\-doom
-+.B @PROGRAM_SPREFIX@\-doom
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
--Chocolate Doom is a port of Id Software's 1993 game "Doom" that is designed
-+@PACKAGE_NAME@ is a port of Id Software's 1993 game "Doom" that is designed
- to behave as similar to the original DOS version of Doom as is possible.
- .br
- @content
- .SH IWAD SEARCH PATHS
- @include iwad_paths.man
- .SH ENVIRONMENT
--This section describes environment variables that control Chocolate Doom's
-+This section describes environment variables that control @PACKAGE_NAME@'s
- behavior.
- @include environ.man
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/default.cfg\fR
--The main configuration file for Chocolate Doom.  See \fBdefault.cfg\fR(5).
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/default.cfg\fR
-+The main configuration file for @PACKAGE_NAME@.  See \fBdefault.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-doom.cfg\fR
--Extra configuration values that are specific to Chocolate Doom and not
--present in Vanilla Doom.  See \fBchocolate-doom.cfg\fR(5).
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-doom.cfg\fR
-+Extra configuration values that are specific to @PACKAGE_NAME@ and not
-+present in Vanilla Doom.  See \fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6),
--\fBchocolate-heretic\fR(6),
--\fBchocolate-hexen\fR(6),
--\fBchocolate-strife\fR(6)
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6),
-+\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
-+\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
-+\fB@PROGRAM_SPREFIX@\-strife\fR(6)
- .SH AUTHOR
- Chocolate Doom is written and maintained by Simon Howard.  It is based on
- the LinuxDoom source code, released by Id Software.
-diff --git a/man/extra.cfg.template b/man/extra.cfg.template
-index b9317c53..77cc0dd3 100644
---- a/man/extra.cfg.template
-+++ b/man/extra.cfg.template
-@@ -1,23 +1,23 @@
--.TH chocolate-doom.cfg 5
-+.TH @PROGRAM_SPREFIX@\-doom.cfg 5
- .SH NAME
--chocolate-doom.cfg \- Chocolate Doom configuration file
-+@PROGRAM_SPREFIX@\-doom.cfg \- @PACKAGE_NAME@ configuration file
- .SH DESCRIPTION
- .PP
--\fIchocolate-doom.cfg\fR
--is a configuration file for \fBchocolate-doom\fR(6).  This file acts
-+\fI@PROGRAM_SPREFIX@\-doom.cfg\fR
-+is a configuration file for \fB@PROGRAM_SPREFIX@\-doom\fR(6).  This file acts
- as an auxiliary configuration file; the main configuration options
- are stored in \fBdefault.cfg\fR, which contains the same configuration
--options as Vanilla Doom (for compatibility).  \fIchocolate-doom.cfg\fR
--contains configuration options that are specific to Chocolate Doom
-+options as Vanilla Doom (for compatibility).  \fI@PROGRAM_SPREFIX@\-doom.cfg\fR
-+contains configuration options that are specific to @PACKAGE_NAME@
- only.
- .PP
--\fIchocolate-doom.cfg\fR is normally stored in the user's home directory,
--as \fI~/.local/share/chocolate-doom/chocolate-doom.cfg\fR.  The path can be
-+\fI@PROGRAM_SPREFIX@\-doom.cfg\fR is normally stored in the user's home directory,
-+as \fI~/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-doom.cfg\fR.  The path can be
- overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
- Base Directory Specification).
- .PP
--The \fBchocolate-setup\fR(6) tool provides a simple to use front-end
--for editing \fIchocolate-doom.cfg\fR.
-+The \fB@PROGRAM_SPREFIX@\-setup\fR(6) tool provides a simple to use front-end
-+for editing \fI@PROGRAM_SPREFIX@\-doom.cfg\fR.
- .SH FILE FORMAT
- .PP
- The file format is the same as that used for \fBdefault.cfg\fR(5).
-@@ -26,7 +26,7 @@ The file format is the same as that used for \fBdefault.cfg\fR(5).
- @content
- 
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
- \fBdefault.cfg\fR(5),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- 
-diff --git a/man/heretic.template b/man/heretic.template
-index 944d4a83..c078c7c6 100644
---- a/man/heretic.template
-+++ b/man/heretic.template
-@@ -1,8 +1,8 @@
--.TH chocolate\-heretic 6
-+.TH @PROGRAM_SPREFIX@\-heretic 6
- .SH NAME
--chocolate\-heretic \- historically compatible Heretic engine
-+@PROGRAM_SPREFIX@\-heretic \- historically compatible Heretic engine
- .SH SYNOPSIS
--.B chocolate\-heretic
-+.B @PROGRAM_SPREFIX@\-heretic
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
-@@ -19,17 +19,17 @@ behavior.
- @include environ.man
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/heretic.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/heretic.cfg\fR
- The main configuration file for Chocolate Heretic.  See \fBheretic.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-heretic.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-heretic.cfg\fR
- Extra configuration values that are specific to Chocolate Heretic and not
--present in Vanilla Heretic. See \fBchocolate-heretic.cfg\fR(5).
-+present in Vanilla Heretic. See \fB@PROGRAM_SPREFIX@\-heretic.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-hexen\fR(6),
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- .SH AUTHOR
- Chocolate Heretic is part of the Chocolate Doom project, written and
- maintained by Simon Howard. It is based on the Heretic source code,
-diff --git a/man/hexen.template b/man/hexen.template
-index 7772b1d4..9184a27e 100644
---- a/man/hexen.template
-+++ b/man/hexen.template
-@@ -1,8 +1,8 @@
--.TH chocolate\-hexen 6
-+.TH @PROGRAM_SPREFIX@\-hexen 6
- .SH NAME
--chocolate\-hexen \- historically compatible Hexen engine
-+@PROGRAM_SPREFIX@\-hexen \- historically compatible Hexen engine
- .SH SYNOPSIS
--.B chocolate\-hexen
-+.B @PROGRAM_SPREFIX@\-hexen
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
-@@ -19,17 +19,17 @@ behavior.
- @include environ.man
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/hexen.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/hexen.cfg\fR
- The main configuration file for Chocolate Hexen.  See \fBhexen.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-hexen.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-hexen.cfg\fR
- Extra configuration values that are specific to Chocolate Hexen and not
--present in Vanilla Hexen.  See \fBchocolate-hexen.cfg\fR(5).
-+present in Vanilla Hexen.  See \fB@PROGRAM_SPREFIX@\-hexen.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-heretic\fR(6),
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- .SH AUTHOR
- Chocolate Hexen is part of the Chocolate Doom project, written and
- maintained by Simon Howard. It is based on the Hexen source code,
-diff --git a/man/chocolate-server.6 b/man/server.template
-similarity index 74%
-rename from man/chocolate-server.6
-rename to man/server.template
-index 74dc6f42..643779f6 100644
---- a/man/chocolate-server.6
-+++ b/man/server.template
-@@ -1,18 +1,18 @@
--.TH chocolate\-server 6
-+.TH @PROGRAM_SPREFIX@\-server 6
- .SH NAME
--chocolate\-server \- dedicated server for chocolate\-doom
-+@PROGRAM_SPREFIX@\-server \- dedicated server for @PROGRAM_SPREFIX@\-doom
- .SH SYNOPSIS
--.B chocolate\-server
-+.B @PROGRAM_SPREFIX@\-server
- [OPTIONS]
- .SH DESCRIPTION
- .PP
--Chocolate Doom is a modern doom engine designed to behave
-+@PACKAGE_SHORTNAME@ is a modern doom engine designed to behave
- as similar to the original doom game as is possible.
- .PP
--.B chocolate\-server
--is a dedicated server for Chocolate Doom. It is equivalent to 
-+.B @PROGRAM_SPREFIX@\-server
-+is a dedicated server for @PACKAGE_SHORTNAME@. It is equivalent to 
- running 
--.B chocolate\-doom
-+.B @PROGRAM_SPREFIX@\-doom
- with the "\-dedicated" option.
- .PP
- Game options are not specified to the server, which merely acts to
-@@ -36,12 +36,12 @@ Don't register with the global master server.
- \fB-servername <name>\fR
- Specify a name for the server.
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@-setup\fR(6)
- .SH AUTHOR
- Chocolate Doom is written and maintained by Simon Howard.
- .PP
--This manual was written by Jon Dowland.
-+This manual was written by Jonathan Dowland.
- .SH COPYRIGHT
- Copyright \(co id Software Inc.
- Copyright \(co 2005-8 Simon Howard.
-diff --git a/man/strife.template b/man/strife.template
-index d616c17b..9ca7f14e 100644
---- a/man/strife.template
-+++ b/man/strife.template
-@@ -1,8 +1,8 @@
--.TH chocolate\-strife 6
-+.TH @PROGRAM_SPREFIX@\-strife 6
- .SH NAME
--chocolate\-strife \- historically compatible strife engine
-+@PROGRAM_SPREFIX@\-strife \- historically compatible Strife engine
- .SH SYNOPSIS
--.B chocolate\-strife
-+.B @PROGRAM_SPREFIX@\-strife
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
-@@ -22,16 +22,16 @@ behavior.
- 
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/strife.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/strife.cfg\fR
- The main configuration file for Chocolate Strife.  See \fBstrife.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-strife.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-strife.cfg\fR
- Extra configuration values that are specific to Chocolate Strife and not
--present in Vanilla Strife.  See \fBchocolate-strife.cfg\fR(5).
-+present in Vanilla Strife.  See \fB@PROGRAM_SPREFIX@\-strife.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- 
- .SH HISTORY
- The source code for Strife was lost, which means, unlike the code for all the
--- 
-2.26.2
-
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 71fc10263a02..9689b64de99f 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1,3 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-EBUILD doomsday-2.1.1-r1.ebuild 2022 BLAKE2B a45fe50a076d2f7e6769d5e33b16b0ed7885fb77c83ceb531e9f13f8c23dc6b6058252772eab6315fc61bc2f6d00b710ff89493b2c8d3e539f94c415358041cd SHA512 21dfcc5e015161b97472f172b4494772707c4f6acc64bcf0a702d20d4470ba20bdc11e6cbc041ae80c241c5f0647e17aa9906032c55231562301e18fa86b4e41
+EBUILD doomsday-2.1.1-r1.ebuild 2045 BLAKE2B 3f48f09f357c53fe7c0e96c85d747ef1211b0aa26a8ceca561ea4611c15d4a21a747a3b623ed2a35749be0b1f4fe4f04dd9870b7172b02a995c84d2f457690d1 SHA512 fe309cf8aa0c04651587496bae8d7cccf9234aec68fb2b43a2d6c0f87b79e68f9f33c51c98ee3589f108bc8bf44576a48ca3365884fff8e702f23da5307902c4
 MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index eb08301295ed..8aa9456f5752 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake python-any-r1 readme.gentoo-r1
+inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="https://www.dengine.net"
 SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
+
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -31,8 +32,7 @@ RDEPEND="
 	tools? ( sys-libs/ncurses:0= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 PDEPEND="
@@ -52,11 +52,11 @@ src_prepare() {
 }
 
 src_configure() {
-	export QT_SELECT=qt5
 	local mycmakeargs=(
 		-DDENG_ASSIMP_EMBEDDED="OFF"
 		-DDENG_ENABLE_TOOLS="$(usex tools)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DQMAKE=$(qt5_get_bindir)/qmake
 	)
 	cmake_src_configure
 }
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index bac14ee9e407..814736cec989 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -2,6 +2,7 @@ AUX eduke32-20190820.8043-log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144
 AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-20200505.8904-gcc10.patch 294 BLAKE2B fe527a1a38b17731322dd5d7c9c1ea16dce86eb2c023966a28e87477c9b25001294fcda456fc2bdbfdfbbefb67991e67f9693db69ef18d8485035546e231e0cf SHA512 a79859e6f167203ee0d09db1740cfd223e0e196f2ed5f65e51830e27c8a7bf284ff9bd20d1527dfc2679a08f1ec2aa92a1e582599e656bd0e655bfda189608c7
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
+AUX voidsw-bin 265 BLAKE2B 61ff722fbf4a161aaf0851d00fe3c4c0ecd9544ef95e9d19df779b52feedbaba3a40c5b094b4ef21360b00e10058fc2773de0971dc4427b9c0e8ca6e135d5890 SHA512 ffeaca39dde274b4eec2cb3d2e59e2503140b3a6fe1451abd57557e3030ecc89425ae98beecf2595920d338b72b582ce40d8439c11b63ac1935cfbf409d9c6e5
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
@@ -9,6 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200829-9253-156963ddc.tar.xz 19786792 BLAKE2B beff97aa7fa6e0db841abddfba6287034b501c6c727239157e986ded0993edf5bfbb891138d95e54a181b1f769b4a36a0406cceb531fed4a5b2c9cdd63dd59e9 SHA512 f69ad01c958cc180e75e4f6c231106634f57257b3d8fd14db5b5079721633df4dde8b72c93397fa75c2782735eb5baf0e00708b2fc5d8781e36c6cda9b949f4d
-EBUILD eduke32-20200829.9253.ebuild 5825 BLAKE2B 5af498587f796380697d51c3b1843a2d0a320a61b0ae33badc433f44d754e0f0264713653e1953d63d5ba89305d968cdd7a06b24a69a19878295eacbdeb01aa6 SHA512 ee28a6597158a2adfc68b3471bf84ec7ce89b35ad106d60acdb6943440425ccde474c8a27d58c6f10185ca65bd4dd41dbf6d45db6c7b940490fb4f1d04324349
-MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
+DIST eduke32_src_20200907-9257-93f62bbad.tar.xz 19787388 BLAKE2B 932bb679ac83320c56284371967e3f18e9d44b2635c743443a2e73511bd62557fb478c035136fc63276b3ada97736c18d05ed809772266d5b16dfdcaf03104d6 SHA512 43b5fd11382cdbc589a32c5f8f2ef36abcd0a41ba0251d4edf1c45466ad2ff875bc237c304b5a6668a44d01fb8f465a761f9e654b306762fa086b40f8bd75284
+EBUILD eduke32-20200907.9257.ebuild 5981 BLAKE2B eff5e356e6614be49a9a29e592588bcb05c4aae00b1fe12b3feee13672317ae1407feafbea099478bd826ff92f2100ab666eb9b006b7f2a173bb38454518a9e5 SHA512 d42dfd9c765621988a46ca098440444124cc976a4e9eec3f1bdc7a9102cc0a9af514884ee64813c8362f9831829b39af48dd2137df218f6e1add01310d0209d6
+MISC metadata.xml 1697 BLAKE2B 76ea172154c71939d93fb4599f516b782682b9d774daf740e8c6a31810926e9a42b9f0c91f131de51975ecde8d2f99a542ddad1757da60b21f4934baadf0222a SHA512 c8f3410f58e8da648e6b0399b5167829d60800aab710df2a370e3976eb27bd1c3f8ad313b964c6e8d47eb22236010ef6bd6bd148b989ee5489122e7b174e17a7
diff --git a/games-fps/eduke32/eduke32-20200829.9253.ebuild b/games-fps/eduke32/eduke32-20200907.9257.ebuild
index bf134c4e55b2..b3342d7aa9ce 100644
--- a/games-fps/eduke32/eduke32-20200829.9253.ebuild
+++ b/games-fps/eduke32/eduke32-20200907.9257.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="156963ddc"
+EGIT_COMMIT="93f62bbad"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -31,7 +31,7 @@ SRC_URI="
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cdinstall demo fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
+IUSE="cdinstall demo fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw vorbis voxels vpx xmp"
 REQUIRED_USE="
 	cdinstall? ( !demo )
 	demo? ( !cdinstall )
@@ -162,13 +162,13 @@ src_compile() {
 
 	emake "${myemakeopts[@]}"
 
-	if use tools; then
-		emake utils "${myemakeopts[@]}"
-	fi
+	use tools && emake utils "${myemakeopts[@]}"
+	use voidsw && emake sw "${myemakeopts[@]}"
 }
 
 src_install() {
 	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
 
 	if use tools; then
 		local tools=(
@@ -209,6 +209,7 @@ src_install() {
 
 	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
 	make_desktop_entry mapster32 Mapster32 eduke32 Game
+	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
 
 	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
 	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
diff --git a/games-fps/eduke32/files/voidsw-bin b/games-fps/eduke32/files/voidsw-bin
new file mode 100644
index 000000000000..5d572204848d
--- /dev/null
+++ b/games-fps/eduke32/files/voidsw-bin
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Get all installed zip files
+zips=$(ls /usr/share/games/eduke32/*.zip)
+
+# Create opts for voidsw
+for zip in ${zips[@]}; do
+	opts+="-g ${zip} "
+done
+
+# Switch to /tmp, for writing there the log file and run voidsw with set opts
+cd /tmp && voidsw ${opts}
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 0ce346f0721f..225b31ad73f5 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="server">Enable support for multiplayer.</flag>
 		<flag name="sdk">Install the SDK files.</flag>
 		<flag name="tools">Install the support tools for mapster32.</flag>
+		<flag name="voidsw">Enable support for Shadow Warrior (Classic) through VoidSW.</flag>
 		<flag name="voxels">Install the Duke Nukem 3D Voxels Pack.</flag>
 		<flag name="vpx">Enable support for <pkg>media-libs/libvpx</pkg>.</flag>
 		<flag name="xmp">Enable support for <pkg>media-libs/exempi</pkg>.</flag>
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 79fece50273d..6ff014848790 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,9 +1,5 @@
-AUX gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 1066 BLAKE2B 9c47664abd809215d3691edcf434e6b1bb22e52ffa08aeea00c7f057719f909b6ce94833fe7e71ed582f1cc3490bbe7a843d911d1b24bef2c53c9f5f808edb3b SHA512 fc3ccd4ccd9994e0544e8e56255ad9d065ef11a004be8fc0a41ee39309d2a05f38b7381193c1c0de8da6bba69bc6212dc1e7c73a93435f781625fe29464e8611
-AUX gzdoom-4.2.1-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
-AUX gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch 1215 BLAKE2B fe3fc937e33124a414abc3de15ede89f5a93a2165c9553eda5c62228bf6bce3a251b082a5a20ff197caf1234544b71d69319fea9eaf09ff091e5abb3167da9ff SHA512 83c5b84bfc972b3b8c6982f9e0f5687911c65982b8406ab8cc171afbc6f4d6c1aeb0072be416a7cdc84e4a3e4c37fdda5a5537713f27405ef59421773d30e718
-AUX gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch 1101 BLAKE2B c66b9e3e6bd76e2ab7609ae073094cefa3231aa2c0c4db20b7c336abaff9d651647a702ef849dfdec97eb8d24cf41e1bfdd43f63aaef70e8b24a359758669e0e SHA512 8dc90a9f36e155aa41712b67dd61c03c4d75c3c6455f1e7f8e4d4969a3d016c3c63b5d01ab16e39669c264f0e89d431eb702541a5de5153599cddb5f8b10b16a
-DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1
-DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b SHA512 cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba
-EBUILD gzdoom-4.3.3.ebuild 2342 BLAKE2B 5144a68cf0e6bc01f4e8153b87d858df53a360117331eae2c55f6c0202db45bdd82dab6eef12213e1f6373b836a6ccbcaf9db99fe111dc8dd469471a88ad0c20 SHA512 ad3451f9539dfbfd4af50ea97b2082e98e98ac05fe85155c0642c524d7e285537b98710ad9eee00a6d9ae545208a263a6420c6063b6de8ae457f0295642c59d0
-EBUILD gzdoom-4.4.2.ebuild 2032 BLAKE2B 6fa7ef768f91194eebae824700e712d746d31f673783e1be31a31bdbb2345dadce106090e69da172e5a1d1961f5b36c76201bc9df3903abb4439128a69da19ff SHA512 6b9a42d6945e1188f73b2a20a14adde4bd75a4568adf28b92306f8ed736ae62201f3d7ccb9647d01171ee6ea27eb28c32c23258337920c72176013050839d9b1
-MISC metadata.xml 1015 BLAKE2B 16dbdbd90a49effad802577e71d8e8026bb9b42d95480cc84a3b755f0f052b6741beae770c45fceb5352776a7e941c60b0ab50f202f82cd787dde735f0839a0b SHA512 021c4ae8ef38c797ed99e7e40ff63010dfe2bc736a8060a8b76c71cf003eeb18f4f9b71c3c65b98471f047205b4693df50cab28ce2ff416e8706a5b53815ef09
+AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1eaff1b9c5de6d2fdd614fb3f6c21b676b1c56283bc3b376bbf31e29c6eed27112c03d8738564215824583338acbfa84289fe69cb78ab8ee613643b4 SHA512 55fecbdbda330ae0e95a3ac99f8780d37ca386704f115680204da5403ad380eec14559f0522f7d2b55e1340aeebb9ecd1cbc41fe61e519689e7bd2feed5745a1
+DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
+DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
+EBUILD gzdoom-4.5.0.ebuild 2183 BLAKE2B bbba5e98ff15aa6273f126d72e493ea07715936346647ad8046094e21282fbf080f49a0ba92e2e28e4220b5dc2e38e7ebdb987868f0071edc549d339cfb81056 SHA512 13e6463e9d3aa140884bb1b40666eef7883a6123e8636f37f14b288b60f288d005514bff1cfa293cb15449850558b40c43102dfd64175c103bbc2563afd3b2c1
+MISC metadata.xml 818 BLAKE2B 5036a4b1f33c1fbe8dda683e35d5b0969bcf939eb2ecc1bb3a1b0c30efe2cc92db3405b31c04cc5416675517b6ed0f9fd0e1029dd81a8a4b53f894533e6bf571 SHA512 de0d5ad463c9dadb7cabf3919ba98d4d245e0d001be36890268b297a6727bb992cbb1785de5a3c9990ed92302fc1242c429b92f78083577140c23645b2a354de
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 5a8460e64199..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 31 Aug 2019 21:23:23 +0900
-Subject: [PATCH] Introduce the BUILD_NONFREE option
-
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
----
- CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2019-10-20 15:16:08.000000000 +0100
-+++ b/CMakeLists.txt	2019-10-24 21:27:58.104006569 +0100
-@@ -444,10 +444,15 @@
- add_subdirectory( libraries/wildmidi )
- add_subdirectory( libraries/oplsynth )
- add_subdirectory( libraries/zmusic )
-+
- add_subdirectory( wadsrc )
--add_subdirectory( wadsrc_bm )
- add_subdirectory( wadsrc_lights )
--add_subdirectory( wadsrc_extra )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+	add_subdirectory( wadsrc_bm )
-+	add_subdirectory( wadsrc_extra )
-+endif()
-+
- add_subdirectory( src )
- 
- if( NOT CMAKE_CROSSCOMPILING )
--- 
-2.23.0
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.
----
- src/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
- 	${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
- 
-+if( WIN32 )
-+	set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+else()
-+	set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+endif()
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks"
-+		DESTINATION ${INSTALL_SOUNDFONT_PATH}
-+		COMPONENT "Soundfont resources")
-+
- if( CMAKE_COMPILER_IS_GNUCXX )
- 	# GCC misoptimizes this file
- 	set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
--- 
-2.21.0
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
deleted file mode 100644
index 779268ca6d7e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Wed, 17 Jun 2020 15:17:49 -0400
-Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library
-
-This makes sure the internal version of this library bundled with the
-GZDoom source code is used. This prevents the system from building
-GZDoom for dynamic linking with an incompatible external library (see
-commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and
-<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
----
- libraries/glslang/spirv/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt
-index 453ac16b5..d39a6e300 100644
---- a/libraries/glslang/spirv/CMakeLists.txt
-+++ b/libraries/glslang/spirv/CMakeLists.txt
-@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
-     SPVRemapper.h
-     doc.h)
- 
--add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
-+add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
- set_property(TARGET SPIRV PROPERTY FOLDER glslang)
- set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(SPIRV PUBLIC
--- 
-2.26.2
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
index d7ece785e25d..64a230dcd984 100644
--- a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -1,35 +1,36 @@
-From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001
+From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001
 From: William Breathitt Gray <vilhelm.gray@gmail.com>
 Date: Sat, 31 Aug 2019 21:23:23 +0900
 Subject: [PATCH] Introduce the BUILD_NONFREE option
 
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
+This allow users to disable building nonfree components (brightmaps.pk3,
+game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
 ---
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4e59452..c2f49b2 100644
+index a3763ec1f..d0c4720bd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma )
+@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma )
  add_subdirectory( tools )
  add_subdirectory( libraries/gdtoa )
  add_subdirectory( wadsrc )
 -add_subdirectory( wadsrc_bm )
  add_subdirectory( wadsrc_lights )
 -add_subdirectory( wadsrc_extra )
+-add_subdirectory( wadsrc_widescreen )
  add_subdirectory( src )
 +option (BUILD_NONFREE "Build nonfree components" ON)
 +if( BUILD_NONFREE )
 +       add_subdirectory( wadsrc_bm )
 +       add_subdirectory( wadsrc_extra )
++       add_subdirectory( wadsrc_widescreen )
 +endif()
-+
  
  if( NOT CMAKE_CROSSCOMPILING )
  	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
 -- 
-2.26.2
+2.28.0
 
diff --git a/games-fps/gzdoom/gzdoom-4.3.3.ebuild b/games-fps/gzdoom/gzdoom-4.3.3.ebuild
deleted file mode 100644
index 1ba984d753b4..000000000000
--- a/games-fps/gzdoom/gzdoom-4.3.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
-HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
-
-DEPEND="
-	media-libs/libsdl2[opengl]
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth:= )
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
-	mpg123? ( media-sound/mpg123 )
-	sndfile? ( media-libs/libsndfile )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
-	"${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-		-DDYN_FLUIDSYNTH=OFF
-		-DDYN_OPENAL=OFF
-		-DDYN_SNDFILE=OFF
-		-DDYN_MPG123=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use non-free ; then
-		ewarn
-		ewarn "GZDoom installed without non-free components."
-		ewarn "Note: The non-free game_support.pk3 file is needed to play"
-		ewarn "      games natively supported by GZDoom."
-		ewarn "A list of games natively supported by GZDoom is available"
-		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
-		ewarn
-	fi
-}
diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index 976f3384a393..bf1ddc570ec4 100644
--- a/games-fps/gzdoom/gzdoom-4.4.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -7,10 +7,11 @@ inherit cmake desktop xdg
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz -> widepix-9273804.tar.gz )"
 
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk gtk2 +non-free openmp"
@@ -31,16 +32,16 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-g${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch"
 	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
-	"${FILESDIR}/${P}-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch"
 )
 
 src_prepare() {
 	rm -rf docs/licenses || die
 	rm -rf libraries/{bzip2,jpeg,zlib} || die
 	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra || die
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+	else
+		mv "${WORKDIR}/WidePix-92738042ca3a37f28153a09809d80a7d61090532/filter" wadsrc_widescreen/static/ || die
 	fi
 
 	cmake_src_prepare
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 73491087ed90..656eb066e47e 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,9 +14,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
-		<flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
 		<flag name="non-free">Enable non-free components</flag>
 	</use>
 	<upstream>
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
index b8da8286d5bf..d016bd218d51 100644
--- a/games-fps/nexuiz/Manifest
+++ b/games-fps/nexuiz/Manifest
@@ -1,5 +1,5 @@
 AUX nexuiz-2.5.2-libpng-1.4.patch 1607 BLAKE2B dbe06a42ecfc2fda130d2eb29a1cbefcf59631b7b5662e73ae8557cf90b7f3083369dc1d277529f09504e1cd74e17a7eee0d6176713b561ad608f9a2e03d9868 SHA512 38aa8fbd0765283c03c0bf6cc13362ed692f4776a12ad23ef582eb9c238fda6eea475284a662ba84d70eab7a7df71a0cb28b5b90f19c12d2594c3ba67f0851aa
 DIST nexmappack_r2.zip 113533483 BLAKE2B 32da18020e80835c0fea24280c4793fc33d017774311fb154ec438de97c46f58608cb83cdc8b27fd033c4086384b5bb3d5ffc9a8841618d7cc54401073cc7d8b SHA512 f7e2dd60530b58f3fc505cdf0d605208b6905136586107210031233cb870b1892bae59efc4fb38403a4f0fc5301321297d03107b38daa501cb90e5669455eac0
 DIST nexuiz-252.zip 931253731 BLAKE2B 620d46cf90ef73cd0039721597d11b7a5924a6614f065d413339f6e01fff8396b49a576bd293f3f64882e51c05fd0dea190eb8c9fbef5ab57cdd26736ccffd4c SHA512 da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c
-EBUILD nexuiz-2.5.2-r1.ebuild 2532 BLAKE2B 2f7f9955e6970fa0b402421246edf312aa0984e5f91aa64618b482f24c8057f8125a50e78e65021fd4e8f79a09f38d3c02987e7a1882d6e9a95a1cfc43638fd7 SHA512 f4dc28ac428b31c352794d2a361cbb41d633cf82fbc1c00eccd520dbe77a7ca1ce84479f6a82d9b596f73ff3a48652ad6f26fade745b30b18faf051478bbd545
+EBUILD nexuiz-2.5.2-r1.ebuild 2553 BLAKE2B fcff261e4cababc230541c1d7ebf7ce4365f6ff1947d0aca0c6d9dab7c544ebcec914124abd5730118fb1b3ca1f2d876bef57167cbf6fc306fb0bf93a5c7a2f5 SHA512 26d1de723465413580cc5a0203ed1fa0d0cfc71171c26702780e1ddf45a3bdc429fb2dc90d948df6dfa2950f397a22f6bc56679d7d17a5487df94e7ca102b8fc
 MISC metadata.xml 416 BLAKE2B 5401c62409ae99347c0ed229edeb5af36b4200b1ba5e9cf35bf70674ac1119fe93bb22bb99f24a4b38b0dfced7d89a724f1985b119b237be1f49c566d27d797a SHA512 f07e139d436fba2f1ef78c41788f8e860258755de93cb8bb1b7f4315b6f9efa140013584f627cbb4cd1d46bb3071021f8d3cef2084e46a81fdd52d9d277ede34
diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
index 2778fcff0c04..68bb3ae1edc8 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+inherit desktop toolchain-funcs
 
 MY_PN=Nexuiz
 MY_P=${PN}-${PV//./}
@@ -69,15 +69,14 @@ src_prepare() {
 
 	# Make the game automatically look in the correct data directory
 	sed -i \
-		-e "/^CC=/d" \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "/-lm/s:$: ${LDFLAGS}:" \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lm/s:$: $(LDFLAGS):' \
 		-e '/^STRIP/s/strip/true/' \
 		makefile.inc || die
 
 	sed -i \
 		-e '1i DP_LINK_TO_LIBJPEG=1' \
-		-e "s:ifdef DP_.*:DP_FS_BASEDIR=/usr/share/${PN}\n&:" \
+		-e "s:ifdef DP_.*:DP_FS_BASEDIR=${EPREFIX}/usr/share/${PN}\n&:" \
 		makefile || die
 
 	if ! use alsa ; then
@@ -88,6 +87,7 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export CC
 	if use opengl || ! use dedicated ; then
 		emake cl-${PN}
 		if use sdl ; then
diff --git a/games-fps/ut2003-data/Manifest b/games-fps/ut2003-data/Manifest
index 265d4ff6066c..33a3ece6c38e 100644
--- a/games-fps/ut2003-data/Manifest
+++ b/games-fps/ut2003-data/Manifest
@@ -1,3 +1,3 @@
 DIST UT2003CrashFix.zip 2764 BLAKE2B 697c35a02f447d0d436fc32bebdeafbca55ef644d951e92085c33f7597108625770b76e027f31287cd2ac66607692ff8c908f6971f936a134d58d0effc2586fc SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444
-EBUILD ut2003-data-2107.ebuild 3943 BLAKE2B c1bd1e3a4139b74cae1d8983abaf947d8edcf9ff39a70b35eed842a14de829fe0e95597ea5113baf8e453dae84794220a6e16f7e88b1dc5c1b297dd634768444 SHA512 fcde8858d48d2754db025283122be15d9b02c82f820c5f04e2fbf42719af073b0861ac0dcb58baee09052e8a61a3c49e305f197bb4fc8641a18f6ff97a945697
+EBUILD ut2003-data-2107.ebuild 3980 BLAKE2B 502c326854ab6ccf87a186f8cf48db17e2c6abfdc8ebb572ad42d5fff49fbeb7fc5cf89e779a2017de5694af34bf3b16045f27a111c97d9c9c6977a19f0a36ba SHA512 8e5438a5e638399e14fec83a5c397a6f718c15d38d5228bc86c911a71b1a1a7fd8f9a239cd6384bb79c73d6c5e873f21e15edf159b30ae53d809f97ffc0804e0
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index 4a77c1f15e5a..44433cc98f3e 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,13 +6,13 @@ inherit eutils unpacker cdrom games
 
 DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
 HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/UT2003CrashFix.zip" # MIT licensed (bug #754360)
 
-LICENSE="ut2003"
+LICENSE="ut2003 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="strip"
+RESTRICT="bindist strip"
 
 RDEPEND=""
 DEPEND="app-arch/unzip
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
index 2412993b999e..98110d470b8d 100644
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp1/Manifest
@@ -1,3 +1,3 @@
 DIST cbp1.zip 144163647 BLAKE2B ff32fbf431475ae2c24920574e5d158c4242fca2359bf1817131e189c0cd25e52d17de3232acb0b118d7f689ee67821cf6707a2e416e1a9b3f2b5f2e8fbcca86 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd
-EBUILD ut2004-bonuspack-cbp1-1-r3.ebuild 536 BLAKE2B dd9200478ff8c3d564a497438575e5f7803c3c21d00e17a3bb8d07868eb5031986ae62a5ec6b3f4457beacc65f98ed44e2a8edf72157a81f5bb99b14c37475d7 SHA512 ca746aa05d2f15e6457f75131e45508842a4d89250459d363190e8a76dfaa2f022f2ee345ed64f7ed6fdcdb319f9d34d5703b1d32a1ac78b10e4876d8a8ef1b1
+EBUILD ut2004-bonuspack-cbp1-1-r3.ebuild 535 BLAKE2B 63dcb5b24e99ad2192493839f58b9098c5e8ab2a97257b485eeb7d4552578e560502c7eaa84751cb4098eead318320cd17e31b5255d1493e28e01d53686ecaf6 SHA512 52c82aeb0db164a8af93630a68541fbc1419b9254a362d6bfb1f7755c0c10c5d658845933e5f606dd8e45106cf68149d44f34d82b0028e7b9c2be8860c92a18b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
index e2723ebdde7d..76aca526c4b4 100644
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="UT2003 Community Bonus Pack for UT2004 Volume 1"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp1.zip"
+SRC_URI="http://ut2004.ut-files.com/BonusPacks/cbp1.zip"
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index 0eb8e115ba6a..92a234ad812a 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,4 +1,4 @@
 DIST cbp2-volume1_zip.zip 203766207 BLAKE2B 7f7d19f4a1a1caaf388eccecadb8123a103d4aafbb95f2b344e106b881507f9bac0ffdda48435be7c2303b8bd70545d3d74ca7971f97a989bfa955d3155d956c SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213
 DIST cbp2-volume2_zip.zip 200444127 BLAKE2B 21d61d09af54e86047d46cc8d136cd6ba746098c4d0a53ade1e8e5c4143b543f0a90eb0dbca2cb00e29754f916dc84e7040a5d64f582bedd2a0107bb4c182291 SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4
-EBUILD ut2004-bonuspack-cbp2-1-r3.ebuild 1052 BLAKE2B f92e0ebfe0fec33bd26165affe515b2bfb69e5df0fe7e073546385b92a6473e2224db158da56c95627e65a2390b61ddea27eec5d673dbb1871e19eff25f7a05d SHA512 182370907dce26dec74b50d57d85f30b5d6575ff79e0e70d3ccf6ff157d1f9cb14b2115de4e5404f2efcae280d830901d20649cb18f208735a2b73fa44e6ac4d
+EBUILD ut2004-bonuspack-cbp2-1-r3.ebuild 1050 BLAKE2B 5473fe8d648e83f61ce302ef0618b4d8373ec007e6efa59d202865eb11ac80e1700231d62fc424cdd8a3942f7463af5f5c79d3d5908c40a1e52e6dc3f09a2f5d SHA512 dcb6d1d247dbf7d93d7cb4c49b720f92d2abbb87b63b8bce91f0757c159bc70ea5f5f4934bea027faa05bf4e9daf743e2cb3457b8e16b220b2c5afd207435e2f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
index a25036f26be7..c67e88e17741 100644
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="UT2004 Community Bonus Pack 2 Volume 1 and 2"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp2-volume1_zip.zip
-	https://ut2004.ut-files.com/BonusPacks/cbp2-volume2_zip.zip"
+SRC_URI="http://ut2004.ut-files.com/BonusPacks/cbp2-volume1_zip.zip
+	http://ut2004.ut-files.com/BonusPacks/cbp2-volume2_zip.zip"
 LICENSE="free-noncomm all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 7f53cda4882a..31c1b97c5402 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -2,5 +2,5 @@ AUX ut2004-ded.confd 175 BLAKE2B 7384ec15a4dd1ea03ddf06068032a69d32a8bfb7536bbfc
 AUX ut2004-ded.initd 320 BLAKE2B 34e3fdf38eb9e5bc2623581c73fea3af040f9dca829c8c46d649b5124472989931278a93c5a2a52acc2faf7c53df74dfaf772a35e52d127b357097070e3c3c12 SHA512 a307105dc110ec1009eabfe61777b33ad89c9e22cebc199ab7e990e9b170b97ab8e176865e62ebed40f4a80f7e5ddee6f248a1e73f25bac1a61c32f0c90a126d
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-3369.3-r3.ebuild 3594 BLAKE2B 406a8529a43d22ebf2815f180ca91b016126cbaef7fdac02f2060c546a89bc2fa9ea74e00cb53678ebb1ebe30203651651d74f32847c59ec3e78b294b1ea9548 SHA512 b3f45125d57599349009d43467fa78a386ff80383f2648e280be49d5da3133586af8b16895cbd42d2d4f32d1f8b7151d6031e14f379aae8faa6662d97d6c5436
+EBUILD ut2004-3369.3-r3.ebuild 3593 BLAKE2B e835433737e1e2eb6947de9a02637f7af790c7f90c58fe93dbbe8a3744d86986bdb5d9b29c712e8f6b2220c08522bf642af1252ef6bca04e39b2c5fa6cde469f SHA512 2af5a1fbcf3c95f9c497bb1adedad2d352f65189323a174f672497d1b28d9cd270d0b092177b5968e19012adca533487b80355fbff3adade79345f125e3f23da
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004/ut2004-3369.3-r3.ebuild b/games-fps/ut2004/ut2004-3369.3-r3.ebuild
index 13d59140205d..cfef6283f8f0 100644
--- a/games-fps/ut2004/ut2004-3369.3-r3.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r3.ebuild
@@ -9,7 +9,7 @@ PATCH_P="${PN}-lnxpatch${PV%.*}-2.tar.bz2"
 DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
 SRC_URI="
-	https://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
+	http://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
 	https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
 "
 
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 94635a4728f5..c58ca3330b82 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,16 +1,11 @@
-AUX yamagi-quake2-7.42-fno-common.patch 2725 BLAKE2B 231b4e9ee57e3885c78e1469a7f729e430f03485535b81af315c971d632a6b7d8bd0a28f8c552e69afaa06fc5105f6ae757bfac327e23aa91c3299f8a5136000 SHA512 107a157bba10ad82bae0a767e00dc445c45b2b3acb5123fb81ea9b38ae4ff361dc38d575ba3dcc0960e46ee29fe4f97b6b2d580947e54f056705c8e144f027bb
-AUX yamagi-quake2-addon-respect-flags-r2.patch 966 BLAKE2B 08c2259fbbbc45ea41e2472ff544f8a51082069f0c340c548694d26dafc8f7d86418deed928b8150f52115cf23c399f4886c90570185ff78fe7c6a9d5b6c5286 SHA512 4f5d0402f9b3c227363681bdd38cb098795b18589d2a44f3ab5d9682cf58d6315015c22747167298a63f1fcbca00109208894b1c35ac2e6e4dec3900e25e7780
 AUX yamagi-quake2-addon-respect-flags-r3.patch 996 BLAKE2B 7d3c6f13b4973db9d63e15de469953699df48668d5bc5d69607f090f6bac57ea4119174f6de3306f1fc8cd2acdbfb90b8808eebfa7af7e4b4b5996d3b2546d93 SHA512 7136ccc0d666ef14f040e7ca19506dd0be5debe21f0eb819c74851e80445187f98ae60f76d8038d2ead40b1ef0f56643f769d6f9e4241e2b175ea11a19a676da
 AUX yamagi-quake2-addon-respect-flags-r4.patch 901 BLAKE2B 3aea1c44231122cc95e5f17ae3051111a77a688abf1553470725266a7619ee810878362abbf2b99371e023bee7975542a63bf7fe93153fed95a60ac77285a9d3 SHA512 ede9fcc0db375defbfe8e79105ca330d8ed46498f67a858b923f337eef558ac4dc9f54b8d3de895e7269750009f26c1643c4e3c26362c2f2be751005ec42d855
 AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3
-DIST quake2-7.42.tar.xz 1987332 BLAKE2B 63ced75746eb031faf949c6b094ec607076f481b8d97eca242f9bf6fd6325afc8dfb5f98fe4f8ba5c5e87b721392f613031fc204b775634fc5292a26fef1d76c SHA512 0f51204fcf14ecb3f1f654e6ee19207836cf4642022569ef202bc12f312f76dbd43695aa4d9f9fb70c8b023f42d1a8fcec25f472a32175ebb0a308211fa40cc0
 DIST quake2-7.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
-DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
+DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
 DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
-DIST quake2-rogue-2.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6
 DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
-DIST quake2-xatrix-2.07.tar.xz 192404 BLAKE2B 54772f1158af82211a5c925676e1399bd9debfa8f336a566dd7c22c6f50eb488030c871a7952b9eb00a7a8498560aed332dfd388074bb5a733ed5e979d59d9dc SHA512 72400afa98faf38559dfbc6dcfd01a16902adc782065bc1bbae4d773b5c139543d79f465195db72f0dbaf33999c667c65fd3582a8029db5b50ea5295d278b2a7
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
-EBUILD yamagi-quake2-7.42.ebuild 3636 BLAKE2B 50b15d9a17697e8191fd9ead2575162536b9c08f56d098a6e45c41093a9c20804cce9e2f0a09e4a623edb119d675d161c3e4141b07523347592ca4fc3cc6088f SHA512 e9707a7b71e4937d9a717c02005e76e9a10bddad7860983b96df5d3e17ea036196125984f9c2900df71fbc8adf6d8f9779085b9a5c9b77f7810351e7da857443
 EBUILD yamagi-quake2-7.43.ebuild 3557 BLAKE2B c2c91c9acb5f74d6b814d14cf32220f0187936bdf8e3c59faacfbe7a9b827a418faf5f32bc795d346ca53ce9add23242ad1d65b8666597cf9c1afd012cc29716 SHA512 8dc27738707ce59720a9685d926ed92df1995c772264a45c3bc5de2b6057253a992e3b3aa4e01a7baec792662e1f3fd8be7ef702c7c9c719cc7dee380e0b0d7b
+EBUILD yamagi-quake2-7.45.ebuild 3505 BLAKE2B ee81e8ec438825670f846c562713c95b7e93a1e77ac88dae61e25bad137376a3076a5dee28435ee03989eb41a40e534d847e68b809610bb2bdd7fe2a3e1c4963 SHA512 5f7391f6fc29d61b819400e9391f54788e9f457cf6d3ecb5bf6120601e615e1edcfd5e78046f50da1e0b2eb052a3b80d59b83d174bd52dabd7af4344500e705e
 MISC metadata.xml 902 BLAKE2B 5431861cde41e065d91af512cbac3e1f41c8c28dc253d54124eef822a38a021be9e9fd6b000bf6571ae242fc87009ea2a4c5045a568adaa37a99302eb1fe8e7f SHA512 7303da58e949237b5d1c6a6fe83c597c4e5dd955ce07368876ee03114cb124cedc44c8d4c51bb4e530c3194ed7041c694167a4495a698fb3b8a6beaf4b8b6f77
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch
deleted file mode 100644
index 6dc8794b874a..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 60a4bd330689b2378e49f2335209bd64a653fab2 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 10 Feb 2020 16:09:09 +0300
-Subject: [PATCH] Fix build with -fno-common
-
-GCC 10 defaults to -fno-common.
-
-Closes #516
----
- src/client/cl_main.c       | 18 ------------------
- src/client/header/client.h |  1 +
- src/client/input/sdl.c     |  2 --
- 3 files changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/src/client/cl_main.c b/src/client/cl_main.c
-index 135407d1..7fc1e6df 100644
---- a/src/client/cl_main.c
-+++ b/src/client/cl_main.c
-@@ -35,8 +35,6 @@ void CL_Connect_f(void);
- void CL_Rcon_f(void);
- void CL_CheckForResend(void);
- 
--cvar_t *freelook;
--
- cvar_t *rcon_client_password;
- cvar_t *rcon_address;
- 
-@@ -58,14 +56,6 @@ cvar_t *cl_showclamp;
- cvar_t *cl_paused;
- cvar_t *cl_loadpaused;
- 
--cvar_t *lookstrafe;
--cvar_t *sensitivity;
--
--cvar_t *m_pitch;
--cvar_t *m_yaw;
--cvar_t *m_forward;
--cvar_t *m_side;
--
- cvar_t *cl_lightlevel;
- 
- /* userinfo */
-@@ -516,14 +506,6 @@ CL_InitLocal(void)
- 	cl_anglespeedkey = Cvar_Get("cl_anglespeedkey", "1.5", 0);
- 
- 	cl_run = Cvar_Get("cl_run", "0", CVAR_ARCHIVE);
--	freelook = Cvar_Get("freelook", "1", CVAR_ARCHIVE);
--	lookstrafe = Cvar_Get("lookstrafe", "0", CVAR_ARCHIVE);
--	sensitivity = Cvar_Get("sensitivity", "3", CVAR_ARCHIVE);
--
--	m_pitch = Cvar_Get("m_pitch", "0.022", CVAR_ARCHIVE);
--	m_yaw = Cvar_Get("m_yaw", "0.022", 0);
--	m_forward = Cvar_Get("m_forward", "1", 0);
--	m_side = Cvar_Get("m_side", "1", 0);
- 
- 	cl_shownet = Cvar_Get("cl_shownet", "0", 0);
- 	cl_showmiss = Cvar_Get("cl_showmiss", "0", 0);
-diff --git a/src/client/header/client.h b/src/client/header/client.h
-index 1a31a1ca..b42abc02 100644
---- a/src/client/header/client.h
-+++ b/src/client/header/client.h
-@@ -302,6 +302,7 @@ extern	cvar_t	*cl_timedemo;
- extern	cvar_t	*cl_vwep;
- extern	cvar_t  *horplus;
- extern	cvar_t	*cin_force43;
-+extern	cvar_t	*vid_fullscreen;
- 
- typedef struct
- {
-diff --git a/src/client/input/sdl.c b/src/client/input/sdl.c
-index 3c7356fa..c8055f3b 100644
---- a/src/client/input/sdl.c
-+++ b/src/client/input/sdl.c
-@@ -62,7 +62,6 @@ int sys_frame_time;
- qboolean joy_altselector_pressed = false;
- 
- // Console Variables
--cvar_t *vid_fullscreen;
- cvar_t *freelook;
- cvar_t *lookstrafe;
- cvar_t *m_forward;
-@@ -1246,7 +1245,6 @@ IN_Init(void)
- 	joy_axis_triggerleft_threshold = Cvar_Get("joy_axis_triggerleft_threshold", "0.15", CVAR_ARCHIVE);
- 	joy_axis_triggerright_threshold = Cvar_Get("joy_axis_triggerright_threshold", "0.15", CVAR_ARCHIVE);
- 
--	vid_fullscreen = Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE);
- 	windowed_mouse = Cvar_Get("windowed_mouse", "1", CVAR_USERINFO | CVAR_ARCHIVE);
- 
- 	Cmd_AddCommand("+mlook", IN_MLookDown);
--- 
-2.24.1
-
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
deleted file mode 100644
index bb800aeaf3c9..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- quake2-xatrix-2.06.orig/Makefile	2019-02-05 10:56:06.000000000 +0300
-+++ quake2-xatrix-2.06/Makefile	2019-04-08 01:24:04.124176498 +0300
-@@ -75,11 +75,11 @@
- #
- # -MMD to generate header dependencies.
- ifeq ($(OSTYPE), Darwin)
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -fwrapv -arch i386 -arch x86_64
- else
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -MMD -fwrapv
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -MMD -fwrapv
- endif
- 
- # ----------
-@@ -107,11 +107,11 @@
- 
- # Base LDFLAGS.
- ifeq ($(OSTYPE), Darwin)
--LDFLAGS := -shared -arch i386 -arch x86_64
-+LDFLAGS += -shared -arch i386 -arch x86_64
- else ifeq ($(OSTYPE), Windows)
--LDFLAGS := -shared -static-libgcc
-+LDFLAGS += -shared -static-libgcc
- else
--LDFLAGS := -shared
-+LDFLAGS += -shared
- endif
- 
- # ----------
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
index 052af9137a45..de8310ba1bfe 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
-CTF_V="1.06"
-ROGUE_V="2.06"
-XATRIX_V="2.07"
+CTF_V="1.07"
+ROGUE_V="2.07"
+XATRIX_V="2.08"
 
 DESCRIPTION="Quake 2 engine focused on single player"
 HOMEPAGE="https://www.yamagi.org/quake2/"
@@ -15,17 +15,18 @@ SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
 	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
 	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
 	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
+S="${WORKDIR}/quake2-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
 REQUIRED_USE="
 	|| ( client dedicated )
 	client? ( || ( opengl softrender ) )
 "
 
-COMMON_DEPEND="
+DEPEND="
 	client? (
 		media-libs/libsdl2[video]
 		!openal? ( media-libs/libsdl2[sound] )
@@ -35,18 +36,11 @@ COMMON_DEPEND="
 		)
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	client? ( openal? ( media-libs/openal ) )
 "
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-	"${FILESDIR}"/${PN}-7.42-fno-common.patch
-)
-DOCS=( CHANGELOG README.md doc/. )
+DOCS=( CHANGELOG README.md doc )
 
 mymake() {
 	emake \
@@ -64,7 +58,7 @@ src_prepare() {
 
 		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
 		if [[ ${addon} = ctf ]]; then
-			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r4.patch
 		else
 			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r3.patch
 		fi
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /games-fps
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)