gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-fps
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
121 files changed, 1391 insertions, 1055 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 874338efcc98..a5e7d979cae0 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/blackshades/Manifest b/games-fps/blackshades/Manifest
index be97a4333f21..92f712705256 100644
--- a/games-fps/blackshades/Manifest
+++ b/games-fps/blackshades/Manifest
@@ -1,5 +1,5 @@
 AUX blackshades-datadir.patch 249 BLAKE2B ed0c1a3cf60eef43cf848c26eb64e6e3cb814e1533fdc810c1d2c2124454b76bbb22aa23ada77bf0c09cacf8d54c01fc6d0f04570d1d06c49983fabcd641d37f SHA512 e1f564b29fee08ab3f335933acafb90ddf2e382f7ad72a7d7d9410d3a46222864e8370ee48bbd117493ee01c01a6ba58a8f68daa6641d250cb6c6dd135ac84dd
 DIST Textures.tar.bz2 340110 BLAKE2B fa0f10c1658235352153bfaca8301090ad1db78bdd25980f50b54e0a386433cb0b0e20b04baa206eba877374b8432c73b106d9a8cc9e58d0b652746e92ad2a2f SHA512 42a2a28072972b0919a67a17ab06cf74d6bb611cbf91ff017d72726fa2d01b3c5dec905c6760a199b710eabfff8d980867269d6ad3476096beab5c4edb2cae10
 DIST blackshades-20070723.tar.bz2 761669 BLAKE2B 5baf7465ddc82c4de3d3063ae91a44550ebf067dc2fca0d001736516511e20d249f01f15f4845dfb6d9e1ac359940f42d583c4c48579c460465a9e58e97c0478 SHA512 9477c59d685227650980c16aeb59f567764bc983c01da4e256b2ec582b5a063ef89222eb4ab0d42552bf6a4ffd95ba270229800decc9ba7a9b289f093c5b9c61
-EBUILD blackshades-20070723-r1.ebuild 1266 BLAKE2B 479e06daec59436ecc9bc8345f8418166102f9876c566a5d1eeeab9879665e8bdd02a261c06146601824104485a17eb4df2a762ae55e43c6b1652f383d6c5a8f SHA512 f6b39d40ece5a33caa9c95bedd97dc9060cb3f624f23472730e53129c5ebbca675e5edff0f93f5b675c2170645303755cf9aaf6e5ad02dc843f6175f7ddd5b76
+EBUILD blackshades-20070723-r1.ebuild 1505 BLAKE2B 88591d3122dda212933d46ef0acab5b1bd7bb1a5a28b72a73c1de7da0d51654ededbb9f06ce4ac0e6ab147a66fc272bc7fb93f16c8645225aaf8d7b390499831 SHA512 d7277670d3e07045949368e4c397520d593f929583f812d7aeebf7e0b653dd1f1ce6a71795c94358b1c68233b38e9e797a222df510a6aaac91e41093c104aafe
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/blackshades/blackshades-20070723-r1.ebuild b/games-fps/blackshades/blackshades-20070723-r1.ebuild
index a531ebbe5987..1ae58711d3a8 100644
--- a/games-fps/blackshades/blackshades-20070723-r1.ebuild
+++ b/games-fps/blackshades/blackshades-20070723-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="You control a psychic bodyguard, and try to protect the VIP"
 HOMEPAGE="http://www.wolfire.com/blackshades.html
 	http://www.icculus.org/blackshades/"
 SRC_URI="http://filesingularity.timedoctor.org/Textures.tar.bz2
 	mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="blackshades"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	media-libs/freealut
@@ -24,8 +25,6 @@ DEPEND="
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-datadir.patch
 )
@@ -36,25 +35,41 @@ src_prepare() {
 	rm -rf Data/Textures || die
 	rm -f ../Textures/{,Blood/}._* || die
 	mv -f ../Textures Data || die "mv failed"
+
 	sed -i \
 		-e "s/-O2 \(-Wall\) -g/${CXXFLAGS} \1/" \
 		-e "/^LINKER/s:$: ${LDFLAGS}:" \
 		Makefile \
 		|| die "sed Makefile failed"
+
+	sed -i \
+		-e "s/CC := gcc/CC ?= gcc/" \
+		-e "s/CXX := g++/CXX ?= g++/" \
+		-e "s/LINKER := g++/LINKER ?= g++/" \
+		-e "s/LDFLAGS := /LDFLAGS := ${LDFLAGS} /" \
+		Makefile || die
+
 	sed -i "s:@DATADIR@:/usr/share/${PN}:" \
 		Source/Main.cpp \
 		|| die "sed Main.cpp failed"
 }
 
 src_compile() {
+	tc-export CC CXX
+
+	export LINKER="${CXX}"
+
 	emake bindir
 	emake
 }
 
 src_install() {
 	newbin objs/blackshades ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r Data
+
 	dodoc IF_THIS_IS_A_README_YOU_HAVE_WON Readme TODO uDevGame_Readme
+
 	make_desktop_entry ${PN} "Black Shades"
 }
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index ffbc908c47ee..613adcc4124f 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,5 +1,5 @@
 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513-r1.ebuild 4349 BLAKE2B 168c527e8b886ff65886c4f27c0161b1699a3652934b639968914f22ee3e55161abb908a065eb145e7ca37db6073aabe0f43a7e36ce291b112f26c05b8dc1919 SHA512 61984cf0e710c3fa838d09b25b21c0268bae358e4252ee19fcdc727fd7e7da504403ab00e7fd1061201a6223f723423deedb96d4e553de5afced5b1ae8bf094d
+EBUILD darkplaces-20140513-r1.ebuild 4482 BLAKE2B 3572a76783bfd7301effe4fe8ee4de5dbe987333b23b4a0ad2af5a82cc23ad7c85eaae903630cb47eaf7039f630f2c446273233fce9455f34f6ed1753f6c652c SHA512 300e90637dcdb64629f630300733b799092f7bf43675f68ac071bb430d1d0c03a1d1a1ca11aec63475d105d191cfdbb8912aa0b23424802d165198acd043f553
 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
index 7ba3bcdb4ce9..7934dcbe22d3 100644
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic unpacker
+EAPI=7
+
+inherit desktop flag-o-matic wrapper unpacker
 
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
 MY_PV="${PV/_beta/beta}"
@@ -18,6 +19,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
 	lights? (
 		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
 		http://www.kgbsyndicate.com/romi/id1.pk3 )"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -60,14 +62,17 @@ DEPEND="lights? ( || (
 	!opengl? ( !sdl? ( !dedicated? (
 		${UIRDEPEND}
 		${UIDEPEND} ) ) )
-	virtual/pkgconfig
+"
+BDEPEND="
 	app-arch/unzip
+	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}"
 dir="/usr/share/quake1"
 
-opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
+opengl_client() {
+	use opengl || ( ! use dedicated && ! use sdl )
+}
 
 src_unpack() {
 	if use lights ; then
@@ -76,6 +81,7 @@ src_unpack() {
 		mv *.lit maps/ || die
 		mv ReadMe.txt rtlights.txt
 	fi
+
 	unpack "${MY_ENGINE}"
 	unpack ./${PN}*.zip
 }
@@ -92,7 +98,7 @@ src_prepare() {
 	# Only additional CFLAGS optimization is the -march flag
 	local march=$(get-flag -march)
 	sed -i \
-		-e "s:-lasound:$(pkg-config --libs alsa):" \
+		-e "s:-lasound:$($(tc-getPKG_CONFIG) --libs alsa):" \
 		-e "/^CPUOPTIMIZATIONS/d" \
 		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
 		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
@@ -115,6 +121,12 @@ src_prepare() {
 src_compile() {
 	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
 
+	# Protect against people choosing a strip implementation
+	# bug #739194
+	unset STRIP
+
+	tc-export CC
+
 	# Preferred sound is alsa
 	local sound_api="NULL"
 	use oss && sound_api="OSS"
@@ -168,6 +180,7 @@ src_install() {
 	if use lights ; then
 		insinto "${dir}"/id1
 		doins -r "${WORKDIR}"/{cubemaps,maps}
+
 		if use demo ; then
 			# Set up symlinks, for the demo levels to include the lights
 			local d
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 411f80dd0230..b5d1b3e2cffa 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,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_20210221-9314-a2d4c2794.tar.xz 19940764 BLAKE2B 9ea44f30cfa1737cf9e6cbd4db79530b3fc1dc109cc7ab9229dd19415e8a035992846d75e59460ae798c1d308de24510ff0eae4b149d8f8a3c4ace32e4010776 SHA512 a40902dd54a92cb333c61cd2e3a88f4760ea38ba0125f7770c4a0a9145d7c1be10e3df310d0dc20565e97fe3deb61678fb7ea79b918c7fafe0b9692b30e64047
-EBUILD eduke32-20210221.9314.ebuild 5752 BLAKE2B d9ce32221eca10151e1aeb16193c2b9e34502806f39768d6414cf608f6f6d6d9deb9dc0f9f4028a976cd434982c44922bbadbe26b5617627404797b2e555afbd SHA512 1d172a77f0f55aa4d8a98830be93cfeed75cae42f355809a0eeb47edacaebeec0fbf4b6e3b05b282508701dfcbd50cca497fe3b6ed16025c2cb78fc40eacef5e
+DIST eduke32_src_20210404-9321-7225643e3.tar.xz 19946104 BLAKE2B 37a8a91aa09e03e91f2e368ae7329a9094b6ec41af46da2e3fa1dd10f5131f0ba67d774d923f8c9659fdd1c28c8109ec2d1695105b84f96955c8fd9b6e347668 SHA512 c3b8aec9d94f3f7aa2431bf3abb243937e58280ec4ed0c74ccdcb28296068a32ed46556a09e4409c6f367a4d1364dc66cb254ccf190851f45e3e473426129425
+EBUILD eduke32-20210404.9321.ebuild 5752 BLAKE2B b9d6d3ba783e014223141eca75b0f39710ea85c523a499fe332924274405d593597cf03be1820a2069e030bbd29c4514eed42ba9e8fde444833ea31b43b08f00 SHA512 6488a539d4dbfa048371629a116c96739bb87650e1e2cb54a5adf658d3dbd21c0fe8a57d1981e24670f91de1995289b144d2669dcd47326a29942730d0a3bddb
 MISC metadata.xml 1695 BLAKE2B 0d309ad2873afa0f103b2f37a585f0a80aed38fc360cac2e15bf7bbde421b30193bbcfa068339f2105ddf1bc02155fb3e803ce0d555a7659f88c6248dfeba62f SHA512 252924650afd01827d4cd39d6a7b43eb4fb8616f629e89a9b8ee9828de68f1586c63e458623e31f7e954320e50b081279edf88b0da935daaa5154d8a7d901597
diff --git a/games-fps/eduke32/eduke32-20210221.9314.ebuild b/games-fps/eduke32/eduke32-20210404.9321.ebuild
index 1cf5593bfd6a..0432169abdab 100644
--- a/games-fps/eduke32/eduke32-20210221.9314.ebuild
+++ b/games-fps/eduke32/eduke32-20210404.9321.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="a2d4c2794"
+EGIT_COMMIT="7225643e3"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
diff --git a/games-fps/etqw-bin/Manifest b/games-fps/etqw-bin/Manifest
index 67ec0369f8db..599da90caef1 100644
--- a/games-fps/etqw-bin/Manifest
+++ b/games-fps/etqw-bin/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-client-1.5-full.x86.run 556383725 BLAKE2B 8fcaa8518c7c452a4fe593a00beea0f5a6d5849c72b03d4a443fffde8540ea53b7bf0376d90b2f2ed4e3a736628f8871e009a49b938344516b2db0495cf1e826 SHA512 32bb3d7ef47790ac6b790a5a5d61592c3504d034372254102985e58dee25b5d200e507330226bf8458c628154c246b2abcb08bf550fa044189c4c8de813af0c2
-EBUILD etqw-bin-1.5-r2.ebuild 2005 BLAKE2B 8a37d8c1220bf9b3a04f76387749ca2a44783ea5e3450a3951ca3b6c64ba8f97af8f5e8cbaef37fb63c1dd8b3c265690ddc902e7b356110e635ca18294861703 SHA512 e0c8d2cd41d2cd40adbe8e8d901271a0c6349cec4eb26de856a69412f1c477f9504535bb319ca63579eacbd35feadbd22a768372125bd5b5083fc6349eefe7d0
+EBUILD etqw-bin-1.5-r3.ebuild 1987 BLAKE2B d776bba9c2a5701aa4865b530a0ea79c5ce9d54ad7e3bea5f8d1be2d15f863c69a15b57d2671e6eae032426d279d93dd35bccf22199765a83d5f0981da4cd90e SHA512 07525bc07821008889c86f17c051e1c4b23046cf4bb72bddf06fe9e7fb3d895e7eeda41f4e3e336b93ea3cefdb21c6f02961ebf14b4a785e2839a8943b7643d4
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
index 75458580db7e..180c6f86e698 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop wrapper
 
 DESCRIPTION="Enemy Territory: Quake Wars"
 HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/"
 SRC_URI="http://ftp.jeuxlinux.fr/files/ETQW-client-${PV}-full.x86.run"
+S="${WORKDIR}"/data
 
 LICENSE="ETQW"
 SLOT="0"
@@ -14,57 +16,57 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall"
 RESTRICT="bindist mirror strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	virtual/jpeg-compat:62[abi_x86_32(-)]
+RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
 	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	sys-libs/glibc
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	cdinstall? ( games-fps/etqw-data )"
+	virtual/jpeg-compat:62[abi_x86_32(-)]
+	amd64? ( sys-libs/glibc[multilib] )
+	cdinstall? ( games-fps/etqw-data )
+"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
-dir=${GAMES_PREFIX_OPT}/etqw
+MY_DIR=opt/etqw
 
-QA_PREBUILT="${dir:1}/*.x86
-	${dir:1}/*.so*"
+QA_PREBUILT="
+	${MY_DIR:1}/*.x86
+	${MY_DIR:1}/*.so*
+"
 
 src_unpack() {
 	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
 	unpack ./${A}.zip
-	rm -f ${A}.zip
+	rm -f ${A}.zip || die
 }
 
 src_install() {
-	insinto "${dir}"
+	insinto ${MY_DIR}
 	doins -r base pb *.png
 	dodoc *.txt
 
-	exeinto "${dir}"
+	exeinto ${MY_DIR}
 	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
 
 	newicon etqw_icon.png etqw.png
-	games_make_wrapper etqw ./etqw.x86 "${dir}" "${dir}"
+	make_wrapper etqw ./etqw.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
 
-	games_make_wrapper etqw-dedicated ./etqwded.x86 "${dir}" "${dir}"
+	make_wrapper etqw-dedicated ./etqwded.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
 
-	games_make_wrapper etqw-rthread ./etqw-rthread.x86 "${dir}" "${dir}"
+	make_wrapper etqw-rthread ./etqw-rthread.x86 "${MY_DIR}" "${MY_DIR}"
 	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	if ! use cdinstall ; then
 		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
-		elog "directory to ${dir}/base before running the game."
+		elog "directory to ${MY_DIR}/base before running the game."
 	fi
+
 	elog "To change the game language from English, add"
 	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
 	elog "Menu fonts may not show up until you do so."
diff --git a/games-fps/etqw-demo/Manifest b/games-fps/etqw-demo/Manifest
index 939904a8f7e9..736070d5c7bb 100644
--- a/games-fps/etqw-demo/Manifest
+++ b/games-fps/etqw-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-demo2-client-full.r1.x86.run 691248874 BLAKE2B 42692da7b2f7f35730dea9557c26bb189ac555eccdaf2873d3b5e91bff640b1cd121022aa671c990f92164a97874e9f46f47c76ad01f2ff2973ad3edea6898db SHA512 41332208626449da74bea71a9926258f50986f0af85045d470d4405d27e497085ba318337181802be58eb50c724ab91df6b9c810e5fcc5f8dc131486d6529f38
-EBUILD etqw-demo-2.0_p1-r2.ebuild 1578 BLAKE2B f63007ba05b07abb5b8136e6252193ceb4b13150f2f8b96a116a35a307125893ead3efaef15c423af8753e32d16e3d378b5db1246624f83a3378d0cb0befd99f SHA512 66a14e35580349f64aba9416b29f0cb0894da6b19939d7c7111421e45c9341cbd513f46040caafc752ed289eac1cdc0cc8029f20c9538ca67b51d1d34ab5a97f
+EBUILD etqw-demo-2.0_p1-r3.ebuild 1548 BLAKE2B 4f04f7f452d00d6a26838adf7064c088d930225bd34d61223ab226adf3f695707bc7797f30790a9935b502c3a497cf53b645d9f5582c48a418f3d2581e0eae57 SHA512 8474b43175dfbda40773ffab928abafd49eebabbf16a0810cfe95159e23330f125bce44b30ea668444d59945e3e57e558f22224b50fa4093db8bd8a290b63027
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
index 862cea3fb0da..244db5ad24ee 100644
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r3.ebuild
@@ -1,37 +1,43 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils versionator games
+EAPI=7
 
-MY_MAJOR=$(get_major_version)
-MY_REV=$(get_version_component_range 3)
+inherit desktop unpacker wrapper
+
+MY_MAJOR=$(ver_cut 1)
+MY_REV=$(ver_cut 3-)
 MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
 
 DESCRIPTION="Enemy Territory: Quake Wars demo"
 HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
 SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
+S="${WORKDIR}"
 
 # See copyrights.txt
 LICENSE="ETQW"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="bindist strip mirror"
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	virtual/jpeg-compat:62[abi_x86_32(-)]
+RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
+	sys-libs/ncurses-compat[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+"
 
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
+BDEPEND="app-arch/unzip"
 
-QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
+dir=opt/${PN}
+
+QA_PREBUILT="
+	${dir:1}/guis/libmojosetupgui_ncurses.so
 	${dir:1}/data/*
-	${dir:1}/data/pb/*.so"
+	${dir:1}/data/pb/*.so
+"
 
 src_unpack() {
 	# exit status of 1 should just be warnings, not corrupt archive
@@ -42,7 +48,7 @@ src_install() {
 	insinto "${dir}"
 	doins -r guis scripts
 
-	cd data
+	cd data || die
 	insinto "${dir}"/data
 	doins -r base pb etqw_icon.png
 	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
@@ -50,11 +56,9 @@ src_install() {
 	exeinto "${dir}"/data
 	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
 
-	games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
+	make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
 	# Matches with desktop entry for enemy-territory-truecombat
 	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
 
-	games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
-
-	prepgamesdirs
+	make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
 }
diff --git a/games-fps/ezquake-bin/Manifest b/games-fps/ezquake-bin/Manifest
index 87e86e0d944c..fd917764c8c6 100644
--- a/games-fps/ezquake-bin/Manifest
+++ b/games-fps/ezquake-bin/Manifest
@@ -2,5 +2,5 @@ DIST ezquake_linux-x86_1.9.3.tar.gz 19230315 BLAKE2B df2128f8aa05a1e4d970b52d193
 DIST ezquake_linux-x86_64.1.9.3.tar.gz 18624824 BLAKE2B 619d2ef3c03a9d105000c75c0c2d21398d4080810b7cab6d6a143ac0a4513420f0756c01d932f7332cbd87dfba335d6b82b1ee122fb94c2fcf4331e7beab7689 SHA512 4c2f5060bbf08ca3b9583d4c3502e69bf6d503efd0e14df9d5fe54e1e8ac1c5ca0b920c3748e4a8e1f86c60d6e5809977352636d4758fd9cb3934cea03b1138f
 DIST ezquake_linux32_2.2.tar.gz 1685934 BLAKE2B f4e1374992ac548c45ca59161c0e86214f50db17502f6bc89d56ec4e9c596478399ff02c86a539e3590f0ad82d90dd7b2f02df25089573068b4e24e1085d0898 SHA512 2a42b43a0b4ad75c22c58bb53f8161eec1460cac3b841ccf2593e0cb803c4ef5cee23f939f859eb6d95409a01c4ccc3eabae108eac6c1cb850f9c5c3445bf5ab
 DIST ezquake_linux64_2.2.tar.gz 1804397 BLAKE2B 9ad294fda829a9dd68201a7c5deb9e3a708f4ac81caa97745e965bcececfc0c1aa787b53ad5465238452bee4ded256214eb234658e8bc17795ef519faaa67057 SHA512 c1f1772971980a7b349da6c6eea5643591d5bc81a939b28e50651c5773d8372277fb6bc9a5681c59e8273ca6250fa712c3b76db488bf521dd3675aabd5e1af8e
-EBUILD ezquake-bin-2.2.ebuild 1947 BLAKE2B 320e929a05931406741c86197f2942edd1f5ced3e39624d3cc548cceff87213987b444d2941ff9c89e5719953a21aa0780dbe3c812b80e2f9b7d158986df95ff SHA512 00f22b5412d339d18b4d533cf976ae604649473ccf98217425977959f323980d06e2c9fa534c2e4bb0c94e0a124a8f2110316d7668bfeb5797c9edc261e9252f
+EBUILD ezquake-bin-2.2-r2.ebuild 1952 BLAKE2B 8eb36d74f9b313705253a2b18f60e34c798ebf5cb94b0fac6a5f2dbd5e0be247e610361ebda7297dcf10907c011b823be74c202e7460ba4b5c00e1fcf2401b62 SHA512 40b56dffc6f236366198d25825a6d68e312f295db6c84e9f1bb648a7ff302d73093eaa906f37580f536a7201a899d40ef0775955fb148ac88428fad3a94d45ee
 MISC metadata.xml 340 BLAKE2B 0e535869685c648fd759901404ee04e736d85783bd09f34756917ce5bfb1239048accdf32fd59ae3a11828da8dbc6ca1b337f28259013b864b9e02e687758cac SHA512 4922600550155470211bb2fe2eab50f02e120d82261d2956f7f73604ec5e76c71e37be5d9a542d9f963eaa0927da7bcb9b464428a7b778d17a383135e423063e
diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild
index 5e6fe5800999..2a31a079e3b6 100644
--- a/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild
+++ b/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=7
+
+inherit wrapper
 
 MY_FULL_PV=1.9.3
 MY_PN="${PN/-bin/}"
@@ -12,57 +13,57 @@ SRC_URI="
 	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
 		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
 	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )"
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )
+"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip mirror"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall"
 
-DEPEND="cdinstall? ( games-fps/quake1-data )"
-RDEPEND="${DEPEND}
-		virtual/opengl
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm"
-
-S=${WORKDIR}/${MY_PN}
+RESTRICT="strip mirror"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
+DEPEND="cdinstall? ( games-fps/quake1-data )"
+RDEPEND="
+	${DEPEND}
+	virtual/opengl
+	x11-libs/libXpm
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+"
 
-QA_PREBUILT="${dir:1}/ezquake*"
+MY_DIR=opt/${PN}
+QA_PREBUILT="${MY_DIR}/ezquake*"
 
 src_unpack() {
 	unpack ${A}
+
 	if use amd64; then
-		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}"
-		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx
+		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}" || die
+		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx || die
 	else
-		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}"
-		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx
+		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}" || die
+		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx || die
 	fi
 }
 
 src_install() {
-	exeinto "${dir}"
-	insinto "${dir}"
+	exeinto ${MY_DIR}
+	insinto ${MY_DIR}
 
 	doexe ezquake-gl.glx
 	doins -r ezquake qw
-	dosym "${GAMES_DATADIR}"/quake1/id1 "${dir}"/id1
-	games_make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${dir}" "${dir}"
-
-	prepgamesdirs
+	dosym ../../usr/share/quake1/id1 ${MY_DIR}/id1
+	make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${MY_DIR}" "${MY_DIR}"
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	if ! use cdinstall; then
 		elog "NOTE that this client doesn't include .pak files. You *should*"
 		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
 		elog "You can also copy the files from your Quake1 CD to"
-		elog "  ${dir}/quake1/id1 (all names lowercase)"
+		elog "  ${MY_DIR}/quake1/id1 (all names lowercase)"
 		elog ""
 		elog "You may also want to check:"
 		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
diff --git a/games-fps/glxquake-bin/Manifest b/games-fps/glxquake-bin/Manifest
index 2bfbc4adc7e7..71b7a8093c53 100644
--- a/games-fps/glxquake-bin/Manifest
+++ b/games-fps/glxquake-bin/Manifest
@@ -1,3 +1,3 @@
 DIST glxquake.tar.gz 164094 BLAKE2B 4f9fa9c1e65dc8f1b3721dd068b9920c622a042875d4cb43a15b6d514bfd5e827f776b142a2087ef62e0adbd539c11a53d2b1f3769545b730531ddbbaaa348fb SHA512 0adb92dbdc8b3130bef7e46ad95a7efa6ddb3723e3e8891cacc3c2e46bccacb6235f688e12b8a1f35099615b6683b1409b2e380fd4278e0827897b2e0c8f3090
-EBUILD glxquake-bin-0-r2.ebuild 1154 BLAKE2B 42b2b9b445e61a06a6ed029876952f38bde7db67e1240e596a9e3719891ebe6a8493318de2e2a8d41159f6d684916e20f81399d10e526626ca7a6762c3869d55 SHA512 fcd428a392de67eadf279d2a2f5de1b81152d5c0a0c10e8eb8c58432a5ba97f8d7439cb44d0d15ef4752a5e7307f4690ec8fc25d34fee3bc0c2af8543102d382
+EBUILD glxquake-bin-0-r3.ebuild 1093 BLAKE2B 9fa6eaf5647d507438b5c09c9977011d2f158c1c54ab06d0458ef44610723b9dacde9b07d34c8858202ba2aa0624eb576d4496dfb0ba520be0a6752bf0f081d4 SHA512 1aff723c04cd8ff315a4d8e207e091f68a41ee95ec76948fb1922c4d1d519673a5f2f7d26b076bf215142b3cfd4c4a7d8be788890a6484c9d145dc6b72c2c8fd
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild b/games-fps/glxquake-bin/glxquake-bin-0-r3.ebuild
index 14f81de25338..eb9cce08a4ba 100644
--- a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
+++ b/games-fps/glxquake-bin/glxquake-bin-0-r3.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=7
 
 DESCRIPTION="A binary that works with any 3D-graphics-card that supports the glx X-extension"
 HOMEPAGE="http://mfcn.ilo.de/glxquake/"
 SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz"
+S="${WORKDIR}"/glxquake
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
-IUSE=""
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
+	sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libXxf86dga[abi_x86_32(-)]"
+	x11-libs/libXxf86dga[abi_x86_32(-)]
+"
 
-S=${WORKDIR}/glxquake
-
-QA_PREBUILT="${GAMES_BINDIR:1}/glquake"
+QA_PREBUILT="usr/bin/glquake"
 
 src_install() {
-	dogamesbin glquake
+	dobin glquake
 	dodoc README
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	elog "To play with it, create a subdirectory called id1"
+	elog "To play with ${PN}, create a subdirectory called id1"
 	elog "Copy the pak0.pak, and eventually pak1.pak into this subdirectory"
-	elog "You can eventually get pak0.pak emerging games-fps/quake1-demodata"
-	elog "The file pak0.pak will be on the ${GAMES_DATADIR}/quake1/demo/"
+	elog "You can get pak0.pa by emerging games-fps/quake1-demodata"
+	elog "(or use the disc)"
+	elog "The file pak0.pak will be in /usr/share/quake1/demo/"
 	elog "You can now run glxquake by executing glquake"
 }
diff --git a/games-fps/industri/Manifest b/games-fps/industri/Manifest
index 641cc08c2f07..74a6115fb9f1 100644
--- a/games-fps/industri/Manifest
+++ b/games-fps/industri/Manifest
@@ -1,8 +1,8 @@
-AUX industri-1.01-exec-stack.patch 642 BLAKE2B cc7ab05c14499a2075605bb2a3b818eed7b219e92b49d90ad777d74481387ac20cae3e85611e9150644ffdb99014c25aceb2c678889332ec4d97b1801f27824e SHA512 c23b38be46b3b692f7b04415b2893c9884d76e627910f9e93579c286e2142fd36bff0c335beffd541226920ce22dfbdb6ffc51537b42afe6d660466905c7be3e
-AUX industri-1.01-glext.patch 983 BLAKE2B 370d7c55d61e38716e84d0af84772b186312a46e12d3bcabf74e2a3d43708798ad7ffda2f1881e8355246ea67b0b7a5f4caddcfa3b5f670dca181e11d95b5e51 SHA512 0d17e3c54fdce139a25b9c51892cf7d9c9b04b0fe2d4f543cabdce141cfe321892dbc630f40ba3e75ffb1612f6c1df5d4108f95d3a06bce3b7f49601cbb2282a
-AUX industri-1.01-ldflags.patch 840 BLAKE2B a4187070a6205de7187cb606baf9e7ae7ab5332d6e4c53c24cc3329fbc29fdd4e10bcf3f340dca9f2df5abfa594b10e902a7625940a411df4cbbb102479dddce SHA512 fc45f5edb2dfabf8815186c66cf071f119cb0c83cd785fa3be083bbcb1be11c1c898f73f7b1b3d3af83c95daddbc0fe226cfaa0ed9c0b9776d718a10562b496e
+AUX industri-1.01-exec-stack.patch 658 BLAKE2B 0b6dc3dd385f3bb7d00748e7c32c3e2ec135359427b4766c27314056fc2cdcf657018be05c04d95b6ac53ccb86da8a56b8b59624e50df9d73a44bb2d7fcc0b29 SHA512 d3b6c712f79612265a31eaeccae3b9688bcfb7916be34e1b9dc6e698c33750f82b323fa51cb09768546c3cdf55bc80fadf0cbc46d4e478ca126ac4124fa06765
+AUX industri-1.01-glext.patch 911 BLAKE2B e6b54ef2a984b8613cd02fdcd9910398899bd8999f9c2b58b59dfc9a68e00e5087335c9294a7b6ee0b19b92026a322a9af4adb55c33201ebfc10a138a086c749 SHA512 f78358f8a384dd0fc86dcb3adbeb92b3768209224ef90b3fbae2850b998b78f5cd495cc1d4978c87860cfdbd3b4d8ac5f525679aecdfe46c82e6ca7a92b90729
+AUX industri-1.01-ldflags.patch 768 BLAKE2B 9f46a1d428ec4c27927f72ee9dc349df6668d94d81276dc21b4e732be03bcf8456d39db9ed2d852921e80020808f796dc0c93b4c32f2ccd114901cb1883465bf SHA512 008685528843429adea440d30d00d34f526205d41c14ca7758a30cc8946e501cffbf94c051a93cc4c5f339fc084d9d80bc71d82b28d7fa6a353648ae6b18a92a
 AUX industri.pretty 42 BLAKE2B 2a53501c32d6b88a2d56c3560a6f55b4fe62c53a5aa659854b0c2dc2e440bc36572dee3e11bde73bcda30c03e0532d3977e7a17810bd721571a13a74ce0d63e1 SHA512 4cd0732b3a9cc3a48a759b68b03c249c854ce90234984ca770f8e3fc61e7bd01651012d64320d9114eb4567ccab254b183af15bdce51dee25a71c35613013df1
 DIST industri-1.00.zip 30339989 BLAKE2B e673bef0e5b79a9081ffe48c9e106de8f3900c3e57d8a9af3f48942a2257305e58b74a41c0338f5349c0414847415547c5bb86c8f4c42a8f41adb7b8621215e0 SHA512 e0eea9d881819fbcc039d91ed613bb4603e76302c892ed315bf1535b023173b742f4b881dc345f9eaca255a5531e3afc5584c2da948a9c6127c9a815a6bfcae9
 DIST industri_BIN-1.01-src.tar.gz 1086838 BLAKE2B 82a88fc640834c8c56deb9a30ea36cfaf7a631b4d1773a4bde588b64b56ab1471f54975fc5a250546685201829a790fd334f973826372dfb32f1abc0a2c3a761 SHA512 023dfcc72faa685a042afcf66b21e040b21c881f3d936af9e4da3e7836320a262c014296ab6fa564d93038c34a106f70f7cc8dd760c6b79e11689df92bff3625
-EBUILD industri-1.01.ebuild 1837 BLAKE2B 28e1565e2214fe15a5b1cdcd480e7950c8454ab7cc2c60312a73c6f6a09456fce8874f61a88c3367175671166d6e2f45777e5aec23b3c7a753e4971f9660d707 SHA512 092ed982e86942cb9d81aef4f26d530b4385fcb0a70b2442a918f3ffb6aa40f561c7097d4c5e193ffccb2b6bc85b132ea7de4861d94b9db226b256956e000f6d
+EBUILD industri-1.01.ebuild 1865 BLAKE2B ec4506a5cac8cbd707152c1409160f9c661de448b3b79f55f39a15d2bcd2415148e8c07ea5dbbb5c5f35c7e00e8ed373be4d3da92b377e49e149e387b2cda9a9 SHA512 789b33e8d064fa72f20541832e34115c04d9ed1fdfd8390e88f86dbccd35c8613d48cb6cafc69cd98cf2d413f009c23bcb0dda17fed4e29b56d67bec95768a45
 MISC metadata.xml 753 BLAKE2B 58d04346b2529f24ebb8558c2ae7c15b0677f2c22951a0ecfb5367e706632b92a5c2e8196a2d010409214aa0da24b655c5a9b0055ff0cc144b8210ff4c257248 SHA512 fe652528480dd111ae034805ffe48a75682fef68562e8ad55218f0b41b3ab05fd99d1b33b0959a09ed3fad97fe66d8171efd8e79f5472956aa42ac3263e6f9b0
diff --git a/games-fps/industri/files/industri-1.01-exec-stack.patch b/games-fps/industri/files/industri-1.01-exec-stack.patch
index bc74e951fe6a..abc8bd4a2b87 100644
--- a/games-fps/industri/files/industri-1.01-exec-stack.patch
+++ b/games-fps/industri/files/industri-1.01-exec-stack.patch
@@ -1,5 +1,5 @@
---- math.s
-+++ math.s
+--- a/math.s
++++ b/math.s
 @@ -416,3 +416,6 @@
  	call	C(BOPS_Error)
  
@@ -7,8 +7,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- snd_mixa.s
-+++ snd_mixa.s
+--- a/snd_mixa.s
++++ b/snd_mixa.s
 @@ -216,3 +216,6 @@
  
  #endif	// id386
@@ -16,8 +16,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- sys_dosa.s
-+++ sys_dosa.s
+--- a/sys_dosa.s
++++ b/sys_dosa.s
 @@ -93,3 +93,6 @@
  
  	ret
@@ -25,8 +25,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- worlda.s
-+++ worlda.s
+--- a/worlda.s
++++ b/worlda.s
 @@ -142,3 +142,6 @@
  
  #endif	// id386
diff --git a/games-fps/industri/files/industri-1.01-glext.patch b/games-fps/industri/files/industri-1.01-glext.patch
index 8a5042e431f2..9c23bebd965a 100644
--- a/games-fps/industri/files/industri-1.01-glext.patch
+++ b/games-fps/industri/files/industri-1.01-glext.patch
@@ -1,5 +1,5 @@
---- glquake.h.old	2011-04-29 12:36:53.000000000 +0200
-+++ glquake.h	2011-04-29 12:44:39.000000000 +0200
+--- a/glquake.h
++++ b/glquake.h
 @@ -977,6 +977,7 @@
  #define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
  
diff --git a/games-fps/industri/files/industri-1.01-ldflags.patch b/games-fps/industri/files/industri-1.01-ldflags.patch
index 987d464f6b48..2ce762d82988 100644
--- a/games-fps/industri/files/industri-1.01-ldflags.patch
+++ b/games-fps/industri/files/industri-1.01-ldflags.patch
@@ -1,5 +1,5 @@
---- linux/Makefile.old	2010-10-13 11:37:27.000000000 +0200
-+++ linux/Makefile	2010-10-13 11:38:20.000000000 +0200
+--- a/linux/Makefile
++++ b/linux/Makefile
 @@ -42,7 +42,7 @@
  RELEASE_CFLAGS = $(BASE_CFLAGS) -O2 -march=pentium4 -pipe -msse -mfpmath=sse \
  	-fomit-frame-pointer -fexpensive-optimizations
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index 70c8dba417f3..11e294ca141f 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Quake/Tenebrae based, single player game"
 HOMEPAGE="http://industri.sourceforge.net/"
 SRC_URI="mirror://sourceforge/industri/industri_BIN-${PV}-src.tar.gz
 	mirror://sourceforge/industri/industri-1.00.zip"
+S="${WORKDIR}"/industri_BIN
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,15 +23,24 @@ RDEPEND="virtual/opengl
 	x11-libs/libXxf86vm
 	media-libs/libpng:0
 	cdinstall? ( games-fps/quake1-data )"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
-	app-arch/unzip"
+"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/industri_BIN
+PATCHES=(
+	"${FILESDIR}"/${P}-exec-stack.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-glext.patch
+)
 
 src_prepare() {
-	mv linux/Makefile{.i386linux,}
-	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die
+	mv linux/Makefile{.i386linux,} || die
+	sed -i \
+		-e "s:-mpentiumpro.*:${CFLAGS} \\\\:" \
+		-e "s:CC.*= /usr/bin/gcc:CC?=/usr/bin/gcc:" \
+		linux/Makefile || die
 
 	# Remove duplicated typedefs #71841
 	for typ in PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC PFNGLVERTEXARRAYRANGEAPPLEPROC ; do
@@ -44,34 +55,35 @@ src_prepare() {
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
 		gl_warp.c || die
 
-	epatch "${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-glext.patch
+	default
 }
 
 src_compile() {
+	tc-export CC
+
 	emake \
 		-C linux \
-		MASTER_DIR="${GAMES_DATADIR}"/quake1 \
+		MASTER_DIR=/usr/share/quake1 \
 		build_release
 }
 
 src_install() {
-	newgamesbin linux/release*/bin/industri.run industri
-	dogamesbin "${FILESDIR}"/industri.pretty
+	newbin linux/release*/bin/industri.run industri
+	dobin "${FILESDIR}"/industri.pretty
+
 	insinto /usr/share/icons
 	doins industri.ico quake.ico
 	dodoc linux/README
-	cd "${WORKDIR}"/${PN}
+
+	cd "${WORKDIR}"/${PN} || die
 	dodoc *.txt
-	insinto "${GAMES_DATADIR}"/quake1/${PN}
+
+	insinto /usr/share/quake1/${PN}
 	doins *.pak *.cfg
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	if ! use cdinstall ; then
-		elog "You need to copy pak0.pak to ${GAMES_DATADIR}/quake1 to play."
+		elog "You need to copy pak0.pak to /usr/share/quake1 to play."
 	fi
 }
diff --git a/games-fps/legends/Manifest b/games-fps/legends/Manifest
index d32b5eb0e61f..4b7109046beb 100644
--- a/games-fps/legends/Manifest
+++ b/games-fps/legends/Manifest
@@ -1,4 +1,4 @@
 DIST legends.png 5092 BLAKE2B 74715a28e6c25e3ce9a3357be23b07a998181e12e7a19d721b094c10b7f1312b273307ad1ac2830c0d71a710434be679149e0d758ee5a785cebc6b71d91f965f SHA512 7b9f336335dc69e2fbc24286b2076a228739ab4abf1b77d977321d9dccfb453897bdbd51388e3ed54369ba39b7faa92e458700928d8bf5ccc0f3639f8737489a
 DIST legends_linux-0.4.1.43.run 123964866 BLAKE2B d16da9613a13c4d78d207fc474b859e222d6c387a676bc2fe851f34fed7e689a5457a022674e2e96abd7cfc8e9e68977078811147ffe44388986796a2157cd69 SHA512 17b1caa3aa6124f2389e2220ced82c41c4523897bde2f8211d219dc9ef8620583c4ae68999b0761155e3d45cb1ad9679cd65ba50c8440dd1848ef3b1a7a590d2
-EBUILD legends-0.4.1.43-r2.ebuild 1810 BLAKE2B 6705beadc455eba7e54c8751e25c196639c438808da35a07c939183775aae19f9d0324c623d5396613a81b4926dd5a654d803ccf43899fbd244923dd4542361e SHA512 60d2cf76324be1f3721067d7de36562edbf6389833c14e58dfc9fbd8096fe6fa4f99fdc79d00dbaf85761ebcf291f211deff41c9a431220df83a42f829476c44
+EBUILD legends-0.4.1.43-r2.ebuild 1823 BLAKE2B 4733189335fc732cfd33cd720e5e0074a34f8b8cda14f4de834718bfe1bf00f9d4cc2f1aea608ad0b7680e53f7832f3e0f0a23ef2512a55d6e4ede646806125f SHA512 e5c6fa582f2d5c0d9bbb0bfa82c6fc818a592c41fdd9b4c6a019d5bc71cfb44a1b1b846b6cf09402b272e1e75550921867f1bc87fd39c3932b0b2a327606b53e
 MISC metadata.xml 1427 BLAKE2B c9e4086f3639e290c414a48d30a56a56c9f541f2e4ad082a19f6361c55f2f57e862ab571e27d63bdb04702c64c2bc53404d345a8f1328902d03aaac2b4f3d150 SHA512 987ace71750e486c141c1010d1699194c656fda09a4952b51b31ad8f526de8f77372e57632d1636034e6de080871a4fc3140b1e2a49e98b3758d907a0eb3bba3
diff --git a/games-fps/legends/legends-0.4.1.43-r2.ebuild b/games-fps/legends/legends-0.4.1.43-r2.ebuild
index e516f30fffca..f94214861731 100644
--- a/games-fps/legends/legends-0.4.1.43-r2.ebuild
+++ b/games-fps/legends/legends-0.4.1.43-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils unpacker
+EAPI=7
+
+inherit desktop unpacker wrapper
 
 MY_P=${PN}_linux-${PV}
 dir=/opt/${PN}
@@ -11,6 +12,7 @@ DESCRIPTION="Fast-paced first-person-shooter online multiplayer game, similar to
 HOMEPAGE="http://legendsthegame.net/"
 SRC_URI="http://legendsthegame.net/files/${MY_P}.run
 	mirror://gentoo/${PN}.png"
+S="${WORKDIR}"
 
 LICENSE="Legends LGPL-2.1+"
 SLOT="0"
@@ -21,7 +23,6 @@ RESTRICT="strip"
 QA_TEXTRELS="${dir:1}/libSDL-1.3.so.0"
 QA_FLAGS_IGNORED="${dir:1}/libSDL-1.3.so.0 ${dir:1}/LinLegends ${dir:1}/lindedicated"
 
-DEPEND=""
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	media-fonts/font-adobe-75dpi
@@ -32,11 +33,9 @@ RDEPEND="sys-libs/glibc
 	media-libs/libvorbis[abi_x86_32(-)]
 	media-libs/openal[abi_x86_32(-)]"
 
-S=${WORKDIR}
-
 src_unpack() {
 	unpack_makeself ${MY_P}.run
-	cd "${S}"
+	cd "${S}" || die
 
 	# keep libSDL-1.3.so because legends requires it as of 0.4.0, and
 	# 1.2.6 is highest in portage
@@ -48,7 +47,7 @@ src_install() {
 	insinto "${dir}"
 	doins -r *
 
-	rm "${D}/${dir}/"/{lindedicated,LinLegends,*.so.0}
+	rm "${ED}/${dir}/"/{lindedicated,LinLegends,*.so.0} || die
 	exeinto "${dir}"
 	doexe lindedicated LinLegends *.so.0
 
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
index d016bd218d51..edb17f1e555c 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 2553 BLAKE2B fcff261e4cababc230541c1d7ebf7ce4365f6ff1947d0aca0c6d9dab7c544ebcec914124abd5730118fb1b3ca1f2d876bef57167cbf6fc306fb0bf93a5c7a2f5 SHA512 26d1de723465413580cc5a0203ed1fa0d0cfc71171c26702780e1ddf45a3bdc429fb2dc90d948df6dfa2950f397a22f6bc56679d7d17a5487df94e7ca102b8fc
+EBUILD nexuiz-2.5.2-r1.ebuild 2704 BLAKE2B eeed57572a0e2459f886b05f0219050a95b8337bc4ac72984b76a2bc477fa155b56503d1f3464880c7f835ced16238285cb3d6c3cc4f66fec7735e8485c2ffdf SHA512 08f894c0cd0014891623f1aeb49f41cb65c87778551d8655dbc80489db8f984d74d87e6db2c0ba31ffeeaf9725ec0df87eb7b3a8c8b50e5de86745a51271d0fa
 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 68bb3ae1edc8..f9054d23eec3 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop toolchain-funcs
 
 MY_PN=Nexuiz
@@ -87,7 +88,13 @@ src_prepare() {
 }
 
 src_compile() {
+	# Unset STRIP because the build system by default will not strip
+	# If users express a preference, this triggers strip
+	# bug #739294
+	unset STRIP
+
 	tc-export CC
+
 	if use opengl || ! use dedicated ; then
 		emake cl-${PN}
 		if use sdl ; then
diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
index d21843d68a07..27a4226d95e5 100644
--- a/games-fps/quake1-data/Manifest
+++ b/games-fps/quake1-data/Manifest
@@ -1,2 +1,2 @@
-EBUILD quake1-data-2.40.ebuild 1558 BLAKE2B 9ba56a23eef6458886be77c0e1fa3f166cf20d274621efdfaa9a3f28a8f633bbf6d03cb08d74823ad528c8427b2eabade9150ad5835953abe130cd5271b37a57 SHA512 5e98400af621f614a9e69e975b9dc9a76bbd086883ccc64d5fc034228d2cf465174dae33601eef2c206a6db4fa20e984c02b76ffe530ffae973cb173ffe5e9e6
+EBUILD quake1-data-2.40-r1.ebuild 1515 BLAKE2B 55f6f0dde2b47b1bdcb41ce669b28ff8d12bbf95787c23f45b483ff905a376bfac602a12f6d87005998b5a025e2de4d0ef23d2d57288360426a719d45c239932 SHA512 42fb00f20a89360dc8a335611b956a63b4aa0b314f6856afbbea00c8740709d5f8d10a3e70d1c3eac715e6f0362c7b6085fc31c62a13a39b3b880a90caac9482
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
index 6c3c9e1eb193..ed730aa32cb3 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: if installing off of the 1.01 cd, need to fetch the
@@ -6,51 +6,53 @@
 # http://linux.omnipotent.net/article.php?article_id=11287
 # ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
 
-EAPI=5
-inherit eutils cdrom games
+EAPI=7
+
+inherit cdrom
 
 DESCRIPTION="iD Software's Quake 1 ... the data files"
 HOMEPAGE="https://www.idsoftware.com/games/quake/quake/"
-SRC_URI=""
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="app-arch/lha"
 RDEPEND="!games-fps/quake1-demodata[symlink]"
-
-S=${WORKDIR}
+BDEPEND="app-arch/lha"
 
 src_unpack() {
 	export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
 	cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
+
 	if [[ ${CDROM_SET} == "1" ]] ; then
-		echo ">>> Unpacking q101_int.lha to ${PWD}"
+		elog "Unpacking q101_int.lha to ${PWD}"
 		cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
 			"${S}"/q101_int.exe
+
 		lha xqf "${S}"/q101_int.exe || die
-		rm -f q101_int.exe
+		rm -f q101_int.exe || die
 	elif [[ ${CDROM_SET} == "3" ]] ; then
-		echo ">>> Unpacking resource.1 to ${PWD}"
+		elog "Unpacking resource.1 to ${PWD}"
 		lha xqf "${CDROM_ROOT}"/resource.1 || die
 	fi
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/quake1/id1
+	insinto /usr/share/quake1/id1
 	case ${CDROM_SET} in
-		0)  doins "${CDROM_ROOT}"/id1/*
+		0)
+			doins "${CDROM_ROOT}"/id1/*
 		    dodoc "${CDROM_ROOT}"/*.txt
 		    ;;
-		1|3)doins id1/*
+		1|3)
+			doins id1/*
 		    dodoc *.txt
 		    ;;
-		2)  newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
+		2)
+			newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
 		    newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak
 		    dodoc "${CDROM_ROOT}"/Docs/*
 		    ;;
 	esac
-	prepgamesdirs
 }
diff --git a/games-fps/quake1-demodata/Manifest b/games-fps/quake1-demodata/Manifest
index 51a46ffe9923..ac8a18ddc980 100644
--- a/games-fps/quake1-demodata/Manifest
+++ b/games-fps/quake1-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST quake106.zip 9094045 BLAKE2B 39d639a7c4daf48bacfed3d8f7488131cabd61eba3d1969b23958f4f35ac7f693a165500a4a1cf2b917bb8d363d360a402c7100ba8f6b7083c7eaba1fe16756a SHA512 8960c48d9c3c8bb142fd812968d29f05304384bd559b5cdb1d2cb8b6faac84d30ebf9cdf5e5e4eb3739907d9b599ca2ba34035647c58a8ed1874bdc7f0b75e1d
-EBUILD quake1-demodata-1.06.ebuild 1496 BLAKE2B 7b4c998677e668480227edf95ed1c6779a0cf200159aea09cd1958d3e196076f7222a3dda8160ac730917bb3327e6eacc1cfa3d9029dd613aaf493a42483ef02 SHA512 20ecec2d80baedaf9055ec322a5a60b4d5e85f045b9536e31a06d735211df1f6673eff1a404c805cff2db021dd54161932ba3c574575acde074bf5020df1d1fb
+EBUILD quake1-demodata-1.06-r1.ebuild 1416 BLAKE2B 1279acf4fb2a83811da4d8aa4cd8c3b3d575e8a7fe6574ba0b89cba32d2ebf764cfa3d15fe6ea36c562c13a27c02d40aa6c5471edc4b12d61e19fdb37ce4c640 SHA512 9e0029a2692dff154f8c700e8e1bc11fdf6bde6620b41d1f5bc26ed5da4ae6b7ffb8a66ef5fcf0c680f6ad6ed3fb1909ac0ae7b8fee9de4fc4ef219018197ed0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06-r1.ebuild
index 102d80da46f6..b5931771e141 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils versionator games
+EAPI=7
 
-MY_PV=$(delete_all_version_separators)
+MY_PV=$(ver_rs 1- '')
 MY_PN="quake"
 
 DESCRIPTION="Demo data for Quake 1"
 HOMEPAGE="https://en.wikipedia.org/wiki/Quake_I"
 SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
+S="${WORKDIR}"
 
 # See licinfo.txt
 LICENSE="quake1-demodata"
@@ -18,15 +18,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
 
 RDEPEND="symlink? ( !games-fps/quake1-data )"
-DEPEND="app-arch/lha
-	app-arch/unzip"
+BDEPEND="
+	app-arch/lha
+	app-arch/unzip
+"
 
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}1
+dir=usr/share/${MY_PN}1
 
 pkg_setup() {
-	games_pkg_setup
-
 	if has_version "games-fps/quake1-data" ; then
 		ewarn "games-fps/quake1-data already includes the demo data,"
 		ewarn "so this installation is not very useful."
@@ -37,31 +36,28 @@ src_unpack() {
 	unpack ${A}
 
 	# File rename for bug #159100
-	mv resource.{1,x}
+	mv resource.{1,x} || die
 
 	lha xfq resource.x || die "lha failed"
 	# Don't want to conflict with the cdinstall files
-	mv id1 demo
+	mv ID1 demo || die
 }
 
 src_install() {
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r demo
 
-	dodoc *.txt
+	dodoc *.TXT
 
 	if use symlink ; then
 		# Make the demo the default, so that people can just run it,
 		# without having to mess with command-line options.
-		cd "${D}/${dir}" && ln -sfn demo id1
+		cd "${ED}/${dir}" || die
+		ln -sfn demo id1 || die
 	fi
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "This is just the demo data."
 	elog "You will still need a Quake 1 client, to play, such as darkplaces."
 	echo
diff --git a/games-fps/quake1-killer/Manifest b/games-fps/quake1-killer/Manifest
index 7018b29eb81f..93571cc006b5 100644
--- a/games-fps/quake1-killer/Manifest
+++ b/games-fps/quake1-killer/Manifest
@@ -1,3 +1,3 @@
 DIST kqp220z.zip 2952348 BLAKE2B 1e31576e137d9943bc3eb62ceac9ca3e6e66f5081252422818f24fe8710f9ba5b2212dd5dff146ced751873872aa23fdb988b96d34ef157ec922fddcf7fdc15a SHA512 8149795435cf72c4358dc35cce473482b718b67cc799ce4739d975cf5fe3e856735cbcd1f40c7b6a345aee8bf830147ecb37e312b1cb141b40c14cc95fd0f56e
-EBUILD quake1-killer-2.2z.ebuild 646 BLAKE2B 01d5b2cacb23ed8dc71966aaf8d80ff140f82604a6dd404ca9fecdf10e0fb5c0b851f0b95cd09eed6da65ffb226113f82f1abacc199443799c9096f337d0468f SHA512 56fffc89e5cc1ebbb78052f529d1c4e7c095bf79d776578d5a86fa5e9becfe668085fe743445d1935b4ad7c7c0692e696e9dbb6cbbb051a4b70d2dc8267ac2e8
+EBUILD quake1-killer-2.2z-r1.ebuild 585 BLAKE2B aa0c754c74ab1a145fb3bf7e34fde981b8eef12823e2a7039d338f4b26f9aa9f7d6f8f48edb078bece3df19b95e53205c100457fe76cd2a89e2bcc711689e97b SHA512 66ed4a4028bacfd0d5914241bc96c8f6626f11a42b6716254931c2f3ff92e7f0e6261dff3da33b7472065b65e4941a064ddec77ba57e2d634b05b29e7ffbc61b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild b/games-fps/quake1-killer/quake1-killer-2.2z-r1.ebuild
index 258296f7f514..f7b2c4a6652c 100644
--- a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
+++ b/games-fps/quake1-killer/quake1-killer-2.2z-r1.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=7
 
 DESCRIPTION="The Killer Quake Patch"
 HOMEPAGE="http://kqp.horoy.com/"
 SRC_URI="http://www.gamers.org/pub/idgames2/quakec/compilations/kqp220z.zip
 	mirror://gentoo/kqp220z.zip"
+S="${WORKDIR}"
 
 LICENSE="quake1-killer"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	echo ">>> Unpacking kqp220z.zip to ${PWD}"
+	elog "Unpacking kqp220z.zip to ${PWD}"
 	unzip -qoL "${DISTDIR}"/kqp220z.zip || die "unpacking kqp220z.zip failed"
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}/quake1/killer"
+	insinto /usr/share/quake1/killer
 	doins -r *
-	prepgamesdirs
 }
diff --git a/games-fps/quake1-rally/Manifest b/games-fps/quake1-rally/Manifest
index a4d4981e02b7..d520b797bcbb 100644
--- a/games-fps/quake1-rally/Manifest
+++ b/games-fps/quake1-rally/Manifest
@@ -1,4 +1,4 @@
 DIST qr12.zip 9885866 BLAKE2B a2fa1ad28033bd5530c53c132b44732325fcfc58585474859b6e3cc34c94751142ff69bcaf01062a8adb16e259583bae923c90d294b08ea7278862621c39a8b2 SHA512 a49b00e67b95c06b4898ad8e1f9e0a718c025736e7d68d3aa8e6ff9cf3062ea8a0cd0ea0deee5c2af8e3e30652c4420cd4b030b3bd8f1dd4ace9236bfaaf5e5a
 DIST qrlo1.zip 4086037 BLAKE2B 066945f0121efe38a222dc475d30d759ad50ab0c58f98e798955b18b3723001e2aeeac8d2627972bb3e9706786032ccf53e7fd96874815ae13f9167589435854 SHA512 94af61a0f6978c39425cbc414e094417deef99f109aac2905877b3723873657c3ef7d7ae7d3b247144d68eabbfb79750a654e627ac039d315ff0f2fd323f395d
-EBUILD quake1-rally-1.2.ebuild 929 BLAKE2B b446cebd96148077c9f0756cf711bd19c8b409e71521edc2e9ee8eb6150fb7517724077a003e3d2feca957b410d201a8739e907314bdb22b80c45b9b236ea659 SHA512 efba1aed594e9a8e759654165f7967c9e2c96409a3fbc117e07fd5800dd8b2741baf96840b3a4c5f477dc69493e7085734a1b857f5b73d5c9290c634badb913d
+EBUILD quake1-rally-1.2-r1.ebuild 910 BLAKE2B 0df1015273f0584d15ca56d86f2ac46ff6c661104726be926423d40c08aab9201a741f07b1e581d0da42ddd50395d2cb28ae74b62fc5818d33506d70b9ac80d4 SHA512 b93d6388833bc37fb5fd2d4c3a551d817e7a18a111b72b1611d3fd45c69f7dcb15c5a4c0da1c91dfb5bfbfd728f7252c6139b8bac2e9de68ff3862b13a0e7321
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-rally/quake1-rally-1.2.ebuild b/games-fps/quake1-rally/quake1-rally-1.2-r1.ebuild
index e7c086e83cbe..5b4137c84763 100644
--- a/games-fps/quake1-rally/quake1-rally-1.2.ebuild
+++ b/games-fps/quake1-rally/quake1-rally-1.2-r1.ebuild
@@ -1,38 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit edos2unix
 
 DESCRIPTION="TC which turns Quake into a Rally racing game"
 HOMEPAGE="http://wiki.quakeworld.nu/Quake_Rally"
 SRC_URI="http://ehall.freeshell.org/quake/qr12.zip
 	http://ehall.freeshell.org/quake/qrlo1.zip"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
+RESTRICT="mirror bindist"
 
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	echo ">>> Unpacking qr12.zip to ${PWD}"
+	einfo "Unpacking qr12.zip to ${PWD}"
 	unzip -qoLL "${DISTDIR}"/qr12.zip || die "unpacking qr12.zip failed"
-	echo ">>> Unpacking qrlo1.zip to ${PWD}"
+
+	einfo "Unpacking qrlo1.zip to ${PWD}"
 	unzip -qoLL "${DISTDIR}"/qrlo1.zip || die "unpacking qrlo1.zip failed"
-	rm -f button.wav qrally.exe
-	cd rally
-	edos2unix $(find . -name '*.txt' -o -name '*.cfg')
-	mv rally{,.example}.cfg
+
+	rm -f button.wav qrally.exe || die
+	cd rally || die
+
+	edos2unix $(find . -name '*.txt' -o -name '*.cfg' || die)
+	mv rally{,.example}.cfg || die
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}/quake1"
+	insinto /usr/share/quake1
 	doins -r *
-	prepgamesdirs
 }
diff --git a/games-fps/quake1-teamfortress/Manifest b/games-fps/quake1-teamfortress/Manifest
index 7cb703baff5d..ef6937537ba6 100644
--- a/games-fps/quake1-teamfortress/Manifest
+++ b/games-fps/quake1-teamfortress/Manifest
@@ -1,4 +1,4 @@
 DIST tf28.zip 4204316 BLAKE2B 9cb90e942d58380e8b9fd8ec527232d7461860621ed2bce888fadbbae03ad7c4cfb96035b74dc10c1a3124659869c161bb716178b7d7954fac2a6c828cbbef1f SHA512 2b158982fbf501712fa31fae7b8d34ce4adf41c7ada7c32549bc94ea7370f56b7ebb03f08f70c38c4e53a4ba49a95cbd23acda39eddc4a360d236cc0129a3262
 DIST tf29qw.zip 626175 BLAKE2B b480cfc0f3ce330142fc1816632b6da8207b532fac9f5e47fd93d4b1b8bc3fc02dbfc541f1ef052782db0ae6251bec90b09f384e607b6ec9272386b6e18623e4 SHA512 77ea488e5d9fcd3ad91317f2a35bd9e19ca38712cf9bf248bcfa88d1a5a66577ccc504476ecfb5d06bb7a28cd93ce92d3728f4be825c93567c8c2b61cb80c08d
-EBUILD quake1-teamfortress-2.9.ebuild 857 BLAKE2B 25253ea854401ca24110656b077c48c56c7e05d1b743880c9dfac41b5fffe59d682be0218259d4b0f9ffa16709924cd75876c2a730da870861fc1e2e5304ab08 SHA512 1ac13963cc26e7933374a42e33223cf2a06e20b862fa78c00758fd2450b2964794fac98c1fff552420b0e1ade02bf4ec7f665d7da2ab1a8555b666310494469b
+EBUILD quake1-teamfortress-2.9-r1.ebuild 826 BLAKE2B e39ee0cb672da49c4da868b9a157959dc8bd2c696ca354ecf977299e778d8075a503c868b41608703627446e776e84b59b466b6ba5423817a6c83341e9ffb75f SHA512 7fe654b6b9b586213ab0591da775723d3991adf5e819b598da649553aa1cdf2e2a9d90a5561fdd3008c0ae95f07d584e89609782d1d99265dfb99e721b313a6c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9-r1.ebuild
index 19e52511fc51..92573dc42b6e 100644
--- a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
+++ b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9-r1.ebuild
@@ -1,37 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit edos2unix
 
 DESCRIPTION="The classic Team Fortress Quake World mod"
 HOMEPAGE="http://www.planetfortress.com/teamfortress/"
 SRC_URI="mirror://gentoo/tf28.zip
 	mirror://gentoo/tf29qw.zip"
+S="${WORKDIR}"
 
 LICENSE="quake1-teamfortress"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	echo ">>> Unpacking tf28.zip to ${PWD}"
+	elog "Unpacking tf28.zip to ${PWD}"
 	unzip -qoL "${DISTDIR}"/tf28.zip || die "unpacking tf28.zip failed"
-	cd fortress
-	echo ">>> Unpacking tf29qw.zip to ${PWD}"
+
+	cd fortress || die
+	elog "Unpacking tf29qw.zip to ${PWD}"
 	unzip -qoL "${DISTDIR}"/tf29qw.zip || die "unpacking tf29qw.zip failed"
 
-	edos2unix $(find . -name '*.txt' -o -name '*.cfg')
-	mv server.cfg server.example.cfg
+	edos2unix $(find . -name '*.txt' -o -name '*.cfg' || die)
+	mv server.cfg server.example.cfg || die
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}/quake1"
+	insinto /usr/share/quake1
 	doins -r *
-	prepgamesdirs
 }
diff --git a/games-fps/quake1-textures/Manifest b/games-fps/quake1-textures/Manifest
index f30678a7a3c0..757956340048 100644
--- a/games-fps/quake1-textures/Manifest
+++ b/games-fps/quake1-textures/Manifest
@@ -1,4 +1,4 @@
 DIST SKINSbmodels-48files-4-23-05.zip 12627945 BLAKE2B 0197f230ef0506aa2fe6ff47e270da9ccc28c78ac3f9e3f961e1026921723999606a41082072ea8c498d9ee49ad7a7c796c21566dc3a1fbab0ccfac2535921d4 SHA512 dcd39b7d8544d4c381b2917820e1cec193f4279eca1c2d1b260cfc0d019a224bef84b4cd6a19da37331913533541d90ac72ac119592eb95cc82c9e2bac8ab37e
 DIST textures-486files-8-20-05.rar 207799283 BLAKE2B 3c59200ded0fecf986261ebe9f85e63291e3c003821f5f8e6157bbe4731ceba98133d0bf98a0dd5ca4b5a52fe2f490e0c65e98e53dcf4f994f47e550f0c4f29e SHA512 3809bea3ff1d7bc7acff51d8f19890677a563778cfb418d3f6ae940ceffa8953a1cf10dd7cc3a5d30715e6d2e79331ec88dd72f1ba22ebec0d179a01ad0eda2a
-EBUILD quake1-textures-20050820.ebuild 1014 BLAKE2B a5cb1d36d13b9dfd8daa0f76a09435ff23a4f7d95bdb93f4db3210a907635a9b12ef09798362249c178850bde54f6ab3082d5e44b8be909fd3ee42a34f7f16d6 SHA512 338fcdfc6fb881239a231e2aad25ebaa1943030009632e9a2525a7c96b0665c327b631c38c3fb6f572aa4606b49c24a44febbc1d2a2d224442844d8f45264bad
+EBUILD quake1-textures-20050820-r1.ebuild 937 BLAKE2B 806240924952058809d9510b8140e49f760036c979dcf8afa8e09f679bf2dd29445c48f07ea760edf1fb297a76019db67c63c2f64868f06e5b5484f3d98c47a8 SHA512 0ea3c4bd4bce8664f22a4353e9b155549406d3a6eea258585dcd13e3ec426409d1a93b40a2c91dfff78ac61b8f05fcbd51cb92dc6c2a827380c13ff2e348449a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-textures/quake1-textures-20050820.ebuild b/games-fps/quake1-textures/quake1-textures-20050820-r1.ebuild
index 4489581ed4ad..38e4e9a9dfa7 100644
--- a/games-fps/quake1-textures/quake1-textures-20050820.ebuild
+++ b/games-fps/quake1-textures/quake1-textures-20050820-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
 
 MY_SKINS="SKINSbmodels-48files-4-23-05.zip"
 MY_TEXTURES="textures-486files-8-20-05.rar"
@@ -11,41 +10,36 @@ DESCRIPTION="Collection of graphical improvements for Quake 1"
 HOMEPAGE="http://facelift.quakedev.com/"
 SRC_URI="http://facelift.quakedev.com/download/${MY_SKINS}
 	http://facelift.quakedev.com/download/${MY_TEXTURES}"
+S="${WORKDIR}"
 
 LICENSE="quake1-textures"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="app-arch/unzip
+BDEPEND="
+	app-arch/unzip
 	|| (
 		app-arch/unrar
-		app-arch/rar )"
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/quake1
+		app-arch/rar
+	)
+"
 
 src_unpack() {
 	unpack ${A}
 
-	mv readme.txt skins.txt
+	mv readme.txt skins.txt || die
 }
 
 src_install() {
-	insinto "${dir}"/id1/textures
+	local dir=/usr/share/quake1
+	insinto ${dir}/id1/textures
 	doins -r *.tga
 
 	# Set up symlink, for the demo levels to include the textures
-	dosym "${dir}/id1/textures" "${dir}/demo/textures"
-
+	dosym ../id1/textures ${dir}/demo/textures
 	dodoc *.txt
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "Use a Quake 1 client (e.g. darkplaces) to take advantage of these."
 }
diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
index e36bac5a5a70..f9636b11104b 100644
--- a/games-fps/quake2-data/Manifest
+++ b/games-fps/quake2-data/Manifest
@@ -1,3 +1,3 @@
 DIST q2-3.20-x86-full-ctf.exe 19267584 BLAKE2B a388035f1694f83ecb9fbbaf48668c190179cd62fd6b013c80dee02edf2a7eb02d5b26a382cc3e4e078fd39b95f04ca82ee74407b19ca2696cc226845b62ff14 SHA512 056a56f218f3fd7a3c5270665990bb347ce3e6f4aa8afa3b65a5d291d3b0cd149e3b58ed0cd136bd3edecb3c080f790f9dac68c63d19f095818720f0537b5bad
-EBUILD quake2-data-3.20.ebuild 2449 BLAKE2B e9c787405d5e824083fd5243909a3dd7280535f14ddf7e205abe9eb3aaed59b0bad604d4214ea597aa1d0a3b83feff9dee7e5cd9a5b214fd925ced793f46678f SHA512 00c52ec44d7e61a6810810d60272070a757c19fac9e3907015850b6b8f0dc6055f812ddca281bdccd81412565c77f306ca0c27dc442c4b0059b75b7a95d16327
+EBUILD quake2-data-3.20-r1.ebuild 2223 BLAKE2B f3958d834c576fec77aabe2c8050eb16ef882bab61c77dc98f1410a1d1eece1fb8d3e97d8a4f093b3aaf35803b62b03f7b1598ad0e108f54bfcb03dc379e432f SHA512 6124fcd1a09520d17b8d9c01041defc3f740d1f36a11e09efdcb36cc1fe84c2aca21866300781628737b779c4a4a7a8246f2923a3e938928778d9ab3dec994fc
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20-r1.ebuild
index d7eda8747829..f631098f4959 100644
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20-r1.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils cdrom games
+EAPI=7
+
+inherit cdrom unpacker
 
 DESCRIPTION="iD Software's Quake 2 ... the data files"
 HOMEPAGE="https://www.idsoftware.com/"
 SRC_URI="mirror://idsoftware/quake2/q2-${PV}-x86-full-ctf.exe"
+S="${WORKDIR}"
 
 LICENSE="Q2EULA"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="videos"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	games_pkg_setup
-	if has_version "games-fps/quake2-demodata[symlink]" ; then
-		eerror "The symlink for the demo data conflicts with the cdinstall data"
-		die "Unmerge games-fps/quake2-demodata to remove the conflict"
-	fi
-}
+RDEPEND="!games-fps/quake2-demodata[symlink]"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	export CDROM_NAME_SET=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
@@ -36,10 +28,11 @@ src_unpack() {
 src_install() {
 	dodoc DOCS/* 3.20_Changes.txt
 	newdoc ctf/readme.txt ctf-readme.txt
+
 	case ${CDROM_SET} in
-		0) dohtml -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ;;
-		1) dohtml -r "${CDROM_ROOT}"/Install/Docs/quake2_manual/* ;;
-		2) dohtml -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ;;
+		0) { docinto html && dodoc -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ; } ;;
+		1) { docinto html && dodoc -r "${CDROM_ROOT}"/Install/Docs/quake2_manual/* ; } ;;
+		2) { docinto html && dodoc -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ; } ;;
 		3) dodoc "${CDROM_ROOT}"/Docs/* ;;
 	esac
 
@@ -51,35 +44,34 @@ src_install() {
 		3) baseq2_cdpath=${CDROM_ROOT}/setup/Data/baseq2;;
 	esac
 
-	dodir "${GAMES_DATADIR}"/quake2/baseq2
+	dodir /usr/share/quake2/baseq2
 
 	if use videos ; then
-		insinto "${GAMES_DATADIR}"/quake2/baseq2/video
+		insinto /usr/share/quake2/baseq2/video
 		doins "${baseq2_cdpath}"/video/*
 	fi
 
-	insinto "${GAMES_DATADIR}"/quake2/baseq2
+	insinto /usr/share/quake2/baseq2
 	doins "${baseq2_cdpath}"/pak0.pak
 	doins baseq2/*.pak baseq2/maps.lst
-	dodir "${GAMES_DATADIR}"/quake2/baseq2/players
+
+	dodir /usr/share/quake2/baseq2/players
 	cp -R "${baseq2_cdpath}"/players/* baseq2/players/* \
-		"${D}/${GAMES_DATADIR}"/quake2/baseq2/players/ || die
+		"${ED}"/usr/share/quake2/baseq2/players/ || die
 
 	for mod in ctf rogue xatrix ; do
 		if [[ -d ${baseq2_cdpath}/../${mod} ]] ; then
 			if use videos && [[ -d ${baseq2_cdpath}/../${mod}/video ]] ; then
-				insinto "${GAMES_DATADIR}"/quake2/${mod}/video
+				insinto /usr/share/quake2/${mod}/video
 				doins "${baseq2_cdpath}"/../${mod}/video/* 2>/dev/null
 			fi
 			if [[ -n $(ls "${baseq2_cdpath}"/../${mod}/*.pak 2>/dev/null) ]] ; then
-				insinto "${GAMES_DATADIR}"/quake2/${mod}
+				insinto /usr/share/quake2/${mod}
 				doins "${baseq2_cdpath}"/../${mod}/*.pak
 			fi
 		fi
 	done
 
-	insinto "${GAMES_DATADIR}"/quake2/ctf
+	insinto /usr/share/quake2/ctf
 	doins ctf/*.{cfg,ico,pak}
-
-	prepgamesdirs
 }
diff --git a/games-fps/quake2-demodata/Manifest b/games-fps/quake2-demodata/Manifest
index f7d21bba52dd..21a19c937889 100644
--- a/games-fps/quake2-demodata/Manifest
+++ b/games-fps/quake2-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST q2-314-demo-x86.exe 39015499 BLAKE2B 1259d8e2481e5667a1a458e356593b026619a16d8dff32b664143121481f61b5e29129aac6b1aee0c0f0f12eee0f254965355f265c6c66d0ba3acab6e1b5983d SHA512 9aa5123807a64a6e3e3b113b582efd353f176f093fd0aae6bd01d9cff397374c06948a7147f59748b3aa6f4251769e409fae838157edb66429c9d41381b3df86
-EBUILD quake2-demodata-3.14.ebuild 1299 BLAKE2B 0ef0f2ebd5620f99e3ca13c5187c309c20825cc38e73b586e298614a26368387d69ad65740426ca3e4351cbecf7e07c030f1cd320f0479c91f26bb4695627c7b SHA512 2d0d5ee34ae5d2a8d5d8b174ce5500264312caa1869d06cee16048992935be4f0e40ceca1e8a450de2978f7b56792704430d156688b0a66e5b014554d7f25687
+EBUILD quake2-demodata-3.14-r1.ebuild 1267 BLAKE2B a6c55477c31070b4d7df471923e4a1989f9e88a7e50314a269d07e7f6ef8e74e5b57edd1cfe3efee55c5300fec48534bc0f02c3095b7d175c9721db3c26b6b8c SHA512 7feafbab771c30d1b7c8d1049c737acc3623fc38e8d31fc946acfe8fa85f3971ea251338d35fa53b02e9297dca21e8510ed3a65ebcd26dc8d93076340b75d226
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
index bcca12997738..b7fe8cd32c7d 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils versionator games
+EAPI=7
 
-MY_PV=$(delete_all_version_separators)
+inherit unpacker
+
+#MY_PV=$(delete_all_version_separators)
+MY_PV=$(ver_rs 1- '')
 MY_PN="quake2"
 FILE="q2-${MY_PV}-demo-x86.exe"
 
 DESCRIPTION="Demo data for Quake 2"
 HOMEPAGE="https://en.wikipedia.org/wiki/Quake_II"
 SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
+S="${WORKDIR}"
 
 # See license.txt - it's a bit different to Q2EULA in Portage
 LICENSE="quake2-demodata"
@@ -18,19 +21,17 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="symlink"
 
-RDEPEND=""
-DEPEND="app-arch/unzip
-	!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data
+RDEPEND="!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}
+dir=usr/share/${MY_PN}
 
 src_unpack() {
 	unpack_zip ${A}
 }
 
 src_install() {
-	insinto "${dir}"/demo
+	insinto ${dir}/demo
 	doins -r Install/Data/baseq2/{pak0.pak,players}
 
 	dodoc Install/Data/DOCS/*.txt
@@ -38,15 +39,12 @@ src_install() {
 	if use symlink ; then
 		# Make the demo the default, so that people can just run it,
 		# without having to mess with command-line options.
-		cd "${D}/${dir}" && ln -sfn demo baseq2
+		cd "${ED}"/${dir} || die
+		ln -sfn demo baseq2 || die
 	fi
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "This is just the demo data. To play, install a client"
 	elog "such as games-fps/qudos"
 	echo
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 7d4c8c4e0f3b..a3990d949be1 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,21 +1,21 @@
-AUX 0.16-rogue-armor.patch 240 BLAKE2B 5643b1af747e3b6d34d21f8ee830d6d5bec91e356e724dfb66e6840df3a594af7ebfe9a442979801fc3096b35b6485f9cd41db3295b154cdf096526779e34fca SHA512 591fccd0cbc1225982b6d95d4818a4d0ff409717de8799b1d49f424633169d8a8187206220c24b60a341337aec2e297dfd8517dd478223e7d557ee85f6ecc453
-AUX 0.16-rogue-nan.patch 170 BLAKE2B 76beecbd38d07bad65595a049aea6802f7575d65e1640cef2a05ce5ecef8031d333af2df56995bcf2b420034e663896d89dadc362959786a92eea0078d609c3c SHA512 3d9b3a95a85a6fa39f2c6f7ad5e49b313b723bfb0fa88392f8690df27c16a7d6ad7617043b6fd66dc87cbbac9b01b941b8cbc8ecf4e045b908e844832c80d26a
+AUX 0.16-rogue-armor.patch 231 BLAKE2B a913e4bd4ea987967af1f35c1fd25e69ea69d81395419390d17164f6f59b98fcd1bfdd38792d0c59da08fc05ee15be3fa75e5f1ee7c96eb9344cf5071297839c SHA512 2e1b80fff54e5b069f9b41ee400c7d72b118b7243f5e8c61e6d187c92e3fb5e8f483fba1b81fc53aab661236e14400959facc008e66b193255b70316832f8b2b
+AUX 0.16-rogue-nan.patch 161 BLAKE2B a80bf2cf61545c1deb682de842f4d43bc4b65ed73cfdb24a090f36b463a77006316d4a194c434ecb4dfd2ff94569af033624731470a5c631406a151e46ac8719 SHA512 4ecf761ace381d08529ab2c1e0ccd5f0e11f26bacbbd874c1d37a9d1656e21e20e71f4d8a25d298e73ccd2f0b4f3cb226106e417c11816e3e42b21c27c8969d2
 AUX README-postinstall 3083 BLAKE2B 364510b4eb37b6623e8346c74743b27156f99938fc9726929500c4488fd9d8a54b45d762586bfb43996d27f8aab09b2cd2feda08cad2aba0be534f4b8ca303e0 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe
-AUX quake2-icculus-0.16.1-alsa.patch 4386 BLAKE2B f85c0332ee7ff5fec98dcc5762cf63733f8442e76864cbd844dc19426f14eb22b4d3fec7fea8592fc9fe95cb55193324cefb87076fefb254cb7773cd2423f567 SHA512 8bb9e4d6f551ebe3e6715e044453affd7edd749650791fca32b5286038e75a59685c7d47efce8ac7b9dff488e6c2952dfdc68807f3365d276afb4b7387ad5dbc
-AUX quake2-icculus-0.16.1-amd64.patch 534 BLAKE2B 8f3afa80b23784a6683762a94b651b5999a7570ae954c87e5bf963ea52bf1fbdb3150c22715b4d4711b31892e3d67ef01bdfbb3285338add10bcbba0aaa335c2 SHA512 03faf4b85aa176a267847196fb56204b6d02bde0ebef858a34edb3c87cb41e57636d9b6e5b3be44163e918cb4b3ff38299b2db9de90690179108ee77146b942d
+AUX quake2-icculus-0.16.1-alsa.patch 4386 BLAKE2B 3ca70a0019a89eef53ef21e9980ece4b4c131e51015b3ffc59f3ece67becfe292a0228d6e05a2ce1bca29ed41075f18593c0374986c04fac2d558ce83ed30ac0 SHA512 75184e826611c6341e7bd128c5a0c8485ec4348d7ea65edd4b8e25f7342a13c47675b809a9522be7ba29b492b643c723ead720b8c7074b217c205cd7a658a487
+AUX quake2-icculus-0.16.1-amd64.patch 538 BLAKE2B 4ef45493f21b12d68c25e1c4568f4a964b69e6e73dd1fef2b04e020a65ce134b58fb4689a44c344906b50b59de98398af622245bd26918d881382242f83dbdcb SHA512 7e493d09dd958d8ed10629057edaeef0dd78b2f34a0f75f2538fcff23474e96a99e3b985233d2e5a736102c92d0999e919aee94bb7141bb311c082e19e191565
 AUX quake2-icculus-0.16.1-fno-common.patch 389 BLAKE2B e8dc118ea7af1f76e4eb5cde68cba3cd858e26cdb67a2ca9d37a9dbdd476651a45041419fedde7726f3b9054d4936313136bb00bc319a49884a817e50a570daf SHA512 26d72187bd580e18f3eb7e235a3b3e2589968508cc2d3363c2c828f79b9aec8b03c4e23d47a79b988f276ea69d3bd012ab7b866b55c4c69f7f49a75dd41b3944
-AUX quake2-icculus-0.16.1-gcc41.patch 292 BLAKE2B 393df8fbd236fb3eb509fa640c650144e734f15baf3b1f985ca0a0d81810e227e87b4a19ceb5db95067b40370ce7dab1e641f48a9ecd00d7f0bcaa3726f9bc56 SHA512 87193f69670e7cd6573bd4ff550202fda2702a5d7dfadb3af31f673b8910958ec3718e0d7ae558666c6a6921c43d543626dc8eaa0e3822345f33aecdbdf7ee50
-AUX quake2-icculus-0.16.1-gentoo-paths.patch 6419 BLAKE2B ed3fe4cd3f812b6dda63bd017eca74a57dafe0ae56a877a30e814c486b4378a04a7c0525f71a13804f653febec5b6ff855be5cea3b8c4a4ca9bccf0e2d441e4f SHA512 91a83f82b013245256db386a212c044bfbd637e1685e532d2ca75959e6870e65f3763f6d83c85db184d46a0ed77b5d4a53c4f7421b55b82a4709bdfc70d0f307
-AUX quake2-icculus-0.16.1-gnusource.patch 316 BLAKE2B 344afcbda64c0a52e06a91cbcfd4a53f9badf8c0d25ac384525e84eff164a1f103df9289d5a691b413e5e1a1a2749872841ad18ff4e3517465fb1c1cd729edce SHA512 0e1bed0bfd7ab31ad574a17534a49e89b44ef99308b90d9a30726f7d39ec4606514643e064968a5d9e53dd7a20394d5a27162fba06f37713ee3bc1e65f31b76b
-AUX quake2-icculus-0.16.1-ia64.patch 2399 BLAKE2B e4dcbc6528f0859ac791627f4a043c479e8a6024c1947196d540e11e53f9909f1151f26b8eaa272e371190f7287f323304ab7f5518704702aad64569278d4ee3 SHA512 fce5f699ecabe8ca9f215507172be537c8850fc91ed44224a588780bf76901d60486c220d5bf821b70fe9d2687f6ec9d966b78008de1f6cf4f1ac3644bb66844
-AUX quake2-icculus-0.16.1-ldflags.patch 1537 BLAKE2B d91b2a7f43f50ef615628e62951701ae4d920f2d8e9cc6f4d5e55368c00c80f2fbc9940df1bcc786b51e85e28fbb43e0c70d04225002a22f302d01a4775185dd SHA512 c4a1dc06b02c227e0cbb8e289b2eab864f5f599f0f92cb376d2a6be7d746774b89fddba21c003c91908a9a140fe639e1588dcff28cccc1a531a6eff8e8f4ccf0
-AUX quake2-icculus-0.16.1-no-asm-io.patch 513 BLAKE2B dbfb2134697e0fdedb47019595a740dfc9c56fa0cb7e21f40cf3a785b20a859d63eb81917cf95157866fd467cd8b0e4f4a8ffa1a871b35679d68c4d77d64bca5 SHA512 ad2d62ce9c69f10683bd5a0970339c82acdf9543b802a0ed070fb025efab6b3aad6e352cc29de5e3120449a3b679823feb920dc175f33b00d230cb9082be3f16
-AUX quake2-icculus-0.16.1-x11_mouse.patch 330 BLAKE2B 0b3da68e551dd76104c29acb9956393d29cd74462c38e9546575ce8951bbf05a14d2f01bd1246aaee842b59e46b25e90fd64e889a5e113dc325aaf7aa948b4e1 SHA512 4387615cab034dd37fb502e7f7411a9cf5ac9370ef474e123c1ea550d79fb06c838ac1de6e443d3e9aeea73ec905bd7464f57f9a561d4eca90852abace20eea0
-AUX quake2-icculus-0.16.1-x11_soft.patch 1128 BLAKE2B 0a0ffe6ced6a6b18f2a1f888d4f329f49b0ddd1ab8c31b20e37cbb6de9dbc703e681ca117aac0eb9e5c98b9b5e5e35b9c3fa6edc6f1925bbbfc7f8d2e21b8e8f SHA512 c8d479919fd4440041d1f2e3a020c45cfb6522d6ff675845bd646c0b736d6ce4b400bcdf99b7f4d456938e8e946e02e40ebab4d574779fb86cff49e4213abc1f
+AUX quake2-icculus-0.16.1-gcc41.patch 292 BLAKE2B 43ec1123bd8bb30453d0e39669da225e2e2d0bffefe0996f5ff9d25ae4d7ac5bc2f2011797dd9f1e5ecf70abc1d45a2a26d5a9bd146d25254e541155ad24ea83 SHA512 41024062095d427976cc4c4311465010c6f3d791852fbc22fd36f4affb6cc327619c53d0545fd222e8ac73a2c0c22a4c2af04b69eadabb27a9cafaf4f6f93c30
+AUX quake2-icculus-0.16.1-gentoo-paths.patch 6439 BLAKE2B 517614b736b315b32752cccfd9e1cdbdea56a6dcc51b3a27e2465ad1b03cb08f03b0b9b5548ea20a6116d923b33f762814d6b3a66c0effbf8930b030828a6561 SHA512 21e96fb9807d0300919ab24d343167da798c0dbc317a923b6ec53ec691f2a71c6250c1b084e928b548ecde5d868d5e4d3d019b28ca0b87979265c4c8384f01c3
+AUX quake2-icculus-0.16.1-gnusource.patch 281 BLAKE2B 2aa26352c9a0745caf821164a463c2ed0cfc785d6c23d2611882e9506703d7ea77a56c10588bbd5abb273778ce9248e32bf134c1dcea5e35fe01cff16981bf92 SHA512 7cf69b146d88096d90a79a640f1618ee52c36fcdf108fe80270dc612661c9f95a09d844b5bb27c807c0d69815bd92bb014096a8642bf8f7f6adba5c7ac496a0f
+AUX quake2-icculus-0.16.1-ia64.patch 2337 BLAKE2B 5b773bd795f2a286c39246331776e7773d0be7d6df08547854c95c8306e36adc76413864683699238054d59fce7f1a613e426fed2a3e86a6d9799622e9dea7fd SHA512 b35400d05030184b7a5dacaca8149be607aada0528d1c9ce0c9e0396a0db7fcab8845ca2537cccacd3e1b202d6377af34b1088a741949115fb989ce61c059143
+AUX quake2-icculus-0.16.1-ldflags.patch 1537 BLAKE2B 751d0e2023c83e30ca803b42a2d2dc0e1a7f2eaae3ca9fa7982d9712fbc7dbb8ba47d1d748ebf08df9f51b4c543de1bf79485a7ba12837eac8b90c4c77bb1c17 SHA512 99c874085b0830ec79d2b69ef2c751785732ff5edceb7f85a7793051f97d4184e41c3ec228bf167649402c5bcf49e50f248994f33c901d9a8b39ef290c9b9f1a
+AUX quake2-icculus-0.16.1-no-asm-io.patch 521 BLAKE2B 35b20680a4f8aec522ad6f861c248f1d5035e9636b905da805376d9f1ac5cbb4f6e4e0475fc62aefca203e77b84f5835f3f6b63d589d83c0ade21146793476aa SHA512 cbf464478ecee90bc0ba1c624672b74e3759a562c971b68c6e88d8a40865b6f9fd5f08cc9a21edf520eb7452e8a60bf8301d11a0f3eef792c5321fdbb9c369db
+AUX quake2-icculus-0.16.1-x11_mouse.patch 330 BLAKE2B 59e0abf37b21d215cbffb0d52eaf39b32b2bd8aa0165bdd43976178920cf63190ca62b07cfd4c6d616317c949c2947895334d2029ce3aaf4448df7e33b99ab50 SHA512 706cf107eb10141451ec2fa3fd3b352e80fbf1d7d33b53417f288a5da3c34bc4c42302dbd3be82f0ecf983d54f2fd132ead84f977f20324e80417764649e0a54
+AUX quake2-icculus-0.16.1-x11_soft.patch 1128 BLAKE2B 04f2d3795e84bc9287c4c87addc0065d4bdec5581e003b3bf7e8599305318733a9c0ea0dc5dce6d2ff18821112a412910c07349dfe5815950c041f391d66df74 SHA512 7a6d488361a9307e6ea3fda72b285760ac2529dcb5de2d3f593777033eed1b4c93fb75502de5d90ffa10831f24f72159e2bf76b4916541a7ed1dd30c7dca6911
 AUX quake2.xpm 1234 BLAKE2B 7525cb6b2be194822bd57554c7de5e4fcc9f7db9363e3216acac8dd13d8bd17810ff19f18000027f4de112b464a13aaf37c6be5370261283abac7d0a9f6ab8c4 SHA512 e7ed561123c2919a514ba7e4bcd32214bb368764cb53ad314b2816abefa0368247c0a9d463d9e96217c3583aa30f0f79b80bb5f798f6af857f4a0b069ab57e80
 DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1eafb3fc9fe50cbb955bb1d0d0cbaa19b08be7c07499c6a488200f1d811fb2fbe98e190dd58b324b8 SHA512 49eef504190323add8bbe6fd007ee51a17dc843898a2199a44a0b214a14da90202070f9eb025503c58b64d6306832bdb6c0d04efe927ea651eb83b0517a59782
 DIST quake2-r0.16.1.tar.gz 1525384 BLAKE2B b95db08ed3799d2788a20d24f63ea3a84d7ff4b581ee5f01dc5d588a1d5af50d52586a04ca28d9942e953d028e140112737432e499edcebf999085a29c63fcfb SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2
 DIST roguesrc320.shar.Z 626769 BLAKE2B f6d79630ee41e834ad07907f886766fdc9fd99152c2a1964629d2c74de259b9a232f691e5e3c4ad26ff3239d127f06d20878422dd7c1b896591db7c732a41ef7 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141
 DIST xatrixsrc320.shar.Z 455917 BLAKE2B 646801fad3c7eaac4957a971f507b13fff0ea6ae0423cb7fe8e8276666c4f89165384e2e2148e828b692533f9f582b64db849efe8d858e51026b9fb847282101 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5237 BLAKE2B 0e99364cb00cfcfcc7a3a9089f9d4318931c1a69543139587ebb2de4accd75f560917c8ba668c04a52dedab7024cf7830511e2e434ead016b08703d2d56c6fd9 SHA512 fa8088fc242db69f2631551be45554f868622302e4dbcf5e23f0185f2589c23c2cefc4a264b944d3063004b786fe21f1f45d9d0f67420cc244eae8710870a99b
+EBUILD quake2-icculus-0.16.1-r2.ebuild 5275 BLAKE2B d3ace24fc61e02223bd159e042858c039a8728d702fd7816f4a8aac354f54c548ae888ed7f832587c9336fb4e20648af0646beb184a090bc71ff47c1de1540d0 SHA512 8ec7804b03f95be8032b9615372a1ea54ea84602670fcb0961626151d8c4bc5af5d619c7f52e33a9b2907a52f096faa85f65b68453f8e82b5c7020e9b7a1fb90
 MISC metadata.xml 612 BLAKE2B 0e452fab96a1eaa0cdbb5113cd957576e968eef662103403cef968ae05b909a3d3bc25939dfbb4d36a191d18853e1af0d342ce37cbd6a30defc4fb5ac9e4285c SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
index 194f965a0501..bed337e4ce31 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig
-+++ src/rogue/g_local.h
+--- a/rogue/g_local.h
++++ b/rogue/g_local.h
 @@ -545,9 +545,6 @@
  extern	int	sm_meat_index;
  extern	int	snd_fry;
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
index 0961fa68a985..09da62bee201 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig
-+++ src/rogue/g_local.h
+--- a/rogue/g_local.h
++++ b/rogue/g_local.h
 @@ -24,3 +24,3 @@
  #ifndef _WIN32
 -#include <nan.h>
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
index 185359373c4b..a27fc035cd4c 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
@@ -1,5 +1,5 @@
---- src/linux/snd_alsa.c.old
-+++ src/linux/snd_alsa.c
+--- a/src/linux/snd_alsa.c
++++ b/src/linux/snd_alsa.c
 @@ -22,13 +22,22 @@
  	$Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34 mr_bones_ Exp $
  */
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
index b3291827996c..30966c813d7c 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
@@ -4,8 +4,8 @@ glx renderer by default.
 
 http://bugs.gentoo.org/show_bug.cgi?id=86552
 
---- src/linux/vid_so.c
-+++ src/linux/vid_so.c
+--- a/src/linux/vid_so.c
++++ b/src/linux/vid_so.c
 @@ -435,6 +440,9 @@ VID_Init
  */
  void VID_Init (void)
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
index 626cf5a1b64d..1ea4d41df80a 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
@@ -1,5 +1,5 @@
---- src/xatrix/g_local.h.old
-+++ src/xatrix/g_local.h
+--- a/src/xatrix/g_local.h
++++ b/src/xatrix/g_local.h
 @@ -446,11 +446,6 @@
  extern	int	sm_meat_index;
  extern	int	snd_fry;
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
index 61f0bb2286e5..4631d3ca92f4 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -74,35 +74,46 @@ endif
  
  CC=gcc
@@ -85,8 +85,8 @@
  
  targets: $(TARGETS)
  
---- src/linux/qgl_linux.c
-+++ src/linux/qgl_linux.c
+--- a/src/linux/qgl_linux.c
++++ b/src/linux/qgl_linux.c
 @@ -3006,13 +3006,17 @@ qboolean QGL_Init( const char *dllname )
  //				dllname, dlerror());
  
@@ -108,8 +108,8 @@
  		}
  		Com_Printf ("Using %s for OpenGL...", fn); 
  	} else {
---- src/linux/vid_so.c
-+++ src/linux/vid_so.c
+--- a/src/linux/vid_so.c
++++ b/src/linux/vid_so.c
 @@ -237,13 +237,17 @@ qboolean VID_LoadRefresh( char *name )
  	//regain root
  	seteuid(saved_euid);
@@ -154,8 +154,8 @@
  }
  
  /*****************************************************************************/
---- src/qcommon/files.c
-+++ src/qcommon/files.c
+--- a/src/qcommon/files.c
++++ b/src/qcommon/files.c
 @@ -60,6 +60,7 @@ typedef struct pack_s
  
  char	fs_gamedir[MAX_OSPATH];
@@ -195,8 +195,8 @@
  
  	//
  	// then add a '.quake2/baseq2' directory in home directory by default
---- src/qcommon/qcommon.h
-+++ src/qcommon/qcommon.h
+--- a/src/qcommon/qcommon.h
++++ b/src/qcommon/qcommon.h
 @@ -74,6 +74,13 @@ Foundation, Inc., 59 Temple Place - Suit
  
  #endif
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
index ad1f37309c30..42041978509f 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
@@ -1,5 +1,5 @@
---- quake2-r0.16.1/src/linux/q_shlinux.c
-+++ quake2-r0.16.1-modified/src/linux/q_shlinux.c
+--- a/src/linux/q_shlinux.c
++++ b/src/linux/q_shlinux.c
 @@ -17,6 +17,9 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
index ae1aa2e4068c..fe61bf501658 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
@@ -1,5 +1,5 @@
---- quake2-r0.16.1.orig/Makefile
-+++ quake2-r0.16.1/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -54,24 +54,26 @@ endif
  
  
@@ -74,8 +74,8 @@
   ifeq ($(strip $(BUILD_SVGA)),YES)
    $(warning Warning: SVGAlib support not supported for $(ARCH))
   endif
---- quake2-r0.16.1.orig/src/linux/sys_linux.c
-+++ quake2-r0.16.1/src/linux/sys_linux.c
+--- a/src/linux/sys_linux.c
++++ b/src/linux/sys_linux.c
 @@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms)
  	char	*path;
  	char	*str_p;
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
index 978c9c9820ea..765c146dd4ec 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -169,18 +169,18 @@
  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
  
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
index d94925b83e4b..0a1eecef2afa 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
@@ -3,8 +3,8 @@ http://bugs.gentoo.org/193107
 asm/io.h does not exist with sanitized kernel headers, nor do these source
 files actually need the header, so punt it
 
---- src/linux/rw_in_aa.c
-+++ src/linux/rw_in_aa.c
+--- a/src/linux/rw_in_aa.c
++++ b/src/linux/rw_in_aa.c
 @@ -46,7 +46,6 @@
  #include <sys/mman.h>
  
@@ -13,8 +13,8 @@ files actually need the header, so punt it
  #include <sys/vt.h>
  #endif
  
---- src/linux/rw_aa.c
-+++ src/linux/rw_aa.c
+--- a/src/linux/rw_aa.c
++++ b/src/linux/rw_aa.c
 @@ -63,7 +63,6 @@
  #include <dlfcn.h>
  #if defined (__linux__)
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
index 6dc6f0f1ddfb..5d2a85a68e9b 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
@@ -1,5 +1,5 @@
---- src/linux/rw_x11.c.old
-+++ src/linux/rw_x11.c
+--- a/src/linux/rw_x11.c
++++ b/src/linux/rw_x11.c
 @@ -989,8 +989,8 @@
  	} 
  	else 
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
index e23caf9db09f..cd0f2c807ae0 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
@@ -1,8 +1,8 @@
 
 the x11 software renderer just needs some tweaks to get working
 
---- Makefile.old
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -358,7 +358,7 @@
   endif
  
@@ -12,8 +12,8 @@ the x11 software renderer just needs some tweaks to get working
   endif
  
   ifeq ($(strip $(BUILD_GLX)),YES)
---- src/linux/rw_x11.c.old
-+++ src/linux/rw_x11.c
+--- a/src/linux/rw_x11.c
++++ b/src/linux/rw_x11.c
 @@ -53,7 +53,7 @@
  #include <X11/Xatom.h>
  #include <X11/keysym.h>
@@ -32,8 +32,8 @@ the x11 software renderer just needs some tweaks to get working
  #ifdef REDBLUE
  static PIXEL16 st2d_8to16table_s[2][256];
  static PIXEL24 st2d_8to24table_s[2][256];
---- src/ref_soft/r_poly.c.old
-+++ src/ref_soft/r_poly.c
+--- a/src/ref_soft/r_poly.c
++++ b/src/ref_soft/r_poly.c
 @@ -994,7 +994,7 @@
  		scale = yscale * pout->zi;
  		pout->v = (ycenter - scale * transformed[1]);
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild
index 5a5e6b994311..ef6f7b8b34a4 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 MY_P="quake2-r${PV}"
 DESCRIPTION="The icculus.org Linux port of iD's Quake 2 engine"
@@ -11,6 +12,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 	qmax? ( http://icculus.org/quake2/files/maxpak.pak )
 	rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z )
 	xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,11 +35,21 @@ DEPEND="${UIDEPEND}
 	rogue? ( app-arch/sharutils )
 	xatrix? ( app-arch/sharutils )"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	# -amd64.patch # make sure this is still needed in future versions
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-no-asm-io.patch
+	"${FILESDIR}"/${P}-gnusource.patch
+	"${FILESDIR}"/${P}-x11_soft.patch
+	"${FILESDIR}"/${P}-x11_mouse.patch
+	"${FILESDIR}"/${P}-alsa.patch
+	"${FILESDIR}"/${P}-ia64.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 pkg_setup() {
-	games_pkg_setup
-
 	if ! use qmax && $( use opengl || use sdl ) ; then
 		elog "The 'qmax' graphical improvements are recommended."
 		echo
@@ -46,39 +58,33 @@ pkg_setup() {
 
 src_prepare() {
 	# Now we deal with the silly rogue / xatrix addons ... this is ugly :/
-	ln -s $(type -P echo) "${T}"/more
+	ln -s $(type -P echo) "${T}"/more || die
+
 	for g in rogue xatrix ; do
 		use ${g} || continue
-		mkdir -p src/${g}
-		pushd src/${g}
+		mkdir -p src/${g} || die
+
+		pushd src/${g} || die
+
 		local shar=../../../${g}src320.shar
 		sed -i -e 's:^read ans:ans=yes :' ${shar} || die
-		echo ">>> Unpacking ${shar} to ${PWD}"
+		elog "Unpacking ${shar} to ${PWD}"
 		env PATH="${T}:${PATH}" unshar ${shar} || die
-		popd
+
+		popd || die
 	done
-	sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die
 
+	sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die
 	sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die
-	# -amd64.patch # make sure this is still needed in future versions
-	epatch \
-		"${FILESDIR}"/${P}-amd64.patch \
-		"${FILESDIR}"/${P}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-no-asm-io.patch \
-		"${FILESDIR}"/${P}-gnusource.patch \
-		"${FILESDIR}"/${P}-x11_soft.patch \
-		"${FILESDIR}"/${P}-x11_mouse.patch \
-		"${FILESDIR}"/${P}-alsa.patch \
-		"${FILESDIR}"/${P}-ia64.patch \
-		"${FILESDIR}"/${P}-fno-common.patch
+
+	default
 
 	if use xatrix ; then
-		epatch "${FILESDIR}/${P}"-gcc41.patch
+		eapply "${FILESDIR}/${P}"-gcc41.patch
 	fi
 	if use rogue ; then
-		cd src
-		epatch \
+		cd src || die
+		eapply \
 			"${FILESDIR}"/0.16-rogue-nan.patch \
 			"${FILESDIR}"/0.16-rogue-armor.patch
 	fi
@@ -123,38 +129,41 @@ src_compile() {
 			BUILD_ARTS=NO \
 			BUILD_ALSA=$(yesno alsa) \
 			SDLDIR=/usr/lib \
-			DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \
-			DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \
+			DEFAULT_BASEDIR="/usr/share/quake2" \
+			DEFAULT_LIBDIR="/usr/$(get_libdir)/${PN}${libsuffix}" \
 			OPT_CFLAGS="${CFLAGS}" \
 			CC="$(tc-getCC)"
+
 		# now we save the build dir ... except for the object files ...
-		rm release*/*/*.o
-		mv release* my-rel-${BUILD_QMAX}
-		cd my-rel-${BUILD_QMAX}
-		rm -rf ref_{gl,soft} ded game client ctf/*.o
-		mkdir baseq2
-		mv game*.so baseq2/
-		cd ..
+		rm release*/*/*.o || die
+		mv release* my-rel-${BUILD_QMAX} || die
+		cd my-rel-${BUILD_QMAX} || die
+		rm -rf ref_{gl,soft} ded game client ctf/*.o || die
+		mkdir baseq2 || die
+		mv game*.so baseq2/ || die
+		cd .. || die
 	done
 }
 
 src_install() {
-	local q2dir=$(games_get_libdir)/${PN}
-	local q2maxdir=$(games_get_libdir)/${PN}-qmax
+	local q2dir=/usr/$(get_libdir)/${PN}
+	local q2maxdir=/usr/$(get_libdir)/${PN}-qmax
 
 	dodoc readme.txt README TODO "${FILESDIR}"/README-postinstall
 
 	# regular q2 files
 	dodir "${q2dir}"
-	cp -rf my-rel-NO/* "${D}/${q2dir}"/
-	dogamesbin "${D}/${q2dir}"/quake2
-	rm "${D}/${q2dir}"/quake2
+	cp -rf my-rel-NO/* "${ED}/${q2dir}"/ || die
+
+	dobin "${ED}/${q2dir}"/quake2
+	rm "${ED}/${q2dir}"/quake2 || die
+
 	use dedicated \
-		&& dogamesbin "${D}/${q2dir}"/q2ded \
-		&& rm "${D}/${q2dir}"/q2ded
+		&& dobin "${ED}/${q2dir}"/q2ded \
+		&& rm "${ED}/${q2dir}"/q2ded
 	use sdl \
-		&& dogamesbin "${D}/${q2dir}"/sdlquake2 \
-		&& rm "${D}/${q2dir}"/sdlquake2
+		&& dobin "${ED}/${q2dir}"/sdlquake2 \
+		&& rm "${ED}/${q2dir}"/sdlquake2
 
 	doicon "${FILESDIR}"/quake2.xpm
 	make_desktop_entry quake2 "Quake 2" quake2
@@ -162,30 +171,32 @@ src_install() {
 	# q2max files
 	if use qmax ; then
 		dodir "${q2maxdir}"
-		cp -rf my-rel-YES/* "${D}/${q2maxdir}"/ || die
-		newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax
-		rm "${D}/${q2maxdir}"/quake2
-		use dedicated \
-			&& newgamesbin "${D}/${q2maxdir}"/q2ded q2ded-qmax \
-			&& rm "${D}/${q2maxdir}"/q2ded
-		use sdl \
-			&& newgamesbin "${D}/${q2maxdir}"/sdlquake2 sdlquake2-qmax \
-			&& rm "${D}/${q2maxdir}"/sdlquake2
+
+		cp -rf my-rel-YES/* "${ED}/${q2maxdir}"/ || die
+
+		newbin "${ED}/${q2maxdir}"/quake2 quake2-qmax
+		rm "${ED}/${q2maxdir}"/quake2 || die
+
+		if use dedicated ; then
+			newbin "${ED}/${q2maxdir}"/q2ded q2ded-qmax
+			rm "${ED}/${q2maxdir}"/q2ded || die
+		fi
+
+		if use sdl ; then
+			newbin "${ED}/${q2maxdir}"/sdlquake2 sdlquake2-qmax
+			rm "${ED}/${q2maxdir}"/sdlquake2 || die
+		fi
 
 		insinto "${q2maxdir}"/baseq2
 		doins "${DISTDIR}"/maxpak.pak
 
 		make_desktop_entry quake2-qmax Quake2-qmax quake2
 	fi
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "Go read README-postinstall in /usr/share/doc/${PF}"
-	elog "right now! It's important - This install is just the engine, you still need"
+	elog "right now! It's important - this install is just the engine, you still need"
 	elog "the data paks. Go read."
 
 	if use demo && ! has_version "games-fps/quake2-demodata[symlink]" ; then
diff --git a/games-fps/quake2-textures/Manifest b/games-fps/quake2-textures/Manifest
index 0165b697f978..ab8a92ec80f2 100644
--- a/games-fps/quake2-textures/Manifest
+++ b/games-fps/quake2-textures/Manifest
@@ -1,3 +1,3 @@
 DIST pak8.zip 15099933 BLAKE2B 297c56b3115462c627febbc5cbcba684a3c36e01f088fe975793c7980abbf274fe721668aa0d6b5a4d5ab6b893fd774be0dda73eb2585bbae05cc11b8fb48e1b SHA512 2d51e3e97796e1ad86894767374bb335f5da59852aacc2dead622c4e51f4b73258c5a852561afbc6c6df54149424e96b3d433179864f7d52af81d9445ada8337
-EBUILD quake2-textures-0_beta8.ebuild 782 BLAKE2B eb293dc21a0be2c1a731a460fcf970e06bb5ecf975be32cab385f4548b9852b548c96df277fae3f063e964ee4012a64c23dd7399e5b7c7a6888c2c284d4ffbd3 SHA512 3daf6ae686340dbfaee5d6920171c24b0986864cf3eb8e7e3c98d8c9b1a0e5ac0fc55895be23662b24b2d276dedd2624188446c0c69e9955fc864d1b1cdd4ead
+EBUILD quake2-textures-0_beta8-r1.ebuild 652 BLAKE2B fdbd4d26fd222149246c4289d2f08f689397fa59a240f8509badd641450572db93d6990657291cd099307ef267d9d04a8dfb76c015ba4e4de62bafdd0056c50b SHA512 1b910a9608e57fa3ba10d7688f4216e9b088ff8b35b7d6dd3f8cd3f1683fdde531f8a5858200934270746cba71c8bf93c323da755fb45b0bae0cf9e73074e051
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-textures/quake2-textures-0_beta8.ebuild b/games-fps/quake2-textures/quake2-textures-0_beta8-r1.ebuild
index 7c3cf3832513..c26a14c1fc59 100644
--- a/games-fps/quake2-textures/quake2-textures-0_beta8.ebuild
+++ b/games-fps/quake2-textures/quake2-textures-0_beta8-r1.ebuild
@@ -1,40 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils versionator games
+EAPI=7
 
-MY_PV=$(get_version_component_range 2-2)
+MY_PV=$(ver_cut 2-)
 MY_PV=${MY_PV/beta/}
 
 DESCRIPTION="High-resolution textures for Quake 2"
 HOMEPAGE="http://jdolan.tastyspleen.net/"
 SRC_URI="http://jdolan.tastyspleen.net/pak${MY_PV}.zip"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
+RESTRICT="bindist mirror"
 
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/quake2
+BDEPEND="app-arch/unzip"
 
 src_install() {
-	insinto "${dir}"/baseq2
+	insinto /usr/share/quake2/baseq2
 	doins *.pak
-
 	dodoc README
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "Use a recent Quake 2 client to take advantage of"
 	elog "these textures, e.g. qudos or quake2-icculus."
 	echo
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index ec595124a5ed..8b32102cdc69 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,4 +1,4 @@
 AUX quakeforge-0.7.2-gentoo.patch 1365 BLAKE2B 486c303505940d78b982b92848b04532a77cf2a5896d1cb26b9cf4dc013dca03aea0686102e42a30f7c4038819859c69f01890f55632c0d5af1102cf91d23f86 SHA512 521ba870e7b04e98c4d5507f661b0bfe7f18dc3901b671aed8c03c7691466e4e67f382d0fe05545eabff3ae684b8ed39e6681b4179348682f9adeb3eab177d9d
 DIST quakeforge-0.7.2.tar.bz2 2887823 BLAKE2B 27526b0e5491cc9a052f70c387c46b0d5518c0d63264f799cac81e471a87b978c9edcf22f4a68db25b8c05b7b51371504459e8ba5de450719e92aae712940cc7 SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55
-EBUILD quakeforge-0.7.2-r1.ebuild 3110 BLAKE2B e33ebe3b29114e0311f073fb311b9ac4bd783971b54af4cac2e48f49aa4887d64fb47ec42785e5bd03b371221f256667f06a4bafb7a6c8620c4add2fb9916a3c SHA512 c0031fac48ad0a1307264b2d077db618636fd247af4cc8efb2ae9e54bc6c99a6514cd15b4f8889286a4956cf56703111d1eda87d082dfc3b2c6213b8f1412716
+EBUILD quakeforge-0.7.2-r1.ebuild 3100 BLAKE2B 16c34ae2ad3e0b827ec82d5fccf993b312a4819296d0c0714c8ac8f974bad0abb217389f346c926f88787bff21fedcfaa4872c8116de808e3da2a13ff3fc996f SHA512 92b942153f275b9e0a0b300dee691ba42af0bb5e5dbd304bd45a5fc35c95e83d68983d08499d33d3bc619468944a828ce24f421be5b277e53e9d24a7c3280ac1
 MISC metadata.xml 1685 BLAKE2B f2ee32565cd97551e6cd22200d0ce2332a014b774511b172dc1e2b486a27e417af441f1f944b8325bf23dc7363e46a01fa6b51237353f8964e98dd5836357cb3 SHA512 caf9d7549c8e5d801f8d626b8a4c2528735a13fa2c721f4b9d5c9ae74ae15ee55c22f165d3027fcfed8309d6bf1face5dea9ebbb1b8624d679658c6768d77bc0
diff --git a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
index 37a670a5b276..df5368e0a3a6 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic autotools
+inherit flag-o-matic autotools
 
 DESCRIPTION="New 3d engine based off of id Softwares's Quake and QuakeWorld game engine"
 HOMEPAGE="http://www.quakeforge.net/"
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index ee12bdf6a0fe..16399f0aad3a 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,6 +1,6 @@
-AUX qudos-0.40.1-gnusource.patch 338 BLAKE2B 31b811ca4592ee82e15cc55ab0d5e9e054dc3456f421bada3be8c41993bb7e15ae40f1c53b8aa54e9600ac850c5c4336a67647863c4f6e2b6b473f49a40b8fac SHA512 6e6411e0d6a4c48a82f70cc83eb64eb8b86a15f0ffa552007cb5af6a8d0f718527f6acbcdb80393b45344e133f52ee366cf7923423afae25b3c6ab10829dae98
-AUX qudos-0.40.1-libpng15.patch 205 BLAKE2B 254b56d3933f6eaa5c818042b7875c978c8864b2db711e9fe820942aa3316f593eb9ccd20558ccc95083b6350075e6830fcddb1d694b4e27e7dab6727d91fa8f SHA512 4a2ccb3566f0d3126910b48c024fc5b9d40fe471ca73ce043bc8c8339d2a08f124b921e622bdee05ed007861f4b816941307184bfcbdb8281eca02733b289f70
+AUX qudos-0.40.1-gnusource.patch 265 BLAKE2B beb6c3f71b39c28789e3dcaa58185464a312d63fe416324ee7cbc8eec084af41a8ca7590e95b19c02a2bfaacc510f7c0c477c1e96cf8726bfc63ae92076d0e30 SHA512 99e30dbcd4773021e6d8e2dc20cbf054534c1d18d86877688bdcb5ea34e7644e877ae0a674baaa471283899c596293336faa7afd4492336b3284d77256fd318b
+AUX qudos-0.40.1-libpng15.patch 209 BLAKE2B 9fb92e63f23f2acd2b5f14e0ef8d85385af868fcc1ef7200b35a18a979ef556b33a49325c860e54e3ae11aabb7a70097fb0733f3b826b78d650dcf2caf1b3124 SHA512 5e8fd8eef45902dbd41e64f7fcd3a31c91f19edc71e2eb1c89d161f46ef4f4c04894f27db8e0c5f9946673bdf72580aac067c63297214fe45531119d1f948380
 DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
 DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
-EBUILD qudos-0.40.1.ebuild 4165 BLAKE2B f998c2ae42671295d371113637686db876c8ed969a1f32e5dab66f907dbce5c86e45998e02a6ad45c70dea873033e628b130e1df51ae38d3e7e6e214c71eaf4e SHA512 9ec0d0d19f668e40a12c527f26ef777fd858fef545372afbe4a7674543f3862e5e286154ad30e1e2a0184627510e3338ff2f97856886f76db9512fb89fbcda4e
+EBUILD qudos-0.40.1.ebuild 4205 BLAKE2B 4ea2a769ed1a04ba80f8599cfbcf61ae82b20546bfb0e9be5d288b6beb8356a191bb239c27a7e4871f6f613feb77a67520b21f8d3be62575265cbad258e90025 SHA512 aea7c9d34ad037a5b07bf4cb0525776b85ad6d06c9b0de65e099287289dc707c8a6eef20eb09e4134e32cb5ce27670b7a00ec9c327b63df53490240d56248ff6
 MISC metadata.xml 665 BLAKE2B 75a147828cd25bf29c05817fb232f5b11f33fbc12700f2cd08802300d545440aa8e800197e18ffcb1c4bd1de9997c98518cf19570954c1901b9fa3226c49dafe SHA512 d48f88a4c7f4be692bc6d5122634c5725282b1c5ca467ce75e317aa16550790a3a58569960ced134c18b5a36ee33b89a15834ddcc0ee35a4aa33ead7832e2f07
diff --git a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch b/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
index dd2113b0c3bb..b82a276b012c 100644
--- a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
+++ b/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
@@ -1,5 +1,5 @@
---- src/unix/qsh_unix.c.orig	2011-10-22 17:46:37.665993357 -0500
-+++ src/unix/qsh_unix.c	2011-10-22 17:46:40.965972209 -0500
+--- a/src/unix/qsh_unix.c
++++ b/src/unix/qsh_unix.c
 @@ -17,6 +17,9 @@
   * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   *
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
index ecf9de9370e9..633215be34be 100644
--- a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
@@ -1,5 +1,5 @@
---- src/ref_gl/gl_local.h
-+++ src/ref_gl/gl_local.h
+--- a/src/ref_gl/gl_local.h
++++ b/src/ref_gl/gl_local.h
 @@ -29,6 +29,7 @@
  #include <GL/glu.h>
  #include <GL/glext.h>
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 1c167f70ec4d..24a6a4e01612 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs games
+inherit desktop flag-o-matic toolchain-funcs
 
 FILE_STEM="QuDos-${PV}-src"
 PK3_FILE="QuDos-${PV}.pk3"
@@ -13,6 +13,7 @@ DESCRIPTION="Enhanced Quake 2 engine"
 HOMEPAGE="https://github.com/ZwS/qudos"
 SRC_URI="mirror://gentoo/${FILE_STEM}.tar.bz2
 	https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> ${PK3_FILE}"
+S="${WORKDIR}"/${FILE_STEM}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -34,13 +35,19 @@ DEPEND="opengl? (
 	x11-libs/libXext
 	x11-libs/libXxf86dga
 	x11-libs/libXxf86vm"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata[symlink] )
-	textures? ( games-fps/quake2-textures )"
+	textures? ( games-fps/quake2-textures )
+"
 
-S=${WORKDIR}/${FILE_STEM}
-dir=${GAMES_DATADIR}/${MY_PN}
+dir=usr/share/${MY_PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-gnusource.patch
+)
 
 default_client() {
 	if use opengl || use sdl || ! use dedicated ; then
@@ -51,8 +58,6 @@ default_client() {
 }
 
 pkg_setup() {
-	games_pkg_setup
-
 	if ! use qmax && $( use opengl || use sdl ) ; then
 		elog "The 'qmax' graphical improvements are recommended."
 		echo
@@ -85,12 +90,12 @@ src_unpack() {
 }
 
 src_prepare() {
-	rm docs/gnu.txt
+	rm docs/gnu.txt || die
 
 	# Change default sound driver and its location
 	sed -i \
 		-e "s:\"oss\":\"${snd_drv}\":" \
-		-e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
+		-e "s:\"\./snd:\"/usr/$(get_libdir)/${PN}/snd:" \
 		src/client/snd_dma.c || die
 
 	sed -i \
@@ -102,11 +107,12 @@ src_prepare() {
 			-e '1i#define OF(x) x' \
 			src/qcommon/unzip/ioapi.h || die
 	fi
+
 	sed -i -e '106,119 s/CFL/LED/' Makefile || die
 
-	epatch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-gnusource.patch
+	sed -i -e 's:-L/usr/lib -L$(LOCALBASE)/lib :: ' Makefile || die
+
+	default
 }
 
 src_configure() {
@@ -115,7 +121,9 @@ src_configure() {
 }
 
 src_compile() {
-	yesno() { usex $1 YES NO; }
+	yesno() {
+		usex ${1} YES NO;
+	}
 
 	local client="YES"
 	default_client || client="NO"
@@ -137,7 +145,7 @@ src_compile() {
 		TYPE="${type}" \
 		DATADIR="${dir}" \
 		LOCALBASE=/usr \
-		LIBDIR="$(games_get_libdir)"/${PN} \
+		LIBDIR="/usr/$(get_libdir)"/${PN} \
 		WITH_QMAX=$(yesno qmax) \
 		BUILD_3ZB2=$(yesno mods) \
 		BUILD_CTF=$(yesno mods) \
@@ -157,24 +165,24 @@ src_compile() {
 
 src_install() {
 	if default_client ; then
-		newgamesbin ${MY_PN}/QuDos ${PN}
+		newbin ${MY_PN}/QuDos ${PN}
+
 		# Change from gif to png in next version?
 		newicon docs/q2_orig/quake2.gif ${PN}.gif
+
 		make_desktop_entry ${PN} "QuDos" ${PN}.gif
 	fi
 
 	if use dedicated ; then
-		newgamesbin ${MY_PN}/QuDos-ded ${PN}-ded
+		newbin ${MY_PN}/QuDos-ded ${PN}-ded
 	fi
 
-	insinto "$(games_get_libdir)"/${PN}
+	insinto "/usr/$(get_libdir)"/${PN}
 	doins -r ${MY_PN}/*
-	rm "${D}/$(games_get_libdir)"/${PN}/QuDos
+	rm "${ED}/usr/$(get_libdir)"/${PN}/QuDos || die
 
-	insinto "$(games_get_libdir)"/${PN}/baseq2
+	insinto "/usr/$(get_libdir)"/${PN}/baseq2
 	newins "${DISTDIR}/${PK3_FILE}" qudos.pk3
 
 	dodoc $(find docs -name \*.txt) docs/q2_orig/README*
-
-	prepgamesdirs
 }
diff --git a/games-fps/red-blue-quake2/Manifest b/games-fps/red-blue-quake2/Manifest
index b5a457d5be80..9a65ccad644e 100644
--- a/games-fps/red-blue-quake2/Manifest
+++ b/games-fps/red-blue-quake2/Manifest
@@ -1,7 +1,7 @@
-AUX 0.1-gentoo.patch 1964 BLAKE2B 75d24546aa8792f0cc0888c5730882ec8939f0ea654a17dad0b3bb2b1921ee0c0928593c667daf87180e1d63634d5afa479c71e942c907a1787b3ecd47cdce41 SHA512 87b7d3a355a57940b1ce2be3e30ff5053aa83af2e53018f1ea00556dba67cbb1767729867eabf062faf1a08eb2ca601176dbccd6c9585160edb2e3477b22fa5a
-AUX red-blue-quake2-0.1-gcc41.patch 895 BLAKE2B eb246353c60602806a835a6ef375d45cb14b08bf51fdeab4eaea884ce1b94b03c7d017ee3c8295d1c2f8d80cf9c0c478423e7033dee515581c497459ee0501b6 SHA512 9cb57a27bc5e8e7123c40a55625f4e227d5c81e179de3119441d7447de7701c9f6e8fc76a24e1b6c21bb92eff142aed24ffed2da39cb5bf2f87eaf8600b210bc
-AUX red-blue-quake2-0.1-ldflags.patch 3382 BLAKE2B 04576aaef36280b2dc62ce22f50c6689ac5343c148760aef3ad68150a8560bdf5e31f671fa09bcdeb3716b547f0509b4e83c1a2b4a7f741ed2798b7c3a4e6327 SHA512 a49ab8462322740fcfef70c6bff16df9b164cfa0cace00bdf366e10db1d0fc13770d97f9aa8dcf1f92d1555d7d978ce7f947d58bc3d030fd2c1be0983e74470a
+AUX 0.1-gentoo.patch 1700 BLAKE2B 4db0ae52fa70b4fbb13c7aefefd5ecc818364432c74c8442bb667873026b18622b8e9b5bd83fb975d65d3909d8f90422e5c3f4ef51a0c2d282bc65a42d45ce99 SHA512 27771e9930a2c09c8259eea611e81fb633c3423e02c479e930865552e50e47900a25529c36da770fd39d15276efd1cfd2bda2dae3f6ea8fb90f29a246112500c
+AUX red-blue-quake2-0.1-gcc41.patch 739 BLAKE2B 9074256ac44e5b7afd3932989a878446cec714b4f90daa58e4f5ddf2d84d7c15394c2cd1fa4c71b6a0b46733644cbf44f37279fb0104f21a17a42eb9c0fbe441 SHA512 7a1879dc60074069d5aae87d56fb3b4b208db35c6ae0abcdf372ab7d4bf1ea01ad0af95b7e54ea3fc0c249aa1d9cb5dce56faf001184d5674c4ddd567b52f12a
+AUX red-blue-quake2-0.1-ldflags.patch 3322 BLAKE2B 6e9fd4e3ce65b9c798c257b28a53896bba8d1a05c0a4ce818fde52620b6aad9c3e8d66a6ea3274eb41c4f0a2ef84ccb032937715cb8c95bfc85a411a8c27a7f9 SHA512 36a63ccc58eac7b1b1b16562fd12a05372402149407c645712cd353f15cf9ec1b77ee64d05e44cd8efb4aa2dc70d97ff22cf95c954302ce2af969392a938ac57
 DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
 DIST red-blue-quake2-0.1.tar.gz 34874 BLAKE2B 6dc10e8307c4274961ee133af0721d5cb9e1605de4fb47c3256b4a54b91c5e7ea79622140bf5eda2cbce10075ba971c40547726cf45f99e81cadc20828663384 SHA512 4123fb1cceb788068c5cd525e3e03cce8a993ecdd0d86c3c154426689a7893b6d33cddeafbb53761a27473a050829545e7fc802f1236f4dc60161103ad259da5
-EBUILD red-blue-quake2-0.1.ebuild 1314 BLAKE2B 612a708a4f576beb4e121c55781ad5b47768fa27a0d9514b030650ace4a10fc1168e18387c059e13d46af76b3186205dfbb8163938c86791eca95987f3defa37 SHA512 22c42fa7611234616e2cc4f5f4d648e0cc0772033071aa27b78dacb54d804b5af42c6703747b8844078880f3bf7b10c23daeaf6ac9fce43963c58b52fa162fa0
+EBUILD red-blue-quake2-0.1-r1.ebuild 1379 BLAKE2B 75e582d235cbf207238b955378f2eeba273492eed037d7d4d99a30cdf0875557504a307f3a22bc2f79e316b9656b2635f7975a7c7dfd0a358d1dc411f22cd803 SHA512 bc9cd60a41fceeff168d86f0c2b6476c4cbc5fbe621e3bd7aa582e30eb872a28cea65b426db9626ee3922a0279dc4063482fe6ad053f241f58de61ece992fd75
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/red-blue-quake2/files/0.1-gentoo.patch b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
index fd13df9bcb45..e283e6e3bc03 100644
--- a/games-fps/red-blue-quake2/files/0.1-gentoo.patch
+++ b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
@@ -1,6 +1,6 @@
 diff -ur Makefile.old Makefile
---- Makefile	2001-12-29 20:37:22.000000000 -0500
-+++ Makefile	2003-07-17 22:14:50.000000000 -0400
+--- a/linux/Makefile
++++ b/linux/Makefile
 @@ -54,7 +54,7 @@
  RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
  	-fomit-frame-pointer -fexpensive-optimizations
@@ -11,8 +11,8 @@ diff -ur Makefile.old Makefile
  endif
  
 diff -ur sys_linux.c.old sys_linux.c
---- sys_linux.c.old	2001-12-22 18:45:58.000000000 -0500
-+++ sys_linux.c	2003-07-17 22:34:11.000000000 -0400
+--- a/linux/sys_linux.c
++++ b/linux/sys_linux.c
 @@ -220,7 +220,7 @@
  	char	curpath[MAX_OSPATH];
  	char	*path;
@@ -38,8 +38,8 @@ diff -ur sys_linux.c.old sys_linux.c
  	}
  
 diff -ur ../qcommon/files.c ../qcommon/files.c
---- ../qcommon/files.c	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
+--- a/qcommon/files.c
++++ b/qcommon/files.c
 @@ -865,7 +865,7 @@
  	//
  	// start up with baseq2 by default
@@ -50,8 +50,8 @@ diff -ur ../qcommon/files.c ../qcommon/files.c
  	// any set gamedirs will be freed up to here
  	fs_base_searchpaths = fs_searchpaths;
 diff -ur ../qcommon/qcommon.h ../qcommon/qcommon.h
---- ../qcommon/qcommon.h	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
+--- a/qcommon/qcommon.h
++++ b/qcommon/qcommon.h
 @@ -25,7 +25,7 @@
  
  #define	VERSION		3.21
diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
index 1f933d33537e..22ca5c56a54f 100644
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
@@ -1,5 +1,5 @@
---- ../game/g_local.h.old	2006-05-07 00:27:45.000000000 +0200
-+++ ../game/g_local.h	2006-05-07 00:28:06.000000000 +0200
+--- a/game/g_local.h
++++ b/game/g_local.h
 @@ -458,11 +458,6 @@
  extern	int	sm_meat_index;
  extern	int	snd_fry;
@@ -12,8 +12,8 @@
  // means of death
  #define MOD_UNKNOWN			0
  #define MOD_BLASTER			1
---- ../ctf/g_local.h.old	2006-05-07 00:36:21.000000000 +0200
-+++ ../ctf/g_local.h	2006-05-07 00:36:38.000000000 +0200
+--- a/ctf/g_local.h
++++ b/ctf/g_local.h
 @@ -466,11 +466,6 @@
  extern	int	sm_meat_index;
  extern	int	snd_fry;
diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
index 58beb0f3cec5..547b9045a869 100644
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-18 09:09:48.000000000 +0200
-+++ Makefile	2010-10-18 09:15:59.000000000 +0200
+--- a/linux/Makefile
++++ b/linux/Makefile
 @@ -59,7 +59,7 @@
  endif
  
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild
new file mode 100644
index 000000000000..01e871966b25
--- /dev/null
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Red-blue Quake II! Play quake2 with 3D glasses!"
+HOMEPAGE="https://www.jfedor.org/red-blue-quake2/"
+SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
+	https://www.jfedor.org/red-blue-quake2/${P}.tar.gz"
+S="${WORKDIR}"/quake2-3.21
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	cd linux || die
+
+	sed -i \
+		-e "s:GENTOO_DIR:$(get_libdir)/${PN}:" \
+		sys_linux.c || die
+
+	sed -i \
+		-e "s:/etc/quake2.conf:/etc/${PN}.conf:" \
+		sys_linux.c vid_so.c || die
+
+	sed -i \
+		-e 's:-O6::' \
+		-e 's:-g::' \
+		Makefile || die
+
+	echo "$(get_libdir)"/${PN} > "${T}"/${PN}.conf || die
+}
+
+src_compile() {
+	cd linux || die
+
+	mkdir -p releasei386-glibc/ref_soft || die
+
+	emake \
+		CC="$(tc-getCC)" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_DATADIR=/usr/share/quake2/baseq2/ \
+		build_release
+}
+
+src_install() {
+	cd linux/release* || die
+
+	exeinto "$(get_libdir)"/${PN}
+	doexe gamei386.so ref_softx.so
+
+	exeinto "$(get_libdir)"/${PN}/ctf
+	doexe ctf/gamei386.so
+	newbin quake2 red-blue-quake2
+
+	insinto /etc
+	doins "${T}"/${PN}.conf
+}
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
deleted file mode 100644
index 96715daaab62..000000000000
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="red-blue Quake II !  play quake2 w/3d glasses !"
-HOMEPAGE="https://www.jfedor.org/red-blue-quake2/"
-SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
-	https://www.jfedor.org/red-blue-quake2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/quake2-3.21/linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-ldflags.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" \
-		sys_linux.c || die
-	sed -i \
-		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c || die
-	echo "$(games_get_libdir)"/${PN} > "${T}"/${PN}.conf || die
-}
-
-src_compile() {
-	mkdir -p releasei386-glibc/ref_soft
-	emake \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release
-}
-
-src_install() {
-	cd release*
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softx.so
-	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so
-	newgamesbin quake2 red-blue-quake2
-
-	insinto "${GAMES_SYSCONFDIR}"
-	doins "${T}"/${PN}.conf
-
-	prepgamesdirs
-}
diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
index 470de2fc72d5..3cb81d701f4a 100644
--- a/games-fps/rott/Manifest
+++ b/games-fps/rott/Manifest
@@ -1,4 +1,4 @@
 DIST rott-1.1.2.tar.gz 749079 BLAKE2B 1c18ef25b8bb97a7edf8c376bf0b6da3829ca0406100ee9f44652077c06414d826086e354850a551152901036673b91d686d4d2e816ba6bb29b8dcce68144c00 SHA512 809a9064fe31c63afccb9a6397ac2c9d4172cdd802b055697cf3b0090ee6a78c9e40b52a4a8df25196489d9a0259304c91e2f84f95413a293bc66192502cf200
 DIST swdata.zip 2889672 BLAKE2B 593f95cbfb4a285ab3b946372d618b6b5cf785aa4b2e5228ac8aaaf702ceb8e4cc000d606f5b3aea85af1b34a4fe45bdebc2f692ba3bfc9c1d3afc7c570ad8a0 SHA512 99373097356afa583021367b2e0ec6ec745941890e4f17f4e07206c66dd370dfa9e928bc0bd6ab9809d8c72646dcc609e3c19f688d2b89a886f215a153b6dd0d
-EBUILD rott-1.1.2-r1.ebuild 1088 BLAKE2B c6dd102f9aa2d38218f1da5e89db7318c7b4cd7fb6a23a834078fff7347badd5b786fb382dffa1e8d2eb43e196092537db68e14c7385eefaa814501741441827 SHA512 0ecd207fb8ec9ecb103611623bdc918e68a499fa58636bc2c9e5719351a4f9efb4ea843da0096fec8abc4d4492339a55210e1d3f4b3d324c152d27a5a446e182
+EBUILD rott-1.1.2-r1.ebuild 1070 BLAKE2B e4c9cc7c141b62e75daf5e3a3384a81f6cb901bc2b61a49280090c356661bf30ecbe6ae9e0eae6eeb64eba07898b7645582d2f3832637bde70d9719f82afb6df SHA512 08b1ce570b416b03c53a52af07d45c4d09b27605a9e3469942ce651597ea2eed9383cfaec32aacdb52d4d7c06507726a89ad2500512d50612fb5c81c284768f4
 MISC metadata.xml 1095 BLAKE2B 4a41d9a0bc9962a6a824d7ecc4d0bb774aa2b7feb21829aae74db25874c7f050698a724d7fe3d19e63d2e6aaf1c98d4870ac4d51f14145df24eea9646b3be2a0 SHA512 6e2d291f04b343b366ad9b7e5c18ae7cce327dd27cfdb496247a0228d2cf160d8d42f803f21aed07181dc1395ad8db9431270abd174dfc3c3d46a951294a3325
diff --git a/games-fps/rott/rott-1.1.2-r1.ebuild b/games-fps/rott/rott-1.1.2-r1.ebuild
index 5eabd67d2f86..915ad6efa315 100644
--- a/games-fps/rott/rott-1.1.2-r1.ebuild
+++ b/games-fps/rott/rott-1.1.2-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 DESCRIPTION="Rise of the Triad for Linux!"
 HOMEPAGE="http://www.icculus.org/rott/"
diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 1a0d4d489e99..1a5be4b7d301 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1,7 +1,12 @@
 AUX sauerbraten-2013.02.03-QA.patch 2037 BLAKE2B e9311a8bb64dcd67355767f57261fd5ef11955ce899dedfcb97cf863f7a9b35617169c24286d5ce3074c233a453364efb56477c6de48009bb8106a73c7e50daf SHA512 1725945f0373f03e5ae81b8e9eee4e2a9260d9362ad424e4198bb71af2e69055439268197f784d2acbd9e17ff977e8b1a7f5193d378a036488ff758d0ead4b5a
 AUX sauerbraten-2013.02.03-system-enet.patch 1880 BLAKE2B 57c35e0d15344fdb226f829460d1c15cb163a103911b4d63d544c786f8cb4fe10a0624749e0d3b6fce5a643d2c8285001a8a63f3c700441971a9597f11deb776 SHA512 b53e7db4e6b7ce012ee292a24cbf6e84e1c6bce01cde1a41985d0b471a68c1d2978f8272bc359a81beb317b5ab2ff88a13a1e73aaeb7f5c643e778ffe9861c7a
-AUX sauerbraten.conf 605 BLAKE2B 454045423be96b14debca64e6f65fc3c335f3428affae889727f9bd598b7d3c4084f2d50b48a26f8571f8774f79a99705479ed73b68058c527f7d44bf5ad8a18 SHA512 685b7358ad7267b1b19ac00f879a82205f346b32fda8cb460c4f8c50e9f20263c102b0fca62ab437dabe67ebbdd281f130f28f3b8ef2bcf064ae45fbd23cce67
-AUX sauerbraten.init 1951 BLAKE2B 48402bfcc32caf16491886c6ccb7395628b2c067a5126d59908fe676311bfc781b9aec89aceda8920cedbd3c2c5477e9b404c29a0f6f7c64fd29263432076d1c SHA512 9a96557cb2822f30693900b1dc9ecad9f1eab9e8a3d75432667bfba784ee86754649cf08ccab5f9cbff6be7ab584f3325b9c40c947005cdee425716a888d5c40
+AUX sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch 5648 BLAKE2B 0515107fdeb0a441cc772c747f98068f4819b8ac4999ffd67a68bef96a59b754c3d6e9602a378dfb51984283867b82f1a855c5fdb8d9dacc392d67b57ba9dfdc SHA512 658325bc184792b776eb1a698eb28efdd451aed2f37c1e2182e7ca4703e5ea38eb0e5a5b4742738c94281f829f14eb394972449c43818805b7fb21f259b2c473
+AUX sauerbraten-2020.12.27-unbundle-enet.patch 3893 BLAKE2B ee866466fc13977c62750ee63c669f4815c4a5c42c14ab34b19fb4b6b356201042eddbab48c768ef173e26bfc883b47fc7f92d82f4b7660ec25efede0ea82679 SHA512 65206ebfed702fc165eef57a922fd85d2bf0251a8e3f6a7b7fa3b7b3ceee207466c8ac846b1303a1de4e9857b5bff61a01688700e6d3a0286c60c567071f2633
+AUX sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch 1028 BLAKE2B b628050655e112e7002f2aa2680d55b7d56dc2034bcf445802c594ac7386aa1ebb8301493df4a981b5595b8e6bdc29bd6851be53733a77ebde1058c0eb48d590 SHA512 85d26c201ac55b746a77755a82e9a055ac3ff8cb374a398e98cf50f373388e9b5183f1b316d5b73af91bba5c9815bfa391f43d1621febd9bd7b8afb3c25ba209
+AUX sauerbraten.conf 614 BLAKE2B 7fcd75fbc0be5ab445ddc5c5f5256529ab52d8f036687f2835b6e2996f0d832d42ecad75b857a4dc5b88db7ea2ff5bd0be30c60bd0462a20b8995b793adef348 SHA512 6731950c3f5309f7155ca71804f01d88562dcc82a7089499c076941b0283f42b0a7a4293859079d20a40b41e57f22f80c8e25f7670b17a64313055e9d1051000
+AUX sauerbraten.init 1903 BLAKE2B a7917ba65edf17c2ed3b0a3026a7f305978e34a15ea28dcf78f9de3ff55b3391a8fb3550f615ea4890c186d2348957ce0cda6354fdaf5b02e811383243efe04f SHA512 d4d95e1917d8324589b682112957f95de4033711e67a0303753978de57cb030ad28d59f350373014c791755f4225f5ec2b914a2fe73ca68e5f94fdb3d6998ae9
 DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 BLAKE2B b8a1c929dcf7a32bc289262fffcbcd4e7bbab3a9030c12bce7d086d63aaddee0c573c5d38f9ac845b3080aeac38d1b548aa9d243b462c3c682b158a379fe8cc2 SHA512 7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897
-EBUILD sauerbraten-2013.02.03.ebuild 3209 BLAKE2B c9029e5ac368e86cb2a30cff279493d7a0f3e5c85838a7b2ed0c9b34cb9e19490211b16d458179f2e5cdc009dc8bff124732e489ba199931572d136178b236b1 SHA512 1be06fad350ab300c5820b5d3370aed9a798c967781513be608797281a5781f715119b763c3e0e36360d6420f08f79ab3ba243aacca7d258bb91ca04ac95e275
+DIST sauerbraten_2020_12_27_linux.tar.bz2 985815649 BLAKE2B 4ec9caf705766aed76153a8631b1990c6432db8c816d579e891263b36adf0e7ed4831d2fee010b7692f6457989c0acea552f72c95e0924e97182d2a03dc947f2 SHA512 60487e0493478b9dd8940a9239834d8f3f6b6ca529f3c5b718f91caf5116073942ca6908d7fff26ab37b7ec590114ab07f24cdcea5c355288d3c2706d626ea28
+EBUILD sauerbraten-2013.02.03-r2.ebuild 3212 BLAKE2B f7dc4702e3b6a3fc0bdb6595168cc607d6fc0443e987b5e443baddb3f20e29eb592fee63e678cfd319dee1069a0330a146cafd3f8454df835ab56cd2c8fd7dde SHA512 7c5523d5d0d029099c2e3fb2223dbb26cf91a0424345153124d02a89ff8beb2c3756fe2c4b2e729acd192ff4842657e0ac31c1fb899d5a92ed9bdb88afadaa05
+EBUILD sauerbraten-2020.12.27.ebuild 3279 BLAKE2B a0166d1afe9237b3104be63276f76f9c0bdfb9c4accff9b92feab6e5850e72854c939840591898c501e85eb2a2bb250f120738833f747cf931fe27088a9e30bf SHA512 975a52d27b6c593d0c3c989522fec621edef9a5bb13c31766aebc808f244ff1075ddcbf8c8e28fcbe39600a46927fb423d78a264cbcd8dd5ceba736ecb7afb42
 MISC metadata.xml 401 BLAKE2B 0447e0bdea4cbb8ea99d24ac4f854ff4aefd0e62c4fb1e349485a5ec8429239c95299f5f26736e5458525787d6ef54bda400441ac5b6de920a2ddf949d2cab20 SHA512 1087c8ed886c5066a8bd600cbc9878e6bf21c41f163939daf22c503ce1e9095aff13b8986959aadaaaaf04cd2f314bb664042829deb30196b88a8c2608ce8266
diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch
new file mode 100644
index 000000000000..6d0dc3b1f082
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch
@@ -0,0 +1,146 @@
+From: Sam James <sam@gentoo.org>
+Date: Thu, 22 Apr 2021 13:47:33 +0000
+Subject: Respect *FLAGS, don't strip symbols
+
+--- a/src/enet/Makefile
++++ b/src/enet/Makefile
+@@ -1,4 +1,3 @@
+-CFLAGS=-O3 -fomit-frame-pointer
+ override CFLAGS:= $(CFLAGS) -Iinclude $(shell ./check_cflags.sh $(CC) $(CFLAGS))
+ 
+ OBJS= \
+--- a/src/rpggame/Makefile
++++ b/src/rpggame/Makefile
+@@ -1,4 +1,3 @@
+-CXXFLAGS= -Os
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+ PLATFORM= $(shell uname -s)
+@@ -7,11 +6,6 @@ PLATFORM_PREFIX= native
+ INCLUDES= -I../shared -I../engine -I../rpggame -I../enet/include
+ 
+ STRIP=
+-ifeq (,$(findstring -g,$(CXXFLAGS)))
+-ifeq (,$(findstring -pg,$(CXXFLAGS)))
+-  STRIP=strip
+-endif
+-endif
+ 
+ MV=mv
+ 
+@@ -118,7 +112,7 @@ clean:
+ $(filter-out shared/%,$(CLIENT_PCH)): $(filter shared/%,$(CLIENT_PCH))
+ 
+ %.h.gch: %.h
+-	$(CXX) $(CXXFLAGS) -x c++-header -o $@.tmp $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@.tmp $<
+ 	$(MV) $@.tmp $@
+ 
+ $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
+@@ -129,13 +123,13 @@ $(filter ../rpggame/%,$(CLIENT_OBJS)): $(filter ../rpggame/%,$(CLIENT_PCH))
+ ifneq (,$(findstring MINGW,$(PLATFORM)))
+ client: $(CLIENT_OBJS)
+ 	$(WINDRES) -I ../vcpp -i ../vcpp/mingw.rc -J rc -o ../vcpp/mingw.res -O coff 
+-	$(CXX) $(CXXFLAGS) -o ../$(WINBIN)/rpg.exe ../vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o ../$(WINBIN)/rpg.exe ../vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)
+ ifneq (,$(STRIP))
+ 	$(STRIP) ../../bin/rpg.exe
+ endif
+ else
+ client:	libenet $(CLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ endif
+ 
+ depend:
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,4 +1,3 @@
+-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
+ PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]')
+@@ -7,12 +6,6 @@ PLATFORM_PREFIX= native
+ INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
+ 
+ STRIP=
+-ifeq (,$(findstring -g,$(CXXFLAGS)))
+-ifeq (,$(findstring -pg,$(CXXFLAGS)))
+-  STRIP=strip
+-endif
+-endif
+-
+ MV=mv
+ 
+ ifneq (,$(findstring MINGW,$(PLATFORM)))
+@@ -65,8 +58,8 @@ CLIENT_LIBS= -F../sauerbraten.app/Contents/Frameworks/ -framework SDL2 -framewor
+ CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox
+ CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet
+ else
+-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags`
+-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
++CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags`
++CLIENT_LIBS= -Lenet -lenet -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
+ endif
+ endif
+ ifeq ($(PLATFORM),LINUX)
+@@ -173,11 +166,11 @@ clean:
+ $(filter-out shared/%,$(CLIENT_PCH)): $(filter shared/%,$(CLIENT_PCH))
+ 
+ %.h.gch: %.h
+-	$(CXX) $(CXXFLAGS) -x c++-header -o $@.tmp $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -o $@.tmp $<
+ 	$(MV) $@.tmp $@
+ 
+ %-standalone.o: %.cpp
+-	$(CXX) $(CXXFLAGS) -c -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+ 
+ $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
+ $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
+@@ -188,35 +181,35 @@ $(SERVER_MASTER_OBJS): CXXFLAGS += $(SERVER_INCLUDES)
+ 
+ ifneq (,$(findstring MINGW,$(PLATFORM)))
+ client: $(CLIENT_OBJS)
+-	$(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc -o vcpp/mingw.res -O coff
+-	$(CXX) $(CXXFLAGS) -o $(WINBIN)/sauerbraten.exe vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc $(LDFLAGS) -o vcpp/mingw.res $(LDFLAGS) -o coff
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(WINBIN)/sauerbraten.exe vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ server: $(SERVER_OBJS)
+-	$(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc -o vcpp/mingw.res -O coff
+-	$(CXX) $(CXXFLAGS) -o $(WINBIN)/sauer_server.exe vcpp/mingw.res $(SERVER_OBJS) $(SERVER_LIBS)
++	$(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc $(LDFLAGS) -o vcpp/mingw.res $(LDFLAGS) -o coff
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(WINBIN)/sauer_server.exe vcpp/mingw.res $(SERVER_OBJS) $(SERVER_LIBS)
+ 
+ master: $(MASTER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(WINBIN)/sauer_master.exe $(MASTER_OBJS) $(MASTER_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(WINBIN)/sauer_master.exe $(MASTER_OBJS) $(MASTER_LIBS)
+ 
+ install: all
+ else
+ client:	libenet $(CLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ ifneq (,$(findstring DARWIN,$(PLATFORM)))
+ 	install_name_tool -add_rpath @executable_path/../Frameworks sauer_client
+ endif
+ 
+ server:	libenet $(SERVER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
+ 
+ master: libenet $(MASTER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
+ 
+ shared/cube2font.o: shared/cube2font.c
+-	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< `freetype-config --cflags`
+ 
+ cube2font: shared/cube2font.o
+-	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
+ 
+ ifneq (,$(findstring DARWIN,$(PLATFORM)))
+ install: client
diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-unbundle-enet.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-unbundle-enet.patch
new file mode 100644
index 000000000000..ad7494b55385
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-unbundle-enet.patch
@@ -0,0 +1,113 @@
+From f269af0dc953ee79d95beabd2679e4c91992ac8d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 22 Apr 2021 14:06:00 +0000
+Subject: [PATCH] Unbundle enet
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -4,7 +4,7 @@ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]')
+ PLATFORM_PREFIX= native
+ 
+-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
++INCLUDES= -Ishared -Iengine -Ifpsgame
+ 
+ STRIP=
+ MV=mv
+@@ -57,10 +57,10 @@ override CXX+= -arch x86_64 -mmacosx-version-min=$(OSXMIN)
+ CLIENT_INCLUDES= $(INCLUDES) -Iinclude
+ CLIENT_LIBS= -F../sauerbraten.app/Contents/Frameworks/ -framework SDL2 -framework SDL2_image
+ CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox
+-CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet
++CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -lenet
+ else
+-CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags`
+-CLIENT_LIBS= -Lenet -lenet -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
++CLIENT_INCLUDES= $(INCLUDES) `sdl2-config --cflags`
++CLIENT_LIBS= -lenet -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
+ endif
+ endif
+ ifeq ($(PLATFORM),LINUX)
+@@ -135,7 +135,7 @@ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_
+ MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
+ else
+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
+-SERVER_LIBS= -Lenet -lenet -lz
++SERVER_LIBS= -lenet -lz
+ MASTER_LIBS= $(SERVER_LIBS)
+ endif
+ SERVER_OBJS= \
+@@ -226,10 +226,6 @@ endif
+ endif
+ endif
+ 
+-enet/libenet.a:
+-	$(MAKE) -C enet CC='$(CC)' AR='$(AR)'
+-libenet: enet/libenet.a
+-
+ depend:
+ 	makedepend -Y -Ishared -Iengine -Ifpsgame $(CLIENT_OBJS:.o=.cpp)
+ 	makedepend -a -o.h.gch -Y -Ishared -Iengine -Ifpsgame $(CLIENT_PCH:.h.gch=.h)
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -193,16 +193,16 @@ master: $(MASTER_OBJS)
+ 
+ install: all
+ else
+-client:	libenet $(CLIENT_OBJS)
++client:	$(CLIENT_OBJS)
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ ifneq (,$(findstring DARWIN,$(PLATFORM)))
+ 	install_name_tool -add_rpath @executable_path/../Frameworks sauer_client
+ endif
+ 
+-server:	libenet $(SERVER_OBJS)
++server: $(SERVER_OBJS)
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
+ 
+-master: libenet $(MASTER_OBJS)
++master: $(MASTER_OBJS)
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
+ 
+ shared/cube2font.o: shared/cube2font.c
+--- a/src/rpggame/Makefile
++++ b/src/rpggame/Makefile
+@@ -3,7 +3,7 @@ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ PLATFORM= $(shell uname -s)
+ PLATFORM_PREFIX= native
+ 
+-INCLUDES= -I../shared -I../engine -I../rpggame -I../enet/include
++INCLUDES= -I../shared -I../engine -I../rpggame
+ 
+ STRIP=
+ 
+@@ -41,7 +41,7 @@ STD_LIBS= -static-libgcc -static-libstdc++
+ CLIENT_LIBS= -mwindows $(STD_LIBS) -L../$(WINBIN) -L../$(WINLIB) -lSDL2 -lSDL2_image -lSDL2_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
+ else	
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags`
+-CLIENT_LIBS= -L../enet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
+@@ -102,10 +102,6 @@ default: all
+ 
+ all: client
+ 
+-enet/libenet.a:
+-	$(MAKE)	-C ../enet/
+-libenet: enet/libenet.a
+-
+ clean:
+ 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) rpg_client
+ 
+@@ -128,7 +124,7 @@ ifneq (,$(STRIP))
+ 	$(STRIP) ../../bin/rpg.exe
+ endif
+ else
+-client:	libenet $(CLIENT_OBJS)
++client:	$(CLIENT_OBJS)
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o rpg_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ endif
+ 
diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch
new file mode 100644
index 000000000000..ae4a43b43f98
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch
@@ -0,0 +1,28 @@
+From: Sam James <sam@gentoo.org>
+Date: Thu, 22 Apr 2021 14:33:15 +0000
+Subject: [PATCH] Use pkg-config for freetype2
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,5 +1,7 @@
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+ 
++PKG_CONFIG?=pkg-config
++
+ PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]')
+ PLATFORM_PREFIX= native
+ 
+@@ -206,10 +208,10 @@ master: libenet $(MASTER_OBJS)
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
+ 
+ shared/cube2font.o: shared/cube2font.c
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< `freetype-config --cflags`
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< `${PKG_CONFIG} --cflags freetype2`
+ 
+ cube2font: shared/cube2font.o
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `${PKG_CONFIG} --libs freetype2` -lz
+ 
+ ifneq (,$(findstring DARWIN,$(PLATFORM)))
+ install: client
+-- 
diff --git a/games-fps/sauerbraten/files/sauerbraten.conf b/games-fps/sauerbraten/files/sauerbraten.conf
index 8d93bf62b788..f0c2896b2bea 100644
--- a/games-fps/sauerbraten/files/sauerbraten.conf
+++ b/games-fps/sauerbraten/files/sauerbraten.conf
@@ -1,15 +1,15 @@
 # Config file for /etc/init.d/sauerbraten
 
 # Owner of Sauerbraten server processes (must be existing)
-USER="%GAMES_USER_DED%"
-GROUP="%GAMES_GROUP%"
+USER="sauerbraten"
+GROUP="sauerbraten"
 
 
 # Whether to run the dedicated server
 RUNSERVER="Yes"
 
 # Location of the dedicated server config directory
-SERVERCONFIG="%SYSCONFDIR%"
+SERVERCONFIG="/var/lib/sauerbraten"
 
 # Additional command line arguments to the dedicated server
 SERVERARGS=""
@@ -19,7 +19,7 @@ SERVERARGS=""
 RUNMASTER="No"
 
 # Location of the master server config directory
-MASTERCONFIG="%SYSCONFDIR%"
+MASTERCONFIG="/var/lib/sauerbraten"
 
 # What port should the masterserver use
 MASTERPORT="28787"
diff --git a/games-fps/sauerbraten/files/sauerbraten.init b/games-fps/sauerbraten/files/sauerbraten.init
index a5a7bb32966d..14248bc88959 100644
--- a/games-fps/sauerbraten/files/sauerbraten.init
+++ b/games-fps/sauerbraten/files/sauerbraten.init
@@ -24,7 +24,7 @@ start_server() {
 
 	start-stop-daemon \
 		--quiet --start --user ${USER}:${GROUP} --chdir ${SERVERCONFIG} \
-		--make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid \
+		--make-pidfile --pidfile /var/run/sauerbraten/server.pid \
 		--background --exec %LIBEXECDIR%/sauer_server -- ${SERVERARGS}
 	eend $?
 }
@@ -45,7 +45,7 @@ start_master() {
 
 	start-stop-daemon \
 		--quiet --start --user ${USER}:${GROUP} \
-		--make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid \
+		--make-pidfile --pidfile /var/run/sauerbraten/master.pid \
 		--background --exec %LIBEXECDIR%/sauer_master -- ${MASTERARGS}
 	eend $?
 }
@@ -58,13 +58,13 @@ stop() {
 
 stop_server() {
 	ebegin "Stopping Sauerbraten dedicated server"
-	start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid
+	start-stop-daemon --stop --retry 3 --pidfile /var/run/sauerbraten/server.pid
 	eend $?
 }
 
 stop_master() {
 	ebegin "Stopping Sauerbraten master server"
-	start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid
+	start-stop-daemon --stop --retry 3 --pidfile /var/run/sauerbraten/master.pid
 	eend $?
 }
 
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
index 6671f8f3e87c..c2efbc863d58 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03-r2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games vcs-clean
+EAPI=7
+
+inherit desktop flag-o-matic gnome2-utils toolchain-funcs vcs-clean wrapper
 
 EDITION="collect_edition"
 DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)"
 HOMEPAGE="http://sauerbraten.org/"
 SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="ZLIB freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug dedicated server"
 
-RDEPEND="
+DEPEND="
 	sys-libs/zlib
 	>=net-libs/enet-1.3.6:1.3
 	!dedicated? (
@@ -23,32 +25,42 @@ RDEPEND="
 		media-libs/sdl-image[png,jpeg]
 		virtual/opengl
 		virtual/glu
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
+		x11-libs/libX11
+	)
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/sauerbraten
+	dedicated? ( acct-user/sauerbraten )
+"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	# Patch makefile to use system enet instead of bundled
+	# respect CXXFLAGS, LDFLAGS
+	"${FILESDIR}"/${P}-{system-enet,QA}.patch
+)
 
 src_prepare() {
 	ecvs_clean
-	rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp}
+	rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp} || die
 
-	# Patch makefile to use system enet instead of bundled
-	# respect CXXFLAGS, LDFLAGS
-	epatch "${FILESDIR}"/${P}-{system-enet,QA}.patch
+	default
 
 	# Fix links so they point to the correct directory
 	sed -i -e 's:docs/::' README.html || die
 }
 
 src_compile() {
+	tc-export CXX
+
 	use debug && append-cppflags -D_DEBUG
 	emake -C src master $(usex dedicated "server" "$(usex server "server client" "client")")
 }
 
 src_install() {
-	local LIBEXECDIR="${GAMES_PREFIX}/lib"
-	local DATADIR="${GAMES_DATADIR}/${PN}"
-	local STATEDIR="${GAMES_STATEDIR}/${PN}"
+	local LIBEXECDIR="/usr/lib"
+	local DATADIR="/usr/share/${PN}"
+	local STATEDIR="/var/lib/${PN}"
 
 	if ! use dedicated ; then
 		# Install the game data
@@ -60,7 +72,7 @@ src_install() {
 		doexe src/sauer_client
 
 		# Install the client wrapper
-		games_make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
+		make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
 
 		# Create menu entry
 		newicon -s 256 data/cube.png ${PN}.png
@@ -76,42 +88,41 @@ src_install() {
 	doexe src/sauer_master
 	use dedicated || use server && doexe src/sauer_server
 
-	games_make_wrapper "${PN}-server" \
+	make_wrapper "${PN}-server" \
 		"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
-	games_make_wrapper "${PN}-master" \
+	make_wrapper "${PN}-master" \
 		"${LIBEXECDIR}/sauer_master ${STATEDIR}"
 
 	# Install the server init script
-	keepdir "${GAMES_STATEDIR}/run/${PN}"
+	keepdir /var/run/${PN}
 	cp "${FILESDIR}"/${PN}.init "${T}" || die
 	sed -i \
 		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
 		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
-		-e "s:%GAMES_STATEDIR%:${GAMES_STATEDIR}:g" \
+		-e "s:%/var/lib/%:/var/run:g" \
 		"${T}"/${PN}.init || die
+
 	newinitd "${T}"/${PN}.init ${PN}
 	cp "${FILESDIR}"/${PN}.conf "${T}" || die
 	sed -i \
 		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
 		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
-		-e "s:%GAMES_USER_DED%:${GAMES_USER_DED}:g" \
-		-e "s:%GAMES_GROUP%:${GAMES_GROUP}:g" \
+		-e "s:%GAMES_USER_DED%:sauerbraten:g" \
+		-e "s:%GAMES_GROUP%:sauerbraten:g" \
 		"${T}"/${PN}.conf || die
 	newconfd "${T}"/${PN}.conf ${PN}
 
 	dodoc src/*.txt docs/dev/*.txt
-	dohtml -r README.html docs/*
 
-	prepgamesdirs
+	docinto html
+	dodoc -r README.html docs/*
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 
 	elog "If you plan to use map editor feature copy all map data from ${DATADIR}"
diff --git a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild b/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild
new file mode 100644
index 000000000000..8b66fceccde3
--- /dev/null
+++ b/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs wrapper xdg
+
+DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)"
+HOMEPAGE="http://sauerbraten.org/"
+SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2020_11_29/sauerbraten_${PV//./_}_linux.tar.bz2"
+S="${WORKDIR}"/${PN}
+
+LICENSE="ZLIB freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated server"
+
+DEPEND="
+	>=net-libs/enet-1.3.6:1.3
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[X,opengl]
+		media-libs/sdl2-image
+		media-libs/sdl2-mixer
+		virtual/opengl
+		virtual/glu
+		x11-libs/libX11
+	)
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/sauerbraten
+	dedicated? ( acct-user/sauerbraten )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# Respect CXXFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch
+
+	# Patch Makefile to use system enet instead of bundled
+	"${FILESDIR}"/${PN}-2020.12.27-unbundle-enet.patch
+
+	# Don't use freetype-config, it's obsolete
+	"${FILESDIR}"/${PN}-2020.12.27-use-pkg-config-for-freetype2.patch
+)
+
+src_prepare() {
+	rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp} || die
+
+	default
+
+	# Fix links so they point to the correct directory
+	sed -i -e 's:docs/::' README.html || die
+}
+
+src_compile() {
+	tc-export CXX PKG_CONFIG
+
+	if use debug ; then
+		append-cppflags -D_DEBUG
+	fi
+
+	emake -C src \
+		master \
+		$(usex dedicated "server" "$(usex server "server client" "client")")
+}
+
+src_install() {
+	local LIBEXECDIR="/usr/lib"
+	local DATADIR="/usr/share/${PN}"
+	local STATEDIR="/var/lib/${PN}"
+
+	if ! use dedicated ; then
+		# Install the game data
+		insinto "${DATADIR}"
+		doins -r data packages
+
+		# Install the client executable
+		exeinto "${LIBEXECDIR}"
+		doexe src/sauer_client
+
+		# Install the client wrapper
+		make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
+
+		# Create menu entry
+		newicon -s 256 data/cube.png ${PN}.png
+		make_desktop_entry "${PN}-client" "Cube 2: Sauerbraten"
+	fi
+
+	# Install the server config files
+	insinto "${STATEDIR}"
+	doins server-init.cfg
+
+	# Install the server executables
+	exeinto "${LIBEXECDIR}"
+	doexe src/sauer_master
+
+	if use dedicated || use server ; then
+		doexe src/sauer_server
+	fi
+
+	make_wrapper "${PN}-server" \
+		"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
+	make_wrapper "${PN}-master" \
+		"${LIBEXECDIR}/sauer_master ${STATEDIR}"
+
+	# Install the server init script
+	cp "${FILESDIR}"/${PN}.init "${T}" || die
+	sed -i \
+		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
+		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
+		-e "s:%/var/lib/%:/var/run:g" \
+		"${T}"/${PN}.init || die
+
+	newinitd "${T}"/${PN}.init ${PN}
+	cp "${FILESDIR}"/${PN}.conf "${T}" || die
+	sed -i \
+		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
+		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
+		-e "s:%GAMES_USER_DED%:sauerbraten:g" \
+		-e "s:%GAMES_GROUP%:sauerbraten:g" \
+		"${T}"/${PN}.conf || die
+	newconfd "${T}"/${PN}.conf ${PN}
+
+	dodoc src/*.txt docs/dev/*.txt
+
+	docinto html
+	dodoc -r README.html docs/*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "If you plan to use map editor feature copy all map data from ${DATADIR}"
+	elog "to corresponding folder in your HOME/.${PN}"
+}
diff --git a/games-fps/serious-sam-tse/Manifest b/games-fps/serious-sam-tse/Manifest
index f5b735ac61be..50c45895e652 100644
--- a/games-fps/serious-sam-tse/Manifest
+++ b/games-fps/serious-sam-tse/Manifest
@@ -1,3 +1,3 @@
 DIST ssamtse-beta1.sh.bin 7952607 BLAKE2B 775c5f22b5c2d8418e69a6ac9d8e46f7f3d958108900ca0bc2135a889b4ee34d4d6528b2dfbe1de343fc8cd28af3f0d86cc764014875d8bb4d7a32ee55f361ea SHA512 43f07fbaef0bf8f90644a748931220331ed5f9179412e5a37daf0472aa98c5bb2455148c54254eae1af0b38ba8a3fde9c310cd8d488ea6b2806fa0f6fb1e1644
-EBUILD serious-sam-tse-1_beta1-r1.ebuild 4657 BLAKE2B 647d51698156d9cfcb7cd92002b6aaee50d6d4b663e732c98e2d998312f6761f9452d74edbda3aa30d8471f215c25acf2d43f3e78824ab6ef21ef16aff7b59ea SHA512 80081ec19931cd78d18560f65019e8dedf422a1ff65688135ac5452dd9b0e2cfdc474d3cad9092d57df0417173a2020c5febfeb44633f4e68150c01c9837ba8b
+EBUILD serious-sam-tse-1_beta1-r1.ebuild 4664 BLAKE2B 16efd6322a183dfeca0b108d7ebcfa0a6291bd1dfa60a7012a305bd33e44434a0fe6f93478ed74a2ef9ed0b54a9c78fb83b43c39dcf7192fcc4b928448327313 SHA512 b932687810a648b67aca73b1fd710ea3f6b1a59064fb9777831614c93d3a9d165414b69e8f9ca131f6cc7a176364e5589530d66e731d16d09bb6757a7dba3273
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild b/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild
index 0a0dc429f256..cec0725099f6 100644
--- a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild
+++ b/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,6 +64,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	# Switch to dynamic executable - runs at sane speeds on modern hardware
 	sed -i -e 's;exec "./ssam_lnx";exec "./ssam_lnx.dynamic";' bin/${MY_PN} \
 		|| die "dynamic binary update failed"
diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index 79ba08f86e04..c3d217236f42 100644
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,3 +1,3 @@
 DIST sof-1.06a-cdrom-x86.run 22928437 BLAKE2B f76f605af08a19b77548455c0101e03aca7cae69462914e47911da2fadd6d4f3b766e1069556ead0d06c757b179ae2e8105e76ea37852f17796b47b4712aec87 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078
-EBUILD soldieroffortune-1.06a-r1.ebuild 2110 BLAKE2B 787a5c00863f9019709f92b3ce6de04daeabca808b51d8e589951286497e48c771f62d7c31f9823b65726cfb57ac72ad80f8dc581100416bbf9e3b592e6302c1 SHA512 05f99512e81837bf410ed719a1610eb51daa178af43c1581f099eaf5f0a56b03ec84c36de84fb35eac5db3f4c1bdb1e5a36c682c22bd210129f572385804b84f
+EBUILD soldieroffortune-1.06a-r2.ebuild 2067 BLAKE2B 3ce93010e6cb4a30d3910db1d2be27e294fb63ab0c9cbbf1d6cea921627573a7ac6bb0db51182d9d4b2a6b8c1f9cfb1ad84d239c7279c287046684706a708676 SHA512 dd7d26e15eb1fa459d6b6d2cbb11d3c41a464476930c09c818f7b5ce8eefef178f4b45341934c5a84101817525b4e0d080df16b872a4fcf94a4397485f17c4d3
 MISC metadata.xml 963 BLAKE2B 3e6d4e2bf56378a5b2db55c5ce7ac3505a2b14a75ef00b409aa37b31d79b190284bbedd1206f9df78922844d583d947dc064ed272444ea77941b8e48dc82dd94 SHA512 59c285b27116238b779238f0179124a2ef1eefca76ae20a84f65ea8850548228dd540ba90b856dafccdd489f911beabb7b2b0a1fa4630562c995f845421f4895
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r2.ebuild
index b10d3fa33648..ad644fc95b44 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r2.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit check-reqs eutils unpacker cdrom games
+EAPI=7
+
+CHECKREQS_DISK_BUILD="1450M"
+CHECKREQS_DISK_USR="725M"
+inherit cdrom check-reqs desktop unpacker wrapper
 
 DESCRIPTION="First-person shooter based on the mercenary trade"
 HOMEPAGE="http://www.lokigames.com/products/sof/"
 SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run"
+S="${WORKDIR}"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="strip mirror bindist"
-IUSE=""
 
-DEPEND="games-util/loki_patch"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	virtual/opengl[abi_x86_32(-)]
+RDEPEND="
 	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
+	media-libs/smpeg[abi_x86_32(-)]
+	sys-libs/glibc
+	virtual/opengl[abi_x86_32(-)]
 	x11-libs/libXrender[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
-	media-libs/smpeg[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${ED}/${dir}
-unpackDir=${T}/unpack
+	amd64? ( sys-libs/glibc[multilib] )
+"
+BDEPEND="games-util/loki_patch"
 
-CHECKREQS_DISK_BUILD="1450M"
-CHECKREQS_DISK_USR="725M"
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
+unpackDir="${T}"/unpack
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
@@ -46,38 +46,37 @@ src_unpack() {
 
 src_install() {
 	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
+
+	exeinto ${dir}
 	doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof
-	insinto "${dir}"
+
+	insinto ${dir}
 	doins -r "${unpackDir}"/*
 	doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm}
 
-	cd "${S}"
+	cd "${S}" || die
 	export _POSIX2_VERSION=199209
-	loki_patch --verify patch.dat
+	loki_patch --verify patch.dat || die
 	loki_patch patch.dat "${Ddir}" >& /dev/null || die
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' +
+	find "${Ddir}" -exec touch '{}' + || die
 
-	games_make_wrapper sof ./sof "${dir}" "${dir}"
+	make_wrapper sof ./sof "${dir}" "${dir}"
 
-	# fix buffer overflow
+	# Fix buffer overflow
 	sed -i -e '/^exec/i \
 export MESA_EXTENSION_MAX_YEAR=2003 \
 export __GL_ExtensionStringVersion=17700' \
-		"${ED}/${GAMES_BINDIR}/sof" || die
+		"${ED}/usr/bin/sof" || die
 
 	doicon "${CDROM_ROOT}"/sof.xpm
 	make_desktop_entry sof "Soldier of Fortune" sof
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "To play the game run:"
 	elog " sof"
 }
diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
index fea075644218..c7602c37e3b3 100644
--- a/games-fps/tenebrae/Manifest
+++ b/games-fps/tenebrae/Manifest
@@ -1,7 +1,7 @@
-AUX 1.04-glhax.patch 1086 BLAKE2B 10e1ac1e10070c23deada452c6b4d69fac860e8cedbf80d317cf0c28d5316e50c2f59c815dea8bf366e41c8181dc801e9f0c6dec4e32851fc3a9ab50b2740714 SHA512 6641a82ba17909aa3ab1d583595d45d0abb1ac34cb8997dc17d1bda736b6a07417276f6ec358b73c08f74d84ca9168e76ed224d2d5220ec773f4a2077dd09800
+AUX 1.04-glhax.patch 996 BLAKE2B 5ef67a44ac80f52c7134ff6527f0ef623d28f4ba710c1842b04285673215e4cf99ede7417179d80d5e5fa400848c52b6bdf061f1e9f0edca346176a04e04cdb8 SHA512 875bab54275165f2aa823ec5d90aaeb30ae96318bfb47f22f15d7153ca04b2d9f5f2220dd9d42ba253e666467f8756d31296e80f619360c75540e3697a416582
 AUX tenebrae-1.04-exec-stack.patch 658 BLAKE2B 0b6dc3dd385f3bb7d00748e7c32c3e2ec135359427b4766c27314056fc2cdcf657018be05c04d95b6ac53ccb86da8a56b8b59624e50df9d73a44bb2d7fcc0b29 SHA512 d3b6c712f79612265a31eaeccae3b9688bcfb7916be34e1b9dc6e698c33750f82b323fa51cb09768546c3cdf55bc80fadf0cbc46d4e478ca126ac4124fa06765
-AUX tenebrae-1.04-redef.patch 393 BLAKE2B 3ea2d06e37dc2a33a8766de606480b027f0d4d6334410d551cdf44d817424f72fccaa7d44e97d8ca1bf36e47aa515a2511a9b495d0494353715a086a0b706cba SHA512 57f63560f3cdf3f0070954109f753cad5ace8828d5f81dc87044a37ac2144594e6bca68d12de186077349c9f42ea17bacbf32a2481216be79569e27bfe1065a6
+AUX tenebrae-1.04-redef.patch 321 BLAKE2B 766659d3395e437c5db77ddfd31c26f4b9f564fde13b68f2da5faad38a7e59b56238c11fd735529953dd547732f93f319e70e0b0050ab94e1b7b9ce64ec763b5 SHA512 a43b59ed0775b5f2e54b960b822e945602334ffed6f9dace005fd2c3dcf879d892acce427e251c900bd3e5c0e37a9ab00ab90eb882c3b09c307e570e05c9da5a
 DIST tenebrae-1.04.tbz2 625988 BLAKE2B f6eebd483c9dc7d4df3484e6dc55cde6d4d6166c029ff73133217d36c8064175e57bc1a3578f6119884f2d4d471cf717902b490c9a308ea38414c60d1d0a1909 SHA512 f74d1dcaf5b29fcc047f93e4c99c8b5264751c5687370ba4605cad76f85fe346e0e17a6546b8766acedabf23fed69d6894dda6499c854ef0736dddeddc89e18e
 DIST tenebraedata.zip 3989498 BLAKE2B 3f78240c0c3be4b265f4d8d1fc53f0ed331b01097afdb77c1146eef667330ae7ce8965a12a974ee23133a183e3dd92d39de320937cab2fcf10659d1d97f5162a SHA512 c69e8e18ab0c7d10b5e1c9ad3b396b0906302e6d75c0969d8c2b513df0a11b410de86736a67632378bf28d564c04c3e937f164cb3850742e183616ddc8ac4742
-EBUILD tenebrae-1.04-r1.ebuild 1503 BLAKE2B 85579ddab05c2ba454ee844b6753c2fa5e0b7c2073a62768d6f04d12d0ac6b103a6dfaa3b3c7d30fa3a3f016c00387b4c5d9e3e5bb566b5e6b3a0bb2e878fd91 SHA512 814ed0cdd765a5030392e3d0dd4928ed13e558901153c8d3bb0b70ad2147a58d6b7fae33d87c5e0d3ac67fa302c3f350b1e7603805eedcb5a9d9cd96fd9f21ac
+EBUILD tenebrae-1.04-r1.ebuild 1462 BLAKE2B 18015e52a13cab19c575e4910bc3b98abac1dc9ed20aa00996a8976345a874c528a56b5223f135447b6718c3148140c497a0cf6c1bfa71d9fb0cd3856eb50b40 SHA512 b483a56d4f892e661005b143c644c027ea54bd890e13e4f7952b5cd04d5effa5f3c40e3802cb0096aad99824a6662d85924a3ed1e7e3acfb3d16aa62c2b8c869
 MISC metadata.xml 709 BLAKE2B 65e253236ac1af184022f0f648cc38781ec78bd5c8d75134bfb238fab26cc299d2f82beb5d31c90196c564ff3799260444430658128ddf2754c68b6a62bc0da7 SHA512 15881aa13e08c8803a638ff40c022871116ffdd6de8141b149433d09c98055163f0661aa299ad041215612fe2ea149a5e04e44dbb1afb1de18a53cadcd196107
diff --git a/games-fps/tenebrae/files/1.04-glhax.patch b/games-fps/tenebrae/files/1.04-glhax.patch
index a185d8e10c7d..ffabf36f1768 100644
--- a/games-fps/tenebrae/files/1.04-glhax.patch
+++ b/games-fps/tenebrae/files/1.04-glhax.patch
@@ -1,5 +1,5 @@
---- tenebrae_0/glquake.h	2004-12-25 00:28:28.707288592 -0500
-+++ tenebrae_0/glquake.h	2004-12-25 00:27:35.000000000 -0500
+--- a/glquake.h
++++ b/glquake.h
 @@ -34,6 +34,7 @@
  #else
  #include <GL/gl.h>
diff --git a/games-fps/tenebrae/files/tenebrae-1.04-redef.patch b/games-fps/tenebrae/files/tenebrae-1.04-redef.patch
index 8bd89aa18e6f..abcfacec180c 100644
--- a/games-fps/tenebrae/files/tenebrae-1.04-redef.patch
+++ b/games-fps/tenebrae/files/tenebrae-1.04-redef.patch
@@ -1,5 +1,5 @@
---- a/sys_dosa.s	2017-09-06 16:41:31.875358788 -0500
-+++ b/sys_dosa.s	2017-09-06 16:41:35.947376646 -0500
+--- a/sys_dosa.s
++++ b/sys_dosa.s
 @@ -44,6 +44,8 @@
  
  	.text
diff --git a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
index 85a7552e4015..07743ada8ed5 100644
--- a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
@@ -1,42 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
 #ECVS_MODULE="tenebrae_0"
-#inherit cvs
-inherit eutils
 
-DESCRIPTION="adds stencil shadows and per pixel lights to quake"
+inherit toolchain-funcs
+
+DESCRIPTION="Adds stencil shadows and per pixel lights to quake"
 HOMEPAGE="http://tenebrae.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tenebrae/tenebraedata.zip
 	mirror://gentoo/${P}.tbz2"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 RDEPEND="
+	media-libs/libpng:0
 	virtual/glu
 	virtual/opengl
-	media-libs/libpng:0
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	x11-base/xorg-proto"
-
-S=${WORKDIR}
+	x11-libs/libXxf86vm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="app-arch/unzip"
 
-src_unpack() {
-	if [[ -z ${ECVS_MODULE} ]] ; then
-		unpack ${A}
-	else
-		cvs_src_unpack
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-glhax.patch
+	"${FILESDIR}"/${P}-exec-stack.patch
+	"${FILESDIR}"/${P}-redef.patch
+)
 
 src_prepare() {
 	cd tenebrae_0 || die "cd failed"
@@ -45,27 +44,27 @@ src_prepare() {
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
 		gl_warp.c || die
 
-	eapply "${FILESDIR}"/${PV}-glhax.patch
-	eapply "${FILESDIR}"/${P}-exec-stack.patch
-	eapply "${FILESDIR}"/${P}-redef.patch
-
 	default
 
 	cd linux || die "cd failed"
 	sed \
 		-e "/^LDFLAGS/s:=:+=:" \
 		-e "s:-mpentiumpro -O6:${CFLAGS}:" \
+		-e "s:CC.*= /usr/bin/gcc:CC?=/usr/bin/gcc:" \
 		Makefile.i386linux > Makefile || die
 }
 
 src_compile() {
+	tc-export CC
+
 	cd "${S}"/tenebrae_0/linux || die "cd failed"
 	emake MASTER_DIR="/usr/share/quake1" build_release
 }
 
 src_install() {
 	newbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae
-	insinto "/usr/share/quake1/tenebrae"
+
+	insinto /usr/share/quake1/tenebrae
 	doins "${WORKDIR}"/tenebrae/*
 	dodoc tenebrae_0/linux/README "${WORKDIR}"/Tenebrae_Readme.txt
 }
diff --git a/games-fps/transfusion-bin/Manifest b/games-fps/transfusion-bin/Manifest
index c73697ec7a70..f3ab82825507 100644
--- a/games-fps/transfusion-bin/Manifest
+++ b/games-fps/transfusion-bin/Manifest
@@ -2,5 +2,5 @@ AUX transfusion 65 BLAKE2B efad05a6cdbe57c12a95d57deafd67f9c377db323fe12f24dd0a1
 DIST transfusion-1.0-linux.i386.zip 40532193 BLAKE2B 9b12f8d6ed91a1c31935f21a3094e186439159401411f3e1291381832dc09dcbc265113ed6df056109394b2c59ee9b556a7e16ebde6b001acd63a8854a58ebbe SHA512 cd4372e09ac6e3e4f1e2fe99afb18b1c5981c56dac84edd4d440be8914322984a377d4622e2b45719fead86d1b1c7f3ab74580430eba8b69bbe01702c8dbcafb
 DIST transfusion-patch-1.01-linux.i386.zip 8790776 BLAKE2B b8faa46a259a2f13f876540860b01b269a31969516b48901cf1e54c372e7db91f416f86af80b9a131e4bf2cb17cffc93dd04b50c1450f361601b3a048b8d2729 SHA512 b5d6b446be580ab09a79bdb651436de242603a7f215e85ab61ecc45d02739ca285a9a0bfaaf95c08df77f79928a42a27cace76a1695300d80172e2f4e9a488cf
 DIST transfusion.png 2102 BLAKE2B 5d062ee459ab8f309b35d07abdb63c442f30b98bb2cce6e55b23336e9ddf36f099f1d554a5ea0a76a3a1b1484a6559cf085e5e3d8aa27972c04d52bee3b7a701 SHA512 902c630c5f0956678a905760674be7c8bd0a4d72e217ca8cddd56681d0b1161051602bd7bf6e24cc25b6d99cf7c0e5a9802f8230eec7c6a9831aecd700838363
-EBUILD transfusion-bin-1.01-r1.ebuild 1144 BLAKE2B 75650b47747a58f600dd3a2e64e707ebbd5d2c5a7f7d844a6af09240006e5e64e5cd450ad71ed3dcfb180425fc2275e77ac7ff8d991dfa15db780d113f82a17b SHA512 d07f719a9481c1c36d6a78b1b89e03b0b39f20586a2f94e41d65b8f453505d47258dd9137b158b43001cfa536d22861f15bc39bc0b91bb1d018671273512025d
+EBUILD transfusion-bin-1.01-r1.ebuild 1286 BLAKE2B e8ab612d54c5b92f12398f449ef3cc55969b57b15b2adc957df3598ebda8c5efadb40e6bb6f3d04f6305784698738260b9039df9b6e567d99b07663446d5e2d9 SHA512 2ac35db67e30ade2f0cf4723262648d1dcae2fa50b2305da357d99aa9e8c7fcf12876ae4daf404b82d7772db14d10ee3acb9c461344f5ef4b372edca66303135
 MISC metadata.xml 328 BLAKE2B be547572a9876be9ff3065dc5203ad70a0907c88ed8eafb48338a582bb28c9d417931b4243d673caee83ec0665963707bc00609fcda74259fe6ba3173f0ec32b SHA512 85e11b06989c540831ee3981820d63507c3a233014e73cb577089d599019de54db3bd52f4304623a5b81ae8dfacd7a6b9f59098865da0aff418cc79a46009f8d
diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
index beeb5e9eb35f..72ae024af233 100644
--- a/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
+++ b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop wrapper
 
 MY_PN="${PN/-bin/}"
 DESCRIPTION="Blood remake"
@@ -10,18 +11,25 @@ HOMEPAGE="https://www.transfusion-game.com/"
 SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip
 	mirror://sourceforge/blood/${MY_PN}-patch-${PV}-linux.i386.zip
 	mirror://gentoo/${MY_PN}.png"
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="strip"
 
-RDEPEND="sys-libs/glibc"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+RDEPEND="
+	sys-libs/glibc
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${MY_PN}"
+QA_PREBUILT="
+	opt/transfusion/transfusion-dedicated
+	opt/transfusion/transfusion-glx
+"
 
 dir="/opt/${MY_PN}"
 Ddir="${D}/${dir}"
@@ -32,14 +40,14 @@ src_install() {
 	HTML_DOCS="${MY_PN}/doc/*.html" einstalldocs
 
 	#...then mass copy everything to the install dir...
-	dodir "${dir}"
+	dodir ${dir}
 	cp -R * "${Ddir}" || die
 
 	# ...and remove the docs since we don't need them installed twice.
 	rm -rf \
 		"${Ddir}"/${MY_PN}/doc \
 		"${Ddir}"/qw/*txt \
-		"${Ddir}"/${MY_PN}/*txt
+		"${Ddir}"/${MY_PN}/*txt || die
 
 	doicon "${DISTDIR}"/${MY_PN}.png
 	make_wrapper ${MY_PN} ./${MY_PN}-glx "${dir}" "${dir}"
diff --git a/games-fps/tribes2/Manifest b/games-fps/tribes2/Manifest
index d5227e8a275a..1b0649d6204c 100644
--- a/games-fps/tribes2/Manifest
+++ b/games-fps/tribes2/Manifest
@@ -1,3 +1,3 @@
 DIST tribes2-25034-cdrom-x86.run 95560158 BLAKE2B a4516fddde83a8623348557983b3b5592c24108805da521d1b24bee21c06f8300ca812db8533855b70d924c59cf2bf417a771daa417c7f9b79e39f34a3611f98 SHA512 a3d2800af06d8659193ed1da4b9042af0924e1a0ade8a410aec31d66591efa2d2773aa12b33f7234975efee083974a77434bb1c0124bd57bfcc3be4898c46ad8
-EBUILD tribes2-25034.ebuild 2083 BLAKE2B c842073958db1bad6b5dcb6fc5eca20976f4f3c97e254c5dad16c60da53ef5a9accdb704628da9577901fde71f9b43a3ee8010cfc659e56c8b11a340ce76e853 SHA512 d7f3caf76e99cf64984d731f71c242d55323b276b9c3f56e547f2495e273d04a74f7efff72ed5e0c39ea04ec6d4b6235919fdab70f55d16587d99e975202dc60
+EBUILD tribes2-25034.ebuild 2030 BLAKE2B 1e760c46cd969e59376fd87ad3c036083f44dbd20632fe082f75517604f734c67beb34721f6a3448ce5fb6c9df7ca129c36111ebe4df6311e47c54a011009e24 SHA512 5ef2e89cfeccb357c282b5fb8e86c5d77f9358f07aefdf1d646cb4817a6e6824015d17bfea83746dd44fc75635332917fa392a1c957cdb7b93d5ffb40a8ed95c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
index b6863191127a..225678114969 100644
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ b/games-fps/tribes2/tribes2-25034.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker cdrom games
+EAPI=7
+
+inherit cdrom desktop unpacker wrapper
 
 DESCRIPTION="Tribes 2 - Team Combat on an Epic Scale"
 HOMEPAGE="http://www.lokigames.com/products/tribes2/"
 SRC_URI="http://www.libsdl.org/projects/${PN}/release/${P}-cdrom-x86.run"
+S="${WORKDIR}"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
@@ -14,21 +16,21 @@ SLOT="0"
 # time to try to figure it out but this definitely needs to stay -amd64 until
 # someone does fix the patching.
 KEYWORDS="-amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist strip"
 
-DEPEND="sys-libs/glibc
-	games-util/loki_patch"
-RDEPEND="${DEPEND}
-	virtual/opengl"
-
-S=${WORKDIR}
+DEPEND="
+	sys-libs/glibc
+"
+RDEPEND="
+	${DEPEND}
+	virtual/opengl
+"
+BDEPEND="games-util/loki_patch"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
 
 pkg_setup() {
-	games_pkg_setup
 	ewarn "The installed game takes about 507MB of space!"
 }
 
@@ -59,17 +61,14 @@ src_install() {
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' +
+	find "${Ddir}" -exec touch '{}' + || die
 
 	newicon "${CDROM_ROOT}"/icon.xpm tribes2.xpm
-	games_make_wrapper t2launch ./t2launch "${dir}" "${dir}"
+	make_wrapper t2launch ./t2launch "${dir}" "${dir}"
 	make_desktop_entry t2launch "Tribes 2" tribes2
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "To play the game run:"
 	elog " t2launch"
 }
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
index 8825a910ccc2..9d92afff36f2 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -3,5 +3,5 @@ DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 2bee5e869b3929564cdba268765f6
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d SHA512 cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730 SHA512 f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
 DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577 SHA512 05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6
-EBUILD urbanterror-data-4.3.4.ebuild 1671 BLAKE2B 76bfe75221c0011abb9b28451d538591d619bd70a939fbe7a5f10012d9f2b586890988562da893dd7a36a1b6df5fcfe99faf52937ddeadb29136f7d44bdbeff7 SHA512 b3c92a2c96e684577a9a1072108315f9b97458cd9596b919d615d8b867bf80b93b74bb49a353b134f241cedc8a88ab738e06bc67a12eeba8aa3a64040181710d
+EBUILD urbanterror-data-4.3.4.ebuild 1675 BLAKE2B 7599d03b28820862b416c62afe772e3f01e61824ca2d14ea609286b3f10ae9645fd643690cee0db77913fb250c8f3f3b648dd081308f1f6beca6ec4751678ef8 SHA512 e162779be2edc3de353875a43a60a5d100023ae5e2905e43626ff96859d0477acfb4ed262f9864ac7885e2bafa38c294619d28d9b77c124fb7793600cc4e9fbd
 MISC metadata.xml 510 BLAKE2B 0d50fe48f57df2a45129154684e758d95611afff76e0128d87d0eba7dd18c546e2789809700ee52df6d278528f4006ae521a7165ba3d173f35d068920ba9f716 SHA512 552ca6daa2d16164a0dd06c772f358a24d458b2a3ab9cfaa46f43563a96d2014c7cc91e28e392322be8333452bd4028f54537ce853ffa2df5e0884d388ad3e57
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index a3c4a290fb5a..cb0421234916 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
 
 inherit check-reqs
 
 ENGINE_PV=${PV}
-
 MY_PN=UrbanTerror
 MY_PV=43_full
 
 DESCRIPTION="Data files for UrbanTerror"
 HOMEPAGE="https://www.urbanterror.info"
-
 # load the base image and save it as .0 file
 # use 43_full-2.zip as upstream fixed something back then
 SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
+S="${WORKDIR}/${MY_PN}43"
 
 # fetch updates recursively for |4.3.x-4.3.0|
 if [[ "${PV}" != "4.3.0" ]]; then
@@ -30,13 +32,9 @@ unset MY_CTR
 LICENSE="Q3AEULA-20000111 urbanterror-4.2-maps"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
+RESTRICT="bindist mirror"
 
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	default
diff --git a/games-fps/ut2003-bonuspack-cm/Manifest b/games-fps/ut2003-bonuspack-cm/Manifest
index 46d626a2e9b4..8ae73ae64ed7 100644
--- a/games-fps/ut2003-bonuspack-cm/Manifest
+++ b/games-fps/ut2003-bonuspack-cm/Manifest
@@ -1,3 +1,3 @@
 DIST cbp2003.zip 149198696 BLAKE2B d6319e3605752e309411b16358696cdf0559b3cc6acedfae2f063eedb4ee98fefb470e9ff601cdce46821eaaa3f7c0ef3c13ddc2ce3639842ec98e1e68fefb85 SHA512 382ea605b7ce89654b7a58dfd1b36f0624bb0ac63aff6a07f1942dd3c8715ac6d79812828f2f28e2bd1b162673147e0ab8653ac67b4ee5d936e8840dede8e408
-EBUILD ut2003-bonuspack-cm-1.ebuild 809 BLAKE2B f23c553ce6f765adc800445fe37344a2cf59f89e28c36445eb4760e08f31bccbea3a81e0b1c49de4786c5490d765ccb5b5686865c3e62d60e4deca13f8b4b79a SHA512 960bde355c1c4e2a21c502774564626edf48a08c43d861130237a35722766cb643196310d152371040d33186182659f41879e48e245fa83da2ee278c3ce6ed23
+EBUILD ut2003-bonuspack-cm-1-r1.ebuild 1602 BLAKE2B 28bb152fd2a762ea19f99219d16adf994f123a9468072ca45bf75bdd0f674d4c90e31b2ff2ce39a5cf831be8a30059d2bccb9a811404803407564f9f1b458756 SHA512 fcc00a8de00ce6ad0c42c1751e413efa86f789d48223f27aa168db74eb6af9e4311f391f8c5b05fb3d5b317a9651979da53f361aae866a5c6020070fd17cdfee
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1-r1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1-r1.ebuild
new file mode 100644
index 000000000000..a40e978c7e73
--- /dev/null
+++ b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="Community Bonus Pack for UT2003"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2003"
+SRC_URI="https://downloads.unrealadmin.org/UT2003/BonusPack/cbp2003.zip"
+S="${WORKDIR}"
+
+LICENSE="ut2003"
+SLOT="1"
+KEYWORDS="~x86"
+# Needs signup to download
+RESTRICT="bindist fetch mirror strip"
+
+RDEPEND="games-fps/ut2003"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+	unpack_zip "${DISTDIR}"/${A}
+}
+
+src_install() {
+	# Inlined from games.eclass
+	local dir="${EPREFIX}"/opt/ut2003
+	local Ddir="${D}${dir}"
+
+	# Inlined from games.eclass
+	_games_umod_unpack() {
+		local umod=${1}
+
+		mkdir -p "${Ddir}"/System || die
+		cp "${dir}"/System/{ucc-bin,Manifest.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System || die
+		# Don't die here (for now) in case Default.ini, DefUser.ini are missing
+		cp "${dir}"/System/Def{ault,User}.ini "${Ddir}"/System &> /dev/null
+
+		cd "${Ddir}"/System || die
+		UT_DATA_PATH="${Ddir}"/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null || die "uncompressing file ${umod}"
+		rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log &>/dev/null || die "Removing temporary files"
+	}
+
+	for i in Animations Help Music Maps StaticMeshes Textures System; do
+		mkdir -p "${Ddir}"/${i} || die
+	done
+
+	_games_umod_unpack CBP2003.ut2mod
+
+	rm "${Ddir}"/Readme.txt "${Ddir}/cbp installer logo1.bmp" || die
+}
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
deleted file mode 100644
index d42bd801c5ed..000000000000
--- a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit games unpacker
-
-DESCRIPTION="Community Bonus Pack for UT2003"
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2003"
-SRC_URI="https://downloads.unrealadmin.org/UT2003/BonusPack/cbp2003.zip"
-
-LICENSE="ut2003"
-SLOT="1"
-KEYWORDS="~x86"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="games-fps/ut2003"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack_zip "${DISTDIR}"/${A}
-}
-
-src_install() {
-	for i in Animations Help Music Maps StaticMeshes Textures System
-	do
-		mkdir -p "${Ddir}"/${i} || die
-	done
-	games_umod_unpack CBP2003.ut2mod
-	rm "${Ddir}/Readme.txt" "${Ddir}/cbp installer logo1.bmp"
-	prepgamesdirs
-}
diff --git a/games-fps/ut2003-bonuspack-de/Manifest b/games-fps/ut2003-bonuspack-de/Manifest
index d06afdd836b5..272d5e6c8869 100644
--- a/games-fps/ut2003-bonuspack-de/Manifest
+++ b/games-fps/ut2003-bonuspack-de/Manifest
@@ -1,3 +1,3 @@
 DIST debonus.ut2mod.zip 74977458 BLAKE2B bd9c91524e1d3b3ac24434c7daedd886044884cbb36b919452e408b73de317cf43b1c18e3f843a0c272652dd40ae7ad2da007d87ea370da23e88ea599c1026ab SHA512 2c70d39eea1ea647d2fbee21dda5b00057b7feb1607a89d86982ac43e6063820aa70c633fbc21c768d1491fec909a06634e0e883aa771be2607b51ab193f0935
-EBUILD ut2003-bonuspack-de-1.ebuild 749 BLAKE2B e168c222778a123d6c8611e68f64162fd39139ed53c388c9e275b6e24d20ae21e3b453859bfb4c5f6d2dba1a26fc8530db5562cf7f666dac4351bc16887812a5 SHA512 d9e2d598362efefc91c7cb97721a56e0b3d71fe401dcdbd791d3ad3eb4d6684995188f53aec1c0c86cf02a4c444b3740d5ec6ff8badb9bcf959eb2ba88f27164
+EBUILD ut2003-bonuspack-de-1-r1.ebuild 1456 BLAKE2B d8c7c34e060960d6150ab4ce50a94fc4944ec173d03e940f382b63ae45d5180be96b125a8c163d6e8c10be026d6cbfd6e5b3d1cdef713e6f3b46b6c3da2e492b SHA512 35de00e1cef7fc25afde34b0d75a66e3778e45f7183cec4a2370af1182d0c125d5a71ccacba2140d97e28571c7bf788c5a9bbc934b7b4bb41441da6bd43b6faa
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1-r1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1-r1.ebuild
new file mode 100644
index 000000000000..6e54cd2f15ee
--- /dev/null
+++ b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="debonus.ut2mod.zip"
+DESCRIPTION="Digital Extremes Bonus Pack for UT2003"
+HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
+SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
+S="${WORKDIR}"
+
+LICENSE="ut2003"
+SLOT="1"
+KEYWORDS="~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="games-fps/ut2003"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+	unzip -qq "${DISTDIR}"/${A} || die
+}
+
+src_install() {
+	local dir="${EPREFIX}"/opt/ut2003
+	local Ddir="${D}${dir}"
+
+	# Inlined from games.eclass
+	_games_umod_unpack() {
+		local umod=${1}
+
+		mkdir -p "${Ddir}"/System || die
+		cp "${dir}"/System/{ucc-bin,Manifest.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System || die
+		# Don't die here (for now) in case Default.ini, DefUser.ini are missing
+		cp "${dir}"/System/Def{ault,User}.ini "${Ddir}"/System &> /dev/null
+
+		cd "${Ddir}"/System || die
+		UT_DATA_PATH="${Ddir}"/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null || die "uncompressing file ${umod}"
+		rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log &>/dev/null || die "Removing temporary files"
+	}
+
+	mkdir -p "${Ddir}"/{System,Maps,StaticMeshes,Textures,Music,Help} || die
+
+	_games_umod_unpack DEBonus.ut2mod
+}
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
deleted file mode 100644
index 7fc87147a470..000000000000
--- a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P="debonus.ut2mod.zip"
-DESCRIPTION="Digital Extremes Bonus Pack for UT2003"
-HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
-SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="games-fps/ut2003"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unzip -qq "${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	mkdir -p "${Ddir}"/{System,Maps,StaticMeshes,Textures,Music,Help} || die
-	games_umod_unpack DEBonus.ut2mod
-	prepgamesdirs
-}
diff --git a/games-fps/ut2003-bonuspack-epic/Manifest b/games-fps/ut2003-bonuspack-epic/Manifest
index 43f229037b16..673cf8ffe823 100644
--- a/games-fps/ut2003-bonuspack-epic/Manifest
+++ b/games-fps/ut2003-bonuspack-epic/Manifest
@@ -1,4 +1,4 @@
 AUX epic-installer 925 BLAKE2B 4d86c44875d58a01e4226fc746aba8d3fa44875554c4aa4ed150797a4d157915cf0335420a019f6b9d32689e1f34f774cfd8ee756996d890240ff558d5bf22a9 SHA512 0e49953e28c1be196c67d5d29a5f6ac0f636f1315a18bf883c35c8236b74f4a5aea45693fba013578592bb0601a9eaa734446cfd533af70db9a24371162c2524
 DIST UT2003-epicbonuspackone.exe 156913152 BLAKE2B ea420203dfd7f12a1f790d06875af34073fa30764a7184d6945e97063291100ef4377025afb86fab2038f7a824d60e2c93b991202465864de993456b10638f94 SHA512 26fa06637c6a99704d11b58f5fe54454f8018c6f07b06b6a9a2075d17b9a9fb7d7155298de5502cefa0f07995f4513ce9531863cef8c344996b5e6dd5fbd339d
-EBUILD ut2003-bonuspack-epic-1.ebuild 2504 BLAKE2B 014935b88571701eabfcd1a0ccabc2fa50fe34cd89674ceac244320529045ae9a0794b87a4ff25474f29ec28ca5f6935f9370bf8a19fa5dbd877bac64822376a SHA512 a761a8651258e62193151ff6d6919d975bc40fcf4663f290309c8322166f242f836d69ac1bcd387176f53b18cf202c263f2e82bd80eabf11140604a2b2d7c8c0
+EBUILD ut2003-bonuspack-epic-1-r1.ebuild 2472 BLAKE2B 88d03f56cb7d34f84b181a6b96ad4d67c7e6c3b18a7c78d38e893d5d188986b3df76c17bc36cf2986ac7e187e158206501acdf7fb9a9db7f6d0563cd6ef46d8c SHA512 09c12de94f5eef9eeaf56be6d5ae88f747bc161cfd0bc9a11276f781fa735a58cb62f24a5f1247b92f82f8a5cf75f0660bcce323d894888a42a32536cf68226d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1-r1.ebuild
index 00d2d8927eef..6a7219759cf8 100644
--- a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
+++ b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=7
 
 DESCRIPTION="Epic Bonus Pack for UT2003"
 HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
 SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/UT2003-epicbonuspackone.exe"
+S="${WORKDIR}"/UT2003-BonusPack
 
 LICENSE="ut2003"
 SLOT="1"
 KEYWORDS="~x86"
-IUSE=""
-RESTRICT="strip"
+RESTRICT="bindist mirror strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND="games-fps/ut2003"
+RDEPEND="
+	acct-group/gamestat
+	games-fps/ut2003
+"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/UT2003-BonusPack
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
+dir=opt/ut2003
+Ddir="${ED}"/${dir}
 
 src_unpack() {
 	unzip -qq "${DISTDIR}"/${A} || die
+
 	# This is done since the files are the same
 	rm -f "${S}"/Textures/LastManStanding.utx || die
 }
@@ -39,12 +40,9 @@ src_install() {
 	cp -r "${S}"/{Maps,Sounds,StaticMeshes,Textures} "${Ddir}" || die
 	cp "${S}"/System/{*.{det,est,frt,int,itt,kot,tmt,u},User.ini} "${Ddir}"/System || die
 	cp -v "${S}"/System/Manifest.ini "${Ddir}"/System/Manifest.ini.epic || die
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "You will need to run:"
 	elog "emerge --config =${CATEGORY}/${PF}"
 	elog "to make the necessary changes to the system .ini files."
@@ -106,5 +104,5 @@ EOT
 
 	cp DefUser.ini DefUser.ini.pre-epic || die
 	sed -i 's/^F11=.*$/F11=MusicMenu/g' DefUser.ini || die
-	chown games:games ${dir}/System/*.ini || die
+	chown :gamestat "${dir}"/System/*.ini || die
 }
diff --git a/games-fps/ut2003-data/Manifest b/games-fps/ut2003-data/Manifest
index 33a3ece6c38e..fdab44b67aa4 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 3980 BLAKE2B 502c326854ab6ccf87a186f8cf48db17e2c6abfdc8ebb572ad42d5fff49fbeb7fc5cf89e779a2017de5694af34bf3b16045f27a111c97d9c9c6977a19f0a36ba SHA512 8e5438a5e638399e14fec83a5c397a6f718c15d38d5228bc86c911a71b1a1a7fd8f9a239cd6384bb79c73d6c5e873f21e15edf159b30ae53d809f97ffc0804e0
+EBUILD ut2003-data-2107-r2.ebuild 4563 BLAKE2B 7c4c621ed4afe06ac018ee18dae3eddd68839baa491dd0594fd7c77aae3b9394bc3138c1a4da50a6ec421b4c2ec4d5fce3a93a50fa8544c63034ac2b163c4ff7 SHA512 f72fb4f1ad49fbc7e1a307484683844106ca29b5e94e7b124af9803c2ccabe3cbea2385d4331c79cd221d4fa3e1cb04db2f2b3e89f5e3aa143667729b4111f45
 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-r2.ebuild
index 44433cc98f3e..ac69da5ef178 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107-r2.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker cdrom games
+EAPI=7
+
+inherit desktop cdrom unpacker
 
 DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
 HOMEPAGE="http://www.unrealtournament2003.com/"
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/UT2003CrashFix.zip" # MIT licensed (bug #754360)
+S="${WORKDIR}"
 
 LICENSE="ut2003 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="bindist strip"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	games-util/uz2unpack"
+RESTRICT="bindist mirror strip"
 
-S=${WORKDIR}
+BDEPEND="
+	app-arch/unzip
+	games-util/uz2unpack
+"
 
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
+dir=opt/ut2003
+Ddir="${ED}"/${dir}
 
 pkg_setup() {
-	games_pkg_setup
 	ewarn "The installed game takes about 2.7GB of space!"
 }
 
@@ -35,6 +35,27 @@ src_unpack() {
 }
 
 src_install() {
+	# Inlined from games.eclass
+	_games_ut_unpack() {
+		local ut_unpack="${1}"
+		local f=
+
+		if [[ -z ${ut_unpack} ]] ; then
+			die "You must provide an argument to games_ut_unpack"
+		fi
+
+		if [[ -f ${ut_unpack} ]] ; then
+			uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" || die "failed uncompressing file ${ut_unpack}"
+		fi
+
+		if [[ -d ${ut_unpack} ]] ; then
+			while read f ; do
+				uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" || die "failed uncompressing file ${f}"
+				rm -f "${ut_unpack}/${f}" || die "failed deleting compressed file ${f}"
+			done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null)
+		fi
+	}
+
 	insinto "${dir}"
 	# Disk 1
 	einfo "Copying files from Disk 1..."
@@ -83,7 +104,7 @@ src_install() {
 	insinto "${dir}"/System
 	doins "${S}"/System/Def{ault,User}.ini
 
-	# install eula
+	# install EULA
 	insinto "${dir}"
 	doins "${S}"/eula/License.int
 
@@ -98,19 +119,19 @@ src_install() {
 	# uncompressing files
 	einfo "Uncompressing files... this may take a while..."
 	for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do
-		games_ut_unpack "${Ddir}"/${j} || die "uncompressing files"
+		_games_ut_unpack "${Ddir}"/${j} || die "uncompressing files"
 	done
 
 	# installing documentation/icon
 	dodoc "${S}"/README.linux
-	newicon "${S}"/Unreal.xpm ut2003.xpm || die "copying icon"
+	newicon "${S}"/Unreal.xpm ut2003.xpm
 	doins "${S}"/README.linux "${S}"/Unreal.xpm
 	# copy ut2003/ucc
 	exeinto "${dir}"
 	doexe "${S}"/bin/ut2003 "${S}"/ucc
 
 	# Here we apply DrSiN's crash patch
-	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System
+	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System || die
 
 	ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
 $
@@ -130,6 +151,4 @@ EOT
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
 	find "${Ddir}" -exec touch '{}' + || die
-
-	prepgamesdirs
 }
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index f80f7aed52d2..f15527da65a2 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -4,5 +4,5 @@ AUX ut2003-demo 692 BLAKE2B c9eef6a5ee06c4c9619ca29c7cdafab5763a3cb63a8b060ac4c2
 DIST UT2003CrashFix.zip 2764 BLAKE2B 697c35a02f447d0d436fc32bebdeafbca55ef644d951e92085c33f7597108625770b76e027f31287cd2ac66607692ff8c908f6971f936a134d58d0effc2586fc SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444
 DIST ut2003-demo-misc.tar.bz2 31851 BLAKE2B 585fe83e142fecdce330ae6116d2c3ef94c870e9bfadb8d7e32185bf0880464bf162330da1f0960feef0d6f3eda7ba591565291d7b25f70f9834d4fbb5a41c58 SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0
 DIST ut2003demo-lnx-2206.sh.bin 137253079 BLAKE2B 9048a6f82e6302c84481989c4ce176fb969eb5c7a86e9d5a8b28060b0e2d139de786b8edbd5080cbf5d49ca9c6114d3f750ed8ad9bcdff6e69841933830538ea SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be
-EBUILD ut2003-demo-2206-r4.ebuild 3552 BLAKE2B 9a7655140e511bc436a0b6d835a58b73079b7594a2cbdf4768c8ce4065b73dbd08aa5b3c1edaeb27deabbf44b0e11c7c4d2f6884afc2d39e44ca537b0d9f61cb SHA512 2a434fcc938c10135de612a3126e4c9d3e4b8665a7e4bb9d8fac8b16616eab573b02e10b7a656e22264849d44f4536dcd8136b858e6ebc25785c111952a517e2
+EBUILD ut2003-demo-2206-r5.ebuild 3504 BLAKE2B 1792b997e8a4c85b9445fbbe487ee45a3b101f41f07a9b40d7a68a1b8f4830a47c59e9ef60a608874f0c70736004022089b783731c89ede268008a52d11f7cda SHA512 9ac270b102ffb42b0b6632f73843010bd850d190e4ec70c93d47a76b739d421a6295533a7445f1ecabd7310f63a7d2333b19524eec0b538e8e74137bf7d164c1
 MISC metadata.xml 602 BLAKE2B 860e51d942ba4cb4200404571230e2f9b7962a050c57e3c7ae336fa909e183a248c191f4dd0718a564945f5cb02592d578f774e1c50db208639ac02470980799 SHA512 2c956bf66965f83b68bb0c04d79d479ae76af9b7781bca93a1ff7898f02838ee0c1cc72290943be9902dee38096f2b119f95f21e5bed781e8c04f331a60adac2
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r4.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild
index 2f1817e72c8e..2ff0e02a1bcc 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r4.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r5.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils unpacker games
+inherit desktop unpacker
 
 DESCRIPTION="Demo for the sequel to the 1999 multi-player first-person shooter"
 HOMEPAGE="http://www.ut2003.com/"
 SRC_URI="http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-${PV}.sh.bin
 	http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
 	https://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-misc.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="ut2003-demo"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
+RESTRICT="bindist mirror strip"
 
-DEPEND="app-arch/unzip"
 RDEPEND="
 	sys-devel/bc
 	sys-libs/libstdc++-v3:5
@@ -25,18 +24,18 @@ RDEPEND="
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 "
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-QA_PREBUILT="${dir:1}/*.so ${dir:1}/*-bin ${dir:1}/System/libSDL-1.2.so.0"
+QA_PREBUILT="${dir}/*.so ${dir}/*-bin ${dir}/System/libSDL-1.2.so.0"
 
 src_unpack() {
 	unpack_makeself "${DISTDIR}"/ut2003demo-lnx-${PV}.sh.bin || die
 	unzip "${DISTDIR}"/UT2003CrashFix.zip || die
-	cd "${S}"
+
+	cd "${S}" || die
 	unpack ./setupstuff.tar.gz || die
 	unpack ./ut2003lnx_demo.tar.bz2 || die
 	unpack ${PN}-misc.tar.bz2 || die
@@ -48,16 +47,14 @@ src_install() {
 
 	local i
 	for i in Animations Benchmark Help KarmaData Maps Music Sounds \
-	StaticMeshes System Textures Web extras
-	do
+			StaticMeshes System Textures Web extras ; do
 		dodir "${dir}"/${i}
-		cp -pPR "${S}"/${i}/* "${Ddir}"/${i}
+		cp -pPR "${S}"/${i}/* "${Ddir}"/${i} || die
 	done
 
 	# Fix the benchmark configurations to use SDL rather than the Windows driver
 	local f
-	for f in MaxDetail.ini MinDetail.ini
-	do
+	for f in MaxDetail.ini MinDetail.ini ; do
 		sed -i \
 			-e 's/RenderDevice=D3DDrv.D3DRenderDevice/\;RenderDevice=D3DDrv.D3DRenderDevice/' \
 			-e 's/ViewportManager=WinDrv.WindowsClient/\;ViewportManager=WinDrv.WindowsClient/' \
@@ -74,11 +71,13 @@ src_install() {
 	done
 
 	# Wrapper and benchmark-scripts
-	dogamesbin "${FILESDIR}"/ut2003-demo
+	dobin "${FILESDIR}"/ut2003-demo
 	exeinto "${dir}"/Benchmark
 	doexe "${FILESDIR}/"{benchmark,results.sh}
-	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-		"${ED}/${GAMES_BINDIR}/${PN}" "${ED}/${dir}"/Benchmark/benchmark || die
+	sed -i \
+		-e "s:GAMES_PREFIX_OPT:/opt:" \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/${dir}"/Benchmark/benchmark || die
 
 	# Here we apply DrSiN's crash patch
 	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System || die
@@ -99,25 +98,26 @@ EOT
 	doexe ucc ut2003_demo
 	newicon Unreal.xpm ut2003-demo.xpm
 	make_desktop_entry ut2003-demo "Unreal Tournament 2003 (Demo)" ${PN}
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	elog "You can run benchmarks by typing 'ut2003-demo --bench' (MinDetail seems"
 	elog "to not be working for some unknown reason :/)"
+
 	echo
 	elog "Read ${dir}/README.linux for instructions on how to run a"
 	elog "dedicated server."
+
 	echo
 	ewarn "If you are not installing for the first time and you plan on running"
 	ewarn "a server, you will probably need to edit your"
 	ewarn "~/.ut2003demo/System/UT2003.ini file and add a line that says"
 	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
 	ewarn "[Engine.GameInfo] section to close a security issue."
+
 	echo
 	elog "To play the demo run:"
 	elog " ut2003-demo"
+
 	echo
 }
diff --git a/games-fps/ut2003/Manifest b/games-fps/ut2003/Manifest
index dae918dfad5e..8db4698510fa 100644
--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@@ -1,5 +1,5 @@
 AUX ut2003-ded.confd 176 BLAKE2B 7cae571353911bd619fe5bb9d3fd49ae65e99c95a5313dde923ec15063537682454510f58c02c565c994abee29143868e581994ae48fc095afd8d289cf6a9f1e SHA512 98b2912dbf9639021a20690c5f1a3bf5a67a6d07ac450c926f79e9bce0dbe4b3adc1d6bf009cd5d08d4a812b002de329ba1221c254c921aa39045635d36fc99b
 AUX ut2003-ded.initd 320 BLAKE2B c534f4485877144e400e8bb9d0b5b9687e19d9f5846973bbe1abfa9e81caa9d89a8e74d336c658ee91f20e61520a9a02f88eb59d4b6d5a4f4e04f5a21f85ae71 SHA512 21fd4385bd1faeb005cbaefaea31abd43de7ebf58529817d7e08fdb5d606bb0835ca305062118f94764f5ca4ad589d5ae577fa99f40520357ab4c6b8742369e3
 DIST ut2003lnx_patch2225.tar.bz2 10039316 BLAKE2B a15398eb2b66606f3e7b1382b01fda6b5d38982bc3fe7065184232eb18a8c85792147187951e810ecb6af738b5f5a15a2e56832d7e91fb21ab8956d699817f76 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d
-EBUILD ut2003-2225-r6.ebuild 2674 BLAKE2B 9fdaced3e551d58ae5e6c23e6e15b1d724342aa44bd6b7e70a7c327b27e4ca83b085c22f9c7dc6f943bae657c0980388b50eaf7f6369e8a6f3ff0a798e0ac5bf SHA512 75872151c0b0ac43c604f53bbb5b8db030320890da51ed2132c96014c35ebc078311023f729a756f4b09a78ac7e9345b87f66f89beeef26510b9b3aa5a900ac6
+EBUILD ut2003-2225-r6.ebuild 2675 BLAKE2B 01550256c71322b884179ba84fe63153e36e36f3fead7f1b9950cdd39c79462fa3cbc4533bcfce38bfaed52318fa70500fdc11a6382444c482cd4302a7c65266 SHA512 2c7ab361e660c3a65fc254339c4816ee69c478d2ba031793c800f8615e3f14379ead19c642925f67fe5a72074b4d3420a799e8f5871dd00cfb481dea1b562896
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003/ut2003-2225-r6.ebuild b/games-fps/ut2003/ut2003-2225-r6.ebuild
index 0f36cd042f78..b69e6770261a 100644
--- a/games-fps/ut2003/ut2003-2225-r6.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
 DESCRIPTION="Sequel to the 1999 Game of the Year multi-player first-person shooter"
 HOMEPAGE="https://en.wikipedia.org/wiki/Unreal_Tournament_2003"
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
index 5a137dd025d6..ad5ec7b4845e 100644
--- a/games-fps/ut2004-bonuspack-ece/Manifest
+++ b/games-fps/ut2004-bonuspack-ece/Manifest
@@ -1,4 +1,4 @@
 DIST UT2004-ONSBonusMapPack.zip 11018471 BLAKE2B bc915d6942c321df4031b02eaa25f83793b3fa1f2bb916c5d413c5569a3f887b6517fc4dceb8cb914e22be62f58512e727a41d5efbc6066113be12a9da9621d0 SHA512 8193375b89cd6fbc8b00de195797099c128fcf5cb73757bbc57d3c5350c497a878eaf0200f2e0711bf062e25c5d170e05b055c63f85b908b18dcc89572d71fd2
 DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-ece-1-r4.ebuild 1922 BLAKE2B a2d5acc3ab09cbfc48fbe4f51ae8140b6949950a6e539c5145600c043e8286030696a6c3b6b6fc766875f17663665299affbfce018fc28ed2d3eac033f32f94d SHA512 22407966f82c6601872e57e749bde3813219d6822e2b24323af8a3ee4ee2bf8d03733ae7a3e035aa77dd0bea04425a3a8fc936e25b72832e6093c46f174ff498
+EBUILD ut2004-bonuspack-ece-1-r4.ebuild 1948 BLAKE2B 9c21e2246f5800b647a90f116ca873c58a29cd549295fe287fcb090580c13a49a0faa4dcf071a5ed82aa4ca2de551898ee1b820d0594d39887987f6f11da7110 SHA512 4af68037cf13bc2646f652a283e23de87f48984b64f1bfea0ce7627456668b7bc65a50b55404b6bfb5536948de1e66f0251348e6598fa8f3ca6dfa0d71d72b4b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r4.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r4.ebuild
index 5460ac93230a..0bd06e11ea1e 100644
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r4.ebuild
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,7 @@ SRC_URI="
 LICENSE="ut2003"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/games-fps/ut2004-bonuspack-mega/Manifest b/games-fps/ut2004-bonuspack-mega/Manifest
index 4a9164ef1f24..d641696053ed 100644
--- a/games-fps/ut2004-bonuspack-mega/Manifest
+++ b/games-fps/ut2004-bonuspack-mega/Manifest
@@ -1,3 +1,3 @@
 DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-mega-1-r3.ebuild 1375 BLAKE2B 11b92ca7bc864e6c196387df7c95b9faae0111b10baf68cd82441f7bf8c3273762a3417254db4d1eeff723d9896a89836c7c710674cc0e7c55b0e95f48c841dc SHA512 8cbc790da61fa8ee378922bab6e67774e793735b8bc2accdf28fe7eabb2577b1ace2cc40a52c465929b207b8e997b066debe7ece8625060fdc17320339c46d2f
+EBUILD ut2004-bonuspack-mega-1-r3.ebuild 1374 BLAKE2B bb139c49e916c4143f8dbe049a4c28e33085fae41b2adad54e9d06aba97c653dbce0708195aab83557f5cb2a982db33a6c31ef51ca0beb40fba8d23935ecbf5e SHA512 905e527a6528b48572dd410a688f7acaf088bc0e1b7c8f110d8472c6425010c035c18c963104891a06bc47373e680757d5ef97d1e4e42d9c72477c2243d26816
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
index 4beb21b3c8aa..76d8760255cb 100644
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,14 +6,12 @@ EAPI=7
 DESCRIPTION="UT2004 Megapack - Megapack bonus pack"
 HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="ut2003"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RESTRICT="bindist mirror"
 
 src_prepare() {
 	default
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
index 085b3461c508..6c1b4337b260 100644
--- a/games-fps/ut2004-data/Manifest
+++ b/games-fps/ut2004-data/Manifest
@@ -1,2 +1,2 @@
-EBUILD ut2004-data-3186-r5.ebuild 13379 BLAKE2B 90e2f1479851b3eafc9baa1e72004bfdaab6f44b5da5dee7c3d99b5458def3d96e4953940fd8a7400598bec5780ec1503f95bc40d87710ce9a0f70a73c10f1fd SHA512 f6c81a3d419bd046612c26cec79bb3a4c4eba1353483ad3e6e4fd78e8650a537e4592fee041645dfd0d0d4b55eb4024d0766d4b76a7bbd4f172453b9333d0b18
+EBUILD ut2004-data-3186-r5.ebuild 13392 BLAKE2B d2ca9bef522a87e31a656618a094125af9544506fe5cf531938ea8d1004b062e8520b2588994d6df582b2c47a949c2d03a4042ed798672c023d6029f7a5c5e3e SHA512 e3d2cdbd859fbef67fd756db54096fbdec658c2895582c5a398a8469e8d784e4c8e1d6f9b51839f4d0e42fdd6d02852ae8aa79026c8f82ad086399e933a62684
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r5.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r5.ebuild
index 21e88f8ad6ac..1afad93fd0c1 100644
--- a/games-fps/ut2004-data/ut2004-data-3186-r5.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cdrom desktop eutils portability unpacker xdg-utils
+inherit cdrom desktop portability unpacker xdg-utils
 
 DESCRIPTION="Unreal Tournament 2004 - This is the data portion of UT2004"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
@@ -12,6 +12,8 @@ LICENSE="ut2003"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RESTRICT="bindist"
+
 BDEPEND="
 	games-util/uz2unpack
 	>=app-arch/unshield-0.5-r1
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index ee755f01cf4b..9e0859ed9657 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,3 +1,3 @@
 DIST ut2004-lnx-demo3334.run 288950743 BLAKE2B 82a45af7de4735cbcb1b8b4b5303d28d96e3e4888e12b60b920db096ed07b4c5d902eda258276c95865316206ddfd5828174397a8e921118e33f63be01e71861 SHA512 4cdd61901f4c082d1e02caf301a24f1e18e89f4efc9fbce0e4496178916b6c14245131b62f27deb17f1763cd4b8bf68ee60cc7af5ece5fa2b39d1bf349361da0
-EBUILD ut2004-demo-3334-r1.ebuild 1864 BLAKE2B 149d10d3593749e97ed173c347cce7d17b3f7ffef4a32d9c9462af1a31dad0b07727e7d230dfa0b4c7c8d5303f7c8f3c08eb8c2a8ad68b6e93b463a8c7788671 SHA512 c5ae87d6fcae8422fceb0fde18c6a690e8b8d0b8fa6aa309a2058b3c6ab07500c9138f8ee04cafcc45aec15dd816c6b737489e2f28b3dda5ed4e8dfac6224df8
+EBUILD ut2004-demo-3334-r2.ebuild 1801 BLAKE2B c6c3787ecea657191de65cf78b0bbef456c174a7800043ef79b58db612e11e84320f18fe23f4d71bb57fd860dc3b34451a596bb1eaf4f491e4f5e20d68dffda6 SHA512 0283e14511d3a1dd7694a05a3e42fe19c04fd6e5dbfdf1ad09f9ab67c5d9e0bfe06ca9965158cbce7c23a0f35a519e5db9eb16145c1a2ead012187c7b2c52fa0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334-r1.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334-r2.ebuild
index 51bc3e089f0b..51362724f160 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3334-r1.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3334-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker games
+EAPI=7
+
+inherit desktop unpacker wrapper
 
 MY_P="ut2004-lnx-demo${PV}.run"
 DESCRIPTION="Demo for the critically-acclaimed first-person shooter"
 HOMEPAGE="http://www.unrealtournament.com/"
 SRC_URI="mirror://gentoo/${MY_P}"
+S="${WORKDIR}"
 
 LICENSE="ut2003-demo"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
+RESTRICT="bindist mirror strip"
 
-DEPEND=""
 RDEPEND="
 	sys-libs/libstdc++-v3:5
 	x11-libs/libX11[abi_x86_32(-)]
@@ -23,11 +23,9 @@ RDEPEND="
 	virtual/opengl[abi_x86_32(-)]
 "
 
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-QA_PREBUILT="${dir:1}/System/*"
+dir=opt/${PN}
+Ddir="${ED}"/${dir}
+QA_PREBUILT="${dir}/System/*"
 
 src_unpack() {
 	unpack_makeself
@@ -35,37 +33,31 @@ src_unpack() {
 }
 
 src_install() {
-	dodir "${dir}"
+	dodir ${dir}
 
 	tar xjf ut2004demo.tar.bz2 -C "${Ddir}" || die
 
-	if use x86
-	then
+	if use x86 ; then
 		tar xjf linux-x86.tar.bz2 || die
-	fi
-	if use amd64
-	then
+	elif use amd64 ; then
 		tar xjf linux-amd64.tar.bz2 || die
 	fi
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins README.linux ut2004.xpm
 	newicon ut2004.xpm ut2004-demo.xpm
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe bin/ut2004-demo
 
-	exeinto "${dir}"/System
+	exeinto ${dir}/System
 	doexe System/{libSDL-1.2.so.0,openal.so,ucc-bin,ut2004-bin}
 
-	games_make_wrapper ut2004-demo ./ut2004-demo "${dir}" "${dir}"
+	make_wrapper ut2004-demo ./ut2004-demo "${dir}" "${dir}"
 	make_desktop_entry ut2004-demo "Unreal Tournament 2004 (Demo)" ut2004-demo
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	echo
 	elog "For Text To Speech:"
 	elog "   1) emerge festival speechd"
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 31c1b97c5402..d1a628a5732a 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 3593 BLAKE2B e835433737e1e2eb6947de9a02637f7af790c7f90c58fe93dbbe8a3744d86986bdb5d9b29c712e8f6b2220c08522bf642af1252ef6bca04e39b2c5fa6cde469f SHA512 2af5a1fbcf3c95f9c497bb1adedad2d352f65189323a174f672497d1b28d9cd270d0b092177b5968e19012adca533487b80355fbff3adade79345f125e3f23da
+EBUILD ut2004-3369.3-r3.ebuild 3594 BLAKE2B 36037690dd8d820a9df5c5e87b747e4a2c4631846ae613418c2e7ed6c2756eb7d053ef412cb91b4d9626e9d57722cb9f7653e67bc6cb2ceb26935b828fb54e93 SHA512 4e94ef89f37825dc66a97a43ade51f857fb604ff195880421b10c35fd624bf498d3a596f7e73a2187364158554298e3951191fd711a645178169518a8f076f4b
 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 cfef6283f8f0..3011645a2d0a 100644
--- a/games-fps/ut2004/ut2004-3369.3-r3.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
 PATCH_P="${PN}-lnxpatch${PV%.*}-2.tar.bz2"
 DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
diff --git a/games-fps/wolfgl/Manifest b/games-fps/wolfgl/Manifest
index a5681c21731a..a981d2840c12 100644
--- a/games-fps/wolfgl/Manifest
+++ b/games-fps/wolfgl/Manifest
@@ -6,5 +6,5 @@ AUX wolfgl-0.93-as-needed.patch 397 BLAKE2B f51e7d40ead7ae01ba2f362ccd3310712884
 DIST sdmdata.zip 557147 BLAKE2B a70a821941175aecfd3edd7746ed54e13181863ddb25bfcc77bf354b1366541b71462739543a1ba9aa548a754b8a88db60eff0cf5d8313097f6d41cb62892b3a SHA512 cf6eae7027acbe6e3da6985639eb36def04254790f6449f5353ffe5edd13a73c01b0a35ef9873f2e97d09ec59e632337c5b3a1a26185befdf4dfa5a161267076
 DIST wolfdata.zip 564771 BLAKE2B 0c1343cae6fbcb695930899fd2ba9e5798af47f4bec984fa15cdca85c9d96e5dd9ed6e5ff2b7bc489251e5be6342ed94a8cb7c626f39564a8599d5d3fe5eb6d2 SHA512 2b14c477e54d14fc543e146fa699f55dabb003bd3bac1e89422a49391cf8f29b5db6967b09c08a82c612f73fe71d624902c180d81481ad42f011f51448652a43
 DIST wolfgl-0.93.tbz2 146132 BLAKE2B b9dbf442be01a516c5cbf1146892d610df881109ca163ec7c1c79bd9ea1c328d8e9401ba5615e1be9c2df5df3940b83fdbe36154c4f0429b617dc6208b6ccf78 SHA512 834dda2eb4e099d70fad52e40760886208c5ca60e687024f1fe51088b94c8cdea7c058d326daa61966946bb70feeee97d0b7fb7c284e98fdec0eb8c503de7e30
-EBUILD wolfgl-0.93-r2.ebuild 1388 BLAKE2B be76735bda639d804c8bb1720aae826f4152f3ef3364e0bb76a83989a870c4c9baf7a9058516a6505a64486f6bde297668989133442c839ad610d5ac74d9ce7c SHA512 8d62f1aa2b2a735b367d02d7d7ae8edeb6f50b33006da1a196c50615d29ca143191003eb5e0a20a821dc5a87485bcfc332182c6895b2c88092dff3b35f865a3f
+EBUILD wolfgl-0.93-r2.ebuild 1369 BLAKE2B 9445a9c34c0c3111b25009234d4fa0f23fc586db67f1ee59fd7cc65657bbf17c6a1bc9999573bfc91e166698ff7a3810eae0b680a2d858cb23da106cceb645e9 SHA512 feda3849fea5782bb41cb24ff8b4f323340cafef352a39e96d8a554f2c6b34d49ff45cd46bdedb20e8d8ab5fdfb22ed774ed0496f052d5664d152eea2fdc1240
 MISC metadata.xml 451 BLAKE2B 0b88acdbf3a154c982180c671b1e5ee23fdac3b2c36650e7b425cffb752dbe209d8beb010047fdd5a8e654740c49453c5b6eb556d68bc9b7b1ffa583e83b1286 SHA512 2623437ddb8f1ebc5290d5076894cf2059df12f31a22043de4cb3246648076f7ba6dc923fde07812038a2405836d57d4f9171f5c80fcfc498ae452616128a8e8
diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
index 8bb95ed031e2..3b90a916f32e 100644
--- a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
+++ b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,6 @@ EAPI=6
 #ECVS_MODULE="wolfgl"
 #inherit cvs
 
-inherit eutils
-
 DESCRIPTION="Wolfenstein and Spear of Destiny port using OpenGL"
 HOMEPAGE="http://wolfgl.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tbz2
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 088d4af21c84..5f8bed0c30a6 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,11 +1,8 @@
 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.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
 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.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
-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 932 BLAKE2B c7754bc8d2a5f53d84108283e176df88686573e80e632c37f7d09e2fa2dd0d1e708adf3a04004c14c74f088bfe873593cbd0b7448fae9b0d308f312533da81e6 SHA512 b0ff273cc5e2594b7a5285e1f094ac7505486f221a46d784ba167f57a625ba1d4222369d006f9cd31ffccefd42dd1bb7015c9aa96d236be52e4484d04ed70215
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch
deleted file mode 100644
index 76ac4b60f503..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile	2017-12-08 12:22:59.000000000 +0300
-+++ b/Makefile	2018-01-14 15:42:56.804047742 +0300
-@@ -165,12 +165,12 @@
- # -MMD to generate header dependencies. (They cannot be
- #  generated if building universal binaries on OSX)
- ifeq ($(YQ2_OSTYPE), Darwin)
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -fwrapv
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -fwrapv
- CFLAGS += $(OSX_ARCH)
- else
--CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \
--		  -Wall -pipe -g -ggdb -MMD -fwrapv
-+CFLAGS += -std=gnu99 -fno-strict-aliasing \
-+		  -Wall -MMD -fwrapv
- endif
- 
- # ----------
-@@ -263,15 +263,15 @@
- 
- # Base LDFLAGS.
- ifeq ($(YQ2_OSTYPE),Linux)
--LDFLAGS := -L/usr/lib -lm -ldl -rdynamic
-+LDFLAGS += -lm -ldl -rdynamic
- else ifeq ($(YQ2_OSTYPE),FreeBSD)
--LDFLAGS := -L/usr/local/lib -lm
-+LDFLAGS += -lm
- else ifeq ($(YQ2_OSTYPE),OpenBSD)
--LDFLAGS := -L/usr/local/lib -lm
-+LDFLAGS += -lm
- else ifeq ($(YQ2_OSTYPE),Windows)
--LDFLAGS := -L/usr/lib -lws2_32 -lwinmm -static-libgcc
-+LDFLAGS += -lws2_32 -lwinmm -static-libgcc
- else ifeq ($(YQ2_OSTYPE), Darwin)
--LDFLAGS := $(OSX_ARCH) -lm
-+LDFLAGS += $(OSX_ARCH) -lm
- endif
- 
- CFLAGS += -fvisibility=hidden
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
deleted file mode 100644
index 335ae177e9f9..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils
-
-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/"
-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 ~arm64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="
-	|| ( client dedicated )
-	client? ( || ( opengl softrender ) )
-"
-
-DEPEND="
-	client? (
-		media-libs/libsdl2[video]
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	client? ( openal? ( media-libs/openal ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-)
-DOCS=( CHANGELOG README.md doc )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		if [[ ${addon} = ctf ]]; then
-			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r4.patch
-		else
-			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r3.patch
-		fi
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-fps
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)